diff --git a/Manifest b/Manifest
index 6892279e3ed3..b76c2dffc7e2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29630 BLAKE2B dc0c1edab4f6df9c195074639accc85b27b5dad7ce6acaecafbc613bf192b3544ab124d8668fe484ec80f3ea7683197bedeb6808fd4d5b2c0aa4ce1c11e7f428 SHA512 6c78c4312390521b9e3d3a522a2ad35db9101e1fbe2773b20cfa971629fb0c8523f1d76066e7e32676f58a23d8a0d56bdef3635df8f5d3c5449d36eb640f34df
-TIMESTAMP 2022-02-01T05:09:11Z
+MANIFEST Manifest.files.gz 29606 BLAKE2B 1f243fc85f0aa354fc47e75f817e7c8091490e4097f21ce4bc6a1e8dd06eebefce12e76fbae4714f76aa466c0cbabe0edb0a87330f8c258a835023ca5180149e SHA512 7d4be74fd91fe798ea6612eb19fd61727947eb531173fe97d179f005b1601946999c24e233ead3beab3291a797d8469af8f136ae90546f93deb78bfbb70cd928
+TIMESTAMP 2022-02-01T18:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH4wHdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH5d0NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA2Xg/8CUi1E3SKUPY9iOw0HhL5am39VdcEgm+lev/lRCx/aNQduf+Lx7ujPNAy
-MiTaVgOqJ+X0yZ7a9hntGgqykucak3zvJTmbiBox+IWg9JzAjSLQwMLh5Ab6umI8
-l9ePj+crDk1cgcSe3/ME/qlD7y0WWFTXBRE8gCtOiZibnGFD8JWv2Cv//SZIMU44
-xeiwFTmM6XexzsdX1L6DhIaBvD4hWWxJ/MCYvQWeiKxdAyCUGsv1mjd9xUi7u8Zh
-GQFa7d31w5oaS3aaY0cfiaLKvDUsLIkozqGwsgCa9m3DZhYWctco18ZSlSg9QiJk
-9AeZDirjJU+9e7VS52+j3aKSebBJxks+xhNe/V3jTxPna8PtMTYocDkNKdH/WeNW
-xYLjvKHxhPdFvBLLHfg1os+GsCLZ09gkBt9iernA6xC0H8F3+zHRj3AA6pqgXpFz
-7pUgx44I51omjbTLPmKGLJbXy535pVz3uZeAPArQ8l91FP0BFcf61tBpOZ7tRt3G
-hBUiwAGRiyXjVuS6ILJe/Z+cLe+in+kvfwWA0kYobWhcPFKeM1MHcWm0/iPF9tIr
-3ve9WznEF3DsXnz5rvqeP4pUxzX7Y/UmpyrDoOEFzVgK9kqGN74uXMbTOTRr9Z2A
-NyVsLxp6xCybzjU2y4oZ1A1isMNHNvGLC9I2F4XFdsHkPtn/W4I=
-=3uFq
+klBilQ//WbwkI7qA15d4cL4GUh83O5WZOfd/lUNngr6FGXLTrcd+FzlGO6EEAsF2
++qRH/7t0JWfLepti06ShuuRAKrvW8H2iDn3KL7VdGWkeSZ4R1pfQ9HTBpT6nBgxo
++pBbJCYYlwr4GwXQSrtp9BIl9rTc36uD3LNeYyLnXViUs+CPvCR9ihz6MzbagPyo
+oRrZgjIP9nt5GJNffWgh+9HDS7arLYhD+zuNCSA+q/c7Nq6MqqxYdfRhxapgZp7z
+QG/CvKAZ5uF42yHgsBNt1nOYvGOVedq1PF+1YaysSJPfOL1k9Y1bl64+xffgp5bU
+ka+ggNTPZAHdqdywctgqoZ16PRi/nXllnVdLCmvB78ZZDV4OtoJ/OODv44U17Jac
+HfyiJda6wDRGLHlqXOjB+SbuE3O/UZaRuhHbc1pzpIbETOS3yjEEhcBCaqAnrmKx
+4hhWGWc6qOgCYY59daTiLhIO+IDyIP3qvCclNLoGyr3PMtrgW6TRQo/WrcGKTh2F
+dUtUITqTJPiB3y5ay2ANSOZKzRO0zG4u48uvEjEin+0EEIDfMKAxIGf5tsoEWThe
+fk8CFNKqoT/05jEtOtrZ3JIoKT5WrYhoNkMy6ddSBSqFfvcETkfeEBbVmXmJoVIC
+Aut0U54/7HV2RG5E4wUJhQjgctyESxXeUh1+BZEhNrR+lL+K26I=
+=pO0Y
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e105cb66c331..ad3609cddfad 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index b1798dd8bd48..0b82541cc1fa 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/biboumi/Manifest b/acct-group/biboumi/Manifest
new file mode 100644
index 000000000000..18b58b5c8c55
--- /dev/null
+++ b/acct-group/biboumi/Manifest
@@ -0,0 +1,2 @@
+EBUILD biboumi-0.ebuild 151 BLAKE2B f87f423bcdf9f62bc0308265ffb19739b471747be382a5753d957c6e1d2017763a8c4f73e5469b92f516330a678f5f3f66b11b67e5e5f0f52c4c51e88d0d3b83 SHA512 7978756fb79cb8c100f5907237afb9f655ce4d07e6b6eb002cdc037161d4a5c8cc4181954874e2104cdeb183c03a8cded800cd5057164121cc0b4a23618908b3
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/acct-group/biboumi/biboumi-0.ebuild b/acct-group/biboumi/biboumi-0.ebuild
new file mode 100644
index 000000000000..14c409597792
--- /dev/null
+++ b/acct-group/biboumi/biboumi-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=508
diff --git a/acct-group/biboumi/metadata.xml b/acct-group/biboumi/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-group/biboumi/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">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 3dfbeac0ba68..4744bf2c13fe 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/biboumi/Manifest b/acct-user/biboumi/Manifest
new file mode 100644
index 000000000000..7b740f249ee0
--- /dev/null
+++ b/acct-user/biboumi/Manifest
@@ -0,0 +1,2 @@
+EBUILD biboumi-0.ebuild 236 BLAKE2B 458acccd702c6fb762a779433f18399bb572d17b6194b85f28bf545e2cc558662ac2d56ac8de2797ed64519498e7a08f128cf6c2702226d5998a038eca8f04f0 SHA512 51124a78e9fd83ba3df510a74b14a6055ac15c61a40b71e8e52fa2a5cd56f7d08fff08e4268609256d294c17f22f2167bb41bc5b7adb47cfdc212628b320f972
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/acct-user/biboumi/biboumi-0.ebuild b/acct-user/biboumi/biboumi-0.ebuild
new file mode 100644
index 000000000000..8cd114a9a893
--- /dev/null
+++ b/acct-user/biboumi/biboumi-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/biboumi"
+ACCT_USER_ID=508
+ACCT_USER_GROUPS=( biboumi )
+
+acct-user_add_deps
diff --git a/acct-user/biboumi/metadata.xml b/acct-user/biboumi/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/acct-user/biboumi/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">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fcdc7d6917b0..badd1efd7f1f 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 730dbc8091ee..9eee78029aff 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -9,5 +9,5 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e4506527ace432af314566b20a8d82ae91e96e3aa039d035f3baf096bb02e16143a35446ff2e3cbba1880c61c1f708688 SHA512 f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10
 DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
 EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
-EBUILD syslog-ng-3.35.1.ebuild 4879 BLAKE2B f934dcc19cbc6ea40995d2ac07b73ed1686dc7047b1da83cdf363c54d7f2e07114feae5034babb2ec63fd2f46fad3de5968498f9dc269ee657e6ce1df7806b5d SHA512 1b4a9714ab52b705649ae9fdaac0ae0382c49ae41c84ebc2aacfd2db128e8cc7d9773c72c9ff66058babae4de3222aaa33c617fc1dd58d4733f4e808ec993491
+EBUILD syslog-ng-3.35.1.ebuild 4878 BLAKE2B ec170b9eb0a9db3bd2ab68d0fd0d71480e0a94b3f24b91ffd4526fdeb599f3a709abed4705bf4f5b7bfd161f6ccf237c04a0072a2a05ee553945173f8845a4a9 SHA512 110af937957ba6a757b62a57225688c0a9919631479d3e21d4fc433fe18dc99ccd9f15ca85d0ca8cfe2e3af6e67596a149299da4550a37854f8f273b846561a3
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
diff --git a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
index f69d887d071a..fcdfa7407b0e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 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"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 94354d2ec397..7e2522cc8645 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 25746291135b..2805c925c0e9 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -22,6 +22,6 @@ DIST clamav-0.103.4.tar.gz 16425023 BLAKE2B beca05941ce462bd98473a5ac72b36e63afe
 DIST clamav-0.103.5.tar.gz 16434316 BLAKE2B c5a21b72419a8cd731656d8a8bbc79c5850895f1d8cc56cb5d19eabe2356a5dfcf88e7dc9553071a24b2719bae07cf1a941da3dbed69da8ac4ae3b8897ab32fe SHA512 242423b507eacbbd31dbae6dd0325dff87da25bb8072f2cee7a5e7cab4b8eb5ee6196c759570c1d75986a2777f0f79f92cfbd6250a30ae5b53390c75b238c29a
 DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa SHA512 8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5
 EBUILD clamav-0.103.4.ebuild 7353 BLAKE2B 6e08edaf316ed94fea7c0c78d40ef673cfeb7f42a39cc7f6de21dbce7ae030460271e58671099a468d07284a733eb497ef7d0a7c0c4a836d1b68c3e8d5b769fe SHA512 93b548284c7697bd69ba92505b673ead50b684cc213c24c2488de05c4dab6e3d311cef0aa6b78fb6ebbe49e86f3e25823b8cb7f45c5b3393b57ca736c05982a4
-EBUILD clamav-0.103.5.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
+EBUILD clamav-0.103.5.ebuild 7354 BLAKE2B 5c247a7d3e0b1d8c85556e3b3412e94599e8b219758e55e38522e916a780749a61dfa27b895e7dbc8a1755a338ace8ff0556f0a4e8514316c34e6b5541994849 SHA512 5c3497f507a0cc61c7bba3b1b46d3d4d702ec4f839f4db4e9a9277080a89937ffc20b3b7284b0e13ab46c542d2205bbf4eefa2f1f676eadd80aa942799e8cae6
 EBUILD clamav-0.104.2.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
diff --git a/app-antivirus/clamav/clamav-0.103.5.ebuild b/app-antivirus/clamav/clamav-0.103.5.ebuild
index c741ac2099ac..98ea805abba2 100644
--- a/app-antivirus/clamav/clamav-0.103.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6a809c408eab..0babc9e81801 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 8214c78bbbae..121a792257be 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,7 +1,11 @@
 AUX bareos-20.0.2-cmake-gentoo.patch 1332 BLAKE2B b84158913e0bf051013681f8583546add34d48ea56647beb057525a0da1fff57dcd06c20dd125f300e34a42adb450c3a00456077de914dedf50b5a68748ef1ae SHA512 61e2b119d12daa60bf1fa0bc1de81d4322df421c6c5d2de4e823686f8a8657f521d53256533b52b17a105a25ef8070058144620d71aa295b491d2a39bc7de2f4
+AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666989c9ec203d478291bb58d8ae974e624c6d83977247f47fdc9cdcae0761552a2864e31ec26cbd64317610bc87613f SHA512 225afe4c2d9ee7774d34776071b8b8430c0a4c28e8a2b301fb5f3963ae4b02ea6f6020082d4bcc0ba937728cd57f77ba19fbc176f8f14c0dc28fa98135fb3c80
 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743
 AUX bareos-cmake-rados.patch 718 BLAKE2B be3c5822a122fb9d6a5bdd6cb388e3edbb59c6e2aafb9e16991bf0c62ab2dbdf0757de88382318bbd9f6b0fb7d48de11c9d0cd6ab276b6fb6c4f61f8b756237a SHA512 46b6ced3bcdf7e6a72029803a60775cfc06b2313004214dfe7d7ffa64f954fb80cb93f7374b967b33b4035aac8fce4412f13833aa57a83e4ce98c503f147918e
 AUX bareos-cmake-symlink-default-db-backend.patch 779 BLAKE2B edb161632215ed8bdc75cae27d54f603787d5f3cbfcf19e180cb7234f661c35527c24dfef38b7c455fd28a46539eae94d157c4777549381c0db64c5fe531d35d SHA512 f5c07d611b7e9f5dc85e0e1440b5bcf43f80a6a6a3b7aead0b88a7a924c9cc8c42bad016d81a0ad55baecc5888e850a516bc86b52a65ddf460c3059fe7f299ee
+AUX bareos-dir-21.confd 357 BLAKE2B d2cd8da7fea60011752d043b307d0df08c655201a384dbe9406ba491a1463412e1353239c6933b6cd44258f452393f92d80760c657c44cd92c613d6b5422e777 SHA512 4a4b3a2aac3d13f3ce9192652cbc2bbd6c5723e13cf4f602e4094c1df8ce646b3ccf2e56ef8125e2cc410ce885fe1a7b483f2aa167ddadcb25e7c781075b8356
+AUX bareos-dir-21.initd 886 BLAKE2B 6ea7ee1717c5ab5241cbd4427b5eef1c96eee8c2e297b8d1cf0cd77ee8564bcb69add8b29daa6676a31640b33c40df332a30a41e28abe559f531b30053a8de47 SHA512 c1a61e7c5c2c9cbafb3e599e357c598cc4e3c80d9cc79dc8c6d93c21188c1a7820d1f3c86b5b897cd5e3509a63dbbfaab50c0dc2965a21f13aaa8d7ede374561
+AUX bareos-dir-21.service 884 BLAKE2B c0a4fb957588136cd043be2670a03e05bd5ffad4ae87275636642961e0e105ff07fb0614490a71771bb7eecfb551e6f860d8d41104e56ea8c5d434c84c5602a8 SHA512 187e331f8495d27d14434bd71baace7051d254e2886c3814493600973cd830cb01f27153321821e0a3bd2356d55f39cf0878488297079ed80bcfb2693cc77809
 AUX bareos-dir.confd 640 BLAKE2B 0c80793f66ef9f3b46995a2dcf150b3d7a8a9f53ff97896887314ab31d6082949ac3db2c260b2fc7551c035183c31558cc853f768eca5b0bebdfa483280780b5 SHA512 af71699773ade63c98e2016f48b4d108f29a419a7533444245df4507a7ad7b807948986f9f850ce1f9af58fb445ecd44a5d880f68732b371a7a87dbc5a25ec7c
 AUX bareos-dir.initd 869 BLAKE2B 80fec7cbe9b4f80f2f5b6152243ad7aa79760dc5198473515e5642ca29255f869d59b83465f87543e42ffc80ba0b3b277e437ff3446c005c5338350e1d04175f SHA512 ea54b7e569cfa69e6b2d996352dedd52487d1eb6f7776d970c3a9efa7e13f40d12b3b8d7388f035d5d84c2096c7644f5834495cc5b4084203e71b2bd0d833e8f
 AUX bareos-dir.service 841 BLAKE2B e8c9508984f2823b334c3ef3c412f51e50666cd45aea1c5491a3ce6b1fadf09e7e0cb836d0658f5398209aa0a478c5a6b4fa1b67476e0fc317d6e25bc0fc54a8 SHA512 8f886d3c60959f009cf5f626f64071eb5d768ebf6c5ac0dd0c0c34d866d29563a2f0c68519363170ac35595cc743b432f46a54ce10bbfa530971f56b9914b0a9
@@ -14,8 +18,10 @@ AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646
 AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
 DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
-DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
+DIST bareos-20.0.5.tar.gz 13343612 BLAKE2B 78fc178b021165377cb912593f56c248fed68b44deab3626087c9fc10d2eeb866730b734e0ba5982424b4bbb875d734e62351c8114c947057478d4929df2ca2c SHA512 a61141944c24042f2b9f977672564923d4912756c821abe516f94a2c21f5b990236f22187c8567956edef09029f740552c3bc6c30f8c6d65c3f0b06b84ef00e7
+DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166 SHA512 0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd
 EBUILD bareos-18.2.12-r1.ebuild 11168 BLAKE2B 952379f3531292e6b20e0e81d9be6d8384b8a76b1747a340310032c1ed0cf5b38415e6b6fc4edafb46b4e836cebce2dc73532fcc7b5737b1464deecec3c1e3ca SHA512 f8878820c0eeb8fc178b65579fe55230b8534b9e37b69ccacb1818635066a8fca016dbd818394b9b1e5916b49c31cee24abb9591dcbc7ed2a094146bb18adb41
 EBUILD bareos-19.2.11-r1.ebuild 10915 BLAKE2B c0101e1fd5a33994bb42b9a460fca12ed422eb4a99a23d6e7333c29b94bf117c39efb1cde61f82b9fda9a00ccc0452187ab8a74ccf6d4e3fdcd813fc9d219908 SHA512 0880c16abaad7ad94bdb75d77e4069994872bfb74b03f496127a936c46d21bb5bf2bbc5b8c078d9a0ecdd3aca40845d72b67bd475b006edabfd57657401979b4
-EBUILD bareos-20.0.3-r2.ebuild 11407 BLAKE2B 3892f00374c4da0f3447ae12308f8147cbadfa6d5f5a3c8995eeeb2d69312317d80233ce25ad4a47bad021917b9a4aab0a29d2ea842470d9bb3737f991297243 SHA512 72441b8e5d54836691209c8e4e9de9b9371c59a8e698095e47c82341d5885ee9070e1556bbce26674da0560362790248c496c70a58d7a80a752f2b4724e86d88
+EBUILD bareos-20.0.5.ebuild 11407 BLAKE2B 00a225c47f39abb02990a088a7b763c73f95aca2b98d3fd49015b7ab852b50c9a0b7455aa881f63071b4fd31676806e13ade6001d8465e41e8b88bbb83524167 SHA512 0924dd4387fcce3821dd039729e6395e142b5de067bee06219de5362fa1068238928c3e9dc243f8648e76717428d80b304acf5ad2719548dafe18b705800497d
+EBUILD bareos-21.0.0.ebuild 10262 BLAKE2B 59c69eea0e81ef4f9d0482a6c29a50806afe561ae4d01ba9b078c1f7d9e299435763b789ed4585701c01ac0ff12d23cf6e39e1e1f2a06b5b8d974aae31da7961 SHA512 5c10b93da2a95081d3a7a7304507c92c954e87b79be5b8ac86d3fddeb44c616cfe21e58f7833db8ca8448a84041897cb30e2db20ba5e1208fbaf98b4ead22f14
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
diff --git a/app-backup/bareos/bareos-20.0.3-r2.ebuild b/app-backup/bareos/bareos-20.0.5.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.3-r2.ebuild
rename to app-backup/bareos/bareos-20.0.5.ebuild
index 98191f5002a8..a678aef69a5f 100644
--- a/app-backup/bareos/bareos-20.0.3-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
diff --git a/app-backup/bareos/bareos-21.0.0.ebuild b/app-backup/bareos/bareos-21.0.0.ebuild
new file mode 100644
index 000000000000..ef360cdc5a34
--- /dev/null
+++ b/app-backup/bareos/bareos-21.0.0.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 lmdb
+	logwatch ndmp readline scsi-crypto
+	static +storage-daemon systemd tcpd vim-syntax vmware 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}
+		dev-db/postgresql:*[threads]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		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="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_prepare() {
+	# fix gentoo platform support
+	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	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 lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=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=no
+		-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`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-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
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		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}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# 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
+		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
+		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-21"
+		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"
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script/-21/}"
+		newconfd "${T}/${script}".confd "${script/-21/}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/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:"
+		einfo
+		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'"
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/files/bareos-21-cmake-gentoo.patch b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch
new file mode 100644
index 000000000000..e42bf91a91fd
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt bareos-Release-21.0.0/core/platforms/CMakeLists.txt
+--- bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt	2021-12-21 01:00:49.000000000 -1000
++++ bareos-Release-21.0.0/core/platforms/CMakeLists.txt	2022-01-30 15:09:41.949529813 -1000
+@@ -30,6 +30,8 @@
+     message(STATUS "adding subdirectories debian and univention")
+     add_subdirectory(debian)
+     add_subdirectory(univention)
++  elseif(${PLATFORM} STREQUAL gentoo)
++    message(STATUS "PLATFORM: " ${PLATFORM})
+   elseif(${BAREOS_PLATFORM} STREQUAL hpux)
+     message(STATUS "BAREOS_PLATFORM: " ${BAREOS_PLATFORM})
+   elseif(${BAREOS_PLATFORM} STREQUAL archlinux)
diff --git a/app-backup/bareos/files/bareos-dir-21.confd b/app-backup/bareos/files/bareos-dir-21.confd
new file mode 100644
index 000000000000..3ad4b7482f93
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir-21.confd
@@ -0,0 +1,10 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-dir
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u bareos -g bareos"
diff --git a/app-backup/bareos/files/bareos-dir-21.initd b/app-backup/bareos/files/bareos-dir-21.initd
new file mode 100644
index 000000000000..7100b615105c
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir-21.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need postgresql
+	use dns bareos-fd bareos-sd
+}
+
+start() {
+	ebegin "Starting bareos director"
+	# g+w until #631598 is resolved
+	checkpath -d -m 0770 -o root:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
+		-- ${DIR_OPTIONS}
+	# harden pid file until #631598 is resolved
+	ewaitfile 10 /run/bareos/bareos-dir.9101.pid
+	chown root:bareos /run/bareos/bareos-dir.9101.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos director"
+	# check pid file until #631598 is resolved
+	if [[ $(stat -c %U /run/bareos/bareos-dir.9101.pid) != "root" ]]; then
+		eerror "SECURITY ALERT: pid file is not root owned anymore?! (see #631598)"
+	else
+		start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid
+	fi
+	eend $?
+}
diff --git a/app-backup/bareos/files/bareos-dir-21.service b/app-backup/bareos/files/bareos-dir-21.service
new file mode 100644
index 000000000000..2f156cf8aecc
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir-21.service
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Bareos Director Daemon
+#
+[Unit]
+Description=Bareos Director Daemon
+Documentation=man:bareos-dir(8)
+Requires=nss-lookup.target network.target remote-fs.target time-sync.target
+After=nss-lookup.target network.target remote-fs.target time-sync.target postgresql.service
+ConditionPathIsDirectory=/var/lib/bareos
+
+[Service]
+# see bug #631598
+#Type=forking
+Type=simple
+User=bareos
+Group=bareos
+WorkingDirectory=/var/lib/bareos
+#PIDFile=/run/bareos/bareos-dir.9101.pid
+StandardError=journal
+ExecStartPre=/usr/sbin/bareos-dir -t -f
+#ExecStart=/usr/sbin/bareos-dir
+ExecStart=/usr/sbin/bareos-dir -f
+SuccessExitStatus=0 1 15
+ExecReload=/usr/sbin/bareos-dir -t -f
+ExecReload=/bin/kill -HUP $MAINPID
+#Restart=on-failure
+
+[Install]
+Alias=bareos-director.service
+WantedBy=multi-user.target
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2533d4aa228f..674d2c4dd12a 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index d5f9be455d4b..db650cc5c385 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-anthy-1.5.13.tar.gz 265252 BLAKE2B d35299dba3260b85f80f259e0a40ea1ec061ed8082b6e5c872eab6398b6242342b2ee4da0c3b191aa428ae2d8dc652b0e414fd0c9f7b93ca8dcd6303c0586b4d SHA512 058feb49b2fe50ae3ca959f4754b8070f3ebc1e6727fef4bca791aa45a23c95018000e2a8bca496d6592b052298a6fb2869a07c2cc56cc473c81cc437efa175b
+DIST ibus-anthy-1.5.14.tar.gz 267418 BLAKE2B a4da45588d8736f10ccf26af52179da85bd3a17a8f1fbdba622058d1eaed933b0102fe12357613574e377df323145487838c3f74c052c813462b435905d5c941 SHA512 4d06d4e177df62d22c61bf6ebfda04ddbf545ea1947d0c315e3dfe5e48d9ddc57e5fcc89919ae3b9f7430e6124a5dfb1295f4ca7362fbc35714d627f80fae6d8
 EBUILD ibus-anthy-1.5.13.ebuild 1310 BLAKE2B 448f52507f33bbcea960398d1ff9e2b177c54bd3523ea63cd3ad034758cbfbc4708b668bd368fc0fb9cd73027f4d290a765f97d4f2cbf03a0fbc403dde28cb7b SHA512 0cbd544a986bce8d41829ec6b3d391ef1bd09e9a8ae7ea382aca72410d778e28e11ffae3c725f94833aaff6f2c132549d288a46a318307ac1e5b24096764bbb2
+EBUILD ibus-anthy-1.5.14.ebuild 1312 BLAKE2B 491e76a279bc1a25acc93ff98db1b6b742ad09d79c3b6f25d84ae5f9cd243f986ce6fd4d719cea1b37e8047dc03f807c2f405050fbea349d0f776350759aceaf SHA512 ae3879999fbbb0696fa1e9a35456c1dab3da437b24b75bf2831a8c9fc0f874a5073071bd4d1a3e3c12c481d4f0bad8b962b9c5711f1a2e72f3b02ef5e09db729
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
new file mode 100644
index 000000000000..d11f1e980d89
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index cf717b055afe..52dfca186322 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 00c060b6d912..5c26e056022b 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -2,5 +2,5 @@ AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
 EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B 439002b6ce33a663b68c282770dbb3b43f86bb8e3255a8e15027c5a480f0642cfa71359be9628a5ca0a77520d1aa45ff337aa7c00902a77ed198941b0b06f6f5 SHA512 5ec8979802319c426e7899a56700bed2beecc656a5469b86f86cb353efe172cd221e0940f65457894b1af607b511459e947a02eb488b55ca27a8b2089df9e544
-EBUILD antiword-0.37-r2.ebuild 1332 BLAKE2B 7d61d4074104c1d4702cc1c22e19ed45f170890f4f645b581e87f26d77f8eb888af19b13b55ba4f4e725800efce77777023eccf946e6d5aaff5a28f20393ea83 SHA512 09fca86d8918aa9bd137d43a7c41abe8a519fa19de32f38a570a0d0be97db6a282b5b71a71e40e8848cf19fa6c4e5df8970f7239bf9f5c64f1fc3e7d3e711dda
+EBUILD antiword-0.37-r2.ebuild 1331 BLAKE2B f42119acb912de393b39f19df9815b8b00a2fc2a808400e53f16939eb089e7e69ea901e73252782ca8cef6719afae2cc8f5c3a03ac5990215bc0ce1317cab4be SHA512 a0a417107e6c9443308aaf715f1f369b91dce63b1f32eae49a7cabd330ef5791bd16d2cd585fa29b8ea9bc87d3120cc2297aaccbc158ef404ab14a723e2e7190
 MISC metadata.xml 343 BLAKE2B 43a8dd808338ef2c570ac118c0600029bb805033af3f7e70d8b3afd7e9c685949c4b4e006e1c5bc51b72f9b8ab54104a0f9c731223d73dd5909f04a5bd964526 SHA512 184ff7031a9864c1ee3daa6c3714d148216f556fd112a62c1c2e352f3eef08bd6a1813dbb46dde3a163cc69f59f06ff99570460e4af1c2d4a31085b9aa7043ce
diff --git a/app-text/antiword/antiword-0.37-r2.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild
index 82d80a466fe7..4cad9bec11ef 100644
--- a/app-text/antiword/antiword-0.37-r2.ebuild
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1fea2bf42be3..76d0199504e0 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 655262d04d0a..98305668bb9e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -11,5 +11,5 @@ DIST sqlite-src-3370000.zip 13141152 BLAKE2B 72e3ba37dcc1e10ab822ce080319c98e67a
 DIST sqlite-src-3370200.zip 13145234 BLAKE2B 296eb8ac0e83552c348847ea1d0b06ce1b610ca1f53d8b56fa872196ccdc29c343a3b5cc671716854950c97425f8a5b78968e1b22c137ea1ff3bf386e94d8acc SHA512 2db103965934bb34c8336cf82ff7d77e75dc1ca00fa6324ac5697f3bf4b41bffff355dec7593515a68816449e5c9827a9503f6d7841c4c13981c231d3414ff76
 EBUILD sqlite-3.35.5.ebuild 12985 BLAKE2B 09e7ce9ba2d0ce36aaea8fd8fb2c3886eaccf0bffe3e756273fd84aead4ae1dda99c76865745f77907bf9bc32f8600becb8fe6af3e593148e2cda050bfc6437c SHA512 71b522aaf44c07f4632877c3626f260659477df560a5ac647e698794967b5554e382abfe5aba5df4f73adbed685a806d34486ee5a1a458c15faa1b34cfee959f
 EBUILD sqlite-3.37.0.ebuild 12993 BLAKE2B 759e75795eaaeac75fa7e70a7b0c13ef48a589c3ed6a1355fd842eaa9b6fe2403912c0a7acab52265191b701b76a7c08815609f286fd40b75cf23ef5704159f4 SHA512 7e62c74a728e6e713e34431f85c0904a6c38d23b672ca5e62f425982784e6eb1e80023264f7b5181c9098f24ce9e010ff3719b8beb272cd81ac163599f99cf17
-EBUILD sqlite-3.37.2.ebuild 12923 BLAKE2B fa99a4f89af40bf4521361909d2841bfbf7b1222c0ecad2ab515d5ba14613e84c7d84a8a94a707a0e9d416dda2842d4d7e47c361f98bc256676bd6ccf30b54f1 SHA512 a8965b97d220218cd9b54ecc71a295beffb424d59d343919b695b7ea1336a230bad340f19d56976be1e756c474c5541453f52b67f1e20f9865d5d3ad42726bfd
+EBUILD sqlite-3.37.2.ebuild 12921 BLAKE2B 1777c52692e6bb5a0757b4892035c6071b330310eed9ae37ee15da719de24cdb9c5ccbc474e3526685e3a35f69f533ad866686a764722286fc2623709003c2c1 SHA512 dd993ce43c0ba4effeb54407c23f17d3ddb39e6a66102b31e26af98c9aee16b06e03e93b74f052f08a22938fb66f1c5dfd16b5f7d76c446bbb63a75973f3a6c6
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
diff --git a/dev-db/sqlite/sqlite-3.37.2.ebuild b/dev-db/sqlite/sqlite-3.37.2.ebuild
index c6b95d74fdcd..c12fe330ac94 100644
--- a/dev-db/sqlite/sqlite-3.37.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.37.2.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-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 icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 0c5bf6625f85..f9f4a9cce2b9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest
new file mode 100644
index 000000000000..bfaf1fe6aa04
--- /dev/null
+++ b/dev-games/irrlicht-mt/Manifest
@@ -0,0 +1,3 @@
+DIST irrlicht-mt-1.9.0.4.tar.gz 4158897 BLAKE2B e03c3ca28ae93e5fa565069b67ae7f60e7e023a3b5434fbd8c080be719e40a67f115e4459f082b7a27181ff81cc591e527120747aaf91efaafe93d997f5dbc9e SHA512 6f6fef27d534a0046a04cb504992586f5f20a757f2c3a35ea6e1fb31d2781e3d81ee0172b03e2913ddd894fb937d6830005613eaed77a29bb9e91aa6d248fab8
+EBUILD irrlicht-mt-1.9.0.4.ebuild 625 BLAKE2B e04335daaa266a2a33de0dc090685436c86d28e180a2337c74473caa23f263d9ab2b0b7c773673ead87ee2bbb70cd57f54cf1e473a882b4865ae3aaa9826253d SHA512 783f438bcd64602056e60817e84b0dc215845150bf4451a2014da99ffe39aa40eacf40ecb60f8af4b0deec86f830f1e067b0b87f18f99214c890517c72236717
+MISC metadata.xml 328 BLAKE2B 65f1524f204dce6e817727e3870a3154eb1333d68d92241b17ea9a9089081d56947e7cd0dae6e4addd55594953cf27661e02774814f814465363df184842d37d SHA512 dddf11f78c1fcc61b3b98246ed7c73ae7c0e3f1765b60fbbc8513d706edec666c405479f45a2259c513f3bf298bd1d0810f756110aa7757b393045c4c18e17d8
diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
new file mode 100644
index 000000000000..34b915793472
--- /dev/null
+++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN%-mt}"
+MY_PV="$(ver_rs 3 'mt')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Minetest's fork of dev-games/irrlicht"
+HOMEPAGE="https://github.com/minetest/irrlicht"
+SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-games/irrlicht-mt/metadata.xml b/dev-games/irrlicht-mt/metadata.xml
new file mode 100644
index 000000000000..cd29c13fee92
--- /dev/null
+++ b/dev-games/irrlicht-mt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">minetest/irrlicht</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7270a5acd1cf..30bcf68a290f 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index d11f240dc211..4bbe31178302 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,5 +1,3 @@
 DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
-EBUILD commons-jxpath-1.3-r5.ebuild 1789 BLAKE2B 09fb1541a9a6ef07effe129b6e02c416ffed48eb36fa6bb37456c7165f94ff75a1e2cba5da12aee532962f48b79bbd2f1657a211d6354032f11ba0e0cb0197a3 SHA512 f15b3c57a20cfd5ea8ece29de3edd80bbbb9d6f103fc032b0ce78157e520914315a3d683fd57d41e4bb8acf1e311df06e90f4f46441d3e5cdec2f24bd1229d61
+EBUILD commons-jxpath-1.3-r5.ebuild 1788 BLAKE2B 2d23caef7b4c7b06c2bf159d4e9d8816e4593d4e303f42a0693d6faa8877d8647e6dc5728dffac01a485de737f9f69d65a2ee0e497c69b575baac899991a79ef SHA512 5cc043334288a3a42f2644b1591f61fc3ce0b8dbdb30294944b451de6e7406527f4f45a700212abdf46d8fca20d8a426e6c68d5bb9119e8a7d3631f1cc201672
 MISC metadata.xml 463 BLAKE2B 1b7774556b00869ef427316f8ce3465dfaa4a666ac45e35099054c09c8956743ead7e1f3483169ac15c9bc208e9d72b0abee49d7103db93f8ae8462f3ae2408a SHA512 a703759ea4165486b35c1ce02dfc35ad5cf5899af03c1bc0580288ae51b931c0fd12da6a741a42d365bf452ed1d56f4296fd6afcebc6c490ce7e48f9234087d7
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
deleted file mode 100644
index 270da007b138..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="http://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-S="${WORKDIR}/${P}-src"
-
-CDEPEND="
-	dev-java/jdom:0
-	java-virtuals/servlet-api:3.0
-	dev-java/commons-beanutils:1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/commons-logging:0
-		dev-java/commons-collections:0
-	)
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
-ANT_TASKS="ant-junit"
-EANT_TEST_TARGET="test"
-
-# This one needs mockrunner. See #259027.
-JAVA_RM_FILES=(
-	src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
-)
-
-java_prepare() {
-	# Don't automatically run tests.
-	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
index df742b5fd7b6..af6d503a2289 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/javax-mail/Manifest b/dev-java/javax-mail/Manifest
index df1701e68172..c4e1bdc715b6 100644
--- a/dev-java/javax-mail/Manifest
+++ b/dev-java/javax-mail/Manifest
@@ -1,3 +1,5 @@
 DIST JAVAMAIL-1_6_2.tar.gz 1107140 BLAKE2B c0f84bad014af1146bc2bb7f4f58924edf8f6762c222f979d1fec787e8dc93861691cd95c23eb663924597277607d2ce5058c232ad1e8626ed2d0f1e17c34a98 SHA512 6c07490fabbcf5969a2d8946bd9f38187cd33b864985e8183f15d9e1ba1508e445f2050633d9054f9ad546fede7790e64d31956bf23eb2ff8dae45129bd43534
+DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
 EBUILD javax-mail-1.6.2-r1.ebuild 2066 BLAKE2B a1bee101bc627a3a90e48368eb20662bbedda45d573e045869bb1bd4a9f336dd047c2e5d42c830852776335e75422af6b8048fb68aeea22d131c678a170a1de4 SHA512 2b6265523669dd4d7c5eaf68e67ea2b34a141bc07a44f53f229144ab1d19a9a55c2242f834285594ecf8ce8140797d68238668eb9e12309752177c161280a0ec
+EBUILD javax-mail-1.6.7.ebuild 2055 BLAKE2B 279e78b4dddb2bb03502ada8c94d838a42ab67ce5d870a9bee08966a425b78bf2804f3f4c0d46d3f6af04bab9140486e668f7e97b9b3c4b92bcffefc91d30e37 SHA512 43a435d6c4866bc5fcdb7db97995947b2f0f254be98c5ea83c41f1a71e4ef448426fe263488cd30e41a7a01419282d2718b301e72abc6656076f57d30d2be32f
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/javax-mail/javax-mail-1.6.7.ebuild b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
new file mode 100644
index 000000000000..63b23faa0a7e
--- /dev/null
+++ b/dev-java/javax-mail/javax-mail-1.6.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mail/pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-mail-1.6.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:1.6.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
+SRC_URI="https://github.com/eclipse-ee4j/mail/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mail/pom.xml
+# com.sun.activation:jakarta.activation:1.2.1 -> >=dev-java/jakarta-activation-1.2.2:1
+
+CDEPEND="
+	>=dev-java/jakarta-activation-1.2.2:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DOCS=( ../{LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-${PV}/mail"
+
+src_prepare() {
+	default
+	mv src/main/{resources,java}/javax/mail/Version.java || die
+}
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_EXTRA_ARGS=( -ea )
+
+src_test() {
+	pushd src/test/java || die
+		# Selection according to 137,138 pom.xml
+		# 1) com.sun.mail.util.logging.MailHandlerTest
+		# java.io.IOException: Permission denied			
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestSuite.java" -o -name "*Test.java" \
+			! -name "MailHandlerTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d4b221b8ee29..1aa403659c5f 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index cde33cb11389..659373891285 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -5,5 +5,5 @@ DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc1
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
 EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
-EBUILD crc32c-1.1.2-r1.ebuild 860 BLAKE2B 2f2c3ebbb17db3d2e34a1e15397f08554b7d23528ed5fe0e42a66aacb1f51a8df7f54356773012bf026cf4ab092656625a889677fc69bd7f8a48b8c83f1b03cf SHA512 24e445d0753ee0340fb99a27f0fa0a95a388101986f532d7982345d22432a143eaebd50b0e32413605e91b556a0fb1a3b36cb0b140bb18f0385bab23116f071a
+EBUILD crc32c-1.1.2-r1.ebuild 857 BLAKE2B 5a235e32ac2650d82811d8d9eee2f9e1e03295a8abc8a4cea3746ddd45f4125489dfa656cafa6443acc4dc187e2a09593ea4cee8e173724eddec09e8caddf873 SHA512 985fdfc66ab9caee0154dddc8f98f08a85ec7c1df812ca8dd6e31e65967bdf7e3d5b70477571caaa3ff146cc59107b0f269477655cf335ce25b07cecd987b466
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
index 860b0ad36081..0bc6721f5fb9 100644
--- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 06fcc86a26c2..d3f797580b52 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -6,5 +6,5 @@ DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
 EBUILD leveldb-1.23-r1.ebuild 940 BLAKE2B c8845aaaedf9dae20e102864641a6562f402c5e13673b17bc9246b721aeddd2e3a8abf2188a8da5327f66176e9749c900c5a541c564d44a5c0bbe1b1bdfe0004 SHA512 9b34fa37095e60d03c2f04e14bbb774e671bc6eefabcdd15f472c03ca4a72d725a6fd0da442df8ad9d2112043bb3422ac1cc000649a10ee08cd434c47d1011f6
-EBUILD leveldb-1.23-r2.ebuild 1029 BLAKE2B afa5fe700f4e29465ca0c58acd4177053711bf2c70dfb0a779d55bfd7c9cb778a5ad15e55b9ecb2cf0ade0f85047d31b1509cbdfd277815062208c329532e6e7 SHA512 04035a78159606bd994c966ea255568e2a0701f141f0939e9c63256b9d7aa2752d8c46327dd8842930fe496cf3ae730cbc031c2ab27b232537922fbe175f5db6
+EBUILD leveldb-1.23-r2.ebuild 1026 BLAKE2B 5b3232e693b5e6314250b9387be8767b19e8e9afee3dc0050d7bdb88a5066102addb0af2261d27222c4f2f2348139c82b73ae610e85440fbab46534396bd305a SHA512 9d8321e5199085c127d11451b136434b1c53a76fc9191ae446e526009aa019edfc8380b045274804beff6bc687d617c93f676e1b07a730a10d928bbd02b6494c
 MISC metadata.xml 511 BLAKE2B 2108f2600f79e95a7afe0d3f2b96afe529ec8b2aec0eba1e4231e902c118b9332f11dd952db93c95f2d6133362d2315435e17da153cf17fb7382da18a8651377 SHA512 44a3726f1dfb71c1abd07b2c3b0c9e0243ac74fa23f87c8564c503d192944879196433e3cae9849ad1fec79f20e72156fed412cbb18d0fbb573d987830f640d4
diff --git a/dev-libs/leveldb/leveldb-1.23-r2.ebuild b/dev-libs/leveldb/leveldb-1.23-r2.ebuild
index 5a4147da05ea..398757537db1 100644
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crc32c +snappy +tcmalloc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ce387b40dd58..544d619d46d1 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 4dad3c69e17c..f1f6bf68d330 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -5,6 +5,7 @@ DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce06
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
 DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d SHA512 7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
+DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 EBUILD opam-installer-2.0.10.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
@@ -12,4 +13,5 @@ EBUILD opam-installer-2.0.8-r3.ebuild 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7d
 EBUILD opam-installer-2.0.9.ebuild 1187 BLAKE2B 66e928ed3ad5a8b836ff39ddd594b1f02684d5e0cd7b8e80b0b65cb9e1c844d261abb1241c96afa1f9ab93a177131c033763959b383ffe6eb7106fc13288219a SHA512 be5af56fada09cfd66422f7344ced66a55ecaba663d2cfdc1b95a3a79d27386f78115a932c6ca75e8f1eb486608c9a2fd8211680fb661345d47ffaab74091d5b
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 EBUILD opam-installer-2.1.1.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
+EBUILD opam-installer-2.1.2.ebuild 1025 BLAKE2B e0dbb6f64946ff0442e28c2b26d44ec185c3e0b5c7d047743b0b454d53b01aebc39ffb43ec57dc462aff71ec24df41de48527f0520c07fc08fb594200fabe127 SHA512 30998c9cb9f839cf3405f0bdff0cb8f222dcf624c7cbd23b346ba6f0ec99eafd7685f2ac666ee5d654b3b7f9b63d30b53941c50eb261c8519ad25149c1e57852
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2.ebuild b/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
new file mode 100644
index 000000000000..d506458c738b
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit dune
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+	>=dev-ml/dose3-6
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 13a1482ae15a..3508e7d69af5 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,7 +1,9 @@
 DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
 DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
+DIST parmap-1.2.4.tar.gz 47584 BLAKE2B a4b03f4e3aaafd2c8e75cda045741b21b9d72998a6a4ca406147cd6fc88eac1ffbcc996f862d4ea090551a6e7219e59f3df0515b48b4155305b49f8ea9b3b123 SHA512 7dfe3bb2ace3547c426bca4974bad0ccfaa1fddbe0ba6f574a0dd8c4c30e8dcd1b90d0938312fcef9468ea87358db096bf870f64467ba822b13465773054a8ed
 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 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
+EBUILD parmap-1.2.4.ebuild 608 BLAKE2B 02706f5586f201675462f9d0a751ac1e932ddd5214c0f791f92588a1c76fab830956245ccdf23f0b209ed7b0830aed7cee9e8ef065fed6a07e7bd48af32bba79 SHA512 752ad0e32546db9257824d3731261dd0b0eea72380b87a1cfc8e8a932deb6d44335888ad655160c2a4336edeb54fd4f1bc4b3e5fc0b0676bab87a93da2d6c265
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 323 BLAKE2B 6e7bcddc8f305eb0ad28f81bf09278c703c7dbfdc7c9825886dae7fa1d8489460a816286f0849cfbc4a1b641cfbc43f6b14a74b0d669593324050f5aefe01c80 SHA512 42cb14a0c6f2439fe053d45546efa9a8a66b2e116aabf02c64f7bb8c28316e302cd86b586cd2d6717f37228a0b04598e99d60feb45d16d301ce8a39da1f02d0a
diff --git a/dev-ml/parmap/parmap-1.2.4.ebuild b/dev-ml/parmap/parmap-1.2.4.ebuild
new file mode 100644
index 000000000000..195afde1cbcd
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.2.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
index ebfd76e4680c..ca161f952b39 100644
--- a/dev-ml/sedlex/Manifest
+++ b/dev-ml/sedlex/Manifest
@@ -2,5 +2,10 @@ DIST sedlex-2.3-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e191
 DIST sedlex-2.3-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
 DIST sedlex-2.3-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
 DIST sedlex-2.3.tar.gz 114507 BLAKE2B ba777d90ceba41136ac552a2aea860b2932dc2c27d02a5875e8533d6740bcababe444d27427fbae59739a42901b3fb85f7b2ed8fd318f984734e7283ecd7e69e SHA512 f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8
+DIST sedlex-2.5-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e19124cc4d6d2f0eec6964d4dcf17c05e4a1f4a6031a821740a34e373c3be82c5f25acdb93a77f9591eafe37d026d40e027054e717c0f SHA512 e6b54579369edf361ee961171d9b4896449e16327d77749201e07a7022a4d9bd9e50ba25cc7397fb4e40c852347b1ef8599ed45bd5bb96a1b8dc5cd04ada5fda
+DIST sedlex-2.5-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
+DIST sedlex-2.5-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
+DIST sedlex-2.5.tar.gz 134289 BLAKE2B 47aa67ed34ee0226b92d538e61bbf7252dcead236dd51d4a291c7b81f7d0747d1024e9eb0a274d7648b25cfa078108e3e62d54ea2702450171b9ff4ab60f7706 SHA512 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef
 EBUILD sedlex-2.3-r1.ebuild 1032 BLAKE2B 8f270fd378c861c23ed396408e3b2bcbec55f463a51680bf617b673afb06db9a4d570b14987f90fc7b6e4b37eef016d99c101301ec10f4022548cffdefaacdfc SHA512 a865b7adc9af6b6302570555808864df07ebc1a6738b2946c7c83a56217e993dc291650f99c79559b8c1591eb2adcd35d5de754011005b32ec70041e68946ecf
+EBUILD sedlex-2.5.ebuild 1032 BLAKE2B 4c37ea8e62183196c36f8e881433ba4ab9c1a0711ec0e671dea9e73ace9edb14b4499d4a75e941da8a7b559a01e6dbd26123cd85fe8364384c7de4d6618025ca SHA512 f95e4d19a976c5a5868d152fe76a9fb7c9b246fe1f54b2570639a1f48ef50f8f77e3399901cd505506f8e7b10fa7260e4a13a98be67af05655cf652259c2781f
 MISC metadata.xml 704 BLAKE2B f2c21c5c672a96091107097a5c4b27e7b373b56982cd4c196c56917997f52da334768f2b51b14bb2ab553478edd60530bba06e328b92437c470f22be10c1086e SHA512 c3ca46b0fafb0f393d5c79b415f3ce46dee477aae4ec8bb8089204415e9bed5d4a3826e02e82a50c7e5d6d5ae88737018cb064cb335b38b9ed12f2312ad96b6e
diff --git a/dev-ml/sedlex/sedlex-2.5.ebuild b/dev-ml/sedlex/sedlex-2.5.ebuild
new file mode 100644
index 000000000000..7b4bbcf44cc7
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/ocaml-community/sedlex"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+FILES=( DerivedCoreProperties extracted/DerivedGeneralCategory PropList )
+for file in ${FILES[@]} ; do
+	SRC_URI+=" https://www.unicode.org/Public/12.1.0/ucd/${file}.txt
+				-> ${P}-${file##*/}.txt"
+done
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/gen:=
+	dev-ml/ppxlib:=
+	dev-ml/uchar:=
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	local file
+	for file in ${FILES[@]} ; do
+		ebegin "Copying ${file}"
+		cp "${DISTDIR}/${P}-${file##*/}.txt"  \
+		   "${S}/src/generator/data/${file##*/}.txt"
+		eend $? || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Remove dune file with rules to download additional txt files
+	rm "${S}/src/generator/data/dune" || die
+}
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
index 4427d2b736a6..e8a379731a2e 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -1,3 +1,5 @@
 DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
+DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721cd9fa435c652e0605cc88bb545247e5a8284b7603e22ca5ab27d36042c6d8020742fc5e9e7b762167a9f864 SHA512 3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013
 EBUILD spawn-0.13.0.ebuild 453 BLAKE2B fd5176e78cbe1bfe8c8f6206c529ad971ed22b165176221cdd2c841738ca1070d3b83e8c58cdc89adf103c0a02ea063ebeffcfcc32bc6f8bc31f3eee5cb6da5c SHA512 e48a10c70d884263948e5ce5c7341de84db98ca53194e451aa64158931df57150a2d754efc06361f463f0465554c5ff5574e7f565b89cdb82dab2d4a35997567
+EBUILD spawn-0.15.0.ebuild 459 BLAKE2B 62a5da443361a62a047a469f5a89a844effb326498582ce5d9ede13484d86e3ab9edcf80021232993b8a0567793b9f1d559f3760c2f8530093aba1df628bf21f SHA512 d63f5d632ceec5c3a6e108238d9c343a4ca51f59561f23b9942c16963e1741482e6dda4362837947b130d5a0e217b46aa85ed5e84cd0869c172f0f0011464a14
 MISC metadata.xml 314 BLAKE2B 24e080f5ed71e296ae2f0009a34fbb934250f84a002dc06bb7ef471ef97bfe8c1a38ed518b04be7ac0321fee38aa4c5688661e5b635edcb4cd19b468a92582e7 SHA512 8d2d7910c38d0272244e16bc337c787f520786d22986904a736da319eaa2629b136c951147e190bbaeb8a161cd38578daedfcd3101fdc7376635ed3d2aa35417
diff --git a/dev-ml/spawn/spawn-0.15.0.ebuild b/dev-ml/spawn/spawn-0.15.0.ebuild
new file mode 100644
index 000000000000..7f4f39e52537
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.15.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-python/Faker/Faker-12.0.0.ebuild b/dev-python/Faker/Faker-12.0.0.ebuild
new file mode 100644
index 000000000000..c83621e099c9
--- /dev/null
+++ b/dev-python/Faker/Faker-12.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 914e3b0cb9fd..c5dbea27ab29 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -3,9 +3,11 @@ DIST Faker-11.0.0.tar.gz 1199121 BLAKE2B e5c4e17daa969249dbf1ae69630a79c50e6e51d
 DIST Faker-11.1.0.tar.gz 1214021 BLAKE2B c4b7b44d19566037135d47bce19895da7bb0eba17c64086ad5f0019bbd49a77aaf4231e6aef8f40aec4811bbe4df209b796773ac5cca6a859ff9b43ea57fe9bc SHA512 646d16bceb3fc5ca8a9004ab7369d7fc6012f0766b2f6b58922a1a415a4bf1ae1af0d5977d58f15792bd794fa2235fb44e626e28f5af168d4e4def8112bab0ca
 DIST Faker-11.3.0.tar.gz 1215886 BLAKE2B 01a0e9cff30597536cc1d6f4ae3f67c43e0e1ec5268d5c544a0cf6ea905c4528f07567515e615b74f32ea4622c9090e63141b0b526d656cbb96a449c23e7b047 SHA512 cb95ecd4cd781c6a08621fe75a1d019349232f8be65d4c9b5825987cb98bb6d031569d6e3253cb36a68986707515540f6ebd7503085aea68d56642b08f86192f
 DIST Faker-11.4.0.tar.gz 1347314 BLAKE2B 0399302df718a9283ecb59ab044f438891f2874a2dd752d97bd88cf7e2de4536ad34ee818576c9c9926d90b5a18626759fb12dcd2cbf6ba54a3a9d2366caec66 SHA512 a12dbc6e3011839852fe978004520c546a42fab7b84ba03d890fe12a40299d36b7ce0ffbe1e678dfb74879fe17410589c459ff2ac904bdd15c9c03b816e8c7c0
+DIST Faker-12.0.0.tar.gz 1428698 BLAKE2B 3dbf231c0969d3f5d0826d69362f57a3bbb8e006c42453d7a6178663b3947b74f773aad8d22237f12c6e152d30a91a883b603d65f562b69a298f34501f6b65f6 SHA512 1998eafec97d16624c4d19f5abe3f083ca75d4a72f49e6fe2df657aae1ce41ddf7ec198ab601bd6a377f86ef8b4e027e031d6830149972b7775e4b656eb2c3b7
 EBUILD Faker-10.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.1.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.3.0.ebuild 723 BLAKE2B a041a53fcb013d95d7f4d112cdcfbfca8f1f37e7272d091a9d1bcfb338f549dc192b9f640d66a7ae2ab165855341c1ee4a0faeda231b87cafaab6ae483fc1180 SHA512 e753ca5e5ab62029a7107e492d6c6f0ff2a422979e59dddfcb7cd5db21f11f3d1475fa9016e3ff2e8db9bb01ad024dda668589c457e82baaefb08b159b68e88f
 EBUILD Faker-11.4.0.ebuild 756 BLAKE2B 9f0c28032ac2f992e5c6a42013e25ed4f49fcc7cc8e942fa43c725bcb260ec04199c8c537ab35d936e8144f011d604a11c24525e173fc0b2d7e4766e9579b568 SHA512 4b4867be319ef0a3951ee30b93b8a92fcfcdb080c865f408a9a0a8b13767b0b08922bfaba6850b97e919138aa1d05eaa66ea8852159fbecb2417785522bcb7a7
+EBUILD Faker-12.0.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3456bf16ed6c..81123bfc313b 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 2af6d9a92fde..9a22e2bb31f6 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,3 +1,3 @@
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.9.1.ebuild 1004 BLAKE2B 231253f9cfe80ba215e36b11a5a0ed5a369d02f1c3095e20ae4db58b159e487f3161a35d88a833ff3d805f21a1d1c3737f8e2008a6f02eb10472d1fbd7f671d2 SHA512 8a609ff128db9f10f7ccc6bb0aa7beafef6f82c529c4e2ef87998c7b300436a3b8914e0ef69bc991f58199bba5d9c9e9d947b937fed86851e1c836774403a642
-MISC metadata.xml 764 BLAKE2B b4eec14c6816151aba2e6cfdd67dcd18ea73406193e10cf0dbcdf8c2a6e6d2c5355b4f22757f81abee02cd7e2285c69ba47885ae724806e6658796b87afb0049 SHA512 5c9141bc1c5dc745e500b72e87eff6bce24ba64cd09a39ed73031e4bf7cde24fb05c5b8aa72559146fc5e5c2771795c02a6f8732dd9fffb25d78a45e06e41df8
+EBUILD commonmark-0.9.1.ebuild 1051 BLAKE2B b673b11adb4b91c23418cdf846b010719aa8e52a7f7ea434a6f60810a196885a2783cd54c0cb424738305684f1950aa32b9f6d6c031033d2a7a788078e5af118 SHA512 485d4bb59a84afa59cc69f38418008c94dfcb6db45ae60bffe0729416f8386e6cddc07d8b64d264bdb202bcb6e3ad10f8495a682fce9c6ac4bfd958528c6e170
+MISC metadata.xml 764 BLAKE2B 4cac2589118c2b971450bf7aaffb1acc288de1d5d7f34760eb49a2ccccb531e35cb2c8719ca81c49dae3221271d7340b1f238cf1cba20c35c9708438b68c4074 SHA512 9f2223a67f87c806f7beffb03454790ec828975d7bf58e5753733090713869fd10584c84c43db988b6d02eb1210c14239dec433a16353b530f128b3c31c7be0d
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index 9c1788a69ec3..aa5d8fe00cc4 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/readthedocs/commonmark.py"
+HOMEPAGE="
+	https://pypi.org/project/commonmark/
+	https://github.com/readthedocs/commonmark.py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/commonmark/metadata.xml b/dev-python/commonmark/metadata.xml
index 2ea40b145c62..321cd37e5dcd 100644
--- a/dev-python/commonmark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
@@ -13,7 +13,7 @@
     keep up to date with changes in commonmark.js.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">CommonMark</remote-id>
+    <remote-id type="pypi">commonmark</remote-id>
     <remote-id type="github">readthedocs/commonmark.py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index e58da6f3e627..7f190cdf4bfa 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,11 +3,20 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
 DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
 DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
+DIST Django-2.2.27.checksum.txt 2556 BLAKE2B 770dc5670d0d4aebcfd1956d644b9d7e4e5bf0b511649ae072de1b8ec8d2ea12dbc48563f5372979dead9e729abd9b5174c99323a14170876b1f1b5e61de96f6 SHA512 fb76f2bef6e6d0a3002298e4eeec5b335bfdc365ae55f0c26dcb050d369864c504dd32d40ac3b49897d56bc0dadc10136b588361ddf3598ffdc03830a97e1d63
+DIST Django-2.2.27.tar.gz 9185716 BLAKE2B 26d509c722c62b5bf784331466a97ad1b961715572da9e6add4be1bdc7cf999c0ec7c763d9bc8ab2fc1ca35a48783feaf748c3c9388ae9f5f3e393972deea734 SHA512 0db670651a820b49d855e38a336c0c6990ce4701bb686c5e8a292ccb03342e995c61c2c628b1d625d2715404e969fc31c256e5bf0fd6c1ff714d1c1c1ee30bff
 DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
 DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
+DIST Django-3.2.12.checksum.txt 2556 BLAKE2B 7ae6e41305b5b07969ddad3474a0819359dff888fc3bdc1c5000ded1b9b726a7c55aa7aaffc85184558edcc6c12b617c8270cc569fa8e645622206631979a9c2 SHA512 5098dde440a15ad066fa7927943f4ec66bb925798afcb42101c5cf50b8148301866c39ad37ebb5db9d7f9e195953337c03dc6fa2c49758716f969ee2ce414d24
+DIST Django-3.2.12.tar.gz 9812448 BLAKE2B 39b6e7e8f50b79d7be62be171eb358ab815c9dd630b8b2ad2cf085c42c79a6a8c92914fae3c471f41578e65fa09f011f959dd0794c804e7b30cfbc9411cf4f4b SHA512 fc8ad3af019b268d514cc5240cac9c6b2fbf3a169c7933e8ab2da92e9cfed72df7a2784a8d92eaec8105bc9c245763acd307178bdf662e5d51407e72ae9d8683
 DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
 DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
+DIST Django-4.0.2.checksum.txt 2547 BLAKE2B 532139126846e1758bbe7b4dc4ad4aad6c6b3607e298f4373366239637ceca7d01a26472b2a87917e64db7140d28a76c1f5fbb396e7022b1a42b723551770d1f SHA512 eddd8ac31fc60f803f1e6f975c079e84e5ef997e8ac93b7dcf3573bd0c5d057adeb6f092acaecb200529044d81aa2db9849c1c13525678c8c2bd27bd14d6b280
+DIST Django-4.0.2.tar.gz 9996300 BLAKE2B 422b0bb000e7f62a854dc8fa686001acc3f629ded462d2520fad9486a9c8eb5d501d29c6a9f30f63ff8da128ded6f40281439371eb688fb9bc95f2377c5ca0f7 SHA512 c64b25aa69b826805cc7a3efcd63ae41bbc31a61e68cdbda90e6bcec6bd8e2c5fc47b82176d0c1708f55d2c7b082c71939b89cb0621fcf1929d1475e3d393a97
 EBUILD django-2.2.26.ebuild 2676 BLAKE2B fac142da15bc8f27726191808b107e7e49be0d68d779259ce4a1730aba104d3fc978292dd8c5ce7fbe9020a802eedad02d5cf1c50e6cbb314e540a254f78e2d9 SHA512 a7cb898618b31a624561389e19fd318bfa9afaf7609e9fedf1d049b7f3dd99b45c39d619d0db3c895f305dac09ac39c33c947cb60422908c394a2a31690d8a8c
+EBUILD django-2.2.27.ebuild 2680 BLAKE2B 99951c73539e0bf7c48447f1ca53a60d411a5caf72cd348eaec211c2c3527b6d3f1294b84c2a8c55cd636457fe6299c502baa608f6596917a8eb6f74075c79bc SHA512 c54a300717fb5a3d03c366e2e403bfb63b929e39c6bbae3b8b0f25124f0f8097e438c31859bdf4f6aeff64ce5fce3e6b8a2404d483674844c4d5fb1bc0966553
 EBUILD django-3.2.11.ebuild 2896 BLAKE2B e152a21beddeb46f0b5ca0210bf362fb4eafbd8ac1152964bab008d4fe47d7c250e6f8d082055797a89c0ef34a9fe1137d9f9fe46a45376c53ba433d78fd5e60 SHA512 9a0788fb8f1c916d79871eeb24b67e8f9fe803db707533994e3087c641e430f6eba308f95775b4006f06b7576bb5b9a19c9bf906c4f50cba1f54fd281331532b
+EBUILD django-3.2.12.ebuild 2900 BLAKE2B 6dd78efc84394b9ab6a23227750c4b64335a1d81f283a629b4ed4b42a4738fe44e4a74e2668032cebf2b70c02d41fbf12835a87e5db88c4427b45ceb99a2f0f1 SHA512 f115b5ab733566d8f17507baa2f9b21e5f26cabbdde84b6bf3b0887e585c4396320d489678a97a566c1ea6438c7e1ef1feb5a6157f099f26b4964977b97d1a14
 EBUILD django-4.0.1.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
+EBUILD django-4.0.2.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-2.2.27.ebuild b/dev-python/django/django-2.2.27.ebuild
new file mode 100644
index 000000000000..9fc3644a1ce4
--- /dev/null
+++ b/dev-python/django/django-2.2.27.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( sec-keys/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.2.12.ebuild b/dev-python/django/django-3.2.12.ebuild
new file mode 100644
index 000000000000..9ad7526948c5
--- /dev/null
+++ b/dev-python/django/django-3.2.12.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.0.2.ebuild b/dev-python/django/django-4.0.2.ebuild
new file mode 100644
index 000000000000..69f33e23fb87
--- /dev/null
+++ b/dev-python/django/django-4.0.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_8 pypy3)"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 9c5b114b9170..51d19378eff4 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
 EBUILD httpx-0.21.3.ebuild 2013 BLAKE2B 14043bdc42c5b3a1dc352836273f935b6c0ffe034e5aa58965d8ce7d422712d8a6fbeb3ec14a1e4ad60b62a1ef80755f84481bbe0eecaeef32ed68f9e780a5bd SHA512 e87c99ff77474483c607933152cfc053efd5768cec2a85b0a4f187c14f608d4c11c331a89e7f7b778d6a5695c2833c5cd2c772752068c106971ca9bbd8736e80
-EBUILD httpx-0.22.0.ebuild 2297 BLAKE2B d547a63878fba72ac8d145f1f0f4d1f6625f11dff28344c39f0a23c4bc4c298a3bc3abee6ef739c20e784ddddbb5748cbb2ff1bf1c4807237aab8dcbed473152 SHA512 07efe3f46a8daaf2a380e0b887f4e4fca71109167dbd910487a645064de92fc776e7493fbe31c7c046caf5ccb9c5e936960d27350f5b2decdb6086a1b8f826fa
+EBUILD httpx-0.22.0-r1.ebuild 2349 BLAKE2B 80073590fe425876072dfe5434955f7031c9091d0838dabdf1f7b1dc26cdb9910815f5d01185cba835d98f4ca811688b6e8ec33474b51730ce7be37d5d41cf0a SHA512 bee92cbc6d8288cc5cbd800103b56e353a2ddb01e211ceb7457730e3f5e615e34398140d4343079aa58ff530630af6481164d22ed4c0a37c190c15a45ff4be2f
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.22.0.ebuild b/dev-python/httpx/httpx-0.22.0-r1.ebuild
similarity index 96%
rename from dev-python/httpx/httpx-0.22.0.ebuild
rename to dev-python/httpx/httpx-0.22.0-r1.ebuild
index 6cc05440c2be..d4b99a44ad3a 100644
--- a/dev-python/httpx/httpx-0.22.0.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	cli? (
 		=dev-python/click-8*[${PYTHON_USEDEP}]
 		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		=dev-python/rich-10*[${PYTHON_USEDEP}]
+		<dev-python/rich-12[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
@@ -54,6 +54,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
+	sed -i -e '/rich/s:==10[.][*]:<12:' setup.py || die
 	if ! use cli; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 5ad75d93340e..da4b377221ab 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -5,6 +5,7 @@ DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee5
 DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
 DIST identify-2.4.5.gh.tar.gz 101319 BLAKE2B 78e17e88ad5c463a8bca5cdc2e66433f38e41ad67fbabe60706d7154841ba6fefa52658550107760d521257366806999ffc24b9eb0ebbd37d3a94581df573b12 SHA512 f2c6ac86ad88431e835c723a83c7b8d0578166ab620e2681f5c16e9634592f58761551a1360491edc4863538c967b793fe8e0730cbf4c92bf1690e50c5669ac9
 DIST identify-2.4.6.gh.tar.gz 101330 BLAKE2B 3e1a0d09b52fa7176f4216d7be40b6ae797cc7f8fc75364efbbaf5ded61db42f5aab7f672c7585466efd96aa33bcc4a3628080dc0a16737c322c4f7b6c915de1 SHA512 61f0420ba9067a3b4a85509d52d7dbc1e5affca555bd429453c9fd0d2b0937f1d41a36ddf6c63b323a9af1035ecc470545f5dcba28d7cee2dd6b6d6d3815059d
+DIST identify-2.4.7.gh.tar.gz 101364 BLAKE2B 279ddd2ee01f4556ddf4fa771aed14522168f1764848a7c4aad0d7c29886ceb303eeadab8bdd9bbf52853ccf4dc0951a3fa6c53ddc4eaccb020e6b5f02073847 SHA512 9de65f0adbfc91c448a6e689cbb514d87bd3aa4fba286a77ca45b30b7822c54e159a63d68702334503a990ba7dcb8f9e269eaa43103126064ee883f300dab125
 EBUILD identify-2.4.0.ebuild 516 BLAKE2B 9e67c4cbb998fad7f8fee2583b0553822dc9dc7d589a092b1127938f48999afc05e1aaef3ba5d3eb1f85d9ae399268c82869eb4bf3ae4274bdbd65b41f14ede8 SHA512 47c7d88fda8e395b105ea8ecbcff161729a21d89717292d393b31e538bcd8c5cf6fe46b0f7249ce20ebe9b10eb7105bbb99a383358bb8843b0754d95d2fc2e3e
 EBUILD identify-2.4.1.ebuild 518 BLAKE2B 4327428e4d169fceba95c9d444157fd626ec810e3e1036514f1e241497cbd1f72c7fa014f7011d8b65e94b0fb750ff442ced7d5047ef9c04ce79a7e26f947148 SHA512 9d8f344351ebbf673680e90335a49802ad3534da08ec2d1fe81df6fd5e8f5489974f17c264a6d34ebe26e99fe27331fbae9f808f498b554e8d3aed0e163f31f0
 EBUILD identify-2.4.2.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
@@ -12,4 +13,5 @@ EBUILD identify-2.4.3.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a
 EBUILD identify-2.4.4.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
 EBUILD identify-2.4.5.ebuild 546 BLAKE2B 97c5375972a242b01b4ad04331c1cfc2b1bf1864b9157e278ddd2a086bddce7562988ccfb05269bc6b27878ec2b14d0e21e26b101e174408b8eec941c952f9a9 SHA512 a9a652f8cd0293918e0c1e575cb0ec3c3215cb76799a526881b24d8bdde259235c475bfb682ad79dc80294f31ec0dd73655ed264ef8a70f8b9f996abd8adf69e
 EBUILD identify-2.4.6.ebuild 546 BLAKE2B 26114479f3e21785bfd3086181862fd1a07f7e0e37cd01e11389e19fe7bb81a663b6a472e952f013db33beb825cae04c979bdfa359818f8f3bfae1bdb4fd9e6d SHA512 777b56fec1fdf73b2298487c8b9ff0da8d073544c21aae7cadad4df74a0aa5946ea6cb8dc5eb34a8d60f3b1ae4a9c14f491bb9452d7804baaf181a77a788b9a7
+EBUILD identify-2.4.7.ebuild 546 BLAKE2B 26114479f3e21785bfd3086181862fd1a07f7e0e37cd01e11389e19fe7bb81a663b6a472e952f013db33beb825cae04c979bdfa359818f8f3bfae1bdb4fd9e6d SHA512 777b56fec1fdf73b2298487c8b9ff0da8d073544c21aae7cadad4df74a0aa5946ea6cb8dc5eb34a8d60f3b1ae4a9c14f491bb9452d7804baaf181a77a788b9a7
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.4.7.ebuild b/dev-python/identify/identify-2.4.7.ebuild
new file mode 100644
index 000000000000..4a00d7b29ab7
--- /dev/null
+++ b/dev-python/identify/identify-2.4.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 3f06ba1d73a0..9d6bc384baa0 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,5 @@
 DIST inflect-5.3.0.tar.gz 74127 BLAKE2B 20c591012a5a6692c3da3a39f4aeaaae290da5ba723af5c9ac90f7d28112a1894acf082633f8f673f6d903f756b9bb70c6c3366762e872cf7ca6c6d5edf1c99c SHA512 f5baf65fb7a6ba59c91a36a17acb0abda3efc74fef56b3a3d99c100b2c6e94c5aafb08ab37310ce410631ac928e9c24a4a4c5e6b5c7d8f907c3d999f4a70cce4
+DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
 EBUILD inflect-5.3.0.ebuild 693 BLAKE2B 93956f86b918a514e41d69cb299105b103ffc17958745019a2c01a4f6585cf87126bffef8048d74755f3697c209cdf45809f7a637480e421ead88c298b80721b SHA512 3f076cb75a6de1b7a18b841c599b396a3055375de73d4a0fb419d7e3e4c4ae8b031c142fde3086d642ef19439750c531a328afdc1bae39f204e31251d7e256d2
+EBUILD inflect-5.4.0.ebuild 698 BLAKE2B c744306f244e8f4b73d7e4b76b9db92ef766a80240ed341adcb4839c33eaaf6a24e589d1e7ea8438e12e740b299b9f9cd0ab01975f8c6e4fb9dae84c246b510f SHA512 1f1e130195f816845c0a984e6069c86cb3823f1d93f0e773880253c80a47b902aa0db6effa6d26db9ebfe8d57cec8974873a1436da270b62818e50f013d37970
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.4.0.ebuild b/dev-python/inflect/inflect-5.4.0.ebuild
new file mode 100644
index 000000000000..39ef4de2bce6
--- /dev/null
+++ b/dev-python/inflect/inflect-5.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jaraco/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 30405eb85fdd..2c46e9b0cfc2 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 983 BLAKE2B 3dfce78649bf78d52b6d7ccabbb8a82cfb3ad8d2b3a6794578bf159cf647b9b98c17949eba87ea61e5397e93dc2a73aea485f3995f01342c09564cf798b320c0 SHA512 e3317bef79dec0566c06dc8405bc5532671e7cf282b414f545506d67d11d56ea22700ee4c13a09a62cdb8384126115740e142b61c09851311653372fb224dcb3
+EBUILD jaraco-path-3.3.1.ebuild 942 BLAKE2B cd85b796ddba7cb8ef289619823dbfa19cfa2f35a105c3e0848a2b17b0a089c88e0d7edcd0e053216cc76fbd75201d4396a821fca57b44a5cb9a4723fad19c56 SHA512 946a2d3c789d82d496523004984cea4eb186c104dd75a18a9164ccc48e873a33830e1b2d8eb869ae6dcbec6e542fc2b450452909c9a0afad201a9b09c35674bf
 MISC metadata.xml 397 BLAKE2B 899056eaa6d393d9c624e20ff93a644bd93f39505f701a085f22d4216154a3c1b19bb879bcbe45f077fba7d91ad5e34617283b10f535305b322c580712df10fc SHA512 104c1a8d8a2613ed4355b6537ce0733b36e915d98ad69204d2a7763dd6e7bbdf74c2cc2e66f34000426e04e79f19a84ca1d8a57e504c62adaa4386f372d34dda
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 49687e49125f..090665b446cb 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -36,5 +36,5 @@ src_prepare() {
 }
 
 python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+	epytest tests
 }
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index c95c5cde0150..d6143712f55e 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -3,5 +3,5 @@ DIST psycopg2-2.9.2.tar.gz 380253 BLAKE2B f3b649986f8bec56df33858373e510ea69623f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
 EBUILD psycopg-2.9.2.ebuild 1306 BLAKE2B 1321dcc989d4b26cd7aa7717a0620aa8f0149b808ae80289dcd4888290202db43ed061c2d887321f7db6425e01502d243a794a8bda79a037d5704eda44d61ed5 SHA512 b579bfec8510acae8b911c214cf06b5e9e671d617550fce0359afc6a8441f6542866d71360cdb5d721c2fb664c15a490c79a529e8f56209db66204079a8bd89c
-EBUILD psycopg-2.9.3.ebuild 1308 BLAKE2B 569422cb4c30bf346c76881af55d6a413fc833a6dc0d4938bca8d31a37377152ebb4dc8bfd74291d80335e1757472656243e3375b6f9e45e420cf6fb3526fba5 SHA512 03b3f0897a30ea5b828af98fa4ad49fb5677c88d80e1f5dea213e2845687b6e76220c9ced594908fa960a958767ec012327755bc2e27d667bcebf9528f0070c1
+EBUILD psycopg-2.9.3.ebuild 1307 BLAKE2B e6dd5afabbed810c9f82e396d75a776bdd070364ce15e5bcc1a028fe7dfe289d0a464183ccb2d0d3d10ec5dfdc0a9bba5a0a1ef8b72477541177193a9238de44 SHA512 169a201f78a6f00f532c24e36615f7005a833c47000b9d104d32d970c8df071228a7a2f4384df7bb82d3ecfe810bb144af07b0f59e73bd5da78b8f62026550e4
 MISC metadata.xml 322 BLAKE2B 2656ba386b42acf8e45737cf0f2428d80f91a05de732bd7db0e76bef480c6de927c0bba1c0dccb3d3404054d78354f698e75f03b44940fea6a7683c0c160a71e SHA512 01a60ea486677ccd335e348e90608ee50ac1ff6351d83a2ef4df76675a580f47b72e79ccfa3fdb84f725592bd5c6ef85322fbf40488258c45bc3724b5ff9098c
diff --git a/dev-python/psycopg/psycopg-2.9.3.ebuild b/dev-python/psycopg/psycopg-2.9.3.ebuild
index ac484223741c..abdf160d3ec0 100644
--- a/dev-python/psycopg/psycopg-2.9.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.3.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index dcd7dcd6f055..7ac17e1263ce 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,3 +1,5 @@
+DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
 DIST pyicu-v2.8.tar.bz2 242791 BLAKE2B 0492b1fbbb97a92fb90620fb720cf82ddb2e404d4ce4d20d4204c271ae0c32c526e5832f5658205893381c074f6b1e2a3274f1935efac094241fe2afbc7b9c07 SHA512 c8ecc11322de79d42aa0f0336cdc47637af203bbf2782107132d3c194cef3725114ba6fc40bbd2bffc26ce168d6d4e39f069904aa268d0d095c506ddca292051
+EBUILD pyicu-2.8.1.ebuild 664 BLAKE2B 7659910ee7439bee9b8481bb48774d0ec27aea45c61d46dd889ba08909321e83c8a2de8879ff9d97723ab0d94cc786354c8d59fdf0e34817f6f3a7c78c9592d4 SHA512 98e141501c82314fb2ebed34c4224e07008071e44595ca26d85004aab7a7d49c69a8bbc41faa6fb6c0d6554ccdb64577019564f22cc03a29d03508b0ad8b1937
 EBUILD pyicu-2.8.ebuild 629 BLAKE2B 644be8ae4aae181ea2be74b2031536f80fd986521d7468dc6bb843acd75328e25c4100c0f3015ffb5fde3e811dae101bd1ed11fbf70f4775babb95b6adc0e921 SHA512 830eae0bfd9d3c0d55a447e1a8d13c8256fd009338932fc4497a4bb4ce0034b4a76030e4ca773754bed99ff9c031f30a2a6bab6fc6f8a6c0fb454e68de34b147
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.8.1.ebuild b/dev-python/pyicu/pyicu-2.8.1.ebuild
new file mode 100644
index 000000000000..fc26d61882f3
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/icu:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-python/six[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 690af7ef0900..26a0e980deb1 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,6 +1,6 @@
 AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262ddb0e331d24c2e950bcd0cf78c92d5f5f79804a9f0eb4a52a7203d353a6be297118e3b951823a973f9a99a8211efb5a31be458 SHA512 92a4497733efa551d9c966f39ba31bc9d3443ece6591f4d664c3732f01f10c928c07de13e2b9e65725f30fa18da7a4a9ee172e0b627d98e1d991c19b7762e2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-234-r1.ebuild 875 BLAKE2B 1db3cda0b08804dea24eca69c805e776576ecdbfc33ca7cb8c62272e966f4c79636c88684048f87f8c63d657e849c02f4419896c18d4d714e84e1e245cdf6963 SHA512 990969d50ad283ff3394aff73d5e59728edb23d85868f74d370742c90a11758e86a917e5138e560d935d5ecf1dba6154eb0e98e4ec9c1391d9d3f17cd167d348
-EBUILD python-systemd-234-r2.ebuild 937 BLAKE2B d9b9aff2e9bda6b58f42dfc36b53d9773b7e9a136e56c591df581db2018de349925837ea95946c82be28bfad4a1c6322127af4ed2931658beb3293ab1d5087f9 SHA512 efea502c4d43377b2519af4431ec321c7d334d515e51bc193dff16f63811544f69aec1487d5ca3815371f66d31457311de6000d5f453c5b86bbd5a5afa857caa
+EBUILD python-systemd-234-r2.ebuild 867 BLAKE2B 31fae39480e6f436230c1c55d78c131fbdf2c43e8d0a2f7ca20f51c228a5aa6e4c95e3254a7976935857aaf499a30b0872cb9fb5d84bde32c2e708b2b47dd336 SHA512 588a21ca0acc19fb1f8f944605475676a11140e1975f06d17d286b8e5d4add4f2d28f36c6973328c6f3d493e94fc5c805c4a8028e96182c139eb33d261687ba2
 EBUILD python-systemd-234.ebuild 894 BLAKE2B 809e9e3314b2eaa2ec4f849f9a1d6c106ac29d53c64d2b784362a6d9e50cf351c8e669e20b9e30c4320a5838461e8be8c287101512f3d62337d93c2e8aee0e6c SHA512 d3cab8c01b42501028d11cee51b97ff7ab5a73984ae7afb857f5e596c04f45024802ce1c14ad8f29a6912af6ec4fea65495f9fde3f3f707f11711b7856285dee
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild
index 60d75ffb0ea8..9ad4a49314b1 100644
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ b/dev-python/python-systemd/python-systemd-234-r2.ebuild
@@ -32,13 +32,8 @@ python_compile() {
 	distutils-r1_python_compile -j1
 }
 
-src_test() {
-	# prevent relative import
-	rm -r systemd || die
-	distutils-r1_src_test
-}
-
 python_test() {
 	unset NOTIFY_SOCKET
+	cd "${T}" || die
 	epytest --pyargs systemd -o cache_dir="${T}"
 }
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 94d951ffa567..c3622369c956 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,4 @@
+AUX rich-11.1.0-pypy3.patch 4348 BLAKE2B 3969d19dad3258d95da3f4bb05bef998e7d401ea39574038f573ddb82f6a8820a2daf11e7f1b33306a38641e5c4ed298a91ff6d1c410a8cbac5dd1d4a5bf1bef SHA512 f56c7cc7520ab9de7803983dcad46cb79351ca3e8cf169728cae783de0f2d1bac974099e6ae577bf2e1b668a7827ea58a3d363e12b3beb2c1d5f181009ef1366
 DIST rich-10.16.2.tar.gz 16282443 BLAKE2B ccc7292e265770880539d6a1a6b2e819b45e2e3d4d152f1a16c56f2da74c9a472ae49ea0a4a677ad71c4dd087fade2c415484073b4b2cd86869ad7c43c32b162 SHA512 9cb8b0c8105589db22d7efdc47cbfa20531cd184f07855db4bfafb667299c7d3e520b19e3b33e7818affb7a5674805849ee9f2e770927e285ccd7f4f838982c3
 DIST rich-11.0.0.tar.gz 16293684 BLAKE2B bd38f84a7e0623dc9474bdc369b452fc668cd4756f00f6dd1b185f95dffb3d55f6b95a7f6dfaed5ee1ec5f2d9514af6080835b9ffd010f150005b15afb761d97 SHA512 bf8218ff43a101c4624baff1ecc316eb95912d0b634c41293b44de135ea4c6ead0fa2c6a96ab1403ce4dd80961915dbe7753415a74c7d41fc1f2d227113e9ff3
 DIST rich-11.1.0.gh.tar.gz 16295117 BLAKE2B 1d326edea18b1eaad633665c2e50aa789f9eba19ee9b4cb50b94a160a69d12604fdf87d57ffbc903835b6e1e745fe17e0c521801b515ae73c8a44bf9ef17b6c2 SHA512 9da2015a66e0924bdd04deebd8fe8e963151d0a912f78320f8de8e61d656a693595c4feb0ce2436610602308d690ed96c8d10b5c81a9fc12a350b2e40907dbcb
@@ -5,5 +6,5 @@ EBUILD rich-10.16.2-r1.ebuild 1068 BLAKE2B 66f3d38d863fdee5f75219b9b567303d12787
 EBUILD rich-10.16.2.ebuild 1072 BLAKE2B 3a85a0b5333b724420adc2a8ff611f4200fa15bba5473c4cb99a188263e09d0e162d21ce77e72dd76e05ebe266b79d7cf14c9d72d91a8ac00ea81be4e4dc09ca SHA512 18e887a517b7b921ea17beffab5bd65f691047a89fcb3ff6cd594a595fbf92b7f854e3d2ef6e3c2dc2f9529858b910990490f489225fbbffeacad79db7dad2cd
 EBUILD rich-11.0.0-r1.ebuild 1066 BLAKE2B 489b7e3f2d249e1ec6109f789874a15fc98bbec8e9f1444a2cb160e4cbaa01124776e40642f837dd803f123564cb5540daeedd14f00369c93d38e6d10411b78d SHA512 d2f0876e2fc18b6b798808e303fdd74bc044f2269de2b00da6461f43a831e9475ebbc6542ce0cc7b99c32d8fc21dbc5fee339030b90a255f1080bfb8c707050c
 EBUILD rich-11.0.0.ebuild 1078 BLAKE2B 27f15447f6ede675694532b5d37bf07514cc25bb5dfcb17bf476c9db511a665c6a262f47b96f474cb4ded18efdfb23f1e1b7a8727b3a926959b06f1f346548ff SHA512 0e242ae01743c40d31a47ae340923366df509679d87d87adf6c0878563379038a12adf8e212788370196c524b97e3958c4b170cec74a73e420d099c650fc53ce
-EBUILD rich-11.1.0.ebuild 1074 BLAKE2B eae25f5f249ff8c3d5665af09997767433856c272e36101d5a4bf9d19c05cb1fdf9dca21eeb2aa8aceb2dea71c18099ed7e83d10dd9abfa8845abe34453039ca SHA512 0254db5309564bed0f4622aacc0f089cefcd0ab0bf9ad6dc1edecc624ce1374169e2cf9abf9e436322117b7e565e591a2f0b63b601b5a42e62328ab6917ecaf0
+EBUILD rich-11.1.0.ebuild 1125 BLAKE2B 794f8e97600b1d96f76aee438dfbf0489916d1a44d7bfb151ee89cd15aeca6b24457624a9004d88ce396242cab0131d775e96d1a6a25084008aba3a304a51038 SHA512 5591f6952d42c86378fbbf884f73f656fb9389ab3398dfb649c191626a8effb6f0485fcf1602efc0a5e94a376f5dee8ae8669cd8b1ec3f2e7c91871f75e0c90c
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/files/rich-11.1.0-pypy3.patch b/dev-python/rich/files/rich-11.1.0-pypy3.patch
new file mode 100644
index 000000000000..09a7f8022e26
--- /dev/null
+++ b/dev-python/rich/files/rich-11.1.0-pypy3.patch
@@ -0,0 +1,129 @@
+From 8e3a0be6fbb9186fa45cc42ec833d0895d2313ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 12:24:18 +0100
+Subject: [PATCH 1/2] Fix test_syntax not to use identity comparison on string
+
+Fix test_syntax to compare strings via "==" rather than "is", in order
+to fix test failure on PyPy3.
+---
+ CHANGELOG.md         | 4 ++++
+ CONTRIBUTORS.md      | 1 +
+ tests/test_syntax.py | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 4997ae3..17f3028 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ - Add support for US spelling of "gray" in ANSI color names https://github.com/Textualize/rich/issues/1890
+ 
++### Fixed
++
++- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
++
+ ## [11.1.0] - 2022-01-28
+ 
+ ### Added
+diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
+index c29cd79..06e0618 100644
+--- a/CONTRIBUTORS.md
++++ b/CONTRIBUTORS.md
+@@ -27,3 +27,4 @@ The following people have contributed to the development of Rich:
+ - [Nicolas Simonds](https://github.com/0xDEC0DE)
+ - [Gabriele N. Tornetta](https://github.com/p403n1x87)
+ - [Patrick Arminio](https://github.com/patrick91)
++- [Michał Górny](https://github.com/mgorny)
+diff --git a/tests/test_syntax.py b/tests/test_syntax.py
+index 46d0126..e5d904f 100644
+--- a/tests/test_syntax.py
++++ b/tests/test_syntax.py
+@@ -277,7 +277,7 @@ def test_from_path_lexer_override():
+     try:
+         os.write(fh, b"import this\n")
+         syntax = Syntax.from_path(path, lexer="rust")
+-        assert syntax.lexer.name is "Rust"
++        assert syntax.lexer.name == "Rust"
+         assert syntax.code == "import this\n"
+     finally:
+         os.remove(path)
+-- 
+2.35.1
+
+From f15dc3ea0b59d5fc04341d3f634f0e61c05a84db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 15:10:32 +0100
+Subject: [PATCH 2/2] Fix test_inspect failures on PyPy3
+
+Mark the test_inspect tests failing on PyPy3 due to different output
+to be skipped appropriately.
+---
+ CHANGELOG.md          | 2 +-
+ tests/test_inspect.py | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 17f3028..1a75bf3 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ ### Fixed
+ 
+-- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
++- Fixed test failures on PyPy3 https://github.com/Textualize/rich/pull/1904
+ 
+ ## [11.1.0] - 2022-01-28
+ 
+diff --git a/tests/test_inspect.py b/tests/test_inspect.py
+index 63c5f06..b4c1d2a 100644
+--- a/tests/test_inspect.py
++++ b/tests/test_inspect.py
+@@ -32,6 +32,11 @@ skip_py310 = pytest.mark.skipif(
+     reason="rendered differently on py3.10",
+ )
+ 
++skip_pypy3 = pytest.mark.skipif(
++    hasattr(sys, "pypy_version_info"),
++    reason="rendered differently on pypy3",
++)
++
+ 
+ def render(obj, methods=False, value=False, width=50) -> str:
+     console = Console(file=io.StringIO(), width=width, legacy_windows=False)
+@@ -81,6 +86,7 @@ def test_render():
+     assert expected == result
+ 
+ 
++@skip_pypy3
+ def test_inspect_text():
+     expected = (
+         "╭──────────────── <class 'str'> ─────────────────╮\n"
+@@ -98,6 +104,7 @@ def test_inspect_text():
+ 
+ @skip_py36
+ @skip_py37
++@skip_pypy3
+ def test_inspect_empty_dict():
+     expected = (
+         "╭──────────────── <class 'dict'> ────────────────╮\n"
+@@ -119,6 +126,7 @@ def test_inspect_empty_dict():
+     assert render({}).startswith(expected)
+ 
+ 
++@skip_pypy3
+ def test_inspect_builtin_function():
+     expected = (
+         "╭────────── <built-in function print> ───────────╮\n"
+@@ -237,6 +245,7 @@ def test_inspect_integer_with_methods():
+ 
+ @skip_py36
+ @skip_py37
++@skip_pypy3
+ def test_broken_call_attr():
+     class NotCallable:
+         __call__ = 5  # Passes callable() but isn't really callable
+-- 
+2.35.1
+
diff --git a/dev-python/rich/rich-11.1.0.ebuild b/dev-python/rich/rich-11.1.0.ebuild
index 76113d1d7315..7fab6ef8c8cf 100644
--- a/dev-python/rich/rich-11.1.0.ebuild
+++ b/dev-python/rich/rich-11.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
@@ -25,6 +25,10 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pypy3.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# check for exact color render string, which changes across pygments bumps
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 7c667968617d..8f155298633b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,10 +4,11 @@ DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d707
 DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
 DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
 DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
+DIST setuptools-60.6.0.tar.gz 2292575 BLAKE2B 410f4eee4e83c14dd1ebc3ab103f9e12bc5092e2e82dece8e71e7be57abc3d41c50763560e94343fe5089c7b903fa223fdab9c9c4648f423fcbd525551c501ef SHA512 9c0bed3d5f3e051fc996c26c2bc8d7ba0193c119a98678c7ef38ee1fdf8b42e569995598e64b527b5c6f1b4c77de655d1d7bdcd526a6d90288fd34efca92ff03
 EBUILD setuptools-59.8.0.ebuild 2933 BLAKE2B d5f4b008152d6a1324ea2a63da229f71fda4f6e20f1d7790f69257e9945ad98c02d765dc5c4e76fe44b476eeb19df6b21f582c684ab13e7b6452e280babfa0fb SHA512 e627a7c69f998d01dcd24c446efddf1af40e97065b13df3398e1c6e8c320f42cf1d5b04d2e84325f32298e0c91c8d789def20d4e947d6aca6e66ddda8058d14e
 EBUILD setuptools-60.2.0.ebuild 2984 BLAKE2B 3cd9bfbbc75d022caf3c2b8e8596d58834a62325ad8089077775eccbf149c65a680a0fd3551e396d9ad9764379ee4d4850ac4a0ad4afeb75f342a0816f77acd6 SHA512 f609442d4acece1735eb444e91db94f2b6a49c48edad30fa58b8fd27bd02cc1583a873b9cbdd3608dc592bed69cc3b1d2a86c80c8589a99218e16b65ae7d589c
 EBUILD setuptools-60.3.0.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
 EBUILD setuptools-60.3.1.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
-EBUILD setuptools-60.5.0-r1.ebuild 3326 BLAKE2B 2f77cb1b0d54a3faa4c4bd2f914fd2968dae89ca59de95bce16595dfd3369a2e239a5f13adbf4b40ea9a23e84b7c02b0c97c46827f4eb392575f308ea3420c55 SHA512 941077a16e57d7757d6fa037ac68544f8c9e9dab1c789f0f7bf6819efffc8ecb77118ce7baf4c6f0ac72685de708a25ca6f6947094ce60de3da593514f595345
 EBUILD setuptools-60.5.0.ebuild 3400 BLAKE2B fc60c2f8fb51f47e40a656f2723640b7962e0c90d8843d80deb25ac2f8984142c29ec0aad437f2feb573e35f88bb33d2b187beb10da4ccbe1276ce88729abb1e SHA512 3750647aff60bf2f1b446a0f2c8e802d438cade32e1843437f693a735ddd44acdbe13a12339e9632ab2df8c024b43c096e70b0733990f4f6d94747037dafc16c
+EBUILD setuptools-60.6.0.ebuild 3567 BLAKE2B 42ddd13c9634b573805de14f30a761b18beb0cff506fe797dc26c8b28446552476ccd9eb070b7269f5ff1542b75ebd71ab5c4e540f1528b32260ba3b17b8b91d SHA512 c05cbc703fb1a7e8bbaafa0eec67ce491b997313dba3222a70ab0a8b889539a901b1b581677e4f9e4901302ce3edcd56bed12143bb8f3c335a294125deca6882
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.5.0-r1.ebuild b/dev-python/setuptools/setuptools-60.6.0.ebuild
similarity index 90%
rename from dev-python/setuptools/setuptools-60.5.0-r1.ebuild
rename to dev-python/setuptools/setuptools-60.6.0.ebuild
index 0dfea3421f86..1088bc0dce27 100644
--- a/dev-python/setuptools/setuptools-60.5.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-60.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -39,6 +39,7 @@ BDEPEND="
 			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
@@ -61,6 +62,12 @@ src_prepare() {
 	# automatically
 	rm -r */_vendor || die
 
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]extern ::' -e 's:\w*[.]extern[.]::' \
+		-i {} + || die
+
 	# apply distutils patches to the bundled distutils
 	pushd setuptools/_distutils >/dev/null || die
 	# TODO: distutils C++ patch?
@@ -84,6 +91,7 @@ python_test() {
 		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
 		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
 		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
 		# unhappy with pytest-xdist?
 		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
 		# TODO
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 4f58940e992a..cc6889139feb 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,8 @@
 AUX xarray-0.19.0-riscv_tests_datetime.patch 1832 BLAKE2B bd38f8d95e67d8c44a17db4283b0e2c8d7b1a87ea2d4c96dd65e186b99d453d4cf3f5b52d70e2077648612c44b9fa26a0f44740f89fa23000bf7f88ac5dec7cf SHA512 40be0dd9969e21dfb6d6183d1aaa18ead960c6aa4888a10b6636bd3ab05d5995fd95c18fd87b95de535b36d0c0bd90302e9e781229407f25c7c68b25042d197c
 DIST xarray-0.20.2.tar.gz 2906021 BLAKE2B 08ed46a27ce66ec1677e63000d74ecc4a01defa81b8ae1ec24595ff330713bf3e5585adce541e5e6769a74d64a4f5eb9d9aad27450e8088973681d0d60d00f83 SHA512 cd292af68ffd8016e01021e30a2ea83dd36e2f79bd9c3d8e7d83adc5a98a95615091d0102a19a0e3337ae334a701f575a142f476d1465804c8d5fe259ca35f1a
 DIST xarray-0.21.0.tar.gz 2937088 BLAKE2B b40d57cbb018e563b92afef1e5208bb597bf8ae892b154f49e90079977c05ab955ba07f136fcf3f456efa8deb70ffd2590dd2d2429b6114a418882b8d96b535f SHA512 85461b86ced78ad5cfd1ace122f1ab89f779a8c0c7e8d0f06233b4654c5f6bcb081eeddc91e5df1c8c40c344d2477f2f18799858e23294c0929e8e59445508b0
+DIST xarray-0.21.1.tar.gz 2936861 BLAKE2B 4d419185a6c49f8054f43748fd7a0ba9694aa9e7377e371705dd6eceea84f5d611d445a7548a79133f8db4c65729c9b5f694ab586d5e2f55640a6369483e3df4 SHA512 be5d925971557f492c8ca7e90eb678a0f98cf0a670eaa8a8564bd160a02fcd8a22362a8691c5447a9baaa67b464257f2ab6954747296839b304f3e25cf13487a
 EBUILD xarray-0.20.2.ebuild 1082 BLAKE2B 9cec6781e283b773d2fc7cfb74a207647f094815101976d84d85d8a20cee06bf8cdb001669e7b33e02cf6108a421a92902a6f471d5f61b7417679188a3fdc618 SHA512 1105213e037c230861494b87a81ee0a9f9f24f88551d114361fe45a360a61ea1f8c106ef7f409c5f49ed614a3f95ddcfb6feacd64741cbdb0db750cc1ac7db93
 EBUILD xarray-0.21.0.ebuild 1199 BLAKE2B 39e238ffc47c27cbcaec5aa30f53c2a406b45c592e533244c05921fd596aa62bc6bb8703416bd9b2487f7e971fdeb6f22cb7213c77f454a1f378531a832b31f3 SHA512 a4f4e26afac89d44a83dd11425392136680a4441276f0ede9d7c95b58c776aff0a02dd00c0df632e50374c065e996787fe6a610a481ca6a7c8da982565fe3eec
+EBUILD xarray-0.21.1.ebuild 1161 BLAKE2B 032c3a27823bfc46b72aaa71835870b1ec1c5a76358bff191bcf41432d46d600a3213ca3ab2221c8ed02a9f070672a06072de2276be9b3c12d10575ef8091146 SHA512 a95aee44d33da4f09f73ab56d55cac002c20a6a331175f604300d45562da9abedd681fa64e9c1315a79dc72b1fde64d0a067d273e9afaae59ee2b229e631575a
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-0.21.1.ebuild b/dev-python/xarray/xarray-0.21.1.ebuild
new file mode 100644
index 000000000000..6fddd59568f1
--- /dev/null
+++ b/dev-python/xarray/xarray-0.21.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 0b3acbb44167..ebbabe528bcc 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,5 @@
 DIST python-zeroconf-0.38.1.gh.tar.gz 133094 BLAKE2B dae802e19b8b9488fc71cf482578be53c99bbb58580de987522e068b8d4042ac093225035bf5f7c2318c9a90bf5404e42f315cae095b0b4455ebd769facdcd81 SHA512 c60f03100c83e9327a910ad84aec768fb890453c21f9baf0fbbec96f0077c602c5e806e8a6047b87108f6d257942305a2ce76c984935ed3c000d83d2c44bb8d6
+DIST python-zeroconf-0.38.3.gh.tar.gz 133187 BLAKE2B 2058a4e8b772b49e1e6c3dd55ca1ef1f73630724d22a253d7f14f63a361e58cff24a700dfdeeaac5ca1bed43490865885dbd8956ee58924b4f9b0c4ae3351131 SHA512 30adeb1d2dfb317224a78a7f23b64da6449b9f2e64bfebf6155711f65fb302327cb78c98afd646ae167f1fbda41b8a6c927f0d36278d266583bc5369af70f8e5
 EBUILD zeroconf-0.38.1.ebuild 1099 BLAKE2B 1b4049225401fd55e519864da1205afe8a2a62f4a250a8ec1efe46c3ac3813bc69c747ab18c4c4c1f9e0908b0639bf8a88e9cb8ff1cf5d5be485704c8b18d8ce SHA512 bf53bab963722c36261a2154626eefe1fcd62abc8a3aa7a6a325b9fd0f4bc84d31b8c8eb128ddc19f95cff28ff7e409ff90b6aca451850a795c2cade60a3aca9
+EBUILD zeroconf-0.38.3.ebuild 1134 BLAKE2B 8ba3fe024b9a0570bef7277bedd95ed8d9cfd676f3086aa0b8a6e77fab730b3976608f1d87edaa9ecbaf972e5f141dced01d48c106244e9b20a3482de2836d57 SHA512 e29bf59dc70c614f5dc0b7b09782a5d07f8f1ef6754334e7124b6c83c1461a3c4ad6083f6ec7374808fe2cdfee9e57d5a3972dd6dcaef686efb9e196fe14d7b4
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.38.3.ebuild b/dev-python/zeroconf/zeroconf-0.38.3.ebuild
new file mode 100644
index 000000000000..267b91fb5e94
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.38.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit 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
+
+EPYTEST_DESELECT=(
+	# 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
+)
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f3fc39964386..990c4afc0d23 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/localhost/Manifest b/dev-ruby/localhost/Manifest
index 5176eb11378f..88c83742c8df 100644
--- a/dev-ruby/localhost/Manifest
+++ b/dev-ruby/localhost/Manifest
@@ -1,3 +1,3 @@
 DIST localhost-1.1.9.tar.gz 2125545 BLAKE2B 5843b3857a11d9f56412f67cb15e424332b07cf81a29ae0a05a3ff20c6f06af56f6a02d8315f97c2d57fe76f7359c737cf19f116868ff532ac083070430fa22e SHA512 d46fd016957fd34309d50488dc61f23e9d47a5a6bfdeda5c049f6ffc112c13cd21394ada3e15c56f14913cba6ab503f60e32237431f7ff824fbbab8cd8a2d746
-EBUILD localhost-1.1.9.ebuild 911 BLAKE2B 610c19bd7fec0ee52a12a0dc61049c053f91e9f89dd53c44113dcd43672b000026e9b42af036045c964981fa216a92d9a6e2b972541dd3aad67d19a67fd6cf12 SHA512 c1919faf24fb65f192aca2b26eb723bf59f729eca88d76241ace02dff574935eb4adf10ce3b4de5043a6c6e1952437388d936cb9a75a75cb9838b5f1b87fa369
+EBUILD localhost-1.1.9.ebuild 909 BLAKE2B cec45b1885571e5067c670ed4a4bf1e5e14a51535257437c4371a3421c47f40db6a8e68e2fff8b8518d2b5719e65fcce0719f8620f878cb0784a7613c5048298 SHA512 3385b937271669d0a00eff1bccfb52102763d927a6ed238cd39be221b10e372936fc3f97f1a908a21897fc31a133a78fb64deb25f5399e0f877a3e3b379cc9cf
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/localhost/localhost-1.1.9.ebuild b/dev-ruby/localhost/localhost-1.1.9.ebuild
index 3517fee9965d..d2c057e2b1dd 100644
--- a/dev-ruby/localhost/localhost-1.1.9.ebuild
+++ b/dev-ruby/localhost/localhost-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/socketry/localhost"
 SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dde213b8a573..5913395f6500 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index ec4b87c3fbe7..b81e29f58d38 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -143,6 +143,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.4.0.crate 14035 BLAKE2B 9a2ce4737bbc4f36b007008fb6d66065bb2354c03df4feab127992d360f2e2d9a681c314f61b856b165b6515781917976bee415fba0b9e814695a046de467387 SHA512 d45b090c83bda578d89480f783e7238149203256d61aed46ae1657dc3de62551a618aa5a02e9d9867b39de82a8df527d37432b9b8c41afbbf0188f3644c4ad2d
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.11.3.ebuild 3638 BLAKE2B b5f9024a73d351cd946907b4932e14c81ff9fe3f22ae6228a72d8e2687ac550d2e480cf7ef42b3d5e7244daa42c8ae5ce44a4933d5852a5f95a522db5c32426a SHA512 d0e8e7883cfcefd7fe7b2c66d83309ad620a5adf3b553846c2d9136652e77f17d947392d20190a49d79b3742cab2f34b297d30101e0226dff0f292022ee97a1c
+EBUILD git-delta-0.11.3.ebuild 3637 BLAKE2B 6b7c2111f9ed1d57c36398679947c7259fff90ac077d2c6a1879ec313742e5726dbf1c508c642aafb5df72c950fd0e04de63a5de66336dbc8196d0fa01bba05c SHA512 57d15f9ee8d1987710ce9e7414dda236ca046c5870c88cc5cedbc56bc845a013a571f6c404959cf5cdc46ac7187be6bd07a04649a1e60bf0ed3b5153df4dda85
 EBUILD git-delta-0.9.2.ebuild 3267 BLAKE2B 4901e4e31893d226fde729f5cdff902695a7b13d58d7c13b31992c18db28e4ae82f8ba97dbb5eb9ef3ac902c6ee09d61a5b141f1ee3c8684d5fd369e70001d3f SHA512 8fb549ec50c1b9f6707f61860602f2f37843d0ac34a85b928894d73b6d025d238b906aa49f5d04967fa212a75923984162626e8e7594e291faca23081deede65
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
diff --git a/dev-util/git-delta/git-delta-0.11.3.ebuild b/dev-util/git-delta/git-delta-0.11.3.ebuild
index 72415182f603..d5e1bdedd96c 100644
--- a/dev-util/git-delta/git-delta-0.11.3.ebuild
+++ b/dev-util/git-delta/git-delta-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -156,7 +156,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index a68dd3b7c119..1ff09bd92ff9 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index a15c5b553595..dae7dfff21ef 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,10 +1,13 @@
 AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
 AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
+AUX minetest-5.5.0-bundled_luabitop.patch 740 BLAKE2B 91f86c47f17572d1bf27be5012cff147eea6625683d4cb5f285f2da72a541a0f5cf3128f0cf4b9514bf0b4f9a27673f5c989dfb4757d4142b8f24ccb29df6918 SHA512 6bdfdb6a1e022a66c67aa1e2314ed1f4e6791f4901a811e63606116c7e4058e801d1fb772a1f75378c8404e8085cc072b6987b867b45bb0c10b5bed01e6779ff
 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
 AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
+DIST minetest-5.5.0.tar.gz 9558895 BLAKE2B 13db90556a4faaac31cca7427fb85439cab144d73f25b79ae9f8367883b0fafa39c39fe0e40f3734d7e3f48cef4942a37a302cf58993707a14024905d8ed9b61 SHA512 9c744eac2704457d6896485997666d614dd156214dae26c2cb413771fd3eab54d80731a5220bcc4a18ddc737db64971893a3c89a56a46020adf8d00aad299817
 EBUILD minetest-5.4.1-r1.ebuild 3478 BLAKE2B cb5f11ed5e8b8c0339570af29fd126f75b4f084f0910cd692870c797ecb3ae0349bc26db743cbd911d4d2fd01aedb5ccce4fa6c043ac07d421a7054a20522232 SHA512 3eb3ace3d2f20f457b2460c7a2a28720534a69454337db9ea3089e1b56bee74b267a1745fc1e13ea4e6cba6403de2aebdcccfdb9138443f49462377b76111cc7
+EBUILD minetest-5.5.0.ebuild 3463 BLAKE2B a91b8486891ee45266e45978615d89238aeec189eaac91708acc12b18a5c8a88cb293d26f06409224bbb8dbd4b664f20b582e0b650fad507adc9b9dec9ae2693 SHA512 c24c159b44f82a19a8bedbae2493868d28769aaca8214ef4421f1be6ad89c51e520726fde4d0b6b12065ea447f143b5dd80903da30d44453e05f8844310e5c8c
 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b
diff --git a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
new file mode 100644
index 000000000000..5006ddd499b6
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
@@ -0,0 +1,17 @@
+When built against PUC Lua, minetest binaries get linked against
+a customised version of LuaBitOp which then gets installed
+as /usr/$(get_libdir)/libbitop.so. This violates the policies of both
+Gentoo (unversioned shared library) and Lua itself (compiled extensions
+should be installed into implementation-specific directories rather than
+top-level libdir, and I'm pretty sure linking against such extensions
+is a no-no). Switching to system dev-lua/LuaBitOp will require work
+so just make the customised version static for now.
+
+--- a/lib/bitop/CMakeLists.txt
++++ b/lib/bitop/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(bitop bit.c)
++add_library(bitop STATIC bit.c)
+ target_link_libraries(bitop)
+ 
+ include_directories(${LUA_INCLUDE_DIR})
diff --git a/games-action/minetest/minetest-5.5.0.ebuild b/games-action/minetest/minetest-5.5.0.ebuild
new file mode 100644
index 000000000000..0b2a456abd27
--- /dev/null
+++ b/games-action/minetest/minetest-5.5.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake flag-o-matic lua-single systemd xdg
+
+DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( client server )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_impl_dep 'deprecated' lua5-1)
+	app-arch/zstd
+	dev-db/sqlite:3
+	>=dev-games/irrlicht-mt-1.9.0.4
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	client? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libvorbis
+			media-libs/openal
+		)
+	)
+	curl? ( net-misc/curl )
+	leveldb? ( dev-libs/leveldb:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+	"${FILESDIR}"/${PN}-5.5.0-bundled_luabitop.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled libraries other than bitop
+	rm -rf lib/{gmp,jsoncpp,lua} || die
+
+	# To avoid TEXTRELs on riscv
+	append-flags -fPIC
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=no
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		keepdir /etc/minetest
+		fowners root:minetest /etc/minetest
+		fperms 2750 /etc/minetest
+
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
+		newconfd "${FILESDIR}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
+		systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ede7c1b69df1..f79f60cada2d 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index 63f77c856c44..151523fb4c1a 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -1,3 +1,5 @@
 DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652
+DIST courier-pythonfilter-3.0.3.tar.gz 61994 BLAKE2B 286e9b9af580512080663cf392d9ebbe12bb35e527e3b8ab5b2c10109049d7dd3ff227f17cce126f6fdf7cf4053b163e494ad23f4260a3778a5ed58af5b50f0e SHA512 0dda245f634a181a363e99be0641c627f778d5c7d3dc67c0fab27a6471d5d4a76d24e371ffe72456653875ffcae58eb423f5885fd483d5882f0dd75be5b946ff
 EBUILD courier-pythonfilter-3.0.2-r1.ebuild 448 BLAKE2B f213859e268388244a6803dd8aebae9e4e802ed33369e24d24a90319dc6162fa757a9fa6eea2a3b04e79017f4f61464b6ccdaa64b945f94bf8eafc7525a76c71 SHA512 f14867eafe1ef91b0c5b630e28acc7f9c1e61a48f88139686ec02b7904c90bf9ff91c34f64e651abbde10965502ceed62a48c62fd80185f9042eb5d8edb44e1f
+EBUILD courier-pythonfilter-3.0.3.ebuild 452 BLAKE2B ed19c807d1195e8fa75209f8053351a6c76470a1c1638804baff100a1225e1a55302b8298012eefccea2315472ca98e75d7aaba4c1fc6705c45d8227fd4bbd7b SHA512 e355891ce6a2428f63543bc8ae3a16796ddc8190a1067980e9338d249b3b4bdd0e11256c8e8e2f2d1b945c173108c8bad228afca33dea0218727a9f3d3169854
 MISC metadata.xml 300 BLAKE2B 1626182463d88ec1e3d6be91a8ada0b0ffcfe1b04f9a7dbf937f120530be568e6961df24ba2a8cb0395b9926752731c013f068b61b40909e58eed812c7a89058 SHA512 d44719d9f36cede9aaf778fad31ae0726b17e14c38ab2720c628d7f8e50eff0b58ec22731324ed94ef08c44212f4e34354d6ad89a6b762bbafe5af2d798d1758
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.3.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.3.ebuild
new file mode 100644
index 000000000000..4b1e392935d5
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Python filtering architecture for the Courier MTA"
+HOMEPAGE="https://pypi.org/project/courier-pythonfilter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="mail-mta/courier"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 56df73581081..09195fdd5907 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index a01576020b31..b1ead55ad1ab 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -3,6 +3,8 @@ AUX rc-addon.sh 1191 BLAKE2B d85ac441b2899b48188bbaa8c021c6ce858a5e93f29b9476406
 AUX vdr-osdteletext.sudo 41 BLAKE2B 0667dd49014acdd7ebcd30fed09020dd72d96f1721c7482ee227ce8609456831c75dd7cd7e4791057daad13ae56712dff9e5e382ef36f7e08a8043c64048dad6 SHA512 bf67c332d86cc4d85c6e67a7d9d4fe8271dec1ca3a319bcb22c234278545120de99a97409c19c7f5e37d1f87e97a09306688ce868f385b502305c730bfa0263f
 DIST vdr-osdteletext-0.9.8.tar.gz 100954 BLAKE2B def803093a3726a7c9b1905e04e5790ad3959d8d66664ccc3b0147cf4ed5ff37389525cbc1504fed7e8da782c5c9e58128e35c6adaa1f4ab04ad15cc3e2ae8ba SHA512 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58
 DIST vdr-osdteletext-2.2.1.tar.gz 130325 BLAKE2B 8bfac7246a555d6b238db7123332b6d50f27444f00ca3ff54b8b86e35f05171f227ded266307f8a38e36046ef3b1bf725f12af5ef6fec64628775d690d0bad93 SHA512 519c716d794eb9d6cd6e86eb538abe759c89c902ef49baf34586f38757f67239253fe19dc87062c5e13983ef9ddcf663844f165dd493cd41b890e62a1ef37810
+DIST vdr-osdteletext-2.3.1.tar.gz 132544 BLAKE2B 33f62e53f6b960322b6e68e9dc1cc449f2d050fa0de22777a68c565233a3d7f509ea3826671fc06aaec7b3a1b9c996efad6e20317b070680d5b7aad87bba90d9 SHA512 1ffeebd35693a6fb41fd0c422e86ec2fdf4dfce5ffbdabd3da65421e50e390c68d9c0a38d5fca8bc65ff65bc2e4d529e520ea52ee304659cde2a337b3bce4a48
 EBUILD vdr-osdteletext-0.9.8.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
 EBUILD vdr-osdteletext-2.2.1.ebuild 1215 BLAKE2B 9d52fa8b0db12dff84c4ba421d67b026ddde788becfb4b7cb0aeaea9159c091b71ce68de70346cd4a5048e54c20fcf45eb0d7bfcbc3cd198fea3822b03cd714d SHA512 7d531da19ed5872be9a8967c801b7c748b67d80d56d9a28a8aac299fdf73a28aeef5b6d1929efb00836abf09df8ec737404f687f0a1c942fdfa35977e3d6e325
+EBUILD vdr-osdteletext-2.3.1.ebuild 1249 BLAKE2B 1fe46c5abd78a559983294fc6209ae22e16fe27c7ef342c5e726a0efa42a14020df5f00b3896b4ac40ac12f407faf2c35a686c757e11b4a06709521454c4bcad SHA512 0b007e232db7d033986ae144cd403f4be690bdb1a0221b837b7870f02ed472f394702c292ac96c1908dd6028c3bed8324d9be82feda82b86480609b340e72211
 MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.3.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.3.1.ebuild
new file mode 100644
index 000000000000..01a002d7ebde
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit user-info vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-osdteletext-${PV}"
+
+LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="acct-group/vdr
+	acct-user/vdr
+	media-video/vdr"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/sudoers.d
+	insopts -m440
+	newins "${FILESDIR}/vdr-osdteletext.sudo" vdr-osdteletext
+
+	local vdr_user_home=$(egethome vdr)
+	insinto "${vdr_user_home}/.local/share/fonts/"
+	insopts -m444
+	doins teletext2.ttf
+	fowners -R vdr:vdr "${vdr_user_home}/.local"
+}
+
+pkg_postinst() {
+	elog "This ebuild has installed a special teletext font"
+	elog "named \"teletext2\""
+	elog "You may go to the plugin's setup menu and select"
+	elog "the font."
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 03219f8b1623..4e0a781be700 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 77465d5f0f04..ac7d48d61d83 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,7 @@
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
-DIST easyeffects-6.2.1.tar.gz 1729150 BLAKE2B 660bfbd21c04bf0afcfd2918278f6fcf6f21a7c44ca5ff69b3782ec9de8a93c65d240bca52a0a6009a8a4c00d7970ff8fe740b1e969bed99e6f24eaa4b0789bd SHA512 0539c2cadf38796b7bb0f82b260829f5794b1ab8e20185b855335b080a107e6858b1d80fbaa3b7b59cdfb50d67e3ad90fecab464fc0901af49e76171f5bc0014
 DIST easyeffects-6.2.2.tar.gz 2614684 BLAKE2B 9a7e3cd53ce31fef424d38f5591130a6f1fd6648b73f72b504c006b8cc3712320fe6eddca7209568b0272820053ea0179d80b0acf198fa9956a4a86c3fc1865b SHA512 d2200d66b54f9d125c36d306b36a71f477ed9ae8bb7c72f06a1a180903edb768ba0dc153322f82859dd6140d9e2f5d92a52506728e0ec06b79db1b400ca9a111
+DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
-EBUILD easyeffects-6.2.1.ebuild 1992 BLAKE2B 15bf4a205539d3f4a3d44ded39405e1e10fee799f0fb101edb050623e91ff6e00585857aa2fbea6ec4b1d78c716f4e8452905a329fe730f25df06e02dfd8e1bb SHA512 1b8ca4a5b9c71d1a247a83812e2b41c152c5c2891d899b16ced184490aef04711499ebe84d88d8cbebf177a1f441665ea52dc87215c9d3f534b9374f3d0f2fb2
 EBUILD easyeffects-6.2.2.ebuild 1992 BLAKE2B 15bf4a205539d3f4a3d44ded39405e1e10fee799f0fb101edb050623e91ff6e00585857aa2fbea6ec4b1d78c716f4e8452905a329fe730f25df06e02dfd8e1bb SHA512 1b8ca4a5b9c71d1a247a83812e2b41c152c5c2891d899b16ced184490aef04711499ebe84d88d8cbebf177a1f441665ea52dc87215c9d3f534b9374f3d0f2fb2
+EBUILD easyeffects-6.2.3.ebuild 1992 BLAKE2B 15bf4a205539d3f4a3d44ded39405e1e10fee799f0fb101edb050623e91ff6e00585857aa2fbea6ec4b1d78c716f4e8452905a329fe730f25df06e02dfd8e1bb SHA512 1b8ca4a5b9c71d1a247a83812e2b41c152c5c2891d899b16ced184490aef04711499ebe84d88d8cbebf177a1f441665ea52dc87215c9d3f534b9374f3d0f2fb2
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.1.ebuild b/media-sound/easyeffects/easyeffects-6.2.3.ebuild
similarity index 100%
rename from media-sound/easyeffects/easyeffects-6.2.1.ebuild
rename to media-sound/easyeffects/easyeffects-6.2.3.ebuild
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 6a93625bba8f..cc1dfe650177 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -8,6 +8,6 @@ DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b840
 DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bccac3dd02729865a8d9f0b12b5d9f75648099d1b43d374e5cba18ff99c89cbec7174130e8c4598d6569c86958 SHA512 a76d12a2cc60d016cd4527b9776898e7dae75a4aa438eee36617afa40d118cd619396cec8db5eff2cd5579aac2cf61941cc77e027120a5996fbe5f574e7b0320
 EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27
-EBUILD murmur-1.4.230-r1.ebuild 3768 BLAKE2B a85b5fc36720dd225d96fbf01a07f1926f8166ba7031bb5cc28bb932df3cb133dc816cb91efe874ba88e522d32a18d59bcc66f6fae4c88928ccd1b3965f37b73 SHA512 3aa207b60aa628d2953af14302b1794cc2d8a1d62b1167bb213946ed617b8c218a79925626d3ee6fa536632476cbafbf61c2bcc79a6720e50e1470d5a9d7743e
-EBUILD murmur-9999.ebuild 3768 BLAKE2B a85b5fc36720dd225d96fbf01a07f1926f8166ba7031bb5cc28bb932df3cb133dc816cb91efe874ba88e522d32a18d59bcc66f6fae4c88928ccd1b3965f37b73 SHA512 3aa207b60aa628d2953af14302b1794cc2d8a1d62b1167bb213946ed617b8c218a79925626d3ee6fa536632476cbafbf61c2bcc79a6720e50e1470d5a9d7743e
+EBUILD murmur-1.4.230-r2.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec
+EBUILD murmur-9999.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec
 MISC metadata.xml 531 BLAKE2B 26cf46acdb8163b6afed12a320ef3a4f776dc1dad34191544da5525c75a5af718bbee12fd1505294bee016fbe40cc0fb3c923fdac9b07428419f0de6efb44c4c SHA512 a11789a617bbf4f78bdf3ab2b406dff874d1db2bc1c24ac48b8eccdb49049d2679b511a809be6004967798fc0d89b52adcdc6e855420eebf2e7bfcba424953fc
diff --git a/media-sound/murmur/murmur-1.4.230-r1.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild
similarity index 95%
rename from media-sound/murmur/murmur-1.4.230-r1.ebuild
rename to media-sound/murmur/murmur-1.4.230-r2.ebuild
index 7192a806faa5..50cc111347c0 100644
--- a/media-sound/murmur/murmur-1.4.230-r1.ebuild
+++ b/media-sound/murmur/murmur-1.4.230-r2.ebuild
@@ -94,7 +94,9 @@ src_prepare() {
 		-i "${S}"/scripts/murmur.{conf,ini} || die
 
 	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+	sed \
+		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-e "s@murmurd@mumble-server@" \
 		-i scripts/${PN}.service || die
 
 	cmake_src_prepare
@@ -116,7 +118,9 @@ src_configure() {
 		-Dserver="ON"
 		-Dzeroconf="$(usex zeroconf)"
 	)
-
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
 	cmake_src_configure
 }
 
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 7192a806faa5..50cc111347c0 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -94,7 +94,9 @@ src_prepare() {
 		-i "${S}"/scripts/murmur.{conf,ini} || die
 
 	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+	sed \
+		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-e "s@murmurd@mumble-server@" \
 		-i scripts/${PN}.service || die
 
 	cmake_src_prepare
@@ -116,7 +118,9 @@ src_configure() {
 		-Dserver="ON"
 		-Dzeroconf="$(usex zeroconf)"
 	)
-
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
 	cmake_src_configure
 }
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a05f6b84196b..09efe7949da6 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c79e266a08a5..1633a92b06f4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Feb 2022 05:09:03 +0000
+Tue, 01 Feb 2022 18:09:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index cab48bad60ca..05e5c330b281 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518284 BLAKE2B cb5fac863af3ef8aeec2b30770dcc46b92cbbaa35f883be3558623dd9e5b3307de19f033786959c2acefd089b402b92ae2601f1a2c9fbecd7bfee07eeebbf7b1 SHA512 052cb56c55e024e97ce62af25a94a63d53c61d2136da88877dd492ef68703ac7e8da03f6d57bdbf30b2c7ff7dccedfad2ae627469dda5745354b99d6f6e960d8
-TIMESTAMP 2022-02-01T05:09:11Z
+TIMESTAMP 2022-02-01T18:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH4wHdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH5d0NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGbBAAm9haO3O7U4dxjJmfxSwVoSLfoL1oHT44U78UUsPcVnOQN7uQA2wXF5Lz
-ap65r1GdZHSrDrKWoRyemhyIvcaWPHjkVmGd4X0QN3wGTQ6JoMylAa1N/7Om9B28
-dajJDZRApENVPRJSWTiHYKtq9a4uS74xkzQ8CBHb/YOy4RQTUbnjkCpnf2mx5xN5
-bTwWQVxM6pQtSMRULwhkM6i655KqUDUrYFZtxicyjdK2SgkZDonlOQo1ld0Uxmqv
-Lv4UmNnTSz0WfRL3zxwtGui9smn4rh1XykBllo2tRPohtLf5/JvRbo4Df4CbQHyi
-h4tIZr2oKm0b2GLkUpQ/y1G+l2hWI0EqQxY1DwJTacUB7+LfdBPqnj75NwjcoY+y
-nyDeJMB8k8O0NJL49GDKatLTU5/ndfHhNNZltGdF+mVNgvB8pLRd0/2H9eeqGz83
-Cp5LG2Zdtz1ZTUtLWHvZwms5eK48EVUv+mClm+yzWLnGNZR6DP3iLC+dOJGOhLE6
-zqJ642fg4lSWRTuDyJHLs2/o7FLH3LF6+dra+4Jks7d4hRAJCDn/oV+u+RmeH8CV
-HgQvPDmz26C0WjvtYDVe17nKYG1nn+DdgNRnbZo2iZNfCcZsZnRT849bActK2IBf
-pYzeT5Pbkx34oqbCdm8TKLwx+jI60dh/FOmd/ZKfiQWlrxZw1oY=
-=6a0v
+klBBSQ//Wn0vytL7lhg8B2fmHbgdDB0IHy4pff5C7bJM06KHMJ45dR9C+wIiq8S1
+KIZ2n2AXxpbroPPfuxGFOxc5HQhAr/ukRHe/egfwvRP3GpkrQmTkY99AXefbMB0p
+hj/V1eYRgYXMfXdfpId3soaweU6FIXX7WHEFYSiD3QJmmTcR0w0F1AG44CaufjxJ
+XgeMQcvKYI93iPD/WYWU2JHuhXrzrZQ3J1gqEXf4mmvWOj9NWWxG1tGsUbm0Q421
+UekzKOmESGT4PJxeUqValrGKi1ilBbFrXGeuUBuhpJ5lWwW1tgmeL4Wcg+UyvOkz
+cysYymV8GDakfG2e4alCOBsM2mbMFiZSqM8dnzjwk2nE99DXvzi2aMJA+UIIo6Pp
+dJ4SCHZA2OpMm2RiVYCffQKamwmIzdHZf/76bmciN/cdS3FujI4Km4SfSK3i2t/T
+lmgVEo/yAo7cjHxL6w5Qqss/lZ1kUt/rpgTAztMFtpmF7uTTJxnpWXpGN70EpumU
+zOCllYMI2zfVU4edtnch0hvL4GVYtRBfaiS10AqokGtO7xiP+Gn+s3PAaKDieNsk
+oHIurdZD7dKStro+nITAjPCKTe97h5swN/w4fCEDUtbp6kLrsHSzJXGUInBgGcPS
+C8x5oStcpPi/5OekzDI/PhXWmFMEJ4qe9Z3hVUEbVD7FdtjNl2I=
+=6mE0
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e301121bd605..1633a92b06f4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Feb 2022 05:09:04 +0000
+Tue, 01 Feb 2022 18:09:03 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8c7d1b1bbc8d..82283f4adc96 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 7108d205c366..f4993aeafb0f 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/biboumi-0 b/metadata/md5-cache/acct-group/biboumi-0
new file mode 100644
index 000000000000..385f953b9aa3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/biboumi-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: biboumi
+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
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=381735805a05e15fa0b0f9f97c78f40a
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index f999a32b122b..62667689fa60 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/biboumi-0 b/metadata/md5-cache/acct-user/biboumi-0
new file mode 100644
index 000000000000..2831ef766181
--- /dev/null
+++ b/metadata/md5-cache/acct-user/biboumi-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-im/biboumi
+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
+RDEPEND=acct-group/biboumi
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=b0a4737136b7d8c0719546359c5b07ee
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f299465260cf..624331439665 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.35.1 b/metadata/md5-cache/app-admin/syslog-ng-3.35.1
index 9bfd5863c478..8ef53100f921 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.35.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.35.1
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=8
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.35.1/syslog-ng-3.35.1.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=79f3e590370894c8cb9603c52ae02d5f
+_md5_=73919374df72ae33f3c7c4c8a986687a
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index abbac71c9455..ecde68c3ff3c 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.5 b/metadata/md5-cache/app-antivirus/clamav-0.103.5
index c5217a0a99f2..f6b452649e81 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.5
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.5
@@ -5,7 +5,7 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=8
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) dev-libs/openssl:0= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
 REQUIRED_USE=libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.5.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5896bd13b908ae2d7d77d95dd0eb894a
+_md5_=672f6e777ab0a4612a8d00f2db942c1a
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 91d9e8885b48..e5c9ffd95b5f 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/bareos-20.0.3-r2 b/metadata/md5-cache/app-backup/bareos-20.0.5
similarity index 95%
rename from metadata/md5-cache/app-backup/bareos-20.0.3-r2
rename to metadata/md5-cache/app-backup/bareos-20.0.5
index 4d991ea8363c..007d6ab159d5 100644
--- a/metadata/md5-cache/app-backup/bareos-20.0.3-r2
+++ b/metadata/md5-cache/app-backup/bareos-20.0.5
@@ -11,6 +11,6 @@ RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph )
 REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/20.0.3.tar.gz -> bareos-20.0.3.tar.gz
+SRC_URI=https://github.com/bareos/bareos/archive/Release/20.0.5.tar.gz -> bareos-20.0.5.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	1ff02d11ad6a5e4729b321ce843e0a33	python-utils-r1	7ee47726753a2bd062a05f6643d849da	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0e311077e72590a3982c4d139dfff422
+_md5_=4f4e1d33f04d0a4156e78791c2f9bc21
diff --git a/metadata/md5-cache/app-backup/bareos-21.0.0 b/metadata/md5-cache/app-backup/bareos-21.0.0
new file mode 100644
index 000000000000..cdc93db8e906
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-21.0.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend 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 dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= 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 lmdb logwatch ndmp readline scsi-crypto static +storage-daemon systemd tcpd vim-syntax vmware 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 dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= 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=static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/21.0.0.tar.gz -> bareos-21.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	1ff02d11ad6a5e4729b321ce843e0a33	python-utils-r1	7ee47726753a2bd062a05f6643d849da	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c359ff85c55dc95c8d95b500d9a7f68d
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 8ef329fc5058..dbfc766c87d4 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
new file mode 100644
index 000000000000..f34066c5b35f
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-i18n/anthy 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(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
+DESCRIPTION=Japanese Anthy engine for IBus
+EAPI=8
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-i18n/anthy 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(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus-anthy/archive/1.5.14/ibus-anthy-1.5.14.tar.gz
+_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnome2-utils	239e7afa214b50012f83b8bb61de7555	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=dad1f0bad5bb7afe13d87572ed1ee302
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ab0fd94ec951..fba0aeb2c751 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/antiword-0.37-r2 b/metadata/md5-cache/app-text/antiword-0.37-r2
index 7a87949e42dd..0e69e6c3554d 100644
--- a/metadata/md5-cache/app-text/antiword-0.37-r2
+++ b/metadata/md5-cache/app-text/antiword-0.37-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=free MS Word reader
 EAPI=8
 HOMEPAGE=http://www.winfield.demon.nl
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa 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=http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz https://dev.gentoo.org/~grobian/distfiles/antiword-gentoo-patches-r2.tar.bz2
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=35676f6e5c0fd7380c35cf9054d96eb6
+_md5_=4018d81a3770350e4ed27da0729f4d34
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 30cdc99de6e0..fe385c56d76a 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/sqlite-3.37.2 b/metadata/md5-cache/dev-db/sqlite-3.37.2
index ada70a23ccc7..8e6afd86c665 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.37.2
+++ b/metadata/md5-cache/dev-db/sqlite-3.37.2
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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
+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
 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(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2022/sqlite-src-3370200.zip doc? ( https://sqlite.org/2022/sqlite-doc-3370200.zip )
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c53bf8f1e74ac23743ad31ade4a5c55c
+_md5_=7a4d2d0b48278261b771d9d7182d5f6e
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 8531ffc54179..d33088802f7d 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.4 b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.4
new file mode 100644
index 000000000000..c00fb0ba0036
--- /dev/null
+++ b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto
+DESCRIPTION=Minetest's fork of dev-games/irrlicht
+EAPI=8
+HOMEPAGE=https://github.com/minetest/irrlicht
+KEYWORDS=~amd64 ~riscv
+LICENSE=ZLIB
+RDEPEND=media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt4.tar.gz -> irrlicht-mt-1.9.0.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=1c5ea3d4fb21871774c66fa53db2c4b5
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f2e7a973e217..0a7fcf4f3311 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
deleted file mode 100644
index 59d466000a5b..000000000000
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 test? ( dev-java/ant-junit:0 dev-java/commons-logging:0 dev-java/commons-collections:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jxpath/
-IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 java-virtuals/servlet-api:3.0 dev-java/commons-beanutils:1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz -> commons-jxpath-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	fe178a2da6b16798a2363acc5543dffa	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4894d3e11fd77f06d93164f624fbede9
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
index 92496a1c5e9b..adc2c1d7776f 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
 EAPI=8
 HOMEPAGE=https://commons.apache.org/jxpath/
 IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/jdom:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
-_md5_=08c98f740cec83b79c73e379da8484da
+_md5_=f716d2054196f344d86d0761b2f0f844
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7 b/metadata/md5-cache/dev-java/javax-mail-1.6.7
new file mode 100644
index 000000000000..fb72261e62dd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Jakarta Mail API
+EAPI=8
+HOMEPAGE=https://eclipse-ee4j.github.io/mail/
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	fe178a2da6b16798a2363acc5543dffa
+_md5_=b48139ee084838c87dcf20e8bc9724bc
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f0f2a01636d9..f6aef52c3a0d 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1 b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
index 958083a59f9d..436d3cd99e9f 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
+++ b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration ins
 EAPI=7
 HOMEPAGE=https://github.com/google/crc32c
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.1.2.tar.gz -> crc32c-1.1.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c452afab93c39635828f129f559b50d3
+_md5_=e245934fe4b90afcc5e582778d0c4075
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.23-r2 b/metadata/md5-cache/dev-libs/leveldb-1.23-r2
index d9c0d96069e0..4f86918c988c 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.23-r2
+++ b/metadata/md5-cache/dev-libs/leveldb-1.23-r2
@@ -5,11 +5,11 @@ DESCRIPTION=A fast key-value storage library written at Google
 EAPI=7
 HOMEPAGE=https://github.com/google/leveldb
 IUSE=+crc32c +snappy +tcmalloc test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=crc32c? ( dev-libs/crc32c ) snappy? ( app-arch/snappy ) tcmalloc? ( dev-util/google-perftools )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/refs/tags/1.23.tar.gz -> leveldb-1.23.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d97bf89c1d559981388d2251b6acd122
+_md5_=f98c0f65f6d69a4474974b9b96f00a9c
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9779102cc741..84affbfb0a9e 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.1.2 b/metadata/md5-cache/dev-ml/opam-installer-2.1.2
new file mode 100644
index 000000000000..d0e9f3b0123c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.1.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.2 >=dev-ml/dose3-6 dev-ml/findlib >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Core installer for opam packages
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+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.1.2 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2.1.2
+SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.2/opam-full-2.1.2.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=e12963f5f2fd77a9ea5c8888f461c9a5
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.4 b/metadata/md5-cache/dev-ml/parmap-1.2.4
new file mode 100644
index 000000000000..e7d4188894c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+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
+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.4
+SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.4.tar.gz -> parmap-1.2.4.tar.gz
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=ffd8d06ccbb8974c4e704013645ce217
diff --git a/metadata/md5-cache/dev-ml/sedlex-2.5 b/metadata/md5-cache/dev-ml/sedlex-2.5
new file mode 100644
index 000000000000..de2734f71914
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sedlex-2.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-ml/gen:= dev-ml/ppxlib:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=An OCaml lexer generator for Unicode
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/sedlex
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/gen:= dev-ml/ppxlib:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2.5
+SRC_URI=https://github.com/ocaml-community/sedlex/archive/v2.5.tar.gz -> sedlex-2.5.tar.gz https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt -> sedlex-2.5-DerivedCoreProperties.txt https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt -> sedlex-2.5-DerivedGeneralCategory.txt https://www.unicode.org/Public/12.1.0/ucd/PropList.txt -> sedlex-2.5-PropList.txt
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=429ffb67bc3ed1dbb7b2ac3003fa1ca1
diff --git a/metadata/md5-cache/dev-ml/spawn-0.15.0 b/metadata/md5-cache/dev-ml/spawn-0.15.0
new file mode 100644
index 000000000000..9796e50d3e74
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/spawn-0.15.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-ml/ppx_expect ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Spawning sub-processes
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/spawn
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.15.0
+SRC_URI=https://github.com/janestreet/spawn/archive/v0.15.0.tar.gz -> spawn-0.15.0.tar.gz
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=9c3ae29b0f10248992c4305f054da347
diff --git a/metadata/md5-cache/dev-python/Faker-12.0.0 b/metadata/md5-cache/dev-python/Faker-12.0.0
new file mode 100644
index 000000000000..1fcd1d58a1c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-12.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-12.0.0.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=2f0fd450703423fd140f10cedf6e5694
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fdefef8b9710..5406dd7df522 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/commonmark-0.9.1 b/metadata/md5-cache/dev-python/commonmark-0.9.1
index 9ee47b274317..40a99377fe77 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.9.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.9.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/hypothesis-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/hypothesis-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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 postinst prepare test
 DESCRIPTION=Python parser for the CommonMark Markdown spec
 EAPI=7
-HOMEPAGE=https://github.com/readthedocs/commonmark.py
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+HOMEPAGE=https://pypi.org/project/commonmark/ https://github.com/readthedocs/commonmark.py/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/c/commonmark/commonmark-0.9.1.tar.gz
 _eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=475cab0d9735fc4f819dbdc1b58371ec
+_md5_=da034b1485f48e2e296da672e7f28285
diff --git a/metadata/md5-cache/dev-python/django-2.2.27 b/metadata/md5-cache/dev-python/django-2.2.27
new file mode 100644
index 000000000000..927c4f975d92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.2.27
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-django ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] )
+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.27.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.27.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_md5_=380f5020f4d4eeb09ece72ac3e3ef04b
diff --git a/metadata/md5-cache/dev-python/django-3.2.12 b/metadata/md5-cache/dev-python/django-3.2.12
new file mode 100644
index 000000000000..749564c82b51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.2.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[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/jinja[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/pillow[webp,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/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?,threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.12.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.12.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_md5_=478cd3088bee2a66c9ce17973ce695eb
diff --git a/metadata/md5-cache/dev-python/django-4.0.2 b/metadata/md5-cache/dev-python/django-4.0.2
new file mode 100644
index 000000000000..ea3124208ab1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-4.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/asgiref-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[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/pillow[webp,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/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?,threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/4.0/Django-4.0.2.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.0.2.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	verify-sig	5cf1b4c749926e7fdeef16c8c3245267
+_md5_=1916bbccb42ea59a734774c759a126fa
diff --git a/metadata/md5-cache/dev-python/httpx-0.22.0 b/metadata/md5-cache/dev-python/httpx-0.22.0-r1
similarity index 74%
rename from metadata/md5-cache/dev-python/httpx-0.22.0
rename to metadata/md5-cache/dev-python/httpx-0.22.0-r1
index b2d8416954fb..1c908cd8b44c 100644
--- a/metadata/md5-cache/dev-python/httpx-0.22.0
+++ b/metadata/md5-cache/dev-python/httpx-0.22.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/brotlicffi[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/h2[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(-)?] dev-python/pytest-trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/socksio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[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(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uvicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.14*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( =dev-python/click-8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pygments-2*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/rich-10*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+BDEPEND=test? ( dev-python/brotlicffi[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/h2[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(-)?] dev-python/pytest-trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/socksio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[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(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uvicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.14*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( =dev-python/click-8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pygments-2*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rich-12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
 EAPI=8
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.python-httpx.org/
 IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.14*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( =dev-python/click-8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pygments-2*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/rich-10*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.14*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( =dev-python/click-8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pygments-2*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rich-12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/encode/httpx/archive/0.22.0.tar.gz -> httpx-0.22.0.gh.tar.gz
 _eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1c27f6288eafe606f39bce0a99265cec
+_md5_=ca99f8adae106f9fedbd46f9ad928b5a
diff --git a/metadata/md5-cache/dev-python/identify-2.4.7 b/metadata/md5-cache/dev-python/identify-2.4.7
new file mode 100644
index 000000000000..916eb1a41294
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.4.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ukkonen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/pre-commit/identify/archive/v2.4.7.tar.gz -> identify-2.4.7.gh.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e263772734293150ec607de5bfc32166
diff --git a/metadata/md5-cache/dev-python/inflect-5.4.0 b/metadata/md5-cache/dev-python/inflect-5.4.0
new file mode 100644
index 000000000000..2fff42c2930f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/inflect-5.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-8.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-8.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-8.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-8.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Correctly inflect words and numbers
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/inflect
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/inflect/inflect-5.4.0.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=63cadcaf152f56eb9843a2844495ae84
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 78af05b53739..b525c3b716fe 100644
--- a/metadata/md5-cache/dev-python/jaraco-path-3.3.1
+++ b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
@@ -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	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5bb5e2883f031d324e8d5624f387e54a
+_md5_=79cd4fe3a57f7ceec864aa46b3488119
diff --git a/metadata/md5-cache/dev-python/psycopg-2.9.3 b/metadata/md5-cache/dev-python/psycopg-2.9.3
index e9b07749ece9..48b89544da1f 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.9.3
+++ b/metadata/md5-cache/dev-python/psycopg-2.9.3
@@ -5,7 +5,7 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=8
 HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
 IUSE=debug 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.9.3.tar.gz
 _eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=025b3bff689839bb75bf0da5637b8edf
+_md5_=3c3169055455f0f5295b419455c20c07
diff --git a/metadata/md5-cache/dev-python/pyicu-2.8.1 b/metadata/md5-cache/dev-python/pyicu-2.8.1
new file mode 100644
index 000000000000..539e6c8b75e7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.8.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-libs/icu:= >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/icu:=
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=8
+HOMEPAGE=https://gitlab.pyicu.org/main/pyicu/ https://pypi.org/project/PyICU/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/icu:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.pyicu.org/main/pyicu/-/archive/v2.8.1/pyicu-v2.8.1.tar.bz2
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b7fdd33a6b01074100bbd951ac84a12c
diff --git a/metadata/md5-cache/dev-python/python-systemd-234-r2 b/metadata/md5-cache/dev-python/python-systemd-234-r2
index f41bf6346c30..0b2513e88333 100644
--- a/metadata/md5-cache/dev-python/python-systemd-234-r2
+++ b/metadata/md5-cache/dev-python/python-systemd-234-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v234.tar.gz -> python-systemd-234.tar.gz
 _eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5cf9beb765f9768d7a27d4ae53c49801
+_md5_=31b1c04932fd7053a64e91905804915b
diff --git a/metadata/md5-cache/dev-python/rich-11.1.0 b/metadata/md5-cache/dev-python/rich-11.1.0
index 144b700d4646..360c46ffdb8d 100644
--- a/metadata/md5-cache/dev-python/rich-11.1.0
+++ b/metadata/md5-cache/dev-python/rich-11.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/poetry-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/poetry-core[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
 EAPI=8
 HOMEPAGE=https://github.com/Textualize/rich
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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/Textualize/rich/archive/v11.1.0.tar.gz -> rich-11.1.0.gh.tar.gz
 _eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=093317506e5d9e3cd56a142e40b05cd9
+_md5_=512dcd246b43d43f2e29739da27d3731
diff --git a/metadata/md5-cache/dev-python/setuptools-60.5.0-r1 b/metadata/md5-cache/dev-python/setuptools-60.5.0-r1
deleted file mode 100644
index 81a6ae2dbe7e..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-60.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[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? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] )
-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/s/setuptools/setuptools-60.5.0.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
-_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=77a9d36db46c1bfbf03cf127d343a21d
diff --git a/metadata/md5-cache/dev-python/setuptools-60.6.0 b/metadata/md5-cache/dev-python/setuptools-60.6.0
new file mode 100644
index 000000000000..bd01485dfdc6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-60.6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[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? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[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/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[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/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[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.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) >=dev-python/installer-0.4.0_p20220124[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] )
+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/s/setuptools/setuptools-60.6.0.tar.gz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=cd79da76d2f6fb648824ac4d65d5e17c
diff --git a/metadata/md5-cache/dev-python/xarray-0.21.1 b/metadata/md5-cache/dev-python/xarray-0.21.1
new file mode 100644
index 000000000000..ee4399b5d7f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xarray-0.21.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/bottleneck[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( >=dev-python/scipy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[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/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=N-D labeled arrays and datasets in Python
+EAPI=8
+HOMEPAGE=https://xarray.pydata.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xarray/xarray-0.21.1.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=6456d09d4fe32f82669cdd9768365a69
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.38.3 b/metadata/md5-cache/dev-python/zeroconf-0.38.3
new file mode 100644
index 000000000000..524b47f36709
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.38.3
@@ -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-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[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(-)?]
+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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.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.38.3.tar.gz -> python-zeroconf-0.38.3.gh.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=91920cbdba05d02440c31fea8ad8f795
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 328c49840308..d079dee0936b 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/localhost-1.1.9 b/metadata/md5-cache/dev-ruby/localhost-1.1.9
index c2fb3a3e0e4a..c164892398b5 100644
--- a/metadata/md5-cache/dev-ruby/localhost-1.1.9
+++ b/metadata/md5-cache/dev-ruby/localhost-1.1.9
@@ -5,7 +5,7 @@ DESCRIPTION=Manage a local CA for self-signed localhost development servers
 EAPI=8
 HOMEPAGE=https://github.com/socketry/localhost
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 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? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/localhost/archive/v1.1.9.tar.gz -> localhost-1.1.9.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3c2abcf49e27f064fcfd0f07cc838ebb
+_md5_=520f002906339fef58d7bc097ed7f544
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6ce9a0680a32..b6d5da0aa81e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/git-delta-0.11.3 b/metadata/md5-cache/dev-util/git-delta-0.11.3
index b594b0599f22..9b9a8a7096d6 100644
--- a/metadata/md5-cache/dev-util/git-delta-0.11.3
+++ b/metadata/md5-cache/dev-util/git-delta-0.11.3
@@ -5,10 +5,10 @@ DESCRIPTION=A syntax-highlighting pager for git
 EAPI=8
 HOMEPAGE=https://github.com/dandavison/delta
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB
 RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
 SLOT=0
 SRC_URI=https://github.com/dandavison/delta/archive/0.11.3.tar.gz -> git-delta-0.11.3.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.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_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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.0/download -> approx-0.5.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.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/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.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/chrono-humanize/0.2.1/download -> chrono-humanize-0.2.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.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/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.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/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/find-crate/0.6.3/download -> find-crate-0.6.3.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.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.0/download -> form_urlencoded-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/git2/0.13.23/download -> git2-0.13.23.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.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.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.5.2/download -> indexmap-1.5.2.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/jobserver/0.1.21/download -> jobserver-0.1.21.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.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.24+1.3.0/download -> libgit2-sys-0.12.24+1.3.0.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/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.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.4/download -> memoffset-0.6.4.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/nix/0.23.0/download -> nix-0.23.0.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-traits/0.2.14/download -> num-traits-0.2.14.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.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/palette/0.6.0/download -> palette-0.6.0.crate https://crates.io/api/v1/crates/palette_derive/0.6.0/download -> palette_derive-0.6.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.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.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.1/download -> phf_generator-0.9.1.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.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.0.1/download -> plist-1.0.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.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-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.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.8/download -> quote-1.0.8.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_hc/0.3.1/download -> rand_hc-0.3.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.10/download -> redox_syscall-0.2.10.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.6/download -> regex-1.4.6.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.22/download -> regex-syntax-0.6.22.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/serde/1.0.118/download -> serde-1.0.118.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.70/download -> serde_json-1.0.70.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/siphasher/0.3.7/download -> siphasher-0.3.7.crate https://crates.io/api/v1/crates/smol_str/0.1.21/download -> smol_str-0.1.21.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.25/download -> structopt-0.3.25.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/syn/1.0.57/download -> syn-1.0.57.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/sysinfo/0.22.2/download -> sysinfo-0.22.2.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/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.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/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.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.9/download -> unicode-width-0.1.9.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.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.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_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.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.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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/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/xdg/2.4.0/download -> xdg-2.4.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_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	7ea27a358c2ff39754bf66a96c06f3de	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=77dc28af0c56452960f1b0f53a431096
+_md5_=5973a592c7858bd64d0ab7b23d9dcea2
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 9cccbb159e22..d96091e5cda1 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/minetest-5.5.0 b/metadata/md5-cache/games-action/minetest-5.5.0
new file mode 100644
index 000000000000..f11b6e4d73a5
--- /dev/null
+++ b/metadata/md5-cache/games-action/minetest-5.5.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) app-arch/zstd dev-db/sqlite:3 >=dev-games/irrlicht-mt-1.9.0.4 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( media-libs/freetype:2 media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libvorbis media-libs/openal ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest ) spatial? ( sci-libs/libspatialindex:= )
+DESCRIPTION=A free open-source voxel game engine with easy modding and game creation
+EAPI=8
+HOMEPAGE=https://www.minetest.net
+IUSE=+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~riscv
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) app-arch/zstd dev-db/sqlite:3 >=dev-games/irrlicht-mt-1.9.0.4 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( media-libs/freetype:2 media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libvorbis media-libs/openal ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest ) spatial? ( sci-libs/libspatialindex:= )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) || ( client server )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/minetest/minetest/archive/5.5.0.tar.gz -> minetest-5.5.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=632e567c15234a13031948b710810dc6
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index dd2dd64ee6a8..5a5481cf166b 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.3 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.3
new file mode 100644
index 000000000000..23292e416e8f
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=mail-mta/courier
+DESCRIPTION=Python filtering architecture for the Courier MTA
+EAPI=7
+HOMEPAGE=https://pypi.org/project/courier-pythonfilter/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.3.tar.gz
+_eclasses_=distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=c8d66372e3fb5da6bcd4e0bb89d03156
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 834d86152c92..e4d7694140c5 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
new file mode 100644
index 000000000000..70fa4506d68f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=acct-group/vdr acct-user/vdr 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=8
+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=acct-group/vdr acct-user/vdr 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.3.1.tar.gz -> vdr-osdteletext-2.3.1.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	a3392443578545d0e1395c9ed3887ea1
+_md5_=ed0c452d7f8e0e0e10aea58ca8e6dba8
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 232e169cbd08..becfadf61f93 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.2.1 b/metadata/md5-cache/media-sound/easyeffects-6.2.3
similarity index 95%
rename from metadata/md5-cache/media-sound/easyeffects-6.2.1
rename to metadata/md5-cache/media-sound/easyeffects-6.2.3
index f33ed916d123..7db52f22e4d8 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.2.1
+++ b/metadata/md5-cache/media-sound/easyeffects-6.2.3
@@ -10,6 +10,6 @@ LICENSE=GPL-3
 RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 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 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.2.1.tar.gz -> easyeffects-6.2.1.tar.gz
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.2.3.tar.gz -> easyeffects-6.2.3.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	239e7afa214b50012f83b8bb61de7555	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	7ee47726753a2bd062a05f6643d849da	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=ba35477926027d06cff05cd8c3171203
diff --git a/metadata/md5-cache/media-sound/murmur-1.4.230-r1 b/metadata/md5-cache/media-sound/murmur-1.4.230-r2
similarity index 98%
rename from metadata/md5-cache/media-sound/murmur-1.4.230-r1
rename to metadata/md5-cache/media-sound/murmur-1.4.230-r2
index 1abe05cb6f29..d0e8327593f5 100644
--- a/metadata/md5-cache/media-sound/murmur-1.4.230-r1
+++ b/metadata/md5-cache/media-sound/murmur-1.4.230-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.4.230/mumble-1.4.230.tar.gz https://dl.mumble.info/mumble-1.4.230.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=778e462cf3f5ff21510e3dea66065913
+_md5_=287166a2c0e4fb9b12a91524bcbc6efc
diff --git a/metadata/md5-cache/media-sound/murmur-9999 b/metadata/md5-cache/media-sound/murmur-9999
index 2b054dd64e90..966a30a2b02b 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	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=778e462cf3f5ff21510e3dea66065913
+_md5_=287166a2c0e4fb9b12a91524bcbc6efc
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ec4ffbe1135a..72ee8ea967b4 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1-r1 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1-r1
new file mode 100644
index 000000000000..c9dc1d826d21
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst
+DEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
+DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
+EAPI=8
+HOMEPAGE=https://www.monitoring-plugins.org/
+IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.1.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=668bb9874eae1c00f4bfd5dc99b1d94b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.38 b/metadata/md5-cache/net-analyzer/zabbix-4.0.38
new file mode 100644
index 000000000000..c635cd04bff3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.38
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) mbedtls? ( net-libs/mbedtls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) mbedtls? ( net-libs/mbedtls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent frontend proxy server ) ssl? ( ^^ ( gnutls mbedtls openssl ) ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+SLOT=0/4.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.38.tar.gz
+_eclasses_=java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	60f2eb31dec733d05e8114cc078ebc33
+_md5_=e64393be245dcb5a5c4d0962b6c4413c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.20 b/metadata/md5-cache/net-analyzer/zabbix-5.0.20
new file mode 100644
index 000000000000..0cfe8f21eb5a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.20
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.20.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.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.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.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.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.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.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/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.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.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.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.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.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.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.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.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//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	6be3eb7a42e4cecb88f18356a783ee35	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	60f2eb31dec733d05e8114cc078ebc33
+_md5_=fe7c1611167bd94cb3f5f5ea338d4156
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.10 b/metadata/md5-cache/net-analyzer/zabbix-5.4.10
new file mode 100644
index 000000000000..33f49cfd95e3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.10
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) ssl? ( ^^ ( gnutls openssl ) ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/5.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.10.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.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.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.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.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.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.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/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.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.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.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.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.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.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.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//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	6be3eb7a42e4cecb88f18356a783ee35	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	fe178a2da6b16798a2363acc5543dffa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	60f2eb31dec733d05e8114cc078ebc33
+_md5_=ef834e0127ca92ab95fb45193a74a8d3
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index a177f168a622..fa34b6d36df6 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.1-r1 b/metadata/md5-cache/net-firewall/nftables-1.0.1-r1
index 35f82550dd68..756513356135 100644
--- a/metadata/md5-cache/net-firewall/nftables-1.0.1-r1
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs xtables python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.1:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.1.tar.bz2
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	distutils-r1	46a97aac0e3039b269e9738b9132e60d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	0e7a98958af67ee30e3c2b2e3b37c0be	python-utils-r1	7ee47726753a2bd062a05f6643d849da	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f17d971f8e1b89c47e4d542875482d53
+_md5_=9ddfdbdef9899ffe8f95cae38a8f689f
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index d495f919361b..b132ea52bfcf 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.12-r5 b/metadata/md5-cache/net-fs/netatalk-3.1.12-r5
index dd55481644d5..ce810be14c98 100644
--- a/metadata/md5-cache/net-fs/netatalk-3.1.12-r5
+++ b/metadata/md5-cache/net-fs/netatalk-3.1.12-r5
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source AFP server
 EAPI=7
 HOMEPAGE=http://netatalk.sourceforge.net/
 IUSE=acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=ldap? ( acl ) tracker? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/18.0
 SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.12/netatalk-3.1.12.tar.bz2
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62614fd778738db3815650a710c6ed40
+_md5_=7544e2b6f8ae2b34f887ac3c86ead02b
diff --git a/metadata/md5-cache/net-fs/samba-4.16.0_rc1 b/metadata/md5-cache/net-fs/samba-4.16.0_rc2
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.16.0_rc1
rename to metadata/md5-cache/net-fs/samba-4.16.0_rc2
index fed28cd2292c..12b475234851 100644
--- a/metadata/md5-cache/net-fs/samba-4.16.0_rc1
+++ b/metadata/md5-cache/net-fs/samba-4.16.0_rc2
@@ -10,6 +10,6 @@ RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://samba/rc/samba-4.16.0rc1.tar.gz
+SRC_URI=mirror://samba/rc/samba-4.16.0rc2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f2f3a6323e14946ad8e54935cdd0b1b8
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index e58e21614d76..6ab0ef99fc19 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1 b/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
index ef809dc4141f..a68e8dc9a3e6 100644
--- a/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
+++ b/metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Very Secure FTP Daemon
 EAPI=8
 HOMEPAGE=https://security.appspot.com/vsftpd.html
 IUSE=pam ssl tcpd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libcap-2 pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) net-ftp/ftpbase
 SLOT=0
 SRC_URI=https://security.appspot.com/downloads/vsftpd-3.0.5.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3d916ae039b164c1f48c064f992569ac
+_md5_=297df3802d66de7137facfe3f9fffc81
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 29ad6fde1554..112ac49e2c3f 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/biboumi-9.0-r2 b/metadata/md5-cache/net-im/biboumi-9.0-r2
new file mode 100644
index 000000000000..1a0724614bde
--- /dev/null
+++ b/metadata/md5-cache/net-im/biboumi-9.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/sphinx dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat virtual/libiconv sys-apps/util-linux sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) idn? ( net-dns/libidn:= ) udns? ( net-libs/udns ) ssl? ( dev-libs/botan:2= ) !ssl? ( dev-libs/libgcrypt ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=XMPP gateway to IRC
+EAPI=8
+HOMEPAGE=https://biboumi.louiz.org/
+IUSE=+idn postgres +sqlite +ssl systemd udns
+KEYWORDS=~amd64
+LICENSE=ZLIB
+RDEPEND=dev-libs/expat virtual/libiconv sys-apps/util-linux sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) idn? ( net-dns/libidn:= ) udns? ( net-libs/udns ) ssl? ( dev-libs/botan:2= ) !ssl? ( dev-libs/libgcrypt ) systemd? ( sys-apps/systemd:= ) acct-user/biboumi
+SLOT=0
+SRC_URI=https://git.louiz.org/biboumi/snapshot/biboumi-9.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=31fbbada0df280d12972ef5d10a04b99
diff --git a/metadata/md5-cache/net-im/ejabberd-21.04-r2 b/metadata/md5-cache/net-im/ejabberd-21.04-r2
index 7dbc4ccb6146..5370a63703e2 100644
--- a/metadata/md5-cache/net-im/ejabberd-21.04-r2
+++ b/metadata/md5-cache/net-im/ejabberd-21.04-r2
@@ -13,4 +13,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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	rebar	f13843e18f4ec00f45f7158bd3f3d3bb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=124334e1c0e01af7e5263f9be064e4c2
+_md5_=dd3b5a11061d3fd891f39782a22fc749
diff --git a/metadata/md5-cache/net-im/ejabberd-21.12 b/metadata/md5-cache/net-im/ejabberd-21.12
index 405c1b32ec0b..5feae451d2fc 100644
--- a/metadata/md5-cache/net-im/ejabberd-21.12
+++ b/metadata/md5-cache/net-im/ejabberd-21.12
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://static.process-one.net/ejabberd/downloads/21.12/ejabberd-21.12.tgz -> ejabberd-21.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pam	e44a1dd98f13e1ad76de01e919bde1f1	rebar	f13843e18f4ec00f45f7158bd3f3d3bb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=042cf7913bf310bcd0db1cdfeb748cb5
+_md5_=ac25f3b270df63c293a1a5cfe58482aa
diff --git a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6 b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6
index 4bb9df7faeec..39a28ad04d92 100644
--- a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6
+++ b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6
@@ -5,8 +5,8 @@ EAPI=8
 HOMEPAGE=https://rocket.chat
 KEYWORDS=-* ~amd64
 LICENSE=MIT
-RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango
+RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.7.6/rocketchat-3.7.6.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d0a9b98c3fb12fca16054c1a3842639f
+_md5_=4a0bb3cd2d326a0fad5546af735484f3
diff --git a/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1 b/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1
index 8e4fbfa52936..521d9f659a3e 100644
--- a/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1
+++ b/metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1
@@ -5,8 +5,8 @@ EAPI=7
 HOMEPAGE=https://github.com/oOthkOo/whatsapp-desktop
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 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/libXScrnSaver x11-libs/pango
+RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 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/libXScrnSaver x11-libs/pango
 SLOT=0
 SRC_URI=amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v0.5.1/whatsapp-desktop-x64.deb -> whatsapp-desktop-bin-amd64-0.5.1.deb ) x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v0.5.1/whatsapp-desktop-x32.deb -> whatsapp-desktop-bin-x86-0.5.1.deb )
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=3130a680c1038c3c8ad1f04a85e5dbac
+_md5_=9fcda13e7c4749f99757d6638e9c42aa
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3c24d430cf3f..1751c8c8926e 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2-r2 b/metadata/md5-cache/net-misc/mosh-1.3.2-r2
index 159f29fb5ee1..c9b690e96186 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2-r2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=8
 HOMEPAGE=https://mosh.org
 IUSE=+client examples +mosh-hardening +server ufw +utempter
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:0= utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=60d8231542e8bf5f1c5036e8cdce6f80
+_md5_=2ee1c8e60bc0aa8bd51359971ff8f788
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a339ac257c0e..0d0ae5a3fd4e 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/uutils-0.0.12 b/metadata/md5-cache/sys-apps/uutils-0.0.12
new file mode 100644
index 000000000000..1e909f50b0f1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/uutils-0.0.12
@@ -0,0 +1,12 @@
+BDEPEND=dev-python/sphinx >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=GNU coreutils rewritten in Rust
+EAPI=8
+HOMEPAGE=https://github.com/uutils/coreutils
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 ISC MIT Unlicense
+SLOT=0
+SRC_URI=https://github.com/uutils/coreutils/archive/refs/tags/0.0.12.tar.gz -> uutils-0.0.12.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.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/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.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/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/bigdecimal/0.3.0/download -> bigdecimal-0.3.0.crate https://crates.io/api/v1/crates/binary-heap-plus/0.4.1/download -> binary-heap-plus-0.4.1.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.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/block-buffer/0.2.0/download -> block-buffer-0.2.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byte-tools/0.2.0/download -> byte-tools-0.2.0.crate https://crates.io/api/v1/crates/byte-unit/4.0.13/download -> byte-unit-4.0.13.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.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.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.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.3.0/download -> clang-sys-1.3.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/compare/0.1.0/download -> compare-0.1.0.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/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/coz/0.1.3/download -> coz-0.1.3.crate https://crates.io/api/v1/crates/cpp/0.5.6/download -> cpp-0.5.6.crate https://crates.io/api/v1/crates/cpp_build/0.4.0/download -> cpp_build-0.4.0.crate https://crates.io/api/v1/crates/cpp_common/0.4.0/download -> cpp_common-0.4.0.crate https://crates.io/api/v1/crates/cpp_common/0.5.6/download -> cpp_common-0.5.6.crate https://crates.io/api/v1/crates/cpp_macros/0.5.6/download -> cpp_macros-0.5.6.crate https://crates.io/api/v1/crates/cpp_syn/0.12.0/download -> cpp_syn-0.12.0.crate https://crates.io/api/v1/crates/cpp_synmap/0.3.0/download -> cpp_synmap-0.3.0.crate https://crates.io/api/v1/crates/cpp_synom/0.12.0/download -> cpp_synom-0.12.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.6/download -> crossbeam-epoch-0.9.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.6/download -> crossbeam-utils-0.8.6.crate https://crates.io/api/v1/crates/crossterm/0.22.1/download -> crossterm-0.22.1.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/data-encoding-macro/0.1.12/download -> data-encoding-macro-0.1.12.crate https://crates.io/api/v1/crates/data-encoding-macro-internal/0.1.10/download -> data-encoding-macro-internal-0.1.10.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/digest/0.6.1/download -> digest-0.6.1.crate https://crates.io/api/v1/crates/dlv-list/0.2.3/download -> dlv-list-0.2.3.crate https://crates.io/api/v1/crates/dns-lookup/1.0.8/download -> dns-lookup-1.0.8.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.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/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/exacl/0.6.0/download -> exacl-0.6.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.6.0/download -> fastrand-1.6.0.crate https://crates.io/api/v1/crates/file_diff/1.0.0/download -> file_diff-1.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fts-sys/0.2.1/download -> fts-sys-0.2.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcd/2.1.0/download -> gcd-2.1.0.crate https://crates.io/api/v1/crates/generic-array/0.8.4/download -> generic-array-0.8.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.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.4/download -> getrandom-0.2.4.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.8.2/download -> half-1.8.2.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.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/hex/0.2.0/download -> hex-0.2.0.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/if_rust_version/1.0.0/download -> if_rust_version-1.0.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/ioctl-sys/0.6.0/download -> ioctl-sys-0.6.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.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.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.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.5.2/download -> memmap2-0.5.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.21.0/download -> nix-0.21.0.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/7.1.0/download -> nom-7.1.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.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-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_enum/0.5.6/download -> num_enum-0.5.6.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.6/download -> num_enum_derive-0.5.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/onig/4.3.3/download -> onig-4.3.3.crate https://crates.io/api/v1/crates/onig_sys/69.1.0/download -> onig_sys-69.1.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.3.1/download -> ordered-multimap-0.3.1.crate https://crates.io/api/v1/crates/os_display/0.1.2/download -> os_display-0.1.2.crate https://crates.io/api/v1/crates/ouroboros/0.10.1/download -> ouroboros-0.10.1.crate https://crates.io/api/v1/crates/ouroboros_macro/0.10.1/download -> ouroboros_macro-0.10.1.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/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste/1.0.6/download -> paste-1.0.6.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.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.0.0/download -> pretty_assertions-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.0/download -> proc-macro-crate-1.1.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-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.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/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quickcheck/0.9.2/download -> quickcheck-0.9.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.14/download -> quote-1.0.14.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.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_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.10/download -> redox_syscall-0.2.10.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/reference-counted-singleton/0.1.1/download -> reference-counted-singleton-0.1.1.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/retain_mut/0.1.2/download -> retain_mut-0.1.2.crate https://crates.io/api/v1/crates/rlimit/0.4.0/download -> rlimit-0.4.0.crate https://crates.io/api/v1/crates/rust-ini/0.17.0/download -> rust-ini-0.17.0.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/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selinux/0.2.5/download -> selinux-0.2.5.crate https://crates.io/api/v1/crates/selinux-sys/0.5.1/download -> selinux-sys-0.5.1.crate https://crates.io/api/v1/crates/serde/1.0.133/download -> serde-1.0.133.crate https://crates.io/api/v1/crates/serde_derive/1.0.133/download -> serde_derive-1.0.133.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.6.0/download -> sha2-0.6.0.crate https://crates.io/api/v1/crates/sha3/0.6.0/download -> sha3-0.6.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.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/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strum/0.21.0/download -> strum-0.21.0.crate https://crates.io/api/v1/crates/strum_macros/0.21.1/download -> strum_macros-0.21.1.crate https://crates.io/api/v1/crates/syn/1.0.85/download -> syn-1.0.85.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.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.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/termsize/0.1.6/download -> termsize-0.1.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.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.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.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/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/utf8-width/0.1.5/download -> utf8-width-0.1.5.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.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.4/download -> version_check-0.9.4.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/which/4.2.2/download -> which-4.2.2.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.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/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/z85/3.0.4/download -> z85-3.0.4.crate
+_eclasses_=cargo	7ea27a358c2ff39754bf66a96c06f3de	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=18ef21563aed11c38f4cf9245ccee29f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index cfd9e477c1ec..a56cc5630cc2 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/crossdev-20211121 b/metadata/md5-cache/sys-devel/crossdev-20211121
index 986c4afeeea3..acb1c5560ccb 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20211121
+++ b/metadata/md5-cache/sys-devel/crossdev-20211121
@@ -3,9 +3,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-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
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=mirror://gentoo/crossdev-20211121.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20211121.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20211121.tar.xz
-_md5_=79f35ce5ff1c8fae9140ac3798fcfaef
+_md5_=64f960beec273fccad933ad7c3639fdd
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5d57736f2a20..c9aaf5dad3ce 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.95 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.96
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.95
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.96
index 780e3ec53f2f..082289c40367 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.95
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.96
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.95
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.95.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.96
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.96.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.19
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.15.18
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.15.19
index e91acb6dc7b9..ce5194b76472 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.19
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.15.18
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.18.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.19
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.5
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.16.4
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.16.5
index 5b470a3fd848..ebd9f4c8d672 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.5
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.16.4
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.16.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz
+SLOT=5.16.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.16.5.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.175 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.176
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.175
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.176
index cf819c161946..95e720b9677b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.175
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.176
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio 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.175
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.175.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.176
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.176.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 72fb4f8f465d..9b7d67af7cfb 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/bottom-0.6.6 b/metadata/md5-cache/sys-process/bottom-0.6.6
index c965f4b29a8e..e6a728e835c7 100644
--- a/metadata/md5-cache/sys-process/bottom-0.6.6
+++ b/metadata/md5-cache/sys-process/bottom-0.6.6
@@ -4,9 +4,9 @@ DESCRIPTION=A graphical process/system monitor with a customizable interface
 EAPI=8
 HOMEPAGE=https://github.com/ClementTsang/bottom
 IUSE=+battery debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.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_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.44/download -> anyhow-1.0.44.crate https://crates.io/api/v1/crates/assert_cmd/1.0.8/download -> assert_cmd-1.0.8.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.4.0/download -> async-lock-2.4.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.2.0/download -> async-process-1.2.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.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/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/battery/0.7.8/download -> battery-0.7.8.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/bottom/0.6.6/download -> bottom-0.6.6.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.71/download -> cc-1.0.71.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/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.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.1/download -> crossbeam-deque-0.8.1.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-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.18.2/download -> crossterm-0.18.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.6.2/download -> crossterm_winapi-0.6.2.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.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/3.0.2/download -> dirs-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/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/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.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/futures/0.3.17/download -> futures-0.3.17.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-executor/0.3.17/download -> futures-executor-0.3.17.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.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.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.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/hex/0.4.3/download -> hex-0.4.3.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.11/download -> instant-0.1.11.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.8/download -> itoa-0.4.8.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.104/download -> libc-0.2.104.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.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.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.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/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-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.26.2/download -> object-0.26.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.1.0/download -> polling-2.1.0.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.3/download -> predicates-2.0.3.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.4/download -> predicates-tree-1.0.4.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-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.30/download -> proc-macro2-1.0.30.crate https://crates.io/api/v1/crates/procfs/0.11.0/download -> procfs-0.11.0.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.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.10/download -> redox_syscall-0.2.10.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/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.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.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.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.10/download -> signal-hook-0.3.10.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/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.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.80/download -> syn-1.0.80.crate https://crates.io/api/v1/crates/sysinfo/0.18.2/download -> sysinfo-0.18.2.crate https://crates.io/api/v1/crates/termtree/0.2.1/download -> termtree-0.2.1.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.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.3.3/download -> time-0.3.3.crate https://crates.io/api/v1/crates/time-macros/0.2.3/download -> time-macros-0.2.3.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tui/0.14.0/download -> tui-0.14.0.crate https://crates.io/api/v1/crates/typed-builder/0.9.1/download -> typed-builder-0.9.1.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.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.9/download -> unicode-width-0.1.9.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/uom/0.30.0/download -> uom-0.30.0.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.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/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.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	7ea27a358c2ff39754bf66a96c06f3de	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4d016ccd368d19530392a2130d5456f6
+_md5_=a83cb8d7b0404e13a70bc6f08cce26c4
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index a6f0341098cf..300d1ad08f01 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/puma-5.5.2 b/metadata/md5-cache/www-servers/puma-5.5.2
index 7a51f845eed7..251b07ad640e 100644
--- a/metadata/md5-cache/www-servers/puma-5.5.2
+++ b/metadata/md5-cache/www-servers/puma-5.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 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
+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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.5.2.tar.gz -> puma-5.5.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2e0e03b509ab015878b630e63cac09fb
+_md5_=b297956ba27444f511f6d455a094d30d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index a2426f248043..1dabe6a299d7 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.47.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.47.03
new file mode 100644
index 000000000000..fce01144405e
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.47.03
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland dist-kernel driver
+KEYWORDS=-* ~amd64
+LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= 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(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/510
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/510.47.03/NVIDIA-Linux-x86_64-510.47.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/510.47.03/NVIDIA-Linux-aarch64-510.47.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.47.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.47.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.47.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.47.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.47.03.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=26d3659f3365d25c8360a92ad632a866
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 3b74217c820c..aed911c3a821 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/rofi-1.7.0-r1 b/metadata/md5-cache/x11-misc/rofi-1.7.3
similarity index 80%
rename from metadata/md5-cache/x11-misc/rofi-1.7.0-r1
rename to metadata/md5-cache/x11-misc/rofi-1.7.3
index d75f099e35ee..dd82f007503d 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.7.0-r1
+++ b/metadata/md5-cache/x11-misc/rofi-1.7.3
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst prepare
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=8
 HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=+drun test +windowmode
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.7.0/rofi-1.7.0.tar.gz
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.7.3/rofi-1.7.3.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dd860abd982a7a9268f588ba3565365c
+_md5_=51e388b1850a6126f83f5c78eaadfc0c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 91adf8465089..93d15fea7081 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15561 BLAKE2B 30d14554c361ecc2db312266d9a96736586a74d15ae25de153aae93816d58fb72e0577a0ce0d08fbed62009358d460331bd52141bf576a73346d006f1e7ff10c SHA512 c39bb0d5ac9d60d346266b7e16a8308e1a9954eef08902e01a2337fe5be084f5a06ea3a47ac08030502c738f5f565cdb6fa298a0f2c3edfbb1a533e78bd1f2ee
-TIMESTAMP 2022-02-01T05:09:11Z
+TIMESTAMP 2022-02-01T18:09:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH4wHdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH5d0NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC1jQ//VWqVNWGvqvFLwhuOSP0+eXMsi0SOtkK08wBu/sqI4XeyeV2xzbBjj8Xv
-VTYHLC2kvLennVvF5YS+UpDuaUI/fIUEzx6s5EGYTbs7xlJoYJ8fxHha+auOsHe9
-uBVTsofJdHk8R7hD2lU017qRPiEoXUVGL14tVNMHyDF2mmRO6o9cIDTx8KYP/teV
-/buSF9P/u9y50ZGn2L09y/q39oCqDd8+V3NpgMiutvoLEClAH9Bhx1B9e7JWWeDb
-audrmE3pD3m1EPjfuIwbTSbueh/sZWU+vjPkhpWW2AZHy6HiHTMkvIhRVRlxgpCH
-tBaxzV6FLDeve+hvHmOtsxdKhd8sMuF2kVzjk64UO42D5yfwJBvs9bDflevKVtXu
-3+T4Wj5lK8k9xQ7e8iIEKlxpTQlnxtsqGcvk+8798KbcVt9AJ+4UGPiu0FIUSou4
-tzEbRBUuXasXG60eMcA6XM2+pZ+l76BW4/LH7bxdcMLEuUaFbrpjEDHTfs2PPJXO
-xd9JteE/ahx18Ld2MoP8xjAPB8u7hlLnhSn+hi0X3ddMkf5TweUw9rt2yo6Z8V7n
-zOc4suAoyDC4eB+gZiMvLfwK3trgxJKIzI9Ou94iEuy9e/Z4mv3L+hlfV/phED2u
-HZ7L9donf9IsYek/vzHEYio7AJ3jGtfFDyh7Kv0kXUV9F9N952s=
-=Lq2c
+klC3PBAAgutvbtB71b5buJLc88SjbAztKCBXvhQQSQKEay3oU/cu2JfAkfapDPQg
+l/4Ves1opo0MARm2PJninB2HcvrIV39hilDsox1ViLcvHLdNuQuKIfYW4eJYckXB
+O0HTQ22vKjZe/7m7X+Y+nuUaWnoKVbGZgwl4RNfQusoTLpDlyHjcph1dhts8vtYt
+b9vsF4vJZlhpemhPEYNdxl7ZuI36UzJHBcjODx7RaoAPy0Lcslbs8pk4NvmTt5An
+ym0GrUe0Pj6/aXBzJrxh7ETNVKvKygk20u8PVplXngxA7Scb5zNZ8hLyfbIQOQ7Q
+3Rx03cH4JDtOVyEfdGylR9olsePQ7WGdLdQmdnpsqCKQwC4JyWiIcpq0Hu7cYMad
+ay0Nz+NQxoakp++H2mDVNz1tYUgQC4dWMEIk9FLg0irbMK+LWyhomKB5gJ/CCbxx
+2yexPS/SSU31MR9rRH2NZ/rFBsr1AV/Wb00SqQ5BfVOq70/mkOGYJQ32bI6luJ2C
+/OW8HYlzpojopXXqrAGTs3F8vEEwQUfCKh7EHvlPvVFFTbGDS5ixnHwZWflUtD5o
+qDCucXFyQETy/y2FsASywDucDZb2JAGIk52suqCxcJNSz05C5D5+bkdf6/jO6JCe
+mWnAa6DEC7LZ2Y6QlehIT4xfccwVWvBT36PaZtzakBv0YSpll6A=
+=vI8C
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e301121bd605..21eef05797b5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Feb 2022 05:09:04 +0000
+Tue, 01 Feb 2022 18:09:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 999a347d8f66..e6b2fb0d2a0b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb  1 05:09:03 AM UTC 2022
+Tue Feb  1 06:09:03 PM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index f442c0ac47ca..33c025a06256 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -450,6 +450,7 @@
 2201301139 ./acct-group/brlapi/brlapi-0.ebuild
 2201301139 ./acct-group/brltty/brltty-0.ebuild
 2201291909 ./acct-group/quagga/quagga-0-r1.ebuild
+2202011409 ./acct-group/biboumi/biboumi-0.ebuild
 2012281255 ./acct-user/abrt/abrt-0-r1.ebuild
 2107101509 ./acct-user/aerospike-amc/aerospike-amc-0.ebuild
 2012281255 ./acct-user/airdcppd/airdcppd-0-r1.ebuild
@@ -860,6 +861,7 @@
 2112290039 ./acct-user/icingadirector/icingadirector-0.ebuild
 2201291909 ./acct-user/quagga/quagga-0-r1.ebuild
 2201302209 ./acct-user/brltty/brltty-0.ebuild
+2202011409 ./acct-user/biboumi/biboumi-0.ebuild
 2107081639 ./app-accessibility/accerciser/accerciser-3.38.0.ebuild
 2111180910 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
 2111180910 ./app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
@@ -1212,7 +1214,7 @@
 2102021709 ./app-admin/sysklogd/sysklogd-9999.ebuild
 2111281639 ./app-admin/sysklogd/sysklogd-2.3.0.ebuild
 2112101110 ./app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
-2201301109 ./app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+2202011039 ./app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
 2009231339 ./app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
 2106302209 ./app-admin/sysrqd/sysrqd-17-r2.ebuild
 2107140639 ./app-admin/sysstat/sysstat-12.5.4.ebuild
@@ -1262,8 +1264,8 @@
 2201130540 ./app-admin/yadm/yadm-3.1.1.ebuild
 2112080309 ./app-admin/mkosi/mkosi-12-r1.ebuild
 2201012339 ./app-antivirus/clamav/clamav-0.103.4.ebuild
-2201130010 ./app-antivirus/clamav/clamav-0.103.5.ebuild
 2201130040 ./app-antivirus/clamav/clamav-0.104.2.ebuild
+2202011109 ./app-antivirus/clamav/clamav-0.103.5.ebuild
 2112232239 ./app-antivirus/clamtk/clamtk-6.14.ebuild
 2112012109 ./app-antivirus/fangfrisch/fangfrisch-1.5.0.ebuild
 2109271739 ./app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
@@ -1424,7 +1426,8 @@
 2112310409 ./app-backup/bacula/bacula-11.0.5.ebuild
 2109252239 ./app-backup/bareos/bareos-18.2.12-r1.ebuild
 2109252239 ./app-backup/bareos/bareos-19.2.11-r1.ebuild
-2109301439 ./app-backup/bareos/bareos-20.0.3-r2.ebuild
+2202011339 ./app-backup/bareos/bareos-20.0.5.ebuild
+2202011409 ./app-backup/bareos/bareos-21.0.0.ebuild
 2106011239 ./app-backup/borgbackup/borgbackup-1.1.15.ebuild
 2106011239 ./app-backup/borgbackup/borgbackup-1.1.16.ebuild
 2110122209 ./app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
@@ -3322,6 +3325,7 @@
 2106250239 ./app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild
 2109291739 ./app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
 2111291639 ./app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
+2202011709 ./app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
 2110310939 ./app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
 2110171709 ./app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
 2109171709 ./app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -4350,7 +4354,7 @@
 2012311940 ./app-text/an/an-1.2_p6.ebuild
 2201242239 ./app-text/ansifilter/ansifilter-2.18.ebuild
 2104180939 ./app-text/antiword/antiword-0.37-r1.ebuild
-2201301109 ./app-text/antiword/antiword-0.37-r2.ebuild
+2202011039 ./app-text/antiword/antiword-0.37-r2.ebuild
 2101061709 ./app-text/antixls/antixls-0.3b.ebuild
 2107031939 ./app-text/apvlv/apvlv-0.1.5-r2.ebuild
 2103230739 ./app-text/asa/asa-1.1-r1.ebuild
@@ -5553,7 +5557,7 @@
 2201070839 ./dev-db/sqldeveloper/sqldeveloper-21.4.1.349.1822.ebuild
 2107140639 ./dev-db/sqlite/sqlite-3.35.5.ebuild
 2112130309 ./dev-db/sqlite/sqlite-3.37.0.ebuild
-2202010009 ./dev-db/sqlite/sqlite-3.37.2.ebuild
+2202011109 ./dev-db/sqlite/sqlite-3.37.2.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
 2107160109 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -5807,6 +5811,7 @@
 2106101509 ./dev-games/t4k-common/t4k-common-0.1.1-r1.ebuild
 2110270939 ./dev-games/tiled/tiled-1.7.2.ebuild
 2104190439 ./dev-games/wfmath/wfmath-1.0.2.ebuild
+2202011739 ./dev-games/irrlicht-mt/irrlicht-mt-1.9.0.4.ebuild
 2104272109 ./dev-go/act/act-1.6.0.ebuild
 1911292209 ./dev-go/coveraggregator/coveraggregator-0_pre20170216-r1.ebuild
 2110200610 ./dev-go/delve/delve-1.7.2.ebuild
@@ -6778,8 +6783,7 @@
 2112260340 ./dev-java/commons-io/commons-io-2.11.0.ebuild
 1912111539 ./dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
 1702282250 ./dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
-1803011208 ./dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
-2201311239 ./dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+2202011039 ./dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
 2108292009 ./dev-java/commons-lang/commons-lang-2.6-r2.ebuild
 2112171409 ./dev-java/commons-lang/commons-lang-3.12.0.ebuild
 2201271140 ./dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -7170,6 +7174,7 @@
 2201251239 ./dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
 2201251239 ./dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
 2201272040 ./dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
+2202011839 ./dev-java/javax-mail/javax-mail-1.6.7.ebuild
 2108061639 ./dev-lang/R/R-4.0.5-r1.ebuild
 2107180609 ./dev-lang/R/R-4.1.0-r2.ebuild
 2201261340 ./dev-lang/R/R-4.1.2.ebuild
@@ -7494,7 +7499,7 @@
 2111272010 ./dev-libs/cppcodec/cppcodec-9999.ebuild
 2109052009 ./dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
 2110122209 ./dev-libs/crc32c/crc32c-1.1.1.ebuild
-2201312339 ./dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+2202011109 ./dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
 2112091939 ./dev-libs/criterion/criterion-2.4_pre20210114.ebuild
 2201291309 ./dev-libs/criterion/criterion-2.4_pre20211218.ebuild
 2104190739 ./dev-libs/crossguid/crossguid-0_pre20150817.ebuild
@@ -7662,7 +7667,7 @@
 2201210309 ./dev-libs/level-zero/level-zero-1.7.9.ebuild
 2110280209 ./dev-libs/leveldb/leveldb-1.23-r1.ebuild
 2201040639 ./dev-libs/leveldb/leveldb-1.20.ebuild
-2201312339 ./dev-libs/leveldb/leveldb-1.23-r2.ebuild
+2202011109 ./dev-libs/leveldb/leveldb-1.23-r2.ebuild
 2101062239 ./dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
 2110190639 ./dev-libs/libaio/libaio-0.3.112.ebuild
 2110190639 ./dev-libs/libaio/libaio-9999.ebuild
@@ -8646,6 +8651,7 @@
 2110030039 ./dev-ml/opam-installer/opam-installer-2.1.0.ebuild
 2111060709 ./dev-ml/opam-installer/opam-installer-2.1.1.ebuild
 2201181539 ./dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+2202011309 ./dev-ml/opam-installer/opam-installer-2.1.2.ebuild
 2111060709 ./dev-ml/opam-repository/opam-repository-2.0.10.ebuild
 2110012209 ./dev-ml/opam-repository/opam-repository-2.0.8.ebuild
 2110031309 ./dev-ml/opam-repository/opam-repository-2.1.0.ebuild
@@ -8679,6 +8685,7 @@
 2110031309 ./dev-ml/parmap/parmap-1.2.1.ebuild
 2110031309 ./dev-ml/parmap/parmap-1.2.3.ebuild
 2103140409 ./dev-ml/parmap/parmap-1.2.ebuild
+2202011309 ./dev-ml/parmap/parmap-1.2.4.ebuild
 2110120339 ./dev-ml/parsexp/parsexp-0.14.0.ebuild
 2110120339 ./dev-ml/parsexp/parsexp-0.14.1.ebuild
 2110031309 ./dev-ml/patience_diff/patience_diff-0.14.0.ebuild
@@ -8748,6 +8755,7 @@
 2103140409 ./dev-ml/sexplib/sexplib-0.14.0.ebuild
 2105292209 ./dev-ml/sexplib0/sexplib0-0.14.0.ebuild
 2103140409 ./dev-ml/spawn/spawn-0.13.0.ebuild
+2202011639 ./dev-ml/spawn/spawn-0.15.0.ebuild
 2103140409 ./dev-ml/splittable_random/splittable_random-0.14.0.ebuild
 2103140409 ./dev-ml/stdio/stdio-0.14.0.ebuild
 2110030039 ./dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -8780,6 +8788,7 @@
 2112040109 ./dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
 2112050639 ./dev-ml/ptmap/ptmap-2.0.5-r1.ebuild
 2112050639 ./dev-ml/sedlex/sedlex-2.3-r1.ebuild
+2202011639 ./dev-ml/sedlex/sedlex-2.5.ebuild
 2112061340 ./dev-ml/fix/fix-20211125.ebuild
 2201300139 ./dev-ml/fix/fix-20220121.ebuild
 2112080239 ./dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
@@ -11097,6 +11106,7 @@
 2112291140 ./dev-python/Faker/Faker-11.1.0.ebuild
 2201062239 ./dev-python/Faker/Faker-11.3.0.ebuild
 2202010310 ./dev-python/Faker/Faker-11.4.0.ebuild
+2202011339 ./dev-python/Faker/Faker-12.0.0.ebuild
 2201081709 ./dev-python/GitPython/GitPython-3.1.24-r1.ebuild
 2201081309 ./dev-python/GitPython/GitPython-3.1.25.ebuild
 2201102310 ./dev-python/GitPython/GitPython-3.1.26.ebuild
@@ -11391,7 +11401,7 @@
 2112101510 ./dev-python/colorlog/colorlog-6.6.0.ebuild
 2110111139 ./dev-python/colorspacious/colorspacious-1.1.2.ebuild
 2202010139 ./dev-python/commentjson/commentjson-0.9.0.ebuild
-2201272210 ./dev-python/commonmark/commonmark-0.9.1.ebuild
+2202011709 ./dev-python/commonmark/commonmark-0.9.1.ebuild
 2111050539 ./dev-python/configargparse/configargparse-1.5.3.ebuild
 2106052209 ./dev-python/configclass/configclass-0.2.0.ebuild
 2108041739 ./dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -11522,6 +11532,9 @@
 2201050109 ./dev-python/django/django-2.2.26.ebuild
 2201050109 ./dev-python/django/django-3.2.11.ebuild
 2201050039 ./dev-python/django/django-4.0.1.ebuild
+2202011339 ./dev-python/django/django-2.2.27.ebuild
+2202011339 ./dev-python/django/django-3.2.12.ebuild
+2202011339 ./dev-python/django/django-4.0.2.ebuild
 2108292239 ./dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
 2111190139 ./dev-python/django_polymorphic/django_polymorphic-3.1.ebuild
 2107081009 ./dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
@@ -11770,8 +11783,8 @@
 2201291909 ./dev-python/httpcore/httpcore-0.14.5.ebuild
 2112200009 ./dev-python/httplib2/httplib2-0.20.2.ebuild
 2112141539 ./dev-python/httpretty/httpretty-1.1.4.ebuild
-2201262140 ./dev-python/httpx/httpx-0.22.0.ebuild
 2201272210 ./dev-python/httpx/httpx-0.21.3.ebuild
+2202011709 ./dev-python/httpx/httpx-0.22.0-r1.ebuild
 2109221409 ./dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild
 2112300239 ./dev-python/huawei-lte-api/huawei-lte-api-1.5.4.ebuild
 2109180139 ./dev-python/humanfriendly/humanfriendly-10.0.ebuild
@@ -11796,6 +11809,7 @@
 2201141140 ./dev-python/identify/identify-2.4.4.ebuild
 2201232239 ./dev-python/identify/identify-2.4.5.ebuild
 2201272310 ./dev-python/identify/identify-2.4.6.ebuild
+2202011339 ./dev-python/identify/identify-2.4.7.ebuild
 2111131239 ./dev-python/idna/idna-3.3.ebuild
 2105061039 ./dev-python/ifaddr/ifaddr-0.1.7.ebuild
 2105222139 ./dev-python/ijson/ijson-3.1.4.ebuild
@@ -11814,6 +11828,7 @@
 2201280210 ./dev-python/incremental/incremental-21.3.0.ebuild
 2110191039 ./dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild
 2201200211 ./dev-python/inflect/inflect-5.3.0.ebuild
+2202011339 ./dev-python/inflect/inflect-5.4.0.ebuild
 2105091439 ./dev-python/inflection/inflection-0.5.1.ebuild
 2108242039 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2108220139 ./dev-python/iniconfig/iniconfig-1.1.1.ebuild
@@ -11860,7 +11875,7 @@
 2201200211 ./dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
 2105081209 ./dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
 2201200211 ./dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
-2201270210 ./dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+2202011739 ./dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
 2111131309 ./dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
 2112100140 ./dev-python/jaraco-text/jaraco-text-3.6.0-r1.ebuild
 2201241309 ./dev-python/jaraco-text/jaraco-text-3.7.0.ebuild
@@ -12326,7 +12341,7 @@
 2110040511 ./dev-python/psutil/psutil-5.7.3.ebuild
 2110241039 ./dev-python/psycopg/psycopg-2.8.6-r1.ebuild
 2112132309 ./dev-python/psycopg/psycopg-2.9.2.ebuild
-2201310139 ./dev-python/psycopg/psycopg-2.9.3.ebuild
+2202011039 ./dev-python/psycopg/psycopg-2.9.3.ebuild
 2105052009 ./dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
 2201300009 ./dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
 2112260340 ./dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
@@ -12452,6 +12467,7 @@
 2201280210 ./dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
 2108020039 ./dev-python/pyhcl/pyhcl-0.4.4.ebuild
 2112031109 ./dev-python/pyicu/pyicu-2.8.ebuild
+2202011339 ./dev-python/pyicu/pyicu-2.8.1.ebuild
 2107172139 ./dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
 2107161409 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
 2201171009 ./dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -12734,7 +12750,7 @@
 2112272240 ./dev-python/python-swiftclient/python-swiftclient-3.13.0.ebuild
 2109050109 ./dev-python/python-systemd/python-systemd-234.ebuild
 2201260909 ./dev-python/python-systemd/python-systemd-234-r1.ebuild
-2201301309 ./dev-python/python-systemd/python-systemd-234-r2.ebuild
+2202011809 ./dev-python/python-systemd/python-systemd-234-r2.ebuild
 2201281840 ./dev-python/python-utils/python-utils-2.6.3.ebuild
 2201281840 ./dev-python/python-utils/python-utils-2.7.1.ebuild
 2201281840 ./dev-python/python-utils/python-utils-3.0.0.ebuild
@@ -12870,7 +12886,7 @@
 2201271310 ./dev-python/rich/rich-10.16.2-r1.ebuild
 2201272210 ./dev-python/rich/rich-10.16.2.ebuild
 2201271240 ./dev-python/rich/rich-11.0.0-r1.ebuild
-2201282210 ./dev-python/rich/rich-11.1.0.ebuild
+2202011739 ./dev-python/rich/rich-11.1.0.ebuild
 2112260340 ./dev-python/rjsmin/rjsmin-1.1.0.ebuild
 2112260340 ./dev-python/rjsmin/rjsmin-1.2.0.ebuild
 2112260340 ./dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
@@ -12933,7 +12949,7 @@
 2201061240 ./dev-python/setuptools/setuptools-60.3.0.ebuild
 2201070009 ./dev-python/setuptools/setuptools-60.3.1.ebuild
 2201090240 ./dev-python/setuptools/setuptools-60.5.0.ebuild
-2201290410 ./dev-python/setuptools/setuptools-60.5.0-r1.ebuild
+2202011409 ./dev-python/setuptools/setuptools-60.6.0.ebuild
 2109081439 ./dev-python/setuptools_rust/setuptools_rust-0.12.1.ebuild
 2108131009 ./dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
 2110092239 ./dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
@@ -13298,6 +13314,7 @@
 2108031409 ./dev-python/wxpython/wxpython-4.0.7-r1.ebuild
 2201111609 ./dev-python/xarray/xarray-0.20.2.ebuild
 2201291040 ./dev-python/xarray/xarray-0.21.0.ebuild
+2202011339 ./dev-python/xarray/xarray-0.21.1.ebuild
 2201310009 ./dev-python/xcffib/xcffib-0.11.1.ebuild
 2110071039 ./dev-python/xdoctest/xdoctest-0.15.10.ebuild
 2111150309 ./dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -13320,6 +13337,7 @@
 2108211609 ./dev-python/zconfig/zconfig-3.6.0.ebuild
 2111111339 ./dev-python/zeep/zeep-4.1.0-r1.ebuild
 2201262340 ./dev-python/zeroconf/zeroconf-0.38.1.ebuild
+2202011339 ./dev-python/zeroconf/zeroconf-0.38.3.ebuild
 2110312109 ./dev-python/zipp/zipp-3.6.0.ebuild
 2201200211 ./dev-python/zipp/zipp-3.7.0.ebuild
 2201281840 ./dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -15218,7 +15236,7 @@
 2201150940 ./dev-ruby/listen/listen-3.7.1.ebuild
 2111211009 ./dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
 2110050909 ./dev-ruby/locale/locale-2.1.3.ebuild
-2112271910 ./dev-ruby/localhost/localhost-1.1.9.ebuild
+2202011109 ./dev-ruby/localhost/localhost-1.1.9.ebuild
 2111221009 ./dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
 2201151010 ./dev-ruby/log4r/log4r-1.1.10-r3.ebuild
 2111221009 ./dev-ruby/log_buddy/log_buddy-0.7.0-r1.ebuild
@@ -16438,7 +16456,7 @@
 2112260340 ./dev-util/gertty/gertty-9999.ebuild
 2201242239 ./dev-util/gi-docgen/gi-docgen-2021.8.ebuild
 2112050609 ./dev-util/git-delta/git-delta-0.9.2.ebuild
-2112310709 ./dev-util/git-delta/git-delta-0.11.3.ebuild
+2202011039 ./dev-util/git-delta/git-delta-0.11.3.ebuild
 2108110009 ./dev-util/github-cli/github-cli-1.14.0.ebuild
 2108261940 ./dev-util/github-cli/github-cli-2.0.0.ebuild
 2006130039 ./dev-util/github-cli/github-cli-9999.ebuild
@@ -17043,6 +17061,7 @@
 2105221539 ./games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
 2201271340 ./games-action/minecraft-launcher/minecraft-launcher-1093.ebuild
 2108131909 ./games-action/minetest/minetest-5.4.1-r1.ebuild
+2202011739 ./games-action/minetest/minetest-5.5.0.ebuild
 2106240539 ./games-action/moon-buggy/moon-buggy-1.0.51-r2.ebuild
 2112120010 ./games-action/multimc-bin/multimc-bin-1.6.1-r1.ebuild
 2109131139 ./games-action/nighthawk/nighthawk-4.0.ebuild
@@ -19063,6 +19082,7 @@
 2201271240 ./mail-filter/bogofilter/bogofilter-1.2.4-r4.ebuild
 2201271240 ./mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
 2101310343 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild
+2202011809 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.3.ebuild
 2104031909 ./mail-filter/couriersrs/couriersrs-0.1.2.ebuild
 2101201239 ./mail-filter/dcc/dcc-1.3.158-r1.ebuild
 2111071239 ./mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
@@ -20840,6 +20860,7 @@
 2108181339 ./media-plugins/vdr-osdserver/vdr-osdserver-0.1.3.ebuild
 2105091239 ./media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild
 2112091939 ./media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
+2202011139 ./media-plugins/vdr-osdteletext/vdr-osdteletext-2.3.1.ebuild
 2108181339 ./media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
 2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
 2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
@@ -21042,8 +21063,8 @@
 2201101440 ./media-sound/drumstick/drumstick-2.5.0.ebuild
 2012292009 ./media-sound/dvda-author/dvda-author-10.06-r1.ebuild
 2201021409 ./media-sound/easyeffects/easyeffects-6.1.5.ebuild
-2201220909 ./media-sound/easyeffects/easyeffects-6.2.1.ebuild
 2201272240 ./media-sound/easyeffects/easyeffects-6.2.2.ebuild
+2202011739 ./media-sound/easyeffects/easyeffects-6.2.3.ebuild
 2109280109 ./media-sound/easytag/easytag-2.4.3-r2.ebuild
 2109190909 ./media-sound/ecasound/ecasound-2.9.3.ebuild
 2111290409 ./media-sound/elisa/elisa-21.08.3.ebuild
@@ -21201,8 +21222,8 @@
 1805120339 ./media-sound/mup/mup-6.6.ebuild
 2107310240 ./media-sound/murmur/murmur-1.3.3.ebuild
 2107310240 ./media-sound/murmur/murmur-1.3.4.ebuild
-2202010039 ./media-sound/murmur/murmur-1.4.230-r1.ebuild
-2202010039 ./media-sound/murmur/murmur-9999.ebuild
+2202010939 ./media-sound/murmur/murmur-1.4.230-r2.ebuild
+2202010939 ./media-sound/murmur/murmur-9999.ebuild
 2008081539 ./media-sound/muse/muse-0.9.2_p20161002.ebuild
 2108211209 ./media-sound/musepack-tools/musepack-tools-465-r1.ebuild
 2103110539 ./media-sound/musescore/musescore-3.6.2.ebuild
@@ -21827,6 +21848,7 @@
 2102271109 ./net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
 1910021809 ./net-analyzer/mdns-scan/mdns-scan-0.5.ebuild
 2107160109 ./net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+2202011139 ./net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
 2104031939 ./net-analyzer/mping/mping-2.01.ebuild
 2201231639 ./net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
 2104032209 ./net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -22058,6 +22080,9 @@
 2201191109 ./net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
 2201191109 ./net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
 2201191109 ./net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
+2202011339 ./net-analyzer/zabbix/zabbix-4.0.38.ebuild
+2202011339 ./net-analyzer/zabbix/zabbix-5.0.20.ebuild
+2202011339 ./net-analyzer/zabbix/zabbix-5.4.10.ebuild
 2110100539 ./net-analyzer/zmap/zmap-2.1.1-r3.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2110212239 ./net-analyzer/zniper/zniper-1.0-r3.ebuild
@@ -22215,8 +22240,8 @@
 2109252239 ./net-firewall/nftables/nftables-0.9.8-r1.ebuild
 2108120240 ./net-firewall/nftables/nftables-0.9.9.ebuild
 2110281709 ./net-firewall/nftables/nftables-1.0.0.ebuild
-2201312209 ./net-firewall/nftables/nftables-1.0.1-r1.ebuild
 2201312209 ./net-firewall/nftables/nftables-9999.ebuild
+2202011009 ./net-firewall/nftables/nftables-1.0.1-r1.ebuild
 2005012139 ./net-firewall/nftlb/nftlb-0.6.ebuild
 2105311239 ./net-firewall/nufw/nufw-2.2.22-r3.ebuild
 2107310340 ./net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild
@@ -22244,7 +22269,7 @@
 2103281109 ./net-fs/mc/mc-2021.03.23.05.46.11.ebuild
 2104192209 ./net-fs/minio/minio-2021.04.18.19.26.29-r2.ebuild
 2106302209 ./net-fs/netatalk/netatalk-3.1.12-r4.ebuild
-2202010809 ./net-fs/netatalk/netatalk-3.1.12-r5.ebuild
+2202010839 ./net-fs/netatalk/netatalk-3.1.12-r5.ebuild
 2111301409 ./net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
 2007310109 ./net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7.ebuild
 2201040640 ./net-fs/openafs/openafs-1.8.7.ebuild
@@ -22256,10 +22281,10 @@
 2112312109 ./net-fs/samba/samba-4.14.10-r2.ebuild
 2112312109 ./net-fs/samba/samba-4.15.2-r2.ebuild
 2201241139 ./net-fs/samba/samba-4.15.4.ebuild
-2201250144 ./net-fs/samba/samba-4.16.0_rc1.ebuild
 2201290710 ./net-fs/samba/samba-4.15.3-r1.ebuild
 2201311639 ./net-fs/samba/samba-4.14.12.ebuild
 2201311639 ./net-fs/samba/samba-4.15.5.ebuild
+2202010939 ./net-fs/samba/samba-4.16.0_rc2.ebuild
 2101312209 ./net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
 2102270939 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2012311940 ./net-fs/sshfs/sshfs-3.7.0.ebuild
@@ -22300,7 +22325,7 @@
 2201032209 ./net-ftp/uftpd/uftpd-2.15.ebuild
 2107272139 ./net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
 2107272139 ./net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
-2201151310 ./net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+2202010909 ./net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
 2106190039 ./net-ftp/yafc/yafc-1.3.7-r1.ebuild
 2103281309 ./net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
 1901181409 ./net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
@@ -22321,8 +22346,8 @@
 2112210540 ./net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
 2107310240 ./net-im/ejabberd/ejabberd-20.04.ebuild
 2107310240 ./net-im/ejabberd/ejabberd-21.04.ebuild
-2112122209 ./net-im/ejabberd/ejabberd-21.04-r2.ebuild
-2201202339 ./net-im/ejabberd/ejabberd-21.12.ebuild
+2202011039 ./net-im/ejabberd/ejabberd-21.04-r2.ebuild
+2202011039 ./net-im/ejabberd/ejabberd-21.12.ebuild
 2107180040 ./net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
 2107180040 ./net-im/ekg2/ekg2-9999.ebuild
 2112312109 ./net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild
@@ -22362,7 +22387,7 @@
 2201220339 ./net-im/qtox/qtox-9999.ebuild
 2107160109 ./net-im/ricochet/ricochet-1.1.4.ebuild
 2007281739 ./net-im/ricochet/ricochet-9999.ebuild
-2201202239 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
+2202011309 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
 2201211639 ./net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
 2201211639 ./net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
 2111020109 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -22398,12 +22423,13 @@
 2108192209 ./net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild
 2107041710 ./net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
 2107041710 ./net-im/vacuum/vacuum-9999.ebuild
-2105241039 ./net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
+2202011309 ./net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
 2107021739 ./net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
 2106210056 ./net-im/ysm/ysm-2.9.9.1-r2.ebuild
 2201091740 ./net-im/zoom/zoom-5.8.6.739.ebuild
 2201091740 ./net-im/zoom/zoom-5.9.1.1380.ebuild
 2201271040 ./net-im/zoom/zoom-5.9.3.1911.ebuild
+2202011409 ./net-im/biboumi/biboumi-9.0-r2.ebuild
 2201011439 ./net-irc/anope/anope-2.0.10.ebuild
 2106302209 ./net-irc/atheme-services/atheme-services-7.2.11-r1.ebuild
 2201312209 ./net-irc/atheme-services/atheme-services-7.2.12.ebuild
@@ -23209,8 +23235,8 @@
 2111060742 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
 2201241810 ./net-misc/modemmanager/modemmanager-1.18.4.ebuild
 2002230040 ./net-misc/monmotha/monmotha-2.3.8-r1.ebuild
-2111082139 ./net-misc/mosh/mosh-1.3.2-r2.ebuild
 2104292039 ./net-misc/mosh/mosh-1.3.2.ebuild
+2202011009 ./net-misc/mosh/mosh-1.3.2-r2.ebuild
 2102161539 ./net-misc/mrouted/mrouted-4.2.ebuild
 2109190709 ./net-misc/mrouted/mrouted-4.3.ebuild
 2111041939 ./net-misc/mrouted/mrouted-4.4.ebuild
@@ -26782,6 +26808,7 @@
 2112100810 ./sys-apps/hwdata/hwdata-0.354.ebuild
 2202010739 ./sys-apps/hwdata/hwdata-0.355.ebuild
 2112062140 ./sys-apps/zram-generator/zram-generator-1.1.1.ebuild
+2202011339 ./sys-apps/uutils/uutils-0.0.12.ebuild
 2105012009 ./sys-auth/AusweisApp2/AusweisApp2-1.22.2.ebuild
 2006242209 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
 2201210309 ./sys-auth/AusweisApp2/AusweisApp2-1.22.3.ebuild
@@ -27290,7 +27317,7 @@
 2110011039 ./sys-devel/crossdev/crossdev-20210718.ebuild
 2110272039 ./sys-devel/crossdev/crossdev-20211027.ebuild
 2111221039 ./sys-devel/crossdev/crossdev-99999999.ebuild
-2201312209 ./sys-devel/crossdev/crossdev-20211121.ebuild
+2202010909 ./sys-devel/crossdev/crossdev-20211121.ebuild
 2002112051 ./sys-devel/ct-ng/ct-ng-1.24.0.ebuild
 2104042139 ./sys-devel/dev86/dev86-0.16.21-r3.ebuild
 2104060140 ./sys-devel/distcc/distcc-3.3.3-r3.ebuild
@@ -27841,10 +27868,10 @@
 2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.227.ebuild
 2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.301.ebuild
 2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.299.ebuild
-2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.95.ebuild
-2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.18.ebuild
-2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-5.16.4.ebuild
-2201291839 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.175.ebuild
+2202012009 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.96.ebuild
+2202012009 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.19.ebuild
+2202012009 ./sys-kernel/vanilla-sources/vanilla-sources-5.16.5.ebuild
+2202012009 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.176.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.16.4.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -28109,7 +28136,7 @@
 2111111039 ./sys-process/below/below-0.3.0-r1.ebuild
 2111111339 ./sys-process/below/below-0.4.1.ebuild
 2110200340 ./sys-process/bottom/bottom-0.6.4.ebuild
-2112301209 ./sys-process/bottom/bottom-0.6.6.ebuild
+2202011039 ./sys-process/bottom/bottom-0.6.6.ebuild
 2101310343 ./sys-process/bpytop/bpytop-1.0.61-r1.ebuild
 2111040010 ./sys-process/bpytop/bpytop-1.0.63.ebuild
 2201112340 ./sys-process/bpytop/bpytop-1.0.67.ebuild
@@ -28718,8 +28745,8 @@
 2105022339 ./www-servers/pshs/pshs-0.4.1.ebuild
 2107121639 ./www-servers/puma/puma-5.3.2-r1.ebuild
 2111080609 ./www-servers/puma/puma-5.4.0.ebuild
-2112271910 ./www-servers/puma/puma-5.5.2.ebuild
 2201281040 ./www-servers/puma/puma-5.6.1.ebuild
+2202011109 ./www-servers/puma/puma-5.5.2.ebuild
 2108311739 ./www-servers/servefile/servefile-0.5.1-r1.ebuild
 2109080310 ./www-servers/servefile/servefile-0.5.2.ebuild
 2111181809 ./www-servers/servefile/servefile-0.5.3.ebuild
@@ -28859,6 +28886,7 @@
 2201202239 ./x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
 2201260440 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.22.ebuild
 2202010609 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
+2202012109 ./x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild
 2101101939 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2201040009 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2201040009 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -29273,9 +29301,9 @@
 2111211309 ./x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
 2201241510 ./x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.0.ebuild
 2110121139 ./x11-misc/rofi/rofi-1.6.1-r1.ebuild
-2111222240 ./x11-misc/rofi/rofi-1.7.0-r1.ebuild
 2112031609 ./x11-misc/rofi/rofi-99999.ebuild
 2201080040 ./x11-misc/rofi/rofi-1.7.2.ebuild
+2202011409 ./x11-misc/rofi/rofi-1.7.3.ebuild
 2106031009 ./x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
 2101310343 ./x11-misc/safeeyes/safeeyes-2.0.9-r2.ebuild
 2101310343 ./x11-misc/safeeyes/safeeyes-2.1.1.ebuild
@@ -30601,10 +30629,11 @@
 2112210540 metadata/md5-cache/acct-group/lxd-0-r1
 2112201210 metadata/md5-cache/acct-group/reg-0-r1
 2112201210 metadata/md5-cache/acct-group/registry-0
-2201301139 metadata/md5-cache/acct-group/Manifest.gz
 2201301139 metadata/md5-cache/acct-group/brlapi-0
 2201301139 metadata/md5-cache/acct-group/brltty-0
 2201291909 metadata/md5-cache/acct-group/quagga-0-r1
+2202011409 metadata/md5-cache/acct-group/Manifest.gz
+2202011409 metadata/md5-cache/acct-group/biboumi-0
 2106241909 metadata/md5-cache/acct-user/abrt-0-r1
 2107101509 metadata/md5-cache/acct-user/aerospike-amc-0
 2106241909 metadata/md5-cache/acct-user/airdcppd-0-r1
@@ -31014,8 +31043,9 @@
 2112201210 metadata/md5-cache/acct-user/registry-0
 2112290039 metadata/md5-cache/acct-user/icingadirector-0
 2201291909 metadata/md5-cache/acct-user/quagga-0-r1
-2201302209 metadata/md5-cache/acct-user/Manifest.gz
 2201302209 metadata/md5-cache/acct-user/brltty-0
+2202011409 metadata/md5-cache/acct-user/Manifest.gz
+2202011409 metadata/md5-cache/acct-user/biboumi-0
 2104180939 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2109021139 metadata/md5-cache/app-accessibility/speechd-el-2.8
@@ -31403,7 +31433,6 @@
 2201291111 metadata/md5-cache/app-admin/supervisor-4.2.2
 2201291111 metadata/md5-cache/app-admin/supervisor-4.2.4
 2201290214 metadata/md5-cache/app-admin/syslog-ng-3.34.1
-2201301109 metadata/md5-cache/app-admin/syslog-ng-3.35.1
 2201290214 metadata/md5-cache/app-admin/syslog-summary-1.14-r5
 2201290214 metadata/md5-cache/app-admin/system-config-printer-1.5.15
 2201290214 metadata/md5-cache/app-admin/undertaker-scripts-1
@@ -31416,15 +31445,16 @@
 2201290214 metadata/md5-cache/app-admin/yadm-3.1.1
 2201310409 metadata/md5-cache/app-admin/vault-1.8.8
 2201310409 metadata/md5-cache/app-admin/vault-1.9.3
-2201312309 metadata/md5-cache/app-admin/Manifest.gz
 2201312309 metadata/md5-cache/app-admin/selint-1.2.1
 2201312309 metadata/md5-cache/app-admin/selint-9999
+2202011039 metadata/md5-cache/app-admin/Manifest.gz
+2202011039 metadata/md5-cache/app-admin/syslog-ng-3.35.1
 2201230146 metadata/md5-cache/app-antivirus/clamav-0.103.4
-2201230146 metadata/md5-cache/app-antivirus/clamav-0.103.5
-2201291111 metadata/md5-cache/app-antivirus/Manifest.gz
 2201290214 metadata/md5-cache/app-antivirus/clamav-0.104.2
 2201290214 metadata/md5-cache/app-antivirus/clamtk-6.14
 2201291111 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
+2202011109 metadata/md5-cache/app-antivirus/Manifest.gz
+2202011109 metadata/md5-cache/app-antivirus/clamav-0.103.5
 2109022141 metadata/md5-cache/app-arch/alien-8.95-r1
 2104060140 metadata/md5-cache/app-arch/cpio-2.12-r1
 2109240209 metadata/md5-cache/app-arch/cpio-2.13
@@ -31628,7 +31658,6 @@
 2201290214 metadata/md5-cache/app-backup/backintime-1.3.1
 2201290214 metadata/md5-cache/app-backup/backintime-9999
 2201290214 metadata/md5-cache/app-backup/bareos-19.2.11-r1
-2201290214 metadata/md5-cache/app-backup/bareos-20.0.3-r2
 2201291111 metadata/md5-cache/app-backup/borgbackup-1.1.15
 2201291111 metadata/md5-cache/app-backup/borgbackup-1.1.16
 2201291111 metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
@@ -31644,8 +31673,10 @@
 2201291111 metadata/md5-cache/app-backup/duplicity-0.8.21
 2201291111 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
 2201291111 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
-2201310609 metadata/md5-cache/app-backup/Manifest.gz
 2201310609 metadata/md5-cache/app-backup/snapper-0.9.1
+2202011409 metadata/md5-cache/app-backup/Manifest.gz
+2202011339 metadata/md5-cache/app-backup/bareos-20.0.5
+2202011409 metadata/md5-cache/app-backup/bareos-21.0.0
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 2008091909 metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r3
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
@@ -33631,8 +33662,9 @@
 2201291111 metadata/md5-cache/app-i18n/transifex-client-0.14.3
 2201282210 metadata/md5-cache/app-i18n/transifex-client-1.0.0
 2201301339 metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
-2201312339 metadata/md5-cache/app-i18n/Manifest.gz
 2201312339 metadata/md5-cache/app-i18n/opencc-1.1.2
+2202011709 metadata/md5-cache/app-i18n/Manifest.gz
+2202011709 metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2201021453 metadata/md5-cache/app-laptop/ibam-0.5.2-r4
 2201021453 metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r2
@@ -34870,7 +34902,6 @@
 2201260040 metadata/md5-cache/app-text/wdiff-1.2.2-r1
 2201260310 metadata/md5-cache/app-text/xhtml1-20020801-r6
 2201260310 metadata/md5-cache/app-text/xhtml11-20101123
-2201301109 metadata/md5-cache/app-text/antiword-0.37-r2
 2201291111 metadata/md5-cache/app-text/asciidoc-10.1.1-r2
 2201290214 metadata/md5-cache/app-text/asciidoc-9.0.5-r1
 2201290214 metadata/md5-cache/app-text/asciidoc-9.1.0
@@ -34966,11 +34997,12 @@
 2201290214 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2201290214 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2201290214 metadata/md5-cache/app-text/zathura-ps-9999
-2202010310 metadata/md5-cache/app-text/Manifest.gz
 2202010310 metadata/md5-cache/app-text/dvipsk-2021.1_p20210325-r1
 2202010310 metadata/md5-cache/app-text/epspdf-0.6.3-r1
 2202010310 metadata/md5-cache/app-text/epspdf-0.6.5
 2202010310 metadata/md5-cache/app-text/texlive-core-2021-r1
+2202011039 metadata/md5-cache/app-text/Manifest.gz
+2202011039 metadata/md5-cache/app-text/antiword-0.37-r2
 2107230839 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2107230839 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2107230839 metadata/md5-cache/app-vim/airline-0.11
@@ -35757,8 +35789,8 @@
 2201290214 metadata/md5-cache/dev-db/postgresql-9.6.24
 2201290214 metadata/md5-cache/dev-db/postgresql-9999
 2201310309 metadata/md5-cache/dev-db/rqlite-7.1.0
-2202010009 metadata/md5-cache/dev-db/Manifest.gz
-2202010009 metadata/md5-cache/dev-db/sqlite-3.37.2
+2202011109 metadata/md5-cache/dev-db/Manifest.gz
+2202011109 metadata/md5-cache/dev-db/sqlite-3.37.2
 2106290046 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
@@ -35994,10 +36026,11 @@
 2201230146 metadata/md5-cache/dev-games/simgear-9999
 2201230146 metadata/md5-cache/dev-games/t4k-common-0.1.1-r1
 2201230146 metadata/md5-cache/dev-games/wfmath-1.0.2
-2201290214 metadata/md5-cache/dev-games/Manifest.gz
 2201290214 metadata/md5-cache/dev-games/cegui-0.8.7-r100
 2201290214 metadata/md5-cache/dev-games/freecell-solver-6.6.0
 2201290214 metadata/md5-cache/dev-games/tiled-1.7.2
+2202011739 metadata/md5-cache/dev-games/Manifest.gz
+2202011739 metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.4
 2109031439 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216-r1
 2109031439 metadata/md5-cache/dev-go/fuzzy-0.0.3
 2109031439 metadata/md5-cache/dev-go/fuzzy-0.0.5
@@ -36975,7 +37008,6 @@
 2201250410 metadata/md5-cache/dev-java/commons-io-2.11.0
 2201250410 metadata/md5-cache/dev-java/commons-jexl-1.1-r1
 2201250410 metadata/md5-cache/dev-java/commons-jexl-2.1.1
-2201250410 metadata/md5-cache/dev-java/commons-jxpath-1.3-r3
 2201250410 metadata/md5-cache/dev-java/commons-lang-2.6-r2
 2201250410 metadata/md5-cache/dev-java/commons-lang-3.12.0
 2201250410 metadata/md5-cache/dev-java/commons-math-3.6.1-r1
@@ -37361,9 +37393,10 @@
 2201310109 metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
 2201310109 metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
 2201310109 metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
-2201311239 metadata/md5-cache/dev-java/Manifest.gz
-2201311239 metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
 2201310939 metadata/md5-cache/dev-java/openjdk-8.322_p06
+2202011839 metadata/md5-cache/dev-java/Manifest.gz
+2202011039 metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
+2202011839 metadata/md5-cache/dev-java/javax-mail-1.6.7
 2108150239 metadata/md5-cache/dev-lang/cfortran-4.4-r3
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
@@ -38521,13 +38554,10 @@
 2201290214 metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
 2201290214 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2201301639 metadata/md5-cache/dev-libs/mathjax-2.7.7
-2202010739 metadata/md5-cache/dev-libs/Manifest.gz
 2202010739 metadata/md5-cache/dev-libs/capnproto-0.9.1
 2201312309 metadata/md5-cache/dev-libs/cereal-1.3.0-r2
-2201312339 metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
 2201310939 metadata/md5-cache/dev-libs/expat-2.4.4
 2202010310 metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
-2201312339 metadata/md5-cache/dev-libs/leveldb-1.23-r2
 2202010439 metadata/md5-cache/dev-libs/libburn-1.5.4
 2202010439 metadata/md5-cache/dev-libs/libisoburn-1.5.4
 2202010439 metadata/md5-cache/dev-libs/libisofs-1.5.4
@@ -38536,6 +38566,9 @@
 2202010739 metadata/md5-cache/dev-libs/protobuf-c-1.4.0-r1
 2201312339 metadata/md5-cache/dev-libs/rapidjson-1.1.0-r3
 2201311839 metadata/md5-cache/dev-libs/voikko-fi-2.5
+2202011109 metadata/md5-cache/dev-libs/Manifest.gz
+2202011109 metadata/md5-cache/dev-libs/crc32c-1.1.2-r1
+2202011109 metadata/md5-cache/dev-libs/leveldb-1.23-r2
 2106291109 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2201021453 metadata/md5-cache/dev-lisp/ecls-16.1.3-r1
 2201021453 metadata/md5-cache/dev-lisp/ecls-20.4.24-r1
@@ -38986,7 +39019,6 @@
 2201301509 metadata/md5-cache/dev-ml/jane-street-headers-0.15.0
 2201301609 metadata/md5-cache/dev-ml/jst-config-0.15.0
 2201302209 metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.0
-2202010039 metadata/md5-cache/dev-ml/Manifest.gz
 2201312109 metadata/md5-cache/dev-ml/bigarray-compat-1.1.0
 2201311709 metadata/md5-cache/dev-ml/core-0.14.1
 2201312139 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.3.0
@@ -38998,6 +39030,11 @@
 2202010009 metadata/md5-cache/dev-ml/opam-repository-2.1.2
 2202010039 metadata/md5-cache/dev-ml/opam-solver-2.1.2
 2202010009 metadata/md5-cache/dev-ml/opam-state-2.1.2
+2202011639 metadata/md5-cache/dev-ml/Manifest.gz
+2202011309 metadata/md5-cache/dev-ml/opam-installer-2.1.2
+2202011309 metadata/md5-cache/dev-ml/parmap-1.2.4
+2202011639 metadata/md5-cache/dev-ml/sedlex-2.5
+2202011639 metadata/md5-cache/dev-ml/spawn-0.15.0
 2109022141 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -41595,7 +41632,6 @@
 2201291111 metadata/md5-cache/dev-python/coloredlogs-15.0.1
 2201291111 metadata/md5-cache/dev-python/colorlog-6.6.0
 2201291111 metadata/md5-cache/dev-python/colorspacious-1.1.2
-2201291111 metadata/md5-cache/dev-python/commonmark-0.9.1
 2201291111 metadata/md5-cache/dev-python/configargparse-1.5.3
 2201291111 metadata/md5-cache/dev-python/configclass-0.2.0
 2201291111 metadata/md5-cache/dev-python/configobj-5.0.6-r1
@@ -41971,7 +42007,6 @@
 2201291111 metadata/md5-cache/dev-python/httplib2-0.20.2
 2201291111 metadata/md5-cache/dev-python/httpretty-1.1.4
 2201291111 metadata/md5-cache/dev-python/httpx-0.21.3
-2201291111 metadata/md5-cache/dev-python/httpx-0.22.0
 2201291111 metadata/md5-cache/dev-python/huawei-lte-api-1.5.2
 2201291111 metadata/md5-cache/dev-python/huawei-lte-api-1.5.4
 2201291111 metadata/md5-cache/dev-python/humanfriendly-10.0
@@ -42056,7 +42091,6 @@
 2201291111 metadata/md5-cache/dev-python/jaraco-itertools-6.0.3
 2201291111 metadata/md5-cache/dev-python/jaraco-logging-3.1.0
 2201291111 metadata/md5-cache/dev-python/jaraco-packaging-8.2.1
-2201291111 metadata/md5-cache/dev-python/jaraco-path-3.3.1
 2201291111 metadata/md5-cache/dev-python/jaraco-stream-3.0.3
 2201291111 metadata/md5-cache/dev-python/jaraco-text-3.6.0-r1
 2201291111 metadata/md5-cache/dev-python/jaraco-text-3.7.0
@@ -42929,7 +42963,6 @@
 2201291111 metadata/md5-cache/dev-python/python-swiftclient-3.13.0
 2201291111 metadata/md5-cache/dev-python/python-systemd-234
 2201291111 metadata/md5-cache/dev-python/python-systemd-234-r1
-2201301309 metadata/md5-cache/dev-python/python-systemd-234-r2
 2201291111 metadata/md5-cache/dev-python/python-utils-2.6.3
 2201291111 metadata/md5-cache/dev-python/python-utils-2.7.1
 2201291111 metadata/md5-cache/dev-python/python-utils-3.0.0
@@ -43063,7 +43096,6 @@
 2201291111 metadata/md5-cache/dev-python/rich-10.16.2-r1
 2201291111 metadata/md5-cache/dev-python/rich-11.0.0
 2201291111 metadata/md5-cache/dev-python/rich-11.0.0-r1
-2201291111 metadata/md5-cache/dev-python/rich-11.1.0
 2201291111 metadata/md5-cache/dev-python/rjsmin-1.1.0
 2201291111 metadata/md5-cache/dev-python/rjsmin-1.2.0
 2201291111 metadata/md5-cache/dev-python/robot-detection-0.4.0-r1
@@ -43123,7 +43155,6 @@
 2201291111 metadata/md5-cache/dev-python/setuptools-60.3.0
 2201291111 metadata/md5-cache/dev-python/setuptools-60.3.1
 2201291111 metadata/md5-cache/dev-python/setuptools-60.5.0
-2201291111 metadata/md5-cache/dev-python/setuptools-60.5.0-r1
 2201291111 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
 2201291111 metadata/md5-cache/dev-python/setuptools_rust-0.12.1
 2201291111 metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1
@@ -43544,7 +43575,6 @@
 2201301439 metadata/md5-cache/dev-python/pickleshare-0.7.5
 2201310339 metadata/md5-cache/dev-python/pillow-9.0.0-r1
 2201301439 metadata/md5-cache/dev-python/prompt_toolkit-3.0.26
-2201310139 metadata/md5-cache/dev-python/psycopg-2.9.3
 2201310139 metadata/md5-cache/dev-python/pybind11-2.9.0
 2201310339 metadata/md5-cache/dev-python/pycryptodome-3.14.0
 2201301639 metadata/md5-cache/dev-python/pydevd-2.7.0
@@ -43576,7 +43606,6 @@
 2201310009 metadata/md5-cache/dev-python/xcffib-0.11.1
 2201301639 metadata/md5-cache/dev-python/yaswfp-0.9.3-r2
 2202010310 metadata/md5-cache/dev-python/Faker-11.4.0
-2202010510 metadata/md5-cache/dev-python/Manifest.gz
 2202010310 metadata/md5-cache/dev-python/ansi-0.3.5
 2201312139 metadata/md5-cache/dev-python/ansi2html-1.7.0
 2201312139 metadata/md5-cache/dev-python/autocommand-2.2.1_p20211118
@@ -43611,6 +43640,23 @@
 2202010310 metadata/md5-cache/dev-python/tikzplotlib-0.10.1
 2202010510 metadata/md5-cache/dev-python/tomli-1.2.3
 2202010510 metadata/md5-cache/dev-python/tomli-2.0.0
+2202011339 metadata/md5-cache/dev-python/Faker-12.0.0
+2202011809 metadata/md5-cache/dev-python/Manifest.gz
+2202011709 metadata/md5-cache/dev-python/commonmark-0.9.1
+2202011339 metadata/md5-cache/dev-python/django-2.2.27
+2202011339 metadata/md5-cache/dev-python/django-3.2.12
+2202011339 metadata/md5-cache/dev-python/django-4.0.2
+2202011709 metadata/md5-cache/dev-python/httpx-0.22.0-r1
+2202011339 metadata/md5-cache/dev-python/identify-2.4.7
+2202011339 metadata/md5-cache/dev-python/inflect-5.4.0
+2202011739 metadata/md5-cache/dev-python/jaraco-path-3.3.1
+2202011039 metadata/md5-cache/dev-python/psycopg-2.9.3
+2202011339 metadata/md5-cache/dev-python/pyicu-2.8.1
+2202011809 metadata/md5-cache/dev-python/python-systemd-234-r2
+2202011739 metadata/md5-cache/dev-python/rich-11.1.0
+2202011409 metadata/md5-cache/dev-python/setuptools-60.6.0
+2202011339 metadata/md5-cache/dev-python/xarray-0.21.1
+2202011339 metadata/md5-cache/dev-python/zeroconf-0.38.3
 2201021453 metadata/md5-cache/dev-qt/qt-creator-4.15.1
 2201021453 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2201021453 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -45397,7 +45443,6 @@
 2201021453 metadata/md5-cache/dev-ruby/listen-3.7.0
 2201021453 metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
 2201021453 metadata/md5-cache/dev-ruby/locale-2.1.3
-2201021453 metadata/md5-cache/dev-ruby/localhost-1.1.9
 2201021453 metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
 2201021453 metadata/md5-cache/dev-ruby/log_buddy-0.7.0-r1
 2201021453 metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -46109,13 +46154,14 @@
 2201262210 metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r1
 2201262210 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
 2201262210 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
-2201301139 metadata/md5-cache/dev-ruby/Manifest.gz
 2201301139 metadata/md5-cache/dev-ruby/msgpack-1.4.4
 2201301139 metadata/md5-cache/dev-ruby/pdf-reader-2.9.0
 2201301139 metadata/md5-cache/dev-ruby/rack-attack-6.6.0
 2201290214 metadata/md5-cache/dev-ruby/rbst-0.6.5
 2201281040 metadata/md5-cache/dev-ruby/rspec-core-3.10.2
 2201281040 metadata/md5-cache/dev-ruby/rspec-rails-5.0.3
+2202011109 metadata/md5-cache/dev-ruby/Manifest.gz
+2202011109 metadata/md5-cache/dev-ruby/localhost-1.1.9
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -46634,7 +46680,6 @@
 2201130540 metadata/md5-cache/dev-util/cargo-license-0.4.1
 2201130540 metadata/md5-cache/dev-util/cargo-license-0.4.2
 2201130540 metadata/md5-cache/dev-util/cbindgen-0.20.0
-2201130540 metadata/md5-cache/dev-util/git-delta-0.11.3
 2201130540 metadata/md5-cache/dev-util/git-delta-0.9.2
 2201131010 metadata/md5-cache/dev-util/jenkins-bin-2.319.2
 2201131010 metadata/md5-cache/dev-util/jenkins-bin-2.330
@@ -47082,8 +47127,9 @@
 2201310709 metadata/md5-cache/dev-util/gef-9999
 2201310639 metadata/md5-cache/dev-util/unicorn-2.0.0_rc5
 2201310639 metadata/md5-cache/dev-util/unicorn-9999
-2201312309 metadata/md5-cache/dev-util/Manifest.gz
 2201312309 metadata/md5-cache/dev-util/bpftrace-0.14.1
+2202011039 metadata/md5-cache/dev-util/Manifest.gz
+2202011039 metadata/md5-cache/dev-util/git-delta-0.11.3
 2106291109 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
@@ -47283,11 +47329,12 @@
 2201230146 metadata/md5-cache/games-action/xblast-2.10.4-r2
 2201250410 metadata/md5-cache/games-action/minecraft-launcher-1.6.93
 2201271340 metadata/md5-cache/games-action/minecraft-launcher-1093
-2201301339 metadata/md5-cache/games-action/Manifest.gz
 2201301339 metadata/md5-cache/games-action/brutal-legend-20130615-r2
 2201290214 metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
 2201290214 metadata/md5-cache/games-action/dxx-rebirth-9999
 2201290214 metadata/md5-cache/games-action/teeworlds-0.7.5-r1
+2202011739 metadata/md5-cache/games-action/Manifest.gz
+2202011739 metadata/md5-cache/games-action/minetest-5.5.0
 2102241843 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2109180739 metadata/md5-cache/games-arcade/apricots-0.2.7
 2108230739 metadata/md5-cache/games-arcade/barbarian-bin-1.01-r3
@@ -49361,8 +49408,9 @@
 2201291111 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
 2201291111 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
 2201291111 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r4
-2201310409 metadata/md5-cache/mail-filter/Manifest.gz
 2201310409 metadata/md5-cache/mail-filter/amavisd-new-2.12.2
+2202011809 metadata/md5-cache/mail-filter/Manifest.gz
+2202011809 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.3
 2110170109 metadata/md5-cache/mail-mta/msmtp-1.8.16
 2110230009 metadata/md5-cache/mail-mta/msmtp-1.8.18
 2111042239 metadata/md5-cache/mail-mta/msmtp-1.8.19
@@ -51075,7 +51123,6 @@
 2201230146 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
 2201230146 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
 2201251210 metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.16.3-r1
-2201290214 metadata/md5-cache/media-plugins/Manifest.gz
 2201290214 metadata/md5-cache/media-plugins/ams-lv2-1.2.2
 2201290214 metadata/md5-cache/media-plugins/grilo-plugins-0.3.14
 2201290214 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4
@@ -51155,6 +51202,8 @@
 2201290214 metadata/md5-cache/media-plugins/mythplugins-31.0_p20210731-r2
 2201290214 metadata/md5-cache/media-plugins/noise-repellent-0.1.5
 2201290214 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
+2202011139 metadata/md5-cache/media-plugins/Manifest.gz
+2202011139 metadata/md5-cache/media-plugins/vdr-osdteletext-2.3.1
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
 2108031439 metadata/md5-cache/media-radio/cqrlog-2.4.0
@@ -51586,7 +51635,6 @@
 2201290214 metadata/md5-cache/media-sound/csound-9999
 2201290214 metadata/md5-cache/media-sound/dir2ogg-0.13-r1
 2201290214 metadata/md5-cache/media-sound/easyeffects-6.1.5
-2201290214 metadata/md5-cache/media-sound/easyeffects-6.2.1
 2201290214 metadata/md5-cache/media-sound/easyeffects-6.2.2
 2201290214 metadata/md5-cache/media-sound/ecasound-2.9.3
 2201290214 metadata/md5-cache/media-sound/exaile-4.1.1
@@ -51654,11 +51702,12 @@
 2201290214 metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r1
 2201310139 metadata/md5-cache/media-sound/deadbeef-1.8.8-r2
 2201301439 metadata/md5-cache/media-sound/streamtranscoder-3.1.11-r1
-2202010039 metadata/md5-cache/media-sound/Manifest.gz
 2201311139 metadata/md5-cache/media-sound/mumble-1.4.230
 2201311139 metadata/md5-cache/media-sound/mumble-9999
-2202010039 metadata/md5-cache/media-sound/murmur-1.4.230-r1
-2202010039 metadata/md5-cache/media-sound/murmur-9999
+2202011739 metadata/md5-cache/media-sound/Manifest.gz
+2202011739 metadata/md5-cache/media-sound/easyeffects-6.2.3
+2202010939 metadata/md5-cache/media-sound/murmur-1.4.230-r2
+2202010939 metadata/md5-cache/media-sound/murmur-9999
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -52317,8 +52366,12 @@
 2201310139 metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r4
 2201310439 metadata/md5-cache/net-analyzer/fail2ban-9999
 2201301639 metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-30
-2201312339 metadata/md5-cache/net-analyzer/Manifest.gz
 2201312339 metadata/md5-cache/net-analyzer/snallygaster-0.0.12
+2202011339 metadata/md5-cache/net-analyzer/Manifest.gz
+2202011139 metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.1-r1
+2202011339 metadata/md5-cache/net-analyzer/zabbix-4.0.38
+2202011339 metadata/md5-cache/net-analyzer/zabbix-5.0.20
+2202011339 metadata/md5-cache/net-analyzer/zabbix-5.4.10
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2106122209 metadata/md5-cache/net-dialup/ppp-scripts-0
 2109022141 metadata/md5-cache/net-dialup/sendpage-1.1.0-r4
@@ -52484,9 +52537,9 @@
 2201290214 metadata/md5-cache/net-firewall/nftables-0.9.9
 2201290214 metadata/md5-cache/net-firewall/nftables-1.0.0
 2201291111 metadata/md5-cache/net-firewall/ufw-0.36
-2201312209 metadata/md5-cache/net-firewall/Manifest.gz
-2201312209 metadata/md5-cache/net-firewall/nftables-1.0.1-r1
 2201312209 metadata/md5-cache/net-firewall/nftables-9999
+2202011009 metadata/md5-cache/net-firewall/Manifest.gz
+2202011009 metadata/md5-cache/net-firewall/nftables-1.0.1-r1
 2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 2201061240 metadata/md5-cache/net-fs/smbnetfs-0.6.3
 2201120510 metadata/md5-cache/net-fs/autofs-5.1.6-r2
@@ -52520,13 +52573,13 @@
 2201290214 metadata/md5-cache/net-fs/samba-4.15.2-r2
 2201290710 metadata/md5-cache/net-fs/samba-4.15.3-r1
 2201290214 metadata/md5-cache/net-fs/samba-4.15.4
-2201290214 metadata/md5-cache/net-fs/samba-4.16.0_rc1
 2201290214 metadata/md5-cache/net-fs/sshfs-3.7.0
 2201290214 metadata/md5-cache/net-fs/sshfs-3.7.1
-2202010809 metadata/md5-cache/net-fs/Manifest.gz
-2202010809 metadata/md5-cache/net-fs/netatalk-3.1.12-r5
 2201311639 metadata/md5-cache/net-fs/samba-4.14.12
 2201311639 metadata/md5-cache/net-fs/samba-4.15.5
+2202010939 metadata/md5-cache/net-fs/Manifest.gz
+2202010839 metadata/md5-cache/net-fs/netatalk-3.1.12-r5
+2202010939 metadata/md5-cache/net-fs/samba-4.16.0_rc2
 2104200439 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2110312244 metadata/md5-cache/net-ftp/pureadmin-0.4-r3
 2012231444 metadata/md5-cache/net-ftp/tnftp-20141104
@@ -52542,8 +52595,6 @@
 2201061240 metadata/md5-cache/net-ftp/proftpd-1.3.7b-r1
 2201061240 metadata/md5-cache/net-ftp/proftpd-1.3.7c
 2201061240 metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1-r1
-2201151310 metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
-2201231839 metadata/md5-cache/net-ftp/Manifest.gz
 2201230146 metadata/md5-cache/net-ftp/atftp-0.7.5
 2201230146 metadata/md5-cache/net-ftp/filezilla-3.53.1-r1
 2201230146 metadata/md5-cache/net-ftp/filezilla-3.54.1
@@ -52564,6 +52615,8 @@
 2201230146 metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r5
 2201230146 metadata/md5-cache/net-ftp/pure-ftpd-1.0.50
 2201230146 metadata/md5-cache/net-ftp/pure-ftpd-9999
+2202010909 metadata/md5-cache/net-ftp/Manifest.gz
+2202010909 metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
 2102160539 metadata/md5-cache/net-im/centerim-5.0.1-r1
 2104192239 metadata/md5-cache/net-im/cpop-0.0.4-r1
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
@@ -52590,7 +52643,6 @@
 2201050010 metadata/md5-cache/net-im/teams-1.4.00.13653-r2
 2201050010 metadata/md5-cache/net-im/teams-1.4.00.26453-r1
 2201050010 metadata/md5-cache/net-im/teams-1.4.00.7556-r1
-2201050010 metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1
 2201060009 metadata/md5-cache/net-im/telegram-desktop-bin-3.4.3
 2201061240 metadata/md5-cache/net-im/mcabber-1.1.2
 2201061240 metadata/md5-cache/net-im/sendxmpp-1.24
@@ -52606,7 +52658,6 @@
 2201162112 metadata/md5-cache/net-im/skypeforlinux-8.79.0.92
 2201162112 metadata/md5-cache/net-im/skypeforlinux-8.79.0.95
 2201162112 metadata/md5-cache/net-im/slack-4.22.0
-2201202239 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6
 2201230146 metadata/md5-cache/net-im/bitlbee-facebook-1.2.2
 2201230146 metadata/md5-cache/net-im/bitlbee-facebook-9999
 2201230146 metadata/md5-cache/net-im/bitlbee-steam-1.4.2
@@ -52618,8 +52669,6 @@
 2201230146 metadata/md5-cache/net-im/dino-9999
 2201230146 metadata/md5-cache/net-im/ejabberd-20.04
 2201230146 metadata/md5-cache/net-im/ejabberd-21.04
-2201230146 metadata/md5-cache/net-im/ejabberd-21.04-r2
-2201230146 metadata/md5-cache/net-im/ejabberd-21.12
 2201230146 metadata/md5-cache/net-im/ekg2-0.4_pre20190315-r1
 2201230146 metadata/md5-cache/net-im/ekg2-9999
 2201230146 metadata/md5-cache/net-im/neochat-1.2.0
@@ -52642,7 +52691,6 @@
 2201260440 metadata/md5-cache/net-im/signal-desktop-bin-5.29.1
 2201271040 metadata/md5-cache/net-im/zoom-5.9.3.1911
 2201271910 metadata/md5-cache/net-im/telegram-desktop-bin-3.4.8
-2201291111 metadata/md5-cache/net-im/Manifest.gz
 2201290214 metadata/md5-cache/net-im/bitlbee-3.6-r1
 2201290214 metadata/md5-cache/net-im/bitlbee-9999
 2201290214 metadata/md5-cache/net-im/empathy-3.12.14
@@ -52667,6 +52715,12 @@
 2201290214 metadata/md5-cache/net-im/toxic-0.11.3
 2201291111 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r2
 2201291111 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
+2202011409 metadata/md5-cache/net-im/Manifest.gz
+2202011409 metadata/md5-cache/net-im/biboumi-9.0-r2
+2202011039 metadata/md5-cache/net-im/ejabberd-21.04-r2
+2202011039 metadata/md5-cache/net-im/ejabberd-21.12
+2202011309 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.6
+2202011309 metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.1
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2109230439 metadata/md5-cache/net-irc/irssi-1.2.3
@@ -53556,7 +53610,6 @@
 2201230146 metadata/md5-cache/net-misc/mico-2.3.13-r14
 2201231241 metadata/md5-cache/net-misc/miniupnpd-2.3.0
 2201230146 metadata/md5-cache/net-misc/mosh-1.3.2
-2201230146 metadata/md5-cache/net-misc/mosh-1.3.2-r2
 2201230146 metadata/md5-cache/net-misc/mstpd-0.1.0
 2201230146 metadata/md5-cache/net-misc/nemesis-1.7-r1
 2201230146 metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4
@@ -53756,9 +53809,10 @@
 2201291111 metadata/md5-cache/net-misc/youtube-dl-9999
 2201291111 metadata/md5-cache/net-misc/yt-dlp-2021.12.27
 2201291111 metadata/md5-cache/net-misc/yt-dlp-2022.1.21
-2201310539 metadata/md5-cache/net-misc/Manifest.gz
 2201310539 metadata/md5-cache/net-misc/mptcpd-0.9
 2201310539 metadata/md5-cache/net-misc/mptcpd-9999
+2202011009 metadata/md5-cache/net-misc/Manifest.gz
+2202011009 metadata/md5-cache/net-misc/mosh-1.3.2-r2
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2109022141 metadata/md5-cache/net-nds/shelldap-1.5.1
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
@@ -57069,10 +57123,11 @@
 2201310339 metadata/md5-cache/sys-apps/inxi-3.3.12.1
 2201310339 metadata/md5-cache/sys-apps/shadow-4.11.1
 2201310339 metadata/md5-cache/sys-apps/util-linux-2.37.3-r1
-2202010739 metadata/md5-cache/sys-apps/Manifest.gz
 2202010739 metadata/md5-cache/sys-apps/hwdata-0.355
 2201312209 metadata/md5-cache/sys-apps/inxi-3.3.08.1
 2201311809 metadata/md5-cache/sys-apps/tuned-2.17.0
+2202011339 metadata/md5-cache/sys-apps/Manifest.gz
+2202011339 metadata/md5-cache/sys-apps/uutils-0.0.12
 2109031439 metadata/md5-cache/sys-auth/docker_auth-1.3.1
 2109031439 metadata/md5-cache/sys-auth/docker_auth-1.4.0
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
@@ -57688,8 +57743,8 @@
 2201290214 metadata/md5-cache/sys-devel/llvm-13.0.1_rc3
 2201290214 metadata/md5-cache/sys-devel/llvm-14.0.0.9999
 2201290214 metadata/md5-cache/sys-devel/rust-std-1.58.1
-2201312209 metadata/md5-cache/sys-devel/Manifest.gz
-2201312209 metadata/md5-cache/sys-devel/crossdev-20211121
+2202010909 metadata/md5-cache/sys-devel/Manifest.gz
+2202010909 metadata/md5-cache/sys-devel/crossdev-20211121
 2201162139 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
 2201162139 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
 2201162139 metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
@@ -58139,14 +58194,14 @@
 2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.227
 2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.301
 2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.299
-2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.95
-2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.18
-2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-5.16.4
-2201291839 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.175
-2201310039 metadata/md5-cache/sys-kernel/Manifest.gz
 2201301909 metadata/md5-cache/sys-kernel/git-sources-5.17_rc2
 2201310039 metadata/md5-cache/sys-kernel/zen-sources-5.15.10
 2201310039 metadata/md5-cache/sys-kernel/zen-sources-5.16.4
+2202012009 metadata/md5-cache/sys-kernel/Manifest.gz
+2202012009 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.96
+2202012009 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.19
+2202012009 metadata/md5-cache/sys-kernel/vanilla-sources-5.16.5
+2202012009 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.176
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 2106231354 metadata/md5-cache/sys-libs/fortify-headers-9999
 2008291639 metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
@@ -58424,7 +58479,6 @@
 2201130540 metadata/md5-cache/sys-process/below-0.3.0-r1
 2201130540 metadata/md5-cache/sys-process/below-0.4.1
 2201130540 metadata/md5-cache/sys-process/bottom-0.6.4
-2201130540 metadata/md5-cache/sys-process/bottom-0.6.6
 2201162112 metadata/md5-cache/sys-process/watchpid-0.1-r2
 2201230146 metadata/md5-cache/sys-process/acct-6.6.4-r3
 2201230146 metadata/md5-cache/sys-process/at-3.2.2-r2
@@ -58460,7 +58514,6 @@
 2201242240 metadata/md5-cache/sys-process/cronbase-0.3.7-r8
 2201242240 metadata/md5-cache/sys-process/cronie-1.5.7
 2201262240 metadata/md5-cache/sys-process/parallel-20211222
-2201300339 metadata/md5-cache/sys-process/Manifest.gz
 2201300339 metadata/md5-cache/sys-process/at-3.2.4
 2201290214 metadata/md5-cache/sys-process/audit-3.0
 2201290214 metadata/md5-cache/sys-process/audit-3.0.1
@@ -58489,6 +58542,8 @@
 2201290214 metadata/md5-cache/sys-process/systemd-cron-1.5.14
 2201290214 metadata/md5-cache/sys-process/systemd-cron-1.5.15
 2201290214 metadata/md5-cache/sys-process/systemd-cron-1.5.17
+2202011039 metadata/md5-cache/sys-process/Manifest.gz
+2202011039 metadata/md5-cache/sys-process/bottom-0.6.6
 2104060140 metadata/md5-cache/virtual/awk-1
 2108131839 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 2107020209 metadata/md5-cache/virtual/blas-3.8
@@ -58997,7 +59052,6 @@
 2201021453 metadata/md5-cache/www-servers/moonbridge-1.0.1
 2201021453 metadata/md5-cache/www-servers/puma-5.3.2-r1
 2201021453 metadata/md5-cache/www-servers/puma-5.4.0
-2201021453 metadata/md5-cache/www-servers/puma-5.5.2
 2201021453 metadata/md5-cache/www-servers/thin-1.8.1
 2201230146 metadata/md5-cache/www-servers/apache-2.4.51
 2201230146 metadata/md5-cache/www-servers/apache-2.4.51-r1
@@ -59050,8 +59104,9 @@
 2201290214 metadata/md5-cache/www-servers/varnish-6.5.2
 2201290214 metadata/md5-cache/www-servers/varnish-6.6.1
 2201290214 metadata/md5-cache/www-servers/varnish-7.0.1
-2201310309 metadata/md5-cache/www-servers/Manifest.gz
 2201310309 metadata/md5-cache/www-servers/nginx-unit-1.26.1
+2202011109 metadata/md5-cache/www-servers/Manifest.gz
+2202011109 metadata/md5-cache/www-servers/puma-5.5.2
 2101061509 metadata/md5-cache/x11-apps/luit-20190106
 2112190440 metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
 2201021453 metadata/md5-cache/x11-apps/radeon-profile-20200824
@@ -59205,8 +59260,9 @@
 2201260440 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.22
 2201290214 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
 2201290214 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r1
-2202010609 metadata/md5-cache/x11-drivers/Manifest.gz
 2202010609 metadata/md5-cache/x11-drivers/nvidia-drivers-470.103.01
+2202012109 metadata/md5-cache/x11-drivers/Manifest.gz
+2202012109 metadata/md5-cache/x11-drivers/nvidia-drivers-510.47.03
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.0.34
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.19
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20
@@ -59657,7 +59713,6 @@
 2201230146 metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
 2201230146 metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
 2201230146 metadata/md5-cache/x11-misc/rofi-1.6.1-r1
-2201230146 metadata/md5-cache/x11-misc/rofi-1.7.0-r1
 2201230146 metadata/md5-cache/x11-misc/rofi-1.7.2
 2201230146 metadata/md5-cache/x11-misc/rofi-99999
 2201230146 metadata/md5-cache/x11-misc/rofi-calc-2.0.0
@@ -59737,7 +59792,6 @@
 2201240039 metadata/md5-cache/x11-misc/tint2-17.0.1-r1
 2201240739 metadata/md5-cache/x11-misc/xscreensaver-6.02-r1
 2201252310 metadata/md5-cache/x11-misc/tint2-17.0.2
-2201300809 metadata/md5-cache/x11-misc/Manifest.gz
 2201290214 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2201290214 metadata/md5-cache/x11-misc/alacarte-3.42.0
 2201291111 metadata/md5-cache/x11-misc/arandr-0.1.10-r2
@@ -59791,6 +59845,8 @@
 2201291111 metadata/md5-cache/x11-misc/zim-0.74.1
 2201291111 metadata/md5-cache/x11-misc/zim-0.74.2
 2201291111 metadata/md5-cache/x11-misc/zim-0.74.3
+2202011409 metadata/md5-cache/x11-misc/Manifest.gz
+2202011409 metadata/md5-cache/x11-misc/rofi-1.7.3
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -60474,4 +60530,4 @@
 2201061409 metadata/md5-cache/sec-keys/openpgp-keys-kovidgoyal-20220106
 2201250210 metadata/md5-cache/sec-keys/Manifest.gz
 2201250210 metadata/md5-cache/sec-keys/openpgp-keys-mlichvar-20210513
-2202010809 metadata/md5-cache/Manifest.gz
+2202012109 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2e07c49cee8d..73461b31d480 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Feb 2022 05:30:01 +0000
+Tue, 01 Feb 2022 18:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index dffb55311169..a068d0e3c2e2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0875dee5da97901503abd5ae1f56dfaf62024f74 1643690573 2022-02-01T04:42:53+00:00
+bb02ec2b236bbe6af8dfc370b08b5dd72a26946c 1643738114 2022-02-01T17:55:14+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 742a458f2e51..e7ee5313bf28 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1643691901 Tue 01 Feb 2022 05:05:01 AM UTC
+1643738701 Tue 01 Feb 2022 06:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c79e266a08a5..1633a92b06f4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Feb 2022 05:09:03 +0000
+Tue, 01 Feb 2022 18:09:03 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ef575203812e..0f0efb682253 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 93c75b4b386e..e047cab471cc 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
+AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
+EBUILD monitoring-plugins-2.3.1-r1.ebuild 3047 BLAKE2B 37cf560fc5b8f020cf630d5038616ec7a29e6f4e6154522637aa6c73a6326b553f8e763d0e40279ec7a4f61d0a2675d3ba23b14c8a9f42ab43851067f6bcc7d7 SHA512 268a672ef83c9ddc974430b93ef97c51d47498d84116678eec559098e00456bdabd7b6fb30602f2773e04dbd03fca46c64efbbb85b0350aa1010ef45e4a185e9
 EBUILD monitoring-plugins-2.3.1.ebuild 3034 BLAKE2B d9c3b074d9fe133c3cccb3679aac0edff0690fbe5b0f7e67b8b8a232008188ad020fa1f6ddcf753c045ff2d1834f0134c3f3ca2a5856104ac14ba12834c2d026 SHA512 e82fc24872ee362fce26de6836fa912ab0582222c10179d8e159ce678fb0f9455f5b7c5e41a2991711ab6305eaa0a7bebf0cd38926b8fd4ea4cedbe9682fa73d
 MISC metadata.xml 1435 BLAKE2B 19cf3223867cee4899e5bdaf33948497c5cd66e94198b6a0c081ea440bf7ecfc7dcf4855b44a7ead5fc983756490f3a79059d51202be9d9f2eea24c6857eb165 SHA512 c781d735ced89fe81d49f400ada6916702ad2825c35c6bb589199902917df415a50335ce058eea45e6eb3fe66813ed2f4009cc6831e15d2b7369fcc12e8c0b26
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
new file mode 100644
index 000000000000..cbd458372133
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/830249
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
+https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 844e625f..a2735195 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
+ 
+ void
+ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+-  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+-  * space on BSD (the actual value should be negative but fsp->fsu_bavail
+-  * is unsigned) */
+-  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
++  p->available = fsp->fsu_bavail;
+   p->available_to_root = fsp->fsu_bfree;
+   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+   if (freespace_ignore_reserved) {
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..9c951f0457cf
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	curl? (
+		dev-libs/uriparser
+		net-misc/curl
+	)
+	ldap? ( net-nds/openldap )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	acct-group/nagios
+	acct-user/nagios
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249
+)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with curl libcurl) \
+		$(use_with curl uriparser) \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index fe9bbc9c7df1..9c3f61749167 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -253,9 +253,15 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST zabbix-4.0.37.tar.gz 17552391 BLAKE2B c5f3b200e8dda2b4a961a78a3ba8cd97a6e07744c4e16acde3a740559cb70649660b5652d36cf42e87f28d03e14803c4efe9e585583834f7a765fcbf0e5953b9 SHA512 007e7664a6fe1e9b3e76f95c5cfdb9744a27139d243b6fcb78c2e84f01ccdc788130f824514d29f1557724761557e459924d22cb33bb35fe740b5fdc6746ef0e
+DIST zabbix-4.0.38.tar.gz 17558387 BLAKE2B 1ddf27d76734128ddd197eb9dffeb59018282464a7322973dc4102992c0ade003d4d0291194f5b5a487d83a702917d6f0036636e56acc424bd7a7d6beb3f787c SHA512 0d38a74336c9e46b3f9985aca3508312dd5b15affeadee3497ebf8d5e59b4fa7b99ff28819b01878cbc5c9c304c1992a6a91d73f35bf1a333ae2ee561e0d7e1f
 DIST zabbix-5.0.19.tar.gz 21367685 BLAKE2B 4e6b52d4ace766f700894d1eb6c7adf8e13ac72fe2534a48625302ffa6aea02734f8e81ee781a1d1aa0e6e375428919609edfca6094f17912123a7ed96e22af0 SHA512 b7223c656f8830e302ccc6321ff19e580eed199355ca9070ac2b59375e0794d17de1dfa4e1600ef6ac5a72e8abd2b80191b2f58fa77f25096dee52e6e40940b9
+DIST zabbix-5.0.20.tar.gz 21434290 BLAKE2B 8203d9f8831c081af05fa306ce3363ea3d1afd72587459a941e2a20de27e97dce21e34b59e21884f87f6238469c2293dad9e6e5436a9ef82c0139a18a4b0c206 SHA512 af625ee69926b1f0860d4e5e5f4348b3630c642027f5f08f876207cf705d46741c21aacbdde1367b8014c705508236281ba8556700de43c1ccf2b7a9b7f68390
+DIST zabbix-5.4.10.tar.gz 24510838 BLAKE2B 37e8561e031b9267dbfeb786da7d88487142262c3f9063e83b2faafeabd88baa1a0f2e7ffa333d2e29c1b11e09ca995f42442aa60b0b994617b276152d46590c SHA512 452513c56db1778d49a32543814ed83836b480047ebc747e588b5cea8f9b199650824b9ea2042695c5551a81f1f3b2e8d98d0f658003f483bf8edf8ed5427c48
 DIST zabbix-5.4.9.tar.gz 24382685 BLAKE2B 3ec6fac5a7dbdf6b0527e7686a57d3d107be5ec4fb9f5a36254199f9e1ac656459b6582b2b8968e9d8c00a9d1167d03df9b5854584070b74ff5ef8518798a21e SHA512 e2e0dd01b4c2a571f554a60d2b88023ff209111a6e71f2f6dd04173ee2a1c4f31a2a0f19f10f73a43e40634351eeaab0c0e98b0b6a020f39af6cabe7f764409b
 EBUILD zabbix-4.0.37-r1.ebuild 9376 BLAKE2B 6de3ede88eee61034b75748dbd5b7fbfc7e73bb441f40b267f38d763671a9a9136e5ebad66009b9e5c2219431373b1382051cb963a01862c5969c303aba9184b SHA512 be8aeb179a403d46ec060557b51676906ec2e4747cff286ddb4a3c36d5b6e1267cac9cb38ae71e30e1ea641980a5509d7f83c5813acccb5c0f34bb6d7a5f7db1
+EBUILD zabbix-4.0.38.ebuild 9378 BLAKE2B f1881dc4a7ecc9c8f25a66d566092e8ada4d74c21cb8e11283b82d74355513a1ae7a70e391897ed3f04051f5b1da12a0e3493a3999b631f2fc7c9df86b35cf03 SHA512 114f75c7c8b4672042b58b8f1629d6d72b1aa36b9d2c02097a0836d03fbb134605351d8aaa3eca7e9c04d56620b7d4bb55acbfae4342a50f9dc76c9f2d6bd812
 EBUILD zabbix-5.0.19-r1.ebuild 31286 BLAKE2B 1f04ff0dea70bc8ce6843b1d9a6f133c9a98c52bd18ccf49a4c3e9dac9af39c257f8a9ed3671d57045b73b518c0234f554f1f34b9029e698656422fe70dae376 SHA512 27d0d0865a7e7d0316a847a2f08c312ed578b1531234d55aec8751ef688d8c5bc2abd2171b97dd2c433d1591c6a23875f45501d82a75d45a5f8bb875b9b9d613
+EBUILD zabbix-5.0.20.ebuild 31288 BLAKE2B 58520ae4c590267516c70b445c02b802c0f82420d96fff21c3a3e137e6146e7892fc1d830bb2e736a79b6f358ddebc4c4eaef5a76f9baeb478825cde70ddffd2 SHA512 c38a1bd7b088231e0ad183ef924fc05dfd6fea614e5d686b2235dd3ff3ea22e04dbfc2ef31ce82ae764f5fcab561ad1c3563df8d7be8cb5aeeddac32d9390d2c
+EBUILD zabbix-5.4.10.ebuild 33678 BLAKE2B f0c8e81548005609e5d7d9eb9cd637fe672850d141d6a8987a089dcc5803b5a4261a87a32f815eb8886aaa05fe1230afa3452b2ba570313262c0dbbc86a99e03 SHA512 6ec314195482e6c42760ff913e1d00436cd8542d61f70c11d5dbfa56e2c6df14005d1d7f629c1cf8805a076b70dccb6fbb5c2638c821c2e6446b3847f9458b5b
 EBUILD zabbix-5.4.9-r1.ebuild 33676 BLAKE2B 46a40006b0d39af0a19699236fe94c59b40d6f0db19e165af650a3325a178b731868a6930ceb92930f5bf2d630ac0293b74e5c86c513015ce181d05542e5b61e SHA512 c16a6092bd660812a20e20e5f7b20ab18a7284438da96eead8ed055d303cbc6baa1b49a73bd8987d9ae97f9846b1f8ed9429dacabda33282053b4817ef86ca95
 MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
diff --git a/net-analyzer/zabbix/zabbix-4.0.38.ebuild b/net-analyzer/zabbix/zabbix-4.0.38.ebuild
new file mode 100644
index 000000000000..3e38c3cbb0e9
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.38.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	ssl? ( ^^ ( gnutls mbedtls openssl ) )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		mbedtls? ( net-libs/mbedtls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mbedtls) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		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:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.20.ebuild b/net-analyzer/zabbix/zabbix-5.0.20.ebuild
new file mode 100644
index 000000000000..0969478dcc2d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.20.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+# content of src/go/go.sum
+#   sed -E "s/^/\t\"/g" src/go/go.sum | sed -E "s/$/\"/g"
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
+	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
+	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
+	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
+	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
+	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
+	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
+	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
+	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
+	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
+	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
+	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
+	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
+	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
+	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
+	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
+	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
+	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
+	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
+	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
+	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
+	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
+	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
+	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
+	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
+	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
+	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
+	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
+	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
+	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
+	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
+	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
+	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
+	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
+	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
+	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
+	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
+	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
+	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
+	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
+	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
+	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
+	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
+	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
+	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
+	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
+	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
+	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
+	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
+	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU="
+	"github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU="
+	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
+	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
+	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
+	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
+	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
+	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
+	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
+	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
+	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
+	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
+	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
+	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
+	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
+	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
+	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
+	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
+	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
+	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
+	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
+	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
+	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
+	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
+	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA="
+	"golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
+	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
+	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
+	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
+)
+go-module_set_globals
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( ${EGO_SUM_SRC_URI} )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	ssl? ( ^^ ( gnutls openssl ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		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:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.4.10.ebuild b/net-analyzer/zabbix/zabbix-5.4.10.ebuild
new file mode 100644
index 000000000000..c5ea8a8848dc
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.4.10.ebuild
@@ -0,0 +1,632 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+# content of src/go/go.sum
+#   sed -E "s/^/\t\"/g" src/go/go.sum | sed -E "s/$/\"/g"
+EGO_SUM=(
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
+	"github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 h1:XeGYLuu3Yu3/2/FLDXyObe6lBYtUFDTJgjjNPcfcU40="
+	"github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3/go.mod h1:55pim6Ht4LJKdVLlyFJV/g++HsEA1hQxPbB5JyNdZC0="
+	"github.com/chromedp/chromedp v0.6.0 h1:jjzHzXW5pNdKt1D9cEDAKZM/yZ2EwL/hLyGbCUFldBI="
+	"github.com/chromedp/chromedp v0.6.0/go.mod h1:Yay7TUDCNOQBK8EJDUon6AUaQI12VEBOuULcGtY4uDY="
+	"github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic="
+	"github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww="
+	"github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
+	"github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ="
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4="
+	"github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY="
+	"github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c="
+	"github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 h1:K9CFK8HRZWzmoIWbpA7u0XYLggCyfa/N77eVaq/nUiA="
+	"github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143/go.mod h1:BLhrehfVmtABJWBZTJV8HyPWCSZoiMzjjcZ3+vHHhPI="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0="
+	"github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts="
+	"github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4="
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ="
+	"github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk="
+	"github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc="
+	"github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4="
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A="
+	"github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI="
+	"github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM="
+	"github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs="
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg="
+	"github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY="
+	"github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro="
+	"github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg="
+	"github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA="
+	"github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA="
+	"github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU="
+	"github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM="
+	"github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og="
+	"github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw="
+	"github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs="
+	"github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM="
+	"github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4="
+	"github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw="
+	"github.com/godror/godror v0.20.1 h1:s/ehD65nfVzWR2MrZGChDkLvVPlIVxbt+Jpzfwkl1c8="
+	"github.com/godror/godror v0.20.1/go.mod h1:YlPoIf962ZZKPM5Xqa8NxmGgck39pi51tqAs+K3IaFM="
+	"github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE="
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM="
+	"github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4="
+	"github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE="
+	"github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI="
+	"github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0="
+	"github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo="
+	"github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8="
+	"github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk="
+	"github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA="
+	"github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE="
+	"github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s="
+	"github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk="
+	"github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc h1:9ThyBXKdyBFN2Y1NSCPGCA0kdWCNpd9u4SKWwtr6GfU="
+	"github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk="
+	"github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE="
+	"github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA="
+	"github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE="
+	"github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM="
+	"github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg="
+	"github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A="
+	"github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA="
+	"github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM="
+	"github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco="
+	"github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA="
+	"github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg="
+	"github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E="
+	"github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg="
+	"github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc="
+	"github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw="
+	"github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0="
+	"github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po="
+	"github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 h1:DrP52jA32liWkjCF/g3rYC1QjnRh6kvyXaZSevAtlqE="
+	"github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig="
+	"github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y="
+	"github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM="
+	"github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc="
+	"github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o="
+	"github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 h1:G5gbS1Q6cq7/Q1Z1CUqU9IKWfar2R1P6CE0zkKClEG0="
+	"github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85/go.mod h1:OWJpVJk5U9XXEiYHeQ+5NtRt82Y5c8gvIZj96kl27Ow="
+	"github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a h1:ec2LCBkfN1pOq0PhLRH/QitjSXr9s2dnh0gOFyohxHM="
+	"github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk="
+	"github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY="
+	"github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y="
+	"github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ="
+	"github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI="
+	"github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo="
+	"github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ="
+	"github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw="
+	"github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE="
+	"github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI="
+	"github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU="
+	"github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo="
+	"github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA="
+	"github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc="
+	"github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ="
+	"github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE="
+	"github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc="
+	"github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s="
+	"github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU="
+	"github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU="
+	"github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz80oP8EA/E="
+	"github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8="
+	"github.com/memcachier/mc/v3 v3.0.1 h1:Os/fUl/8c+hc1qWgjv5hNK0JI6GxKUOuehzB/UmjLP0="
+	"github.com/memcachier/mc/v3 v3.0.1/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U="
+	"github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A="
+	"github.com/omeid/go-yarn v0.0.1 h1:mUQExNwUrYn7tZRwQdsUuoQWHIujtjjpjb/PAtUj9dk="
+	"github.com/omeid/go-yarn v0.0.1/go.mod h1:JYxmAvShSw7YmX/9vFsccpJE4o/KW111eUh3n/TQ5h8="
+	"github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4="
+	"github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0="
+	"github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM="
+	"github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4="
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4="
+	"github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ="
+	"github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU="
+	"github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc="
+	"github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0="
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY="
+	"github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o="
+	"github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q="
+	"github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE="
+	"github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME="
+	"github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE="
+	"github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs="
+	"github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI="
+	"github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4="
+	"github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4="
+	"github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA="
+	"github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q="
+	"go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE="
+	"go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ="
+	"go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0="
+	"go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU="
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA="
+	"go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE="
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI="
+	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI="
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc="
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc="
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA="
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad h1:MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo="
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k="
+	"golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs="
+	"golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q="
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc="
+	"golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE="
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM="
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw="
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY="
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0="
+	"gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI="
+	"gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw="
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU="
+	"gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c="
+	"gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10="
+	"gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI="
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg="
+)
+go-module_set_globals
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( ${EGO_SUM_SRC_URI} )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	ssl? ( ^^ ( gnutls openssl ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0= )
+		openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+	if use agent2; then
+		go-module_src_unpack
+	fi
+}
+
+src_configure() {
+	econf \
+		"$(use_enable agent)" \
+		"$(use_enable agent2)" \
+		"$(use_enable ipv6)" \
+		"$(use_enable java)" \
+		"$(use_enable proxy)" \
+		"$(use_enable server)" \
+		"$(use_enable static)" \
+		"$(use_with curl libcurl)" \
+		"$(use_with gnutls)" \
+		"$(use_with ldap)" \
+		"$(use_with libxml2)" \
+		"$(use_with mysql)" \
+		"$(use_with odbc unixodbc)" \
+		"$(use_with openipmi openipmi)" \
+		"$(use_with openssl)" \
+		"$(use_with oracle)" \
+		"$(use_with postgres postgresql)" \
+		"$(use_with snmp net-snmp)" \
+		"$(use_with sqlite sqlite3)" \
+		"$(use_with ssh ssh2)"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		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:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index db950d5ba555..db3bddaf9304 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 5aed84df5871..c96b8bb76853 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -14,6 +14,6 @@ DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B e406699c96b98495f1b6deeab0233873ce20b
 EBUILD nftables-0.9.8-r1.ebuild 4285 BLAKE2B 4c03efb0f42ce1619c8aee1a27fa837dab27ab37c1b4db78428fe5391a0f7b7cd1b1f84c9affc52ee656d85e22055a4eacb4b09a69139239a8e480d8c3339c92 SHA512 d66b7e3072b28495cf87dcb3f55488bde050a3cce741a394b2ab9347f5ceaffca53cd258f530098c1ad87c0447d11c6fa6f77b462a00ff9b6d42caf3e0f7122a
 EBUILD nftables-0.9.9.ebuild 4553 BLAKE2B 54b3de2a5413532de597c7b496dcc83405136e442f1d9dca2e3c3cabe23f0ed8d2e84311d9091b62ec14e284cf768652f924cfd51df537a576d391026d82df2d SHA512 6d17349a2749437becd3d8a75c192e58d6019b49c3e99594d7f0f6989cb84b5a24820b843aed08cf6a43cdf359f63c250b7a00fdf2cb994c93faa31f3ad458b3
 EBUILD nftables-1.0.0.ebuild 4558 BLAKE2B 8365c83cd919817f8c0b7868a3a66b1018e9718b338d7902e7a1a836d19980eb56301359630d0c18f104ac89dce85b36291d190defbbe278521eb473b620b466 SHA512 7220d616f94de73f024290bb9c24fd65a17a68855c1754d9b4b74a60bb2a7005b643d2d356f58809ed638358ce5872e387c62b4e37fb8ce108a3529d6db59809
-EBUILD nftables-1.0.1-r1.ebuild 4735 BLAKE2B 364499724015c29d6ede31ce9229fc5603a35953c7169e9734279b63d0bb78c94b6852fec33c6c0b420d0abf9db3f281b9ce36eed522e72d55af28e9a07551ad SHA512 1d2045639f63325f2d8a7ace74cd686e9ce5ad74ed68d5016e2e9be6f4b25ecbb437c1c33bdd350349e3d8e819c537ca7fb198d3432dc25cccd5f77fa2cbc3b3
+EBUILD nftables-1.0.1-r1.ebuild 4741 BLAKE2B 732080a02f8585a46e3a52d64e888d1210b1e6ae5773ebf6dfa10f7372d7c272aaa727a5815ec997657367e94c9f42e48f112d9539338137614a0987aa9390fb SHA512 626742cd980ea46eedd24aef6c3ffb566d12fcf3ffe9b9c5004031addd2908f91e2aba76b4fd5b3ef03676db2380f59a9565149cbdb07102f891f9b8c3122cd4
 EBUILD nftables-9999.ebuild 4735 BLAKE2B 364499724015c29d6ede31ce9229fc5603a35953c7169e9734279b63d0bb78c94b6852fec33c6c0b420d0abf9db3f281b9ce36eed522e72d55af28e9a07551ad SHA512 1d2045639f63325f2d8a7ace74cd686e9ce5ad74ed68d5016e2e9be6f4b25ecbb437c1c33bdd350349e3d8e819c537ca7fb198d3432dc25cccd5f77fa2cbc3b3
 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25
diff --git a/net-firewall/nftables/nftables-1.0.1-r1.ebuild b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
index 82923aace969..584e495b73d4 100644
--- a/net-firewall/nftables/nftables-1.0.1-r1.ebuild
+++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 	"
 else
 	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index dbf96dcc5dd7..2e537914d4d9 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index e82e3a383749..af2374be5820 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -5,5 +5,5 @@ AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
 EBUILD netatalk-3.1.12-r4.ebuild 4728 BLAKE2B 4209a89f0ef674779ff8106499f2bc465113ddfa26c8abe55d1c200af79a4d9f0f1d7aad1b7e4815c4f5b60daa6713abee2efd8a74c256d50934a6394782f2be SHA512 aaa05b3ffad00f933ad9687edf80f135c82ee6ec428896e5570a429089d77a757d784b2342daca8b838d1486c4dc076c2f21e619d24a0a5f44fc52d8b76d0b1e
-EBUILD netatalk-3.1.12-r5.ebuild 4826 BLAKE2B 7c1c80ea7b105d807e796c0d61b8673f77a4f6aac5fa6001f1cce516042bf7d88fe346400c0fa5028eaed4bcd8a2ab58c3ef9abbe5bc3f88ec09cdec8092aa23 SHA512 0a6619abe56804eda2bcd89c13ff3ee85dd173fabf4d8357e294f858a0056104d7b23b66b4f06d96f5c1e71d6d2ed1e76902d85fa2a246dded256090eab8fae0
+EBUILD netatalk-3.1.12-r5.ebuild 4825 BLAKE2B 444f2d5ee7c9b46916867b334e5308c22ce59ff4da7e328a8e4b5cc7ca418c801ce46052c538dc166f19a1b4f4082c2d008fd65448ca3af0eaa563ff31a3274c SHA512 5b18517bb7a7861d76f3d9c3ff84f40bf9a4e253ba7560de3089430e1c87d57783ce84eb146fee2151c7e854a147964969a86163678d78c6f3e707ab655e9b2f
 MISC metadata.xml 720 BLAKE2B fa966860b8fe4f5d18748b8f6a4e4fa78b8b98a6dc12d73d6f7a5b15804c24a4559d9b0be1e73ee294ae5a8ca6521281e6ae948c5f433a22c338760781ef5793 SHA512 77a1fe546ffcaa1e4c9afc2f22d1a27c883ed743dc68c5b259d5a3a59d5ed941e24e7826b35c383d43039c11d92b1fecb3a6f96fd6029252923f1ecfef9efa93
diff --git a/net-fs/netatalk/netatalk-3.1.12-r5.ebuild b/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
index e1d1f84ed120..9961be891b55 100644
--- a/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 
 LICENSE="GPL-2 BSD"
 SLOT="0/18.0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
 IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf"
 
 CDEPEND="
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 1d56d1e43d11..2d2bf2f44f8c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -11,12 +11,12 @@ DIST samba-4.15.2.tar.gz 19252338 BLAKE2B aded33cbefce69c9b20148de1be224514de5cc
 DIST samba-4.15.3.tar.gz 19272345 BLAKE2B ada18904ee7889209488f022daacc34ce1f41c12f9c8c48515cc24aa158072da499cc6ec484cf2b9108c6b2d4074ad734d1850063a354000aa90091faba6f7a6 SHA512 1c30cfa6cd927f4d822dd7227b89542d05d7ab4e50c2d9717eea4fcf1af5120b55d66ec628acd5c887e9bffc732c1d37ab084db953534a2b3987531b10fef63c
 DIST samba-4.15.4.tar.gz 19280813 BLAKE2B 3106f2f265263e871fe3f82d3eecaac2e5f642925ff5dd2a9d163092fd13e9348a3910e40431d51cb94a1abeb3b9c32c487ce1f8caebe59a8d6d90641b4d9201 SHA512 e55473dd4971816a01880870309ca44f022625cd529511bcf386c865a2e7e79118577ee4866559f607952de47dc0d310d6426bd08dd4293db95ddbbe3982383d
 DIST samba-4.15.5.tar.gz 19279071 BLAKE2B 355970b9918e95f925636cdea919e123b072f8710134fe6310637c29b2b5e1bc55d7b66d9674a68408ce5f14545a2cb9a94f596f90204935addb2f8f6a503873 SHA512 808e0f15931bab18a1e36298528a01a1250efaef9f99508dd620d6936dd4a2fc3ccc64ab9dcc94bd73460697d16d6ca0652ccbcdbe1644ffedce0137d796d3ca
-DIST samba-4.16.0rc1.tar.gz 30490862 BLAKE2B 7031266abcffbd23536bc4ec3fa606f4eb270b8a7d8d293d417993e096fe81770378b7ed5a0b15444860562dc22f53c994178d65e613a057d8b5fe9c0d3bb7d3 SHA512 48bdc4f17116b29a30c2f146ca11617af1149559e96f009e70597c93a53f734e6f719fb7a04726ce5bb6f912cf07c224518c2a8076bc1d4bceba4f6787d032d8
+DIST samba-4.16.0rc2.tar.gz 30500023 BLAKE2B d187a1b26f04b1c2748e076c51b6a6e7520079aa63fc1dec8abae7611384ce963e23399b47852837cfeaf4fa8a57f899e6a6024e94e196ae8c2d67ade59fc9c2 SHA512 481e2ab18c502fa5f983bf905c29b2ac6cf66135913065a2368e574d46aae1f99b0786b816b0df11e1404f0dc8c2ab9702c1973ca43d99c3cb88742836f7723b
 EBUILD samba-4.14.10-r2.ebuild 10228 BLAKE2B e10beded76e18d79d78a280a4099e62c3190e9b56e6a5389042e3105bb4221df30b63846b55b4c46adaa7096bd1317edd41936dd6b0eded1970896ce4560f841 SHA512 271c1fc112653695e78feffdea04539cd6cce4b39be167a6cad53c1ff5010f149b1e7bfc7956b2518322d534d990539250e079350ae77356390b0129fa4d6a3e
 EBUILD samba-4.14.12.ebuild 10150 BLAKE2B 6db526fd89184bde4d903c17c45aa77fbc56aac93533429df31e6a54f48fcd9d211a03e990e2253dac49bb34514450430c3e942114393fd8e699e2f69d4fd120 SHA512 546fb0023b4fdc4bba5c942460c3675592af06014339189ecb94203aad3c2a2d7a29a22fa619a8ee47fefeac51bc79f46be04819615312a76d16ace2749dc0fc
 EBUILD samba-4.15.2-r2.ebuild 10096 BLAKE2B 92edf79f42f67ae7850388e0db4204099c0ec1a01358ee9cbbc7d6d25404212ce97c05f917810068f80a6aec9d74ad8fa53fa504009b1bdd6402510cc63be919 SHA512 c255639951280b1d37cf3a97cb543114874444686246a23b8ff33b52d9d90bb3e4f6f89a0caae85cd7230aad64789df2441ecabec92dd95d6f48b12b6f17f0b7
 EBUILD samba-4.15.3-r1.ebuild 10081 BLAKE2B 0624ba774f3625a1d90251186f10b07fee41ccb492d639ab2d9861034a81e14e92a5335c8eb41dd3c3e59f48393cf442760b22e94e80c3b0b0fcdbcded663caa SHA512 ba1657d4abb77a8cbd5e0f838a3ea9f96cb42ffe4436d20aaf30dbcab1274b35abb22642f29cbd648dc357eafbfc0136626ce984b894f6ec96c80fa1f06d6e84
 EBUILD samba-4.15.4.ebuild 10085 BLAKE2B 894637d02cc8cd9151f49529747e1feb493265dbc68d94684a7828ca07ff0c9b0cb8edc7be6196a4013e3dd9a080cef0cdd3b8b2d4fdac0a47d81cc652e5882b SHA512 3d97e2b7f1ceeed11deb4dcb94bc2bc62fe960719627ad3e3dadccbf05afb29da63cd7627f5d1d872d74a2ec7cf7849e311e9b46f55a3dedc591dba74e9b120c
 EBUILD samba-4.15.5.ebuild 10085 BLAKE2B 894637d02cc8cd9151f49529747e1feb493265dbc68d94684a7828ca07ff0c9b0cb8edc7be6196a4013e3dd9a080cef0cdd3b8b2d4fdac0a47d81cc652e5882b SHA512 3d97e2b7f1ceeed11deb4dcb94bc2bc62fe960719627ad3e3dadccbf05afb29da63cd7627f5d1d872d74a2ec7cf7849e311e9b46f55a3dedc591dba74e9b120c
-EBUILD samba-4.16.0_rc1.ebuild 10085 BLAKE2B d73fba1fa4986b33097d598ce9ba2ea25fe89d6b32f807142bddb12db17864a7dd096c12dc754d59f7f03fe2ae9e2828bd4e1007414740c071188e302ddeb3aa SHA512 2ed82657ca0b10a5c346e9031f5bfc3895395a9fa24c6b4cecac3024e1a4d6858dc0da8b1ef08b8d425957627c30398ffcdba3a0add53c55f8b80415e9659b15
+EBUILD samba-4.16.0_rc2.ebuild 10085 BLAKE2B d73fba1fa4986b33097d598ce9ba2ea25fe89d6b32f807142bddb12db17864a7dd096c12dc754d59f7f03fe2ae9e2828bd4e1007414740c071188e302ddeb3aa SHA512 2ed82657ca0b10a5c346e9031f5bfc3895395a9fa24c6b4cecac3024e1a4d6858dc0da8b1ef08b8d425957627c30398ffcdba3a0add53c55f8b80415e9659b15
 MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
diff --git a/net-fs/samba/samba-4.16.0_rc1.ebuild b/net-fs/samba/samba-4.16.0_rc2.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.16.0_rc1.ebuild
rename to net-fs/samba/samba-4.16.0_rc2.ebuild
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index dc9cc6b4bfb7..9affbe227f01 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 0f4d89078b9f..f8ebe389432d 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -25,5 +25,5 @@ DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f
 DIST vsftpd-3.0.5.tar.gz 197778 BLAKE2B c197a070f7eef8c97ef0adc1ebb883520e7613d67ba0eabb1380b3adaae272f4ef79110e79ce4aad5ddebd6100fb059308d905203249c5445d3ea64c29dc5ec2 SHA512 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
 EBUILD vsftpd-3.0.3-r4.ebuild 3700 BLAKE2B afd82fb42398d3ff80e3ac6caea0353be89742c79a419876d415c9eb2283ef2548fec791d945a78e2039cb66b39a7348b5e2d2b41422122032ef743c0fd1f8fb SHA512 29ee6f8547e35bad5861bc7ae2818b6f55aee69cdb909965931c698c3c05e40504b8b198869819531a223f03850d73350d03e7f7baaeccf3c2aaa74222bcc8f2
 EBUILD vsftpd-3.0.4-r1.ebuild 3691 BLAKE2B c59a4d4579e99b2e6137658b70d2f6341c4d907f6f492a0ec6e57a7090d072dde5cd0a9e5c333bad96f1fe025ff838c9f6c4f6ac737d85648bcf8480d5ba4973 SHA512 8c6b75ea2f16ed9f916194e3d2e9a266f455459c4effee22ec13c7a31324c722f3f4c7d439fead4cf507ec6860d10ade01a5e1f3c0bc8d5686dec337ca58eb3e
-EBUILD vsftpd-3.0.5-r1.ebuild 2329 BLAKE2B beb3d2addd0705ddff874642e9a4d24fb8a89614ae2947632084bc82cef4006aba0709e7ee9cd57a43b102febb1d9824f1da46e33fe523dc7d543e728bc7763e SHA512 f68968096e0c0d7a569fa87bb1aa1002565a93d5f838848ad3518a2bba7d7374748f66f50b7eff9b3f51fdd6547e16f2eabd3a68d159fcbaccbb1140eef15f0a
+EBUILD vsftpd-3.0.5-r1.ebuild 2325 BLAKE2B f6fe9c84d80997c8461d0a9877380c3592850f66f72127fc8ac5561bb8b0cfb34ec6180db18f71537fc9ec3e8847e560a1e81564a0c0fc830b1c7c81c5b740a0 SHA512 f0f5fb74c81c4c516890e8d012f5b1ad3b18f99fb1a9830469e50f1399198dd270a0c945339a84e2cdef3ee5131e08e4a706767dd03b29877ff30953b846a62e
 MISC metadata.xml 219 BLAKE2B 92feec299114ee9e14d6e84d01a8b845b76d520cb5c0d7ca7efcb519e0b49c63a5900724b51ec250bf48275083031b1bae2dfd3b38eb188393275eb6538f966e SHA512 d57180760f0844d3cba2a9680717aa134fc2592573c7bec1c5ef5dff1d02d5b7bedf6b3846e27b1db05aa5a519e5c1e37f70932742e083bfab2a8d8915b6df0b
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 7b213e6d4c26..42443b775d2e 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e80ea04c1d4a..b19867bd27fd 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
new file mode 100644
index 000000000000..13726a938684
--- /dev/null
+++ b/net-im/biboumi/Manifest
@@ -0,0 +1,5 @@
+AUX biboumi.initd 520 BLAKE2B bdbc87967462914eee4537cd4a0d11d9aefdb13c2f860159c003c56424f0c1b702670c2baed94c299161b7b292c097a9b8eb5c18475b6ff07fa392d28a50a249 SHA512 e13b30e67ac801b36f16f4dc453e1f41910c2f5828772af66af9e1e0cdd32a8209c907fdcd0e50afd691da0c8e2cad10803a51e681ce6bf86876439c968a0319
+AUX biboumi.logrotate 193 BLAKE2B d44e520d149bbd379cf5636482327bf480401f9810c7103df1ada990e959863f857b97c8f74b1943d23ec61e4f0a1501be82c906ab41ebe49ca84b2279357cf3 SHA512 438c290f2632e4e901e6ec359d8480c67e787d8e89ec19dd2bfe2abae86684532d712b93d382024a2ea5818b03a491ed1d9768f950c57c717db8cd0cacb5f7c8
+DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18
+EBUILD biboumi-9.0-r2.ebuild 2057 BLAKE2B af342a4bd879f07339a6feef779d4efab989e267c4664b426f2aab719e8f01cd5fe85d45a7998a18439bcf5037f61fa2b7eaa300c09142b8d1ddeabc11f1cab5 SHA512 d6c23ddd1c41045b9dadb363ce2dd965fbca1fe1f63ea770fa92317b9363b09b377c1cb03fe78f9560976abdc2adcf11de33a9eb14dc86a6fc8badf4134049fa
+MISC metadata.xml 732 BLAKE2B 3418ff1a363aea3373d4f68cada39664e6c82b97c08a469bbfb45451e66cb80ad1eb1a31fd9aa5dab5b652a2627b86899e3812249bef2967143e188ed25f251f SHA512 35d9fac63a66783356d0111ada2ca78536ff01ecbf6f0db92d6fc968380f3533004f061ce0c353fb8898a83dddfc31a86d67b773abfaea8fe16d3e35c61f874e
diff --git a/net-im/biboumi/biboumi-9.0-r2.ebuild b/net-im/biboumi/biboumi-9.0-r2.ebuild
new file mode 100644
index 000000000000..4f571807cf7e
--- /dev/null
+++ b/net-im/biboumi/biboumi-9.0-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="XMPP gateway to IRC"
+HOMEPAGE="https://biboumi.louiz.org/"
+SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+idn postgres +sqlite +ssl systemd udns"
+
+DEPEND="
+	dev-libs/expat
+	virtual/libiconv
+	sys-apps/util-linux
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	idn? ( net-dns/libidn:= )
+	udns? ( net-libs/udns )
+	ssl? ( dev-libs/botan:2= )
+	!ssl? ( dev-libs/libgcrypt )
+	systemd? ( sys-apps/systemd:= )
+"
+BDEPEND="dev-python/sphinx"
+RDEPEND="
+	${DEPEND}
+	acct-user/biboumi
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( README.rst CHANGELOG.rst doc/user.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSERVICE_USER="${PN}"
+		-DSERVICE_GROUP="${PN}"
+	)
+
+	# Account for biboumi's atypical configuration system.
+	if use systemd; then
+		mycmakeargs+=(-DWITH_SYSTEMD=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_SYSTEMD=yes)
+	fi
+
+	if use idn; then
+		mycmakeargs+=(-DWITH_LIBIDN=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_LIBIDN=yes)
+	fi
+
+	if use ssl; then
+		mycmakeargs+=(-DWITH_BOTAN=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_BOTAN=yes)
+	fi
+
+	if use udns; then
+		mycmakeargs+=(-DWITH_UDNS=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_UDNS=yes)
+	fi
+
+	if use sqlite; then
+		mycmakeargs+=(-DWITH_SQLITE3=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_SQLITE3=yes)
+	fi
+
+	if use postgres; then
+		mycmakeargs+=(-DWITH_POSTGRESQL=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_POSTGRESQL=yes)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	cmake_build man
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	diropts --owner=biboumi --group=biboumi --mode=750
+	if use sqlite; then
+		keepdir /var/lib/biboumi
+	fi
+	keepdir /var/log/biboumi
+
+	insinto /etc/biboumi
+	insopts --group=biboumi --mode=640
+	newins conf/biboumi.cfg biboumi.cfg.example
+}
diff --git a/net-im/biboumi/files/biboumi.initd b/net-im/biboumi/files/biboumi.initd
new file mode 100644
index 000000000000..665db9120c9c
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="XMPP gateway to IRC"
+pidfile="/var/run/biboumi.pid"
+command="/usr/bin/biboumi"
+command_args="${BIBOUMI_CONFIG:-/etc/biboumi/biboumi.cfg}"
+command_user="${BIBOUMI_USER:-biboumi}"
+command_background="true"
+extra_commands="reload"
+
+depend() {
+	use jabber-server
+}
+
+reload() {
+	ebegin "Reloading configuration of Biboumi"
+	start-stop-daemon --pidfile ${pidfile} --signal USR1
+	eend $?
+}
diff --git a/net-im/biboumi/files/biboumi.logrotate b/net-im/biboumi/files/biboumi.logrotate
new file mode 100644
index 000000000000..19964cf60f3f
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.logrotate
@@ -0,0 +1,10 @@
+/var/log/biboumi/*.log {
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		for service in /etc/init.d/biboumi*; do
+			rc-service $(basename ${service}) reload > /dev/null
+		done
+	endscript
+}
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml
new file mode 100644
index 000000000000..cbe709768d65
--- /dev/null
+++ b/net-im/biboumi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Biboumi is an XMPP gateway that connects to IRC servers and translates
+		between the two protocols. It can be used to access IRC channels using
+		any XMPP client as if these channels were XMPP MUCs.
+	</longdescription>
+	<upstream>
+		<doc>https://doc.biboumi.louiz.org/</doc>
+		<bugs-to> https://lab.louiz.org/louiz/biboumi/-/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="udns">Asynchronously resolve domain names using
+		net-libs/udns</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 9e79d7e2587a..95c712d11cf4 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -10,7 +10,7 @@ DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c5176
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
 DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
 EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60
-EBUILD ejabberd-21.04-r2.ebuild 7519 BLAKE2B e7e934bac544603e9160004a534f59e121cfa167fbc6889e070c0eb0353a925cfa51b19c4c37002aa3e0e25632eeff0f10c5f0ae4174b2dde99d8a097c987be5 SHA512 219c906693f428947a1d2d213779432d3dbf801b8ed48a7b0eb03febbc0fb26f7fea2ec8cdc1afb340abfe0a3c236de192d206a8930d92e13d27e014246e01b9
+EBUILD ejabberd-21.04-r2.ebuild 7518 BLAKE2B fd8b91125137ce9317ee54bacddadda34178128c1f34984aeec826e3cb5f5d2b3e2695966bb89a6f6490a4a5fe212d96e7d4b8e195b71bac5cbf931745cdf5af SHA512 8a5589b0e14c66e32ecc23643c5cd609ea883b1e0d87d32a23c936475e649f95b8d1eebcc626dfe856f284bfb6521d4345a14b47d2cc0cb29956fed17c1be5a9
 EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2
-EBUILD ejabberd-21.12.ebuild 6994 BLAKE2B f5ab354184987c9ec65094b54bc23065d768e41c199463448fabe2f482dc0fade3de242fb548e7eb2eabf18de3b001977fb027a9e9f4528a46c36018da7463ec SHA512 a41d136dc9c303cf25b0ceecebec3936e0631d79924e25b3d4e68357f010a9b6c68c9eddb1f6e7202b7339103296114eb9510543d9ecfacc02bdc16f76112daf
+EBUILD ejabberd-21.12.ebuild 6993 BLAKE2B a36c94f7b9bd08479b678c43cb881a086bfe36245028ab68afea96441b8a9db54a0d919e099d3d72d337b5a5d38c8e78a078d2114299121b6d373c4909e1b90c SHA512 2fdfe51005e975228fae04eeb7bbb15d12500885321af3bcefa69a3dedbf215db3ca56268e4cb58be0203cae43b78a7e9dd3e0832acaced05a361f26d966d7ee
 MISC metadata.xml 1517 BLAKE2B 5db739eeebcfcb1be6ee3fe281e40bbd3f98943c26910247fce1d491f6300b6c5e1814906838b846a2716b2a50bc8ed26219db49cd1101a9263e23d607d5afdb SHA512 a1856f7fea3d1add4503f1c3b92c6318bbfce0946f44d8e18c44be98d11e814bf56d73b626ee825787871a5adc834541853c7350709ef8204182fafd6dec1710
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 63128525a5ca..d8911b3b288c 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -237,7 +237,7 @@ pkg_postinst() {
 		done
 
 		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "(just as upstream) and *not* /etc/jabber."
 		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
 		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
 		ewarn "Please check your configuration."
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12.ebuild
index 49c2dc3fcfce..2b533f549d33 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -223,7 +223,7 @@ pkg_postinst() {
 		done
 
 		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "(just as upstream) and *not* /etc/jabber."
 		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
 		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
 		ewarn "Please check your configuration."
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index b18e471c7d7a..6de9a77768da 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
 DIST rocketchat-3.7.6.x86_64.rpm 72058676 BLAKE2B adc5dcf4366c679cda4e55fdcffefa3284f82e4e0616229ee3fbece519da81a9e71f24c3a04a7301d4b754292a09e09c13221c9e3b2ece65d2ba266655da5b43 SHA512 2d29cbdf9fa1e18eec7687edaea1ebe1b8005aa550df68cec91bb04f91f7fa65dd54b08b3de2ff1f5442fcf97d5b12e5d134123bed6c3e9cbaf6069ffc7a1e5f
-EBUILD rocketchat-desktop-bin-3.7.6.ebuild 1073 BLAKE2B 5859847c3d9afc86cb527326383758ff7cfb9437dce0aac73168ce68c2e1460afc0314f785269c9ffda19e70af9a3e2329c084fda6ad12694e7a7b9c5843f912 SHA512 168671c7ff4a19d102af480c292d5685031e8bd3ca6543cb0b4f6eccd17c345efc0cc1eb240d028a72e99525b42a5e895dedc22a463117b93a3713762efd7d5c
+EBUILD rocketchat-desktop-bin-3.7.6.ebuild 1089 BLAKE2B f3efa622db8a3e734d3037063d0ddb8343fbc12f180131544be1edf9d98c7ce9c301fba3f1cea4f26244651df6b00682b110344132afb3bfb550ab9087fa060f SHA512 86e38fb3f25fd20db8f8398396e78067805e073b28668c48b36531ceabe95c04888a3fda2f83cf92eaf2f299d56676c4420fcd76af47151a8ce8ba87a3dbd629
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
index f29cf9d59bde..9953c00c594d 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	media-fonts/noto-emoji
 	media-libs/alsa-lib
 	net-print/cups
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-im/whatsapp-desktop-bin/Manifest b/net-im/whatsapp-desktop-bin/Manifest
index eb83366fbc2f..3d389518c1be 100644
--- a/net-im/whatsapp-desktop-bin/Manifest
+++ b/net-im/whatsapp-desktop-bin/Manifest
@@ -1,4 +1,4 @@
 DIST whatsapp-desktop-bin-amd64-0.5.1.deb 39705544 BLAKE2B abdf7091f8b10e614e78e457e501bf878f7462f54257e5b96ca2118ddd872bd71fc4c000c24f881741a252932d7bd0bb3d8654cdaeddf2e42ee2d8de5788f565 SHA512 96411b1bcf064a9b5836b64687389898bebf3b8636a95adb8c55b74b4405b9b5c45d099fb594947130b6618520f1f0d1bd84618537fa8a19c001db4ddc630f7c
 DIST whatsapp-desktop-bin-x86-0.5.1.deb 40671520 BLAKE2B 06f6b2c3168c48de9caa2b834ab41ee47a43a534751eac6ddffc29acc981281e3d0d54b96bbd44dfc870257c9561f88ba72fd26a85cd13168fd1eb4a3ddb56dd SHA512 b87fa9b901fec104284e55c2747ad742da9d484fb13b9e8259ae99f60b5d293ae93831ca7daefa38cab04ea50c764de089b0422c797e693ebebaa136932fd6e0
-EBUILD whatsapp-desktop-bin-0.5.1.ebuild 1206 BLAKE2B 73b4c35f33d4cc0d0707c9be47a3075b1fe3d72187d9a840f9424d28be55be1d1477798b3c77303c4ac6710ef291da58fc2eb146daaca8c42f2881b5ee93ecef SHA512 c19acfbad1e0e25fe809e42140a19340096a5447ae6d818092b616cfff1c731c1605222fcb208522b469c8fd2d1cc84aca155a1f973cda67dd45f44d3a12cbf5
+EBUILD whatsapp-desktop-bin-0.5.1.ebuild 1222 BLAKE2B 3bf6ab615ee4cf1c81127c5ac8eaa4a1ebb5ac65fdb613e5fbfc84319c9cd7ceade237f9e6328aabe43a873d5616e7e52a867153490aa0c5560f53348e652157 SHA512 e62509b529cb4dbadba327d4c761d125b1071bd5d86f22bd60906f0823c471f4a9f141206fb66dab248f4871fa7b327206b3560697ed5795bbbbbce0b565559d
 MISC metadata.xml 420 BLAKE2B e54fc393304f277cf58dca4f650ebf8536e6c16673a357cb5c8ac021ec1284d2bb3963f3c1793750255ec91c35099448e0a945abc8c718b98dc25e98e46751fd SHA512 8bd96dff0a0eb33262bbaf0dab744aa718b15498f4e8c38b1036829dc4d1f509fe3fefa29334322609b2a3247a60d16c42d83842f8b6efc212d06031ce3a4ee5
diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
index 1358c9b70bc6..f5747bb58c8b 100644
--- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
+++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	media-fonts/noto-emoji
 	media-libs/alsa-lib
 	net-print/cups
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2f2dac5e3ee5..0082081150ee 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index b3909d6b8444..e6def6cfd48e 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,6 +1,6 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.3.2-r2.ebuild 1483 BLAKE2B 810b03aaf006c531dddd4cca178251a81730b08729b8b27113b64818b59d773bb2e3094a789d5e2754511cee337481f4575a552a329354e29be61ed736613e47 SHA512 070d5841d827c3efbf2312ded70e0343eb316acbf05dd41544e8d6da6e628eb51bace622721ec8dc9c779528a559719a2a26b3662bdd7b838d4d571aa693707c
+EBUILD mosh-1.3.2-r2.ebuild 1489 BLAKE2B 29d6f01b6293dee4248b22109bfc62ae3d869ac4d032d9d707ba83504394afcdbaae5dad77b8f177ef939a7bc05dc18d4ffe3fcbc6596a076b4d4b6c5e6045bf SHA512 1c61bcd4844518aa42bade23ee10d10c28ba1a95f527230ce0bfc51893a1e00f10bcbcb826742eb5b397cd604fdf441a77aedcdabb9bb1871c6f6b57850df23a
 EBUILD mosh-1.3.2.ebuild 1432 BLAKE2B 762f107430bdfdff1b200fce097fb298f7fe5ecd1799cb5e4f890552ffaa1a91e84c2fbdc0de18b3472c2aaa8ed8c4b9d6d732279d9e341f6ef4f1f63faaf664 SHA512 93ab6bfd1a7dac29ee7da5a3a8021b18f34acda6d1c8f3df624ee6da05ecdc0757406dfa68644d1cdd588b490b2df7ad73a8691e5c48303fe429878bb6edecdc
 MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db
diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild
index 710a8c1fe272..1d38d71898ba 100644
--- a/net-misc/mosh/mosh-1.3.2-r2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7aaa41c571f8..6d095934da4d 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index e510c95edb02..43f6974176e1 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Viorel Munteanu <ceamac.paragon@gmail.com> (2022-02-01)
+# Binary package linked to glibc
+net-im/mattermost-desktop-bin
+
 # Ulrich Müller <ulm@gentoo.org> (2022-01-25)
 # Binary package linked to glibc
 media-gfx/brscan4
@@ -25,6 +29,8 @@ dev-db/sqlcl-bin
 # Binary package linked to glibc
 app-text/zotero-bin
 media-video/popcorntime-bin
+net-im/rocketchat-desktop-bin
+net-im/whatsapp-desktop-bin
 
 # Ulrich Müller <ulm@gentoo.org> (2022-01-04)
 # Emacs 23 does not support x86_64-gentoo-linux-musl systems
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6539e5efdce6..2d167c8c3014 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5744,6 +5744,7 @@ net-ftp/pure-ftpd:vchroot - Enable support for virtual chroot (possible security
 net-ftp/tftp-hpa:client - Compile and install the tftp client
 net-ftp/tftp-hpa:server - Compile and install the tftp server
 net-ftp/yafc:ssh - Build with SFTP support
+net-im/biboumi:udns - Asynchronously resolve domain names using net-libs/udns
 net-im/bitlbee:libevent - Use libevent for event handling
 net-im/bitlbee:msn - Enable MSN Messenger IM protocol support.
 net-im/bitlbee:nss - Use NSS for SSL support in MSN and Jabber
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d6adb72a2be1..d417deadd512 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/uutils/Manifest b/sys-apps/uutils/Manifest
new file mode 100644
index 000000000000..a4bc656c23b4
--- /dev/null
+++ b/sys-apps/uutils/Manifest
@@ -0,0 +1,236 @@
+DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
+DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
+DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST bigdecimal-0.3.0.crate 26679 BLAKE2B f0bc55c8b90b6cee84b3452a078008263bc04590adcc60f680e833ebd8b125699af05073e4e3cc739dff7985a481601be466c349a8125db69c7d45c62bca9890 SHA512 3a55f6ab1450974fe58dac268019fa7f76b0dee131ed66f5c5529ea28da5d9e7d11579585f28c0d3d45a6456992cdeee81df524c0c7bcc5c3dc86b26d4f12981
+DIST binary-heap-plus-0.4.1.crate 17088 BLAKE2B 55913d260748f3031e4aa37637bf66ac4c7b22f0104ac854c5c8e45e62e0ee5200c030bd4512839631bf14aff1bb861cf3c88b6ecab74fc4038581b86385540a SHA512 80c6957cdd7dc1f5bc6feebb12ed834474980b22c37c653246972fb4358ad9f802b83802050a64541ec2553bb92ae37d6a9979d3dd03fef73f73366a5a387f29
+DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
+DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
+DIST block-buffer-0.2.0.crate 6953 BLAKE2B 50824cd61b043523e1fb1a09da064b5fbc6daf46aa35683a1e3d64cbf313775133aedfa781f82550e1029ba56212e85c4a6b206a622c3a45f3eb10155eb9df72 SHA512 4d3b4dc5ffa3083e27781482993349c712c43b737e701d371a4e50bf160a1f850db2ed453dbb3d4b25145f3a1d590cba2660e835239a8103843289cfc9b670ac
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
+DIST byte-tools-0.2.0.crate 6454 BLAKE2B 8fac079ccb1f8bdafacfd54d0bb20628b3c1c08ffdc86feb70c44ae973cb36dbdb8bf92fcf859535d5de0098b936592db68e4951edba8890902107d8952fc314 SHA512 bad83b237d3f8dd1784f9031f26dd8ce2772aa9d307951cf6f5eb6c445567f80b554c26f597a2933d4164adc110e42db618f35ee68e951a0bb837abf20f6b0b5
+DIST byte-unit-4.0.13.crate 10846 BLAKE2B ed38559dc0883590fba933c6326d6722cf151257df9350f3730a7ff90a37a2f5a95bfb3d5a337e7c0b9fa2ceccca26671e9ea10b668c02c4b9e6403f70b699b1 SHA512 d100207e25d2a6e7a1677ba13703518bf157aef3a641020f9b569546fcf7d0405d73b8a9aaedcba812584537c0ee5d94a048e04673f49458626bd63274afe197
+DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
+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-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST compare-0.1.0.crate 9291 BLAKE2B a181687c26ed0433afbbbcd6f6b3d5af43aa5ff5f2305d79b334bafe54732a4d17c82e8efaa19b346e01a3af33a20abc5f7375c52253b0e3b80317a7873234a4 SHA512 ea2747232b94e1233a3ae4f4c5c80ed5280457add6e213f278276912cef904b255c46a3c977f2b769536551a6f9c83eedab132576661cc55abfb9d1fddb25322
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST conv-0.3.3.crate 22124 BLAKE2B 9a05d9beecbd288168438e920ab4f42075f1217f224c9dc91d8e23869808868274e108ae5f881da157276cd407a63f2e8dd990b7cd9fa1731045c2cbd2f3a48e SHA512 f050cff8528f0fb5a8dd936995c423c5478afc47041c3a8cc8611ceae3228098b80589fdadf78d0028e960fa354768440dd7084cf295a29f2c6aeb554f47a8cb
+DIST coz-0.1.3.crate 21914 BLAKE2B 4c79083d5e699824015e71c8ceae0db119567f34969e644ed18249d7210c92ab503e0384a3b521aae7a5c469a26881840fa4b24c983d4139ac59178c4d8a28d5 SHA512 476b8627d9694813fed0ec262681e18f296977da8fc3ad9d749008e4406a77add8d3c2b15bb82a397d435d99bf8edbeec001a438d64d50038a0a47ac462230de
+DIST cpp-0.5.6.crate 5856 BLAKE2B 19156cc19af6538d23ced81ee7bbd6640b8ff44055cc7b13e80bc7a5aea0c5c6081990a489891b3fb08eeb66f3a3eeba668b2dfdde049a6ebcfcd142e5f7f397 SHA512 9bbe849212f479d34ddf6b0ff349662d168465067205b51e250dc517a8e858bb37fe2000685764ff58fdcc7d2ab8a48e012741c3bbc104c4830564dd6616dfcd
+DIST cpp_build-0.4.0.crate 9037 BLAKE2B 270b3d00892483950de0b71d6b85d91516d219bba5ab29cb8d67323f2a4c10c6f508ae6e2cfce0f1c20ce25d979eca36b440ca3f79e072ccc185e8d96f8c5823 SHA512 da63c22fdb7713d442d1f73b4083f282505bbba2b6165ca5239de463cd9e4de7a7d7f8317ab4fb592a1df5ae5244b74f9a57f63f68f0894f0a778025c2dfb86c
+DIST cpp_common-0.4.0.crate 4300 BLAKE2B 8f9877cf924dd6cd8148d04832d754b9be6b1dea8279c040f83558e981413fdaabfbd29f337335ba4d1dc705a0e0c43e5b6a61989d456f81ca676e424ed95290 SHA512 6a9fb6bde2fb6f0897b19eb05ef48a3ffad94f74d550e02f2c933f712869a79cf0534c6982b4b1ec151224415c2ad4e37a606a442d11650d7c36a41c32892248
+DIST cpp_common-0.5.6.crate 4023 BLAKE2B 9b49614f971564560bcd10a364ac73e10124f87e63f6d01c3eaa8dad736cb60ec2f8d60eddc8a0ce54b7d6147b09b69b8e4b5917d5cd99f536d5fb27d64da3e5 SHA512 0a9bb663a6316e8e57c7ed9f001088052b41cee5dd94ad742f13f16242a343c88c8e1d53669845719820a7a94b68fe645562591998b0ff334c49076f7391d7d5
+DIST cpp_macros-0.5.6.crate 6346 BLAKE2B f52cb8e92e46f1fd595709b3eb3299dac06dbc11d0e8d3a278037d3e7c19ab5e520d20cd7303bce7154360e30806ae1b921983156548fe593f44c24614dd9a46 SHA512 258522e1f177995e179b629af92945f173a41046ef2dbf93e41178434c4f02a97c0b02cbd3dc5da3f38ef86c3a18cf76304c5633adb4c38e4179feccef43269c
+DIST cpp_syn-0.12.0.crate 56642 BLAKE2B cb3d090a88157d116f5329aaaf423d0bf90ca6d81ae7993daece8621c6ea2ba7991182f34281df3c9bd0f38e29c0417959cd9d744aed063aa8c7c95608603b45 SHA512 8d2859e646491558ec0630d790e7d3be34456d5f765805b46a7c75bc7734a335acf16c118f40954a580a6836c7427aece143960a5d20ca5ed0108c0e8e89ab9e
+DIST cpp_synmap-0.3.0.crate 4708 BLAKE2B b42526490ffa516835d04a3ecf88e19acf001f81bddb1663b52291e4a5439bf197feb1f457a8da16e0b401186c28154ac5da01cbcdf3f8dae69681df0d664158 SHA512 b502c0dbbd18796590e09b5be66ad9cb476a9e5b9244de160372f701e8f3ea76024f2599d090248f4182f75fc1e229a6b0cc4568f28a45bad4c0d1f7433c8407
+DIST cpp_synom-0.12.0.crate 10731 BLAKE2B 2e014d4a9ad3ca758bd8366612c50273538a366431c7ac89453950260288cb12a98e04cb83134138a1f00c6c27b91ae706be4acd7d2daa6e0724579c1503b333 SHA512 b8db3b154b0906e2d74010138da9f8bfb3775be671835f729447704ab99bcbf50ab8b2f63ccae25d0239605a319cc544f7e86ecd3cabcdee985f200b22faae4f
+DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
+DIST crossbeam-epoch-0.9.6.crate 46055 BLAKE2B dad8d1181a2b68f6ecf4c620c6222e24850db5f76b99f402f7b79bacaae910effa776c0b72796271b2c9ee8b34f05778998cebf2f25fd88e0bd2f936580dea94 SHA512 5a91cc7ab84b802b9b2d74760b548da9c07e13a1926b9c772c3fb0e8003a27e4d7043c400106175b5009b93aaeaff4ce758a758aa6866d6c60c4c67813481e04
+DIST crossbeam-utils-0.8.6.crate 38841 BLAKE2B 90729cb53f5bdabaea522ac72e06e411a9737398c7970b1805a40bfc3e4d8717eb04c3afac8cf31a1c29c5ef4f137713bfb56320aa5c0e2cdaa6d49e3426b29b SHA512 ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9
+DIST crossterm-0.22.1.crate 105450 BLAKE2B 4e90dddf5da88dd94c4ae82d0a6d989126b063fae56e5e0963414f196d779f4fdd265d528ecfda387a604866efb41943db8ceee124c2e97dfdcb1f092678f76b SHA512 2a8534a12bb119be583d491b3595259d164de6922ce2a17bbe6f19fcff93339a6d0d8c08398958a7592d6aa765eb2ebc6e61b54211080785357c711b2c454d91
+DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
+DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
+DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
+DIST custom_derive-0.1.7.crate 10700 BLAKE2B 205c46bd4f052873ff9790974052f8d81ca1fb16815b591d20db96fb330ef5b782a54eca9c07615edc5e55ba93eb38fcd37c1225f49251e83ea6059ed2cc3910 SHA512 593a98f7c9adfbd07eeacbc6915d3de053ffb33076099f425f5a72c089ee0dfabab8ea31f525cd3eb5da5c19782925ddd14a3672bd9999c6866fd9f14150518c
+DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
+DIST data-encoding-macro-0.1.12.crate 3730 BLAKE2B 5a56bc42b5b1b228e3153a4c344c014475b820f6a9df51e6b503885769ff8cca08d78231fb0feec535afe583b20dbacd2d6db524884f26e994eff2e13855b98b SHA512 2b3aa08f98f413c3c0f8a67cbf7907c913a358a0875b7e231c2cfb956d2e8fdf745c65aeb01d54bf2be0b4206233b08cb606666dc1c109816b18ecbff7aa5d59
+DIST data-encoding-macro-internal-0.1.10.crate 3149 BLAKE2B 50d5132e0b53569a74b8a946870c582489512f92c48c6578db82b05865a59f2883ae947cbf55d70d0d248c05afaa2c3396f71a3b102a677eb80326506b92b2c7 SHA512 fd98100d95644c081cde3cd9f6c86206dc0e0ea369266b198a8b63ac20e146802ff019da8e19b632418c619fbfc29ac662a95285051072e508b71b7c9c2019c0
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
+DIST digest-0.6.1.crate 6953 BLAKE2B a640151f656ce6454480541c85a797dabb2d0d85bf739adbf72ae959abefdcd8381fd8b47eb51374d5290e7fd9bf4af17614ae34760105e438d62728668abcfe SHA512 6effe42ec7c6968d502e5eefb2984ccd31970d0f2e9a03e9c0721378be7b0936b93eeebb19a0ad2e3596510721ad0a287792838416421e5f8d6c5d52f7b06d6d
+DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
+DIST dns-lookup-1.0.8.crate 13153 BLAKE2B d1a23c188dd879760fd3038c72368ed15ee39378314f91c92c4073fa762bfe6c8c2a2a2d5317fcb2342dcf4f2fde9fb1548aa20b473c52b8d871733000f103c6 SHA512 88889f6dbc7e027753e6daa487f77b0db070ab67c3d4925ee463b30e7a37ab75f22c7aa88f3eca6b100e58c560bdc163dfbd1e36baf4773495ea5ce7607bf787
+DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
+DIST exacl-0.6.0.crate 54894 BLAKE2B 2fee75fcbd0b0291afce72a2d042c0a9847ae018d66cf019c21dc4ef5611e9d529068efdb1d3790951b9a8e82b6e518a6400f228d0d041699bc0e3ac5e04721c SHA512 2c1048343540d9a5de311bf5f8df2259b2e5c3f917b4372132ff5db838bac937e8a5e5ceed80a323d660becca067240ad068b5658b852b493f7a8b2c99d88691
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
+DIST fastrand-1.6.0.crate 11338 BLAKE2B 2862c5d40364b3412c7a6fbceab0f883a012412f22a24b960008b7951f3d6f0d5410fb28f75913d0bf3ac6254fde72b591343425e4e1016d77b9e53c8f5a934f SHA512 85f0c5e01b9e549b6a170561600138caea9604f18eccafcc4c37c2bd70f992e77e852bec20302028ffeee40d85fe8e8dcb812c0d996010a0427fb68a0ed7b029
+DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
+DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
+DIST fts-sys-0.2.1.crate 3731 BLAKE2B 51cbafc8f70022d30564c71cb2eeea42acfa0571ff9ce1804178a1b6551a1e655e246a382935dd138a0c5f02aed7ebbd0fe2672fde65574bf99dfdc09eb589c2 SHA512 c45db4f32783a83940a96ddf53b0b5db1a8a118ba85c81a11e8f034b7291979f54dd629c7db2a8dab21fb94743f1fbd76916d09da981d1e1aeecd391e019ca95
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST gcd-2.1.0.crate 8470 BLAKE2B 285985256a2cbea486ebf355214b525517d80db93a3d298b205fb82b539cfa6654d38e563c393b70ffa384f0f5fd722ef7c3c24bb2a5da4928d7fe4a2c2f9449 SHA512 f7b2389ac51730329c5a34ce116d4dc506e9b1edd609a3e85795e419d5942f0fc80f2298905098d5e5a4272c2638661bb4b5b34fec4ed8dbeaeccf539a606755
+DIST generic-array-0.8.4.crate 9820 BLAKE2B cbb5eaddafcb58b9f2ed5b02196dc3ebdf217bc4de9aae513bfbf61351ea78b028e1b19d5829615887fe66a244bfdcbb8fa6365d04c2dfb2a3fab5bb8a37d963 SHA512 410b136fb535bf9373623bb4025cd0adf7189165c32ced8d74ba91a8a3e7847a2fe9367f1b6357a201b035217e60b49e2d735184a3989492ae1961d1ce6de059
+DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.4.crate 26800 BLAKE2B 68836e848f1f87f5db77e64314b027bf47517746ddfa7677191ab518c9fb77d9a554cf4d1f9490bce1d8aa22a35c1952b088e200374dfd5c5d84555ed082510f SHA512 a7e63985824dcc8459736e44b1c0c4798a212955c89e5d3a3b852a3f80643d0231c4825f6cd416e87724aab80c19097210b06bccd2006e56115ae94920241716
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hex-0.2.0.crate 12368 BLAKE2B ab1294efedcb16c18e0a624bc67ea17430dea26eff34071df16a211d79fdd54c7a05b00a516f7561b19bcdbd28907863ecf2fa5022a539fc682a3e2a7e21e335 SHA512 9dafcd03e7e244b8134cf33141888788c722d64c6099946ea63d6ac714e9a1b2a6c158a19c2a85ee488ba32429306174a4778488579a65da08084b468259ec25
+DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST if_rust_version-1.0.0.crate 9976 BLAKE2B e9e72b64d99d2e3d058fddc44ccd947337f59704b2f103832502bda59bc4e5bfbb426a921309597cd47148843c9ee7124d26b8b592d918d3d2ce208caf6bbf95 SHA512 8e57d7a54dbb783cafd58825205844419b3a8ae531bf16aec2ed8ac6038c58a03ab4035818e89dc784c7ecddd54ac41e114634e67ae952bdab93c0361aa95fa4
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST ioctl-sys-0.6.0.crate 2673 BLAKE2B 9cd99c4a2bc8d3227d91957b70ade7ef520f63b5611f1c456d4f04f3fb13ddced4249ac6d593c6431b04c6a4b0c4c54db8a3c9db3cf201f05e770c4d4c75e7e8 SHA512 70b3dbb9ac02c24c0692c1ead480cf14eefe7d15f10d68607b881273706e1bd31f3071effeef894d6832e6ff5f82191bf5414e3adfc7824da7b2edd956eb7703
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
+DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+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.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
+DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
+DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
+DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
+DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
+DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memmap2-0.5.2.crate 21294 BLAKE2B 824057d1fd90f30656814ad349a8056fc9b3785865e458ad893f6cdfa1b0c02e42afa0c94bbded213c37b91a51513cbc56fe50bc54483b046fb1181c208f0d0f SHA512 3b85f9436e0ece40d5fc63c7c64b8e92b34d60ccf7bd4937704e99de46306567481d0ac1f9e8659e3610e50d1166bb27dbbf15bf8b92dada4b791aa69fcc1632
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
+DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
+DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
+DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
+DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043ba8233f1016417f91ecff64887c3bec1dd6bf4cc6b3b3803a2c19a44513f1affc635d8be6212bdc8ee47d SHA512 aacf14e84be17edced412e3d256734508426a8acb8352e83a5d9d4f26d640f60a881d8f70fbc6edf1843173af63ec05be7694fcd6c6287d871e40518e2ed04ee
+DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
+DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST num_enum-0.5.6.crate 13721 BLAKE2B 8257cb2a8ba51e5936fc998d3af39b2bbff9631abdd8b0c063bd26912e562e387953d6f2002b5837accea122ed0720c870d8626c85ce08bbd0f2f1225f65a8dc SHA512 a8b73276374b9bbba4803a054af214f6a4c7569acf597f438da56b50c296aa1b6109fd9d2d83548c0bc2e31f90167dde7dc91734bca0955fd240d6a7835c301b
+DIST num_enum_derive-0.5.6.crate 11672 BLAKE2B 81535facdcb2059831f09112519683b21e2bff19e7f611dbe022501f95a57a230ce2d9c48b64b1da53963e9207e4d1b6c572b0cf0995ca2fbaa8692f1660e183 SHA512 28cedf7a7f1d00d8e9ef89ec9df1b0bfe5133108661729f1108a1c1f724f21f6c868b0f29e29cb9dd46845893bd201d9f2ea3c51168dc2d8ab80174ea707ecc9
+DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
+DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
+DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
+DIST onig-4.3.3.crate 27408 BLAKE2B 03bf3d7d72c0022277f2c96123c4d5588b2ba672ecd893e30b30da834e870a12009fcea484c1461beb2839ba15df141a0e4481a1a279a030e07307c1efe60ce7 SHA512 6c8e06a9c2f0aa130df2e3ace50d3b24b8da6906ed6dd153d34cc2036e886e8c7848dd3861218a8981aeda30813c9c86d7d0b5b98eca20bda4632b56ae6d67c5
+DIST onig_sys-69.1.0.crate 544763 BLAKE2B 29e614a2c2eb191e0f132348f841613d85e9877d27397a04e2e20d4e724fe730d6c467140fc02921fa75669110f303fa5182780789cdda2e05208de050b8fc32 SHA512 676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6
+DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
+DIST os_display-0.1.2.crate 15165 BLAKE2B a6a31e9d9a63b173b61038c3e5f5f21f9f7eae80d7b1d0067f78a069175f972ba16393d1faa7be84224eda28a28d1cdef5bb93cdf594b467c476f694c835e12f SHA512 4655672bd57ba97155eee880f18db96d34fbd93ff4cff4cce3d66a1ce588185ae0045b2422d992866e476baab6abf766ac10de01805b36ba324c73b3cab4ea23
+DIST ouroboros-0.10.1.crate 5956 BLAKE2B e16b423f47834e550356f0dfac46d16fb15234bd98451c44c348698cbd02f2c3722a4336321bb81def67f8da6e84d8077ac5a3c9df98658e34c40e7e7c315bcb SHA512 ab6e715e6246f1f7f76345194efcbbd7e8b86e88fec9a4fd3ee3e0c22965e57336fc73f7b9b0099eb8436b7c6d60a13f925753c2e5a6d3b1caf9691ef2098cc0
+DIST ouroboros_macro-0.10.1.crate 13432 BLAKE2B 7e32d9c83c3bf305e5487c86e8a50e9c002190d47079b4765be9690019b21ad3de5ebb3d2a4b1b8d8d10908ce71ffee24f99a2778922d34fd3e4c7675c12023a SHA512 8844b862625d9bd20163e201c6f3397a504200fe07cc881314d2bbcd31f567d2b9c2f8af1a087535b3847a1627b86d5860b40b7e903f3c1f161c7ffa2f27db98
+DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
+DIST paste-1.0.6.crate 17808 BLAKE2B 8659076678f659ab0bc5d9c626d405f1f545742c79222348ad6d974beeef4541663e166247433c617829e5e65fb7a5b4d00656d95d37bad214bcfb2182d45677 SHA512 cf7795c64ded12c16ed7bc90a29bb36156abc8c424066c62d3eff8831a86b4133965d87b8b76b17ed5487ec286fc80e05fff1180833dee4b48f0429016bea25e
+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 pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
+DIST platform-info-0.2.0.crate 11571 BLAKE2B 4cb4f50d878175e080144f6d96b3ee3f53a49c1c889e96a9fc45595518db45c46e4f24d491dec20ea27b336942023118ed0a8bf01a17e1d2d6cb5218825c86db SHA512 9420f1fdde9e3b47720c312eea5056970c38422829a5768cb280dcb876f12c631e5a64b73a0f4120732a823fa75abcb3a45c117777e453b48b2e47659d378f62
+DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
+DIST pretty_assertions-1.0.0.crate 73836 BLAKE2B bfe519373be45508354c160acde346c17bea9c1d6b1b3c8e1b96025a6d690e42759cbc54369b458308fab3db1df734d6d6640b8d3c544d0dd696ec83290a4f35 SHA512 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5
+DIST proc-macro-crate-1.1.0.crate 8535 BLAKE2B 73e4d8c7c19d122a74961ddcbd04b003418e61bbddac092e14e4f4a85bb5bc132289096b719f533b83310e1d2daae3e125dc63cb96cd33c8fbd8aacc781a0d45 SHA512 dd23638f127c46c24e7bc360a9f108ced8124acf8b0558b95021c40a59259f80c27a6ee6e366d72fc120908ae254c58feb7a73969457fce94fc1d20130ee590c
+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.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
+DIST quickcheck-0.9.2.crate 27401 BLAKE2B 673b583a26e241134d5176bf3aa9edc7934b6eab54502cca339a697841e3b010244e499dce5659f84e41fa5bf6714e196e84ae74100e224f2f0e840d5c2fcea2 SHA512 a136316dcf7daac3d879a660a61c768bd14b647fe53e7a5c2731f197106fa9a351456417ae8e588247d3b9da0c26707c6dc55c1e1fa6f8bf47e40727ce0d5030
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
+DIST rand-0.5.6.crate 137236 BLAKE2B 26ce5ac8fa86492fed467b68047a6a47f17af3720099410a3498c95531efe9d8329998df0ce693190c63d371c2efc67f07df9c1bed624ada18b5365f555b6c5c SHA512 0e2a643eadf6cd9f035eb720b540b838a00d6c790b1a99b36cec349c2e24dcaadcae6607f99fe86957e77b244d356dfba436a03c1d4d0756d6f8362c19087b64
+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.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+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.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
+DIST reference-counted-singleton-0.1.1.crate 6145 BLAKE2B e0004bef8503cb4bc0a84dd5451fdd6724896b0483d690ca86fc0b9dbc1ab902ff6fb7b18663b6344b256e0aac1e8c5dd6859079a88f40218a1418ac8b035b99 SHA512 6903043fa9d849790827685c0c5042e8553319d249e91e8af0a3f1561e6cccd9e8cbd467b231519b83029f1e41e5376213e757febf230df143e6636ebda1810f
+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 retain_mut-0.1.2.crate 2723 BLAKE2B c899036528da0047e8c833bb9c7e0710cf56eee1088bc2a3f5df497cbdf3687b00fae032ba9fd807ba2995438e4d0734405e100db658194a235685709b1340ac SHA512 2e45b0091c97d92894731b17726c99cddbc7866d92af3bbc7b83f5721ade4bd8bb2e44570e100229ed33fd6e96de48045da025a15e37ec17e46561c47a5d1189
+DIST rlimit-0.4.0.crate 5294 BLAKE2B ec55f0f9aeabe8fd030a41570885dfcd84e8d5ca0fbfc81fa43e4088bb59be4c5572db32b4d6dd9bd8c4774fb468933070083b4b7cec7ef1570d3c9e436b5571 SHA512 2687e303c4ddceadaf21ff23b1b95f572186aab2592332d8f5d542497bdeb5235d5ff22dfc37e4244511c27acc9e03cc6439542276d362ed398bca7d4ac9c08a
+DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST selinux-0.2.5.crate 33886 BLAKE2B e5f518bbb12a69f522db92e5b191fbc754c115e8e5ee9fbfca140b3a05f3a3ff9cc9053df61054536bd412baa163251fdfb67aa7a6593f1ae502cb9a9bf5c72e SHA512 e6a01150977e47f1d761e688fa4e248df237e988b4a765dc98706759191c5ac694bdf10ce8b59fafcd1bfa3dd22c7c301ec74bea5f6aa52a538a298182ce91e7
+DIST selinux-sys-0.5.1.crate 8263 BLAKE2B 33aef6eea96c3b13d65be4f8397cf1f526cb90eab70c588e95011f0641d29f06a02c979e86478f4043602063914e3ab9780871e7393bd38fe79fde870339912b SHA512 59885ef9af1d547a1deb980620ebf044c96c5d959d7811a22373e3faf86e384dd3268274794ce9b34f6171591876f8a167db0e649d85986e9627634cdfe916cd
+DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de1488953addce546ed1dbfeb2350a2a2b25b6088920f47172e2cc9e755c4ef682c19c579a2b70e7f4ae4a7ffb1 SHA512 53f6027a23688a5a303ad9ad169a333c02272ff9c0dc827705c75c162b70040ddf676428f38d04b9aaa49ddd4cee96b5ea5e1dc03f09b90d5f12d8ad22dced0a
+DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441
+DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST sha2-0.6.0.crate 17463 BLAKE2B 22b6fd6330ca4b8c540b98d2d1d0761093c1392b7a0fa6f376223e5c692dc4aed0ff7e48e4804838054fc98bf15fd0d507dfa12d10ea204128bf6214c635845c SHA512 74f7fec02721e474aac5cb39b67af35fc4863ab9b041305cfcd1da0296bbc2e69dba255b9705778db0f7cf85c5dd584254b1399ef5a4ad30fb282d8233dcd6c9
+DIST sha3-0.6.0.crate 572150 BLAKE2B 44ad4953eaaf99754c96777095f8fd12f028d91637a803966a8d9ff5e254ee45f6407c56f0578755782aac84f96bd6afdd94021e87a667130866e8c540b0a017 SHA512 45854bcf8a5d830f087b876f2298be547e3dad7b18767c6e8d06197d80873b17c066fa057df49194e3abdf9085b72b695093ea308de3ba2b40ad8266b5d3213f
+DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
+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 smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
+DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
+DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
+DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
+DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
+DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
+DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
+DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
+DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
+DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
+DIST termsize-0.1.6.crate 5616 BLAKE2B ffb46966472bd1f21b316c1039163c233cf7c6d1f13b88ed575eb5cdfe7661f45c1bdcfb78c75f581c8c2f8f031ba656b227cb4256cdf1af0212d6ef81c33767 SHA512 993451c633b41bfd82abf168b553e443e3ba3bd14fc6e6a99565a1a75ef7c34b05aea955dfb0152c98ce01788f56da0fd252529568ff4b71478ab1709e342d02
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
+DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
+DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe406f75e6b366a29a807f6981973fc84560ce83f8483743ad31bc0c53d8be40f215f7cf0822b7405195bee474e79b SHA512 dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
+DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
+DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
+DIST utf8-width-0.1.5.crate 2941 BLAKE2B 3203d11eda41fc8f4eb4f7ccce6ff3cdc8fde5c36d04887b92f3569ce269cee44b3cd9dce0d5901c022dca26d6d021fce03f5f5c53f3e65c991506d8f47a8b08 SHA512 9491b21ae7d516afc6015ce06fba94ba2916c4811bdb58b91b1d531603e978985473651abd56777285c58b8b0c7ed650a68fdab20423b623e0140aeab1bf3f6e
+DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
+DIST uutils-0.0.12.tar.gz 2185584 BLAKE2B 59344436c7462a7b43aabe1f2c9d6f6e74f2f6d1e17e79864677c65956e1749d76425385dcd1fbfbe2448ef6f508ffaaaabfb10c427a7cd09826a10f31bd0c7d SHA512 9c78c1ffe8495e95ddb07ce104f68e48dc7ed0d5c156f9095a579b4a27fafbded276314b2a3a239dac693aa0e9bde9bfda6513dcf30ddb17c1925cea27a4578f
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+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 which-4.2.2.crate 8589 BLAKE2B 360ea38f7fcb357f558f8e80a2c951d016e4f5dd45f1294f1b85a6ab441cf89fb6f3192b63ca42491693f2eeb57c048d8d0f9ca9f1d857301288b098b138b07c SHA512 25fe54f3703d865bdda04a26720839d6cf52300558e1abdf339eec985cc085fc983ea44a3b36767ef56748c865d432b0105a9fbe677f4b4deee8ec0af9dda59c
+DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-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 xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
+DIST z85-3.0.4.crate 9067 BLAKE2B 448e069d733316d6ad0705be11e8e2324611dc3b482a94237df06d444fef2eca4863f4161bf374f0ddfabbce01ea595617ea4539d26bb83e7216b69f92c515e3 SHA512 0fb3c73f196b65f7c7dad97a88195d4308726f64fdf10b09a12f071b32a622667c374f87b72a0ed70c556d55a859773f13913c019150e270d00d397ee4387768
+EBUILD uutils-0.0.12.ebuild 5139 BLAKE2B f32e400e7d05dd49af8252010950b38caebb3f16df347c0accb74b4aac4a807d514213c5c84a4c49f76b2827f4cb4fdb524d0832b56c909fe0e5176d8662f837 SHA512 bd9f5c48fd31292436f969f9ab4abacfac2c9b2b52877a2125faba9f2564d8967c735ea58181cec2c1f3b61d91bd604aa0c1a4c6d7d33083f5484b9d1cea9d9b
+MISC metadata.xml 523 BLAKE2B 71fea6775cf5acf1f8601208185ef09ef2b4432020d7aa981260ae82e92dfc61385a7a385a5e003dc3f0002b85ed1f5a9c0c42745e55f5f95bd31574829d9981 SHA512 aac39be0b85200eac0762219840295319f1f6f3c0ec161b16d97b6b3bbb2891bfca3921d7c38bf0f94cf0ccefc48709a5406ff37be4b367c2b128414e6678d86
diff --git a/sys-apps/uutils/metadata.xml b/sys-apps/uutils/metadata.xml
new file mode 100644
index 000000000000..713859b7110b
--- /dev/null
+++ b/sys-apps/uutils/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+		<name>Luca Barbato</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">uutils/coreutils</remote-id>
+	</upstream>
+	<longdescription>Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...), written in Rust
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/uutils/uutils-0.0.12.ebuild b/sys-apps/uutils/uutils-0.0.12.ebuild
new file mode 100644
index 000000000000..06c4360a16fc
--- /dev/null
+++ b/sys-apps/uutils/uutils-0.0.12.ebuild
@@ -0,0 +1,273 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.0
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	ahash-0.4.7
+	aho-corasick-0.7.18
+	aliasable-0.1.3
+	ansi_term-0.12.1
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	atty-0.2.14
+	autocfg-1.0.1
+	bigdecimal-0.3.0
+	binary-heap-plus-0.4.1
+	bindgen-0.59.2
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	blake2b_simd-0.5.11
+	block-buffer-0.2.0
+	bstr-0.2.17
+	byte-tools-0.2.0
+	byte-unit-4.0.13
+	bytecount-0.6.2
+	byteorder-1.4.3
+	cc-1.0.72
+	cexpr-0.6.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clang-sys-1.3.0
+	clap-2.34.0
+	cloudabi-0.0.3
+	compare-0.1.0
+	constant_time_eq-0.1.5
+	conv-0.3.3
+	coz-0.1.3
+	cpp-0.5.6
+	cpp_build-0.4.0
+	cpp_common-0.4.0
+	cpp_common-0.5.6
+	cpp_macros-0.5.6
+	cpp_syn-0.12.0
+	cpp_synmap-0.3.0
+	cpp_synom-0.12.0
+	crossbeam-channel-0.5.2
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.6
+	crossbeam-utils-0.8.6
+	crossterm-0.22.1
+	crossterm_winapi-0.9.0
+	ctor-0.1.21
+	ctrlc-3.2.1
+	custom_derive-0.1.7
+	data-encoding-2.3.2
+	data-encoding-macro-0.1.12
+	data-encoding-macro-internal-0.1.10
+	diff-0.1.12
+	digest-0.6.1
+	dlv-list-0.2.3
+	dns-lookup-1.0.8
+	dunce-1.0.2
+	either-1.6.1
+	env_logger-0.7.1
+	env_logger-0.9.0
+	exacl-0.6.0
+	fake-simd-0.1.2
+	fastrand-1.6.0
+	file_diff-1.0.0
+	filetime-0.2.15
+	fnv-1.0.7
+	fs_extra-1.2.0
+	fts-sys-0.2.1
+	fuchsia-cprng-0.1.1
+	gcd-2.1.0
+	generic-array-0.8.4
+	getopts-0.2.21
+	getrandom-0.1.16
+	getrandom-0.2.4
+	glob-0.3.0
+	half-1.8.2
+	hashbrown-0.9.1
+	heck-0.3.3
+	hermit-abi-0.1.19
+	hex-0.2.0
+	hostname-0.3.1
+	humantime-2.1.0
+	if_rust_version-1.0.0
+	instant-0.1.12
+	ioctl-sys-0.6.0
+	itertools-0.8.2
+	itertools-0.10.3
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.112
+	libloading-0.7.3
+	lock_api-0.4.5
+	log-0.4.14
+	lscolors-0.7.1
+	match_cfg-0.1.0
+	md5-0.3.8
+	memchr-1.0.2
+	memchr-2.4.1
+	memmap2-0.5.2
+	memoffset-0.6.5
+	minimal-lexical-0.2.1
+	mio-0.7.14
+	miow-0.3.7
+	nix-0.21.0
+	nix-0.23.1
+	nodrop-0.1.14
+	nom-7.1.0
+	ntapi-0.3.6
+	num-bigint-0.4.3
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_enum-0.5.6
+	num_enum_derive-0.5.6
+	number_prefix-0.4.0
+	numtoa-0.1.0
+	once_cell-1.9.0
+	onig-4.3.3
+	onig_sys-69.1.0
+	ordered-multimap-0.3.1
+	os_display-0.1.2
+	ouroboros-0.10.1
+	ouroboros_macro-0.10.1
+	output_vt100-0.1.2
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-1.0.6
+	paste-impl-0.1.18
+	peeking_take_while-0.1.2
+	pkg-config-0.3.24
+	platform-info-0.2.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.0.0
+	proc-macro-crate-1.1.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.36
+	quick-error-1.2.3
+	quick-error-2.0.1
+	quickcheck-0.9.2
+	quote-0.3.15
+	quote-1.0.14
+	rand-0.5.6
+	rand-0.7.3
+	rand-0.8.4
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.3.1
+	rand_core-0.4.2
+	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.10
+	redox_termios-0.1.2
+	reference-counted-singleton-0.1.1
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	retain_mut-0.1.2
+	rlimit-0.4.0
+	rust-ini-0.17.0
+	rustc-hash-1.1.0
+	same-file-1.0.6
+	scopeguard-1.1.0
+	selinux-0.2.5
+	selinux-sys-0.5.1
+	serde-1.0.133
+	serde_derive-1.0.133
+	sha1-0.6.0
+	sha2-0.6.0
+	sha3-0.6.0
+	shlex-1.1.0
+	signal-hook-0.3.13
+	signal-hook-mio-0.2.1
+	signal-hook-registry-1.4.0
+	smallvec-1.8.0
+	smawk-0.3.1
+	socket2-0.4.2
+	stable_deref_trait-1.2.0
+	strsim-0.8.0
+	strum-0.21.0
+	strum_macros-0.21.1
+	syn-1.0.85
+	tempfile-3.3.0
+	term_grid-0.1.7
+	term_size-0.3.2
+	termcolor-1.1.2
+	terminal_size-0.1.17
+	termion-1.5.6
+	termsize-0.1.6
+	textwrap-0.11.0
+	textwrap-0.14.2
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	time-0.1.43
+	toml-0.5.8
+	typenum-1.15.0
+	unicode-linebreak-0.1.2
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.9
+	unicode-xid-0.0.4
+	unicode-xid-0.2.2
+	unindent-0.1.7
+	unix_socket-0.5.0
+	users-0.10.0
+	utf-8-0.7.6
+	utf8-width-0.1.5
+	uuid-0.8.2
+	vec_map-0.8.2
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	which-4.2.2
+	wild-2.0.4
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xattr-0.2.2
+	z85-3.0.4
+"
+
+inherit cargo
+
+DESCRIPTION="GNU coreutils rewritten in Rust"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/uutils/coreutils"
+SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 ISC MIT Unlicense"
+BDEPEND="dev-python/sphinx"
+
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}/coreutils-${PV}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s:gzip:tee:g" -e "s:1\.gz:1:g" GNUmakefile || die
+}
+
+src_compile() {
+	emake V=1 PROFILE=release
+}
+
+src_install() {
+	emake V=1 PREFIX="/usr" PROG_PREFIX="uu-" DESTDIR="${D}" MANDIR="/share/man/man1" install
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 91e446f6dc78..501bfc231cad 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 4489b9301dfa..489df0de690f 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -5,6 +5,6 @@ DIST crossdev-20211121.tar.xz 28700 BLAKE2B bfe637dcd3c5b6d45e289d6298de18cab4b7
 EBUILD crossdev-20210621.ebuild 832 BLAKE2B 3253956c99cefc7045f6e127dc319b0861fa251755db320ec0bdff9738b3f9480df6c94fe29a6a4597a25f30baee8a86bffe2eade232600d556136840c741601 SHA512 7ca8f2d6dabd9cd3f47b9fb9e09647c70c1c5d321aa832a2ed515c723903a87acfa0b90648c512c921e7c955a53ebc312fefeb6e459b2707a7d5c0c4140250a2
 EBUILD crossdev-20210718.ebuild 840 BLAKE2B e4774046a16df9e3a9956db328aad6ca3ac95fd00b683d4960f52bf28178b05baf62b471447dd84139b4d5942b9b33e8b8f39b5316d32e9ce93ba3317e3bda77 SHA512 4dbcc4d6cec4eaf17cf736b81ffafa0ccfc61737f949e277feca6b266b709dffbf4051a228d017140cee58abced205740209067daea452f3f10d64138c112741
 EBUILD crossdev-20211027.ebuild 898 BLAKE2B e16a0e822a7a547d040203f4b8bf8f017e2bd424f9a2ec53facb3149fe2903b18552bdccd423f36602a4862bd35ce29aa83623224da97d57a42656a37ee91fb5 SHA512 1c5a13d1ef504394686ffd62c56e2f652488459acdbcbafde780a1bb5a370e8493539cbef0c4c0a64d5d5ff82e50b9ede044e44f98945858e707c0ca434d1f2f
-EBUILD crossdev-20211121.ebuild 909 BLAKE2B 012718bf7f48483ff7844af5df3bbff2d68bccb8b7c3e3a7cb6477cfde088aad254789b3dd4aca12cd237b8904dd698ed6b3af65329a50b6882e3affbaae6312 SHA512 ebe110377b612cbb4c51aa6e5cb9e874794d78d0e2408fe1ead231c570cb588881c8fc4c476c609ee59bd7309ec358fbc71d263e3aebaba94a83ab859599c0a3
+EBUILD crossdev-20211121.ebuild 908 BLAKE2B b3e424f234669d19959b0ee39521a41f51751911576fd52b1d7b1f6792281b5880485c90750f0e644ed68a5f65857e159ae32d2fd9d621ed5234bcb0b0d05d8d SHA512 e9bdac44211ceaac37a25c05d7c86c5e522a2edfa01cad82e124d6e517190ca604921793dcd044589787b1b5930046eb9205c2804b1192d5ba3bb9ec05a686fd
 EBUILD crossdev-99999999.ebuild 916 BLAKE2B fc8db87b2419cbe292c64b22ae699943619ccc91add4cd8ec0e148e0e90e52db49be940d998623209cdec950fdf5b16a80dd623316f8e73c7bfea38f00fe3b89 SHA512 93c02450f068588555ba09dc0d827b7250bcc26fdbe4ed4265cc9f48556396c4a2d5a94d73777860d3c615785fbdcff027159e33201af448dab3eb6ae3aaed71
 MISC metadata.xml 381 BLAKE2B 1d383a0b95cc180ed7be66205a9525f0a3e973a9b7e296c463e3a735163e1b673140a82dfc0a21ad30d71cad1b482770fb3a0028fef32593e6f7b53df127dcef SHA512 8074c54c17718021de7fcd8aef8b6c137eae75cd41c5dd02f86c987f7465d98af449f92a67fccd489a4f0ab0670ae89fb737e290be37a225acb81b8f1074446f
diff --git a/sys-devel/crossdev/crossdev-20211121.ebuild b/sys-devel/crossdev/crossdev-20211121.ebuild
index 53a4cf0a82e1..fe3c418c3092 100644
--- a/sys-devel/crossdev/crossdev-20211121.ebuild
+++ b/sys-devel/crossdev/crossdev-20211121.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d1579d4f4228..e6254c6d8fda 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index cd0cf0d3d404..7a23f79f1957 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,16 +10,16 @@ DIST patch-4.14.264.xz 4609200 BLAKE2B b2424cc53dc507447bbb265962e045bbda5a1c37f
 DIST patch-4.19.227.xz 4469908 BLAKE2B 8fb87064f4aaebaee5a7981fe8150fd670467da14e7f13c72c55c04e83b9495e1913bc19b5d3e56b63b9ffe16f257c722fc9f82758b1690d926cde18a0326332 SHA512 56b3c64f1ac97923e7a860b33cdbf5288117ee806391142a8c3237c59241f6f3ac1b4b0385410ca00c57c7908d0ac8fa5f686247c198869b1c91fbb468175fba
 DIST patch-4.4.301.xz 3750464 BLAKE2B 5b7ee1a89be64f3c515a7d765ff82f35bf1fac0b9fbe7535810a8a44ea6b8c29dd92504133e2d9b618bce7b1a6e0ceadfcedc21cb0224542ef824369a4c0645e SHA512 3854282384fed68766ddd482fa0cc4679c05c864c478b9d76bfb3959f2f587ac4fae331d180ce57b1dd6708323563eae9476dcab5504868b4361c19c4ab0772d
 DIST patch-4.9.299.xz 4228536 BLAKE2B 1f62f5df294235abd3fd1b382f2aef48cdb8cde0c686f259cbe8bc15fd09efe92b65941b8aa34fe3cd23f72c131a95ce1d1a89b26226cf919172bfed925ec351 SHA512 ee4c5b82410e0acf325b65778fab56e575f96ed750337f88d458dd33453477bdd41b8160baacdcdd026e80a4547c21828b9430894cd3c6d596d378bac25a94b1
-DIST patch-5.10.95.xz 2708708 BLAKE2B 11371f402c5ab5eb7b0fd4a7351fe4cade952c0b54977e119f4104f4e630ca1f96718c80dbb82ceb67f0039cb906428a51a9cd05c67e0308c3464eb05bceb703 SHA512 9d974219bdc5ce1eb39d784bb31d43bf8239ae388f7af11f8f88c616d0265fd3f501167d405ccfe16c7fb72aa1eb124ff264aafc3acd6cc65c78b73dec262195
-DIST patch-5.15.18.xz 902060 BLAKE2B 667f4611e4565d42c8216885684191afcb6d3f5107756e5f476702073854ea4d11dffb369f9564f4b258f2e43113f69fcd4e687ee95db2dfc639cb8ab96d86bb SHA512 eea2198323520f3b982616f47cace70cde0ef83517e2729f9197745dddaf3458a8af1fe74bb8442a63a0ec8b5eedc01ac62e4cdf63349a107c0e593fbb7557d4
-DIST patch-5.16.4.xz 343964 BLAKE2B 1fa1b90cecafe11ea0be1c099c4e2b4775ab87fd204a3ab2985e1ed479866763663db62a4de15c6aae243c0c34356f72c51df7437ce9a8fa8e257c4b3bc6cf20 SHA512 504d02a825dc9e06f2f6802567f179d5b956f3be4ccf3dae97ec31eefb0826f784292215e85fbb51ea98198288db9735de8d87f84551ff85f389cb713ee1cff5
-DIST patch-5.4.175.xz 3688388 BLAKE2B 7fce7570e3910eecea82a29993c2819b1f54c847cb450d97785fa3216232650f76ace85ac39aad5fc60e45e5219062bdd00acc54f37ae4e3611c85819ad9b92b SHA512 66012ad74046a882f571b343d9dfde92ca2268c08f8396bda7cb4e7cbf84fbf1aeeb53128ae1a782efcde1985b75c2a66baef0bf069b1e339687fb4dae636364
+DIST patch-5.10.96.xz 2730284 BLAKE2B f2bd99cd0a6c1f3be597001dc6d4fe9fabca18ce1810782b7199d3578fb1bf9127c86c0003a09e53ef621d0ce7ae0d96a2284fb7ac8c61d8fe4d0880c97ca756 SHA512 6b762a355e8266e316739d46c95dc459b523c4d133918ab1233535e74e6ed5522c8a0450c48de74eb0dcb22930bbe3198bbfe9a3ee5b81bef23bcc1643216230
+DIST patch-5.15.19.xz 944068 BLAKE2B 7451c0ab57d0a341b2291335c51bfc549489d7427279d20a3bc8f57fa110a709c4614c6e2f744aa837b0b6b8e3d39e0a661e04dcde8d54c74a5b4e37f15485a8 SHA512 f0c16bf6b11d00ed830939d10a63d84f36f97e2ee950264cd8bb4537676ae1b882e86690c73ff1dc48ede709d23268af9b4fcd2ac146813ec5f34022dcd94199
+DIST patch-5.16.5.xz 401000 BLAKE2B e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4 SHA512 8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3
+DIST patch-5.4.176.xz 3698648 BLAKE2B df5d333c91957e78386550df034abb6cb819bc6ae61f2fc0c5e09328ae72d86a42a86218c1b56a602ff28761025786e59f45c2a7c2843ce719d4166cffa59f44 SHA512 4303b56d0f8417c1ccc997647ced5b23f126187eafe80b523f362c3ea70e41510ffea5641c4be9bb7594ed120c5412c76964dd328f4af0ae0dac13b2f8e6216f
 EBUILD vanilla-sources-4.14.264.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.19.227.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.4.301.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.299.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.95.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.18.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.16.4.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.4.175.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.96.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.19.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.16.5.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.4.176.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.95.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.96.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.95.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.96.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.19.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.15.18.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.15.19.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.16.4.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.16.5.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.16.4.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.16.5.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.175.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.176.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.175.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.176.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f3974bfe68b1..1201e8655d19 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 073052c0e5c8..e252dce88d46 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -257,5 +257,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 bottom-0.6.4.ebuild 4781 BLAKE2B b184f32fb89e2aba25f4e20a38ce28e1dc248510b3a106be796fbdf5daa7102168a0548e18d169187e263ad88a8690a7610e91f5de445d22128eca3e1d0c848c SHA512 ea86003d719f89d536d43ec11ff90848639df9ef373501add6143fd79a27669ad9406483f75289a3927e018e18dadebd1b50302e2c8edb0877676ebcfe5328cb
-EBUILD bottom-0.6.6.ebuild 4390 BLAKE2B 427c5fbdd1491e76daf289beaa2d3df38976a4fd1a9713e94da109cb86b64ab37e95817e7863335358beb3799181cd6c426650f36fae01eb3808b4ce6affa352 SHA512 ff3d7cdaa78b851b6d3b49584cbf6cc6d1038feff30e8a36926359e08f56b111b2bf2fe547a98cdd04f6616835b01a374df1d47a477b41fc5884096fab093cb2
+EBUILD bottom-0.6.6.ebuild 4389 BLAKE2B 68b48efc43a5b7195d58f5d698268133145b319c79e3be68a7876cfacf076e6abb5ba6370e1c61855d6f5bfd78dda412763152ba07a95495042368bcaad6eb91 SHA512 3b6ab88b3824b4f3ffc5b9dd0712ee3a33bdbcbac00b150c43a9268e5e1cbfab2be9e6da48ec677a215200615573852cf90f503af38fe8305b38e874d4aeca50
 MISC metadata.xml 797 BLAKE2B 444693b0becb99edaa93f5623dfa48058648852e0d328802001df5de7661ca8a5f07e920f75aaa06ad7287cbbb46e47f24e5f9897d626574ade3d6270f8eea6f SHA512 e209429c2824e3248c7c2e89b121c6665f80d3a410038709c19fbc9a30b118edd317b8f0b1dab8059aa8c74a3b72d8086f35cd19f7c722d106e0aba5c2586c3d
diff --git a/sys-process/bottom/bottom-0.6.6.ebuild b/sys-process/bottom/bottom-0.6.6.ebuild
index d772cc53aed4..5c5897e41ac9 100644
--- a/sys-process/bottom/bottom-0.6.6.ebuild
+++ b/sys-process/bottom/bottom-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -179,7 +179,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="+battery"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ce457cad2e41..976ec568fd13 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 80a22ddd3374..a52edc0ae033 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,8 +1,8 @@
-AUX conf/lighttpd.conf 8257 BLAKE2B 82090a8c467e3738d1e7bb3a55310040145ab6a0ee7dc0ab45abd9ad657cfacec895727eb34799f3552d0c1c11a6dfbf6fe7cc1fd6e17b610284b7194e02aed0 SHA512 0bfa3d44c28f6893362b4c428d7bdce2a560ba155e349af9ee293510341fee03d484f95e9d967afb87f0a61aa11dd33ef9c633e206146c0af791f2690aed9852
+AUX conf/lighttpd.conf 6707 BLAKE2B 87c74414991a45ba6be17235db7a627dfea85fd4393efd3fc653495adbed1f0b4950d2f9a9c774fe57ce10d8abbff8025dffdef5dfc7003c09f9ca7fcb8a8572 SHA512 7a466414e455bbbdbf181ca2be602aba8cb8ab4afc2002d9d7fd9b7e7e98cd62fb17863bc291a2dc940b14e08251069ec5961c819e3f6fe592888e91d402bc95
 AUX conf/lighttpd.conf-r1 7623 BLAKE2B 51805756814ed7ea8770419fa98009b1ecf6e963c9f1b9d7694ad307fd3c3f6f9c1c167a41b6048910e4cd89af4211b6a8f48382a9adadb10b76ab61f55b6115 SHA512 8985c77d2dc22cca8caf7a484619d2712dd1fa7ecd4a71c19b8c5d09af471c6b42ab0cf131d40d2c61440d4d3053a86285fb90209204d2ba711868513c800722
-AUX conf/mime-types.conf 8035 BLAKE2B 4f47860376d6bed610ecacf2c79c3ccbd6ed7a05bce6fe57c93e4dfacc5f85fd4957730470765644c4ee233f9e4c853b5092362cbdcd4ad06d6e641ff53439b3 SHA512 230d86331c39e8819c14583309669e49c0a0dcf52144f9ddc24bcdd8a742364f6efee720c964ffaddb1f88bc64b04a32c5ac13b0d512806f98282e20e2682b6e
-AUX conf/mod_cgi.conf 749 BLAKE2B dd565d6052d74aea3489f3a011a5913fcbd331b57ca02e71496eecff7c303cd56e8e43cd5a9b33c27463304a2f2218fc7451cb5754200c9ef48eb4104b820547 SHA512 e611b3ed232af4fb8e9b8821a29fbc32acb0a3431c701e5a64afc192abc288cf90582fbbf79085de9426be23d8d42d90da66e6993ab7cf89943ae23d59d681a1
-AUX conf/mod_fastcgi.conf 549 BLAKE2B 7bd525db1ace97a826bc4fcc11fc230f16839005da8988b21f54e5d43763a7df82b0d3b2cd5f410074cd87b2c8dbaab91042563bb7878ca0bedc076eafdc5906 SHA512 a9245394cbde327f997932546e2c6ee755da9365ce3a3d4662d2042971a9ec0a5fc36f9cdd7c032d35a6c0c3d02471b4b9b394b2cd349291c4a9827ca06cea4f
+AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a
+AUX conf/mod_cgi.conf 624 BLAKE2B b2d998f15c3fa6de05a91e987a60f9ba599ec5b8fe24317f17566ce6473cffaf1ad04b937724ef32064afacc87672323cd10718c7a0bdf24091150e4535aa7a8 SHA512 2b9fe376fac868a67daffe5cdcdd3c28a27e210219748f5513f1d2f4763a934739232b2ae521e5596ed4ae84137667c982a1e0d7b4161708e41d6f78ffe395a9
+AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331
 AUX lighttpd-1.4.59-nspr-header.patch 546 BLAKE2B c5354d75a0543a7ccb7e1f2c9aabc09dadd1703cc7199438b1b894c566314f189e2115db5f41d70c8df10101e05c31f7f5644634c0e4f9fca7919ced92457793 SHA512 e0ea1b0d3948ff487ffc050bbe692e488b98f4cacdfc122837458527168cf5c40125cd98e69a1f95095ecd28b309b19e209e07be75dae2bcdd48ea1692f1056b
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd 1957 BLAKE2B df5ba8a820d9a75657e6bb3225f86b961d15f11f4b05278c44ffb1840386be5e8dd2c74e4c053ab4c5f10e5987ebac2e9b8e1489436e5ab337a2f96ca403610c SHA512 d5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf
index 2a13a57c1c8d..13d5e772ac1b 100644
--- a/www-servers/lighttpd/files/conf/lighttpd.conf
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf
@@ -2,67 +2,67 @@
 # Default lighttpd.conf for Gentoo.
 ###############################################################################
 
-# {{{ variables
-var.basedir  = "/var/www/localhost"
-var.logdir   = "/var/log/lighttpd"
+# Variables
+var.basedir = "/var/www/localhost"
+var.logdir = "/var/log/lighttpd"
 var.statedir = "/var/lib/lighttpd"
-# }}}
 
-# {{{ modules
+
+# Modules
 # At the very least, mod_access and mod_accesslog should be enabled.
 # All other modules should only be loaded if necessary.
 # NOTE: the order of modules is important.
 server.modules = (
-#    "mod_rewrite",
-#    "mod_redirect",
-#    "mod_alias",
-    "mod_access",
-#    "mod_cml",
-#    "mod_trigger_b4_dl",
-#    "mod_auth",
-#    "mod_status",
-#    "mod_setenv",
-#    "mod_proxy",
-#    "mod_simple_vhost",
-#    "mod_evhost",
-#    "mod_userdir",
-#    "mod_compress",
-#    "mod_ssi",
-#    "mod_usertrack",
-#    "mod_expire",
-#    "mod_secdownload",
-#    "mod_rrdtool",
-#    "mod_webdav",
-    "mod_accesslog"
+#  "mod_rewrite",
+#  "mod_redirect",
+#  "mod_alias",
+   "mod_access",
+#  "mod_cml",
+#  "mod_trigger_b4_dl",
+#  "mod_auth",
+#  "mod_status",
+#  "mod_setenv",
+#  "mod_proxy",
+#  "mod_simple_vhost",
+#  "mod_evhost",
+#  "mod_userdir",
+#  "mod_compress",
+#  "mod_ssi",
+#  "mod_usertrack",
+#  "mod_expire",
+#  "mod_secdownload",
+#  "mod_rrdtool",
+#  "mod_webdav",
+   "mod_accesslog"
 )
-# }}}
 
-# {{{ includes
+
+# Includes
 include "mime-types.conf"
-# fcgi and cgi are included below 
-# }}}
+# include "mod_cgi.conf"
+# include "mod_fastcgi.conf"
 
-# {{{ server settings
-server.username      = "lighttpd"
-server.groupname     = "lighttpd"
 
+# Server Settings
+server.username = "lighttpd"
+server.groupname = "lighttpd"
 server.document-root = var.basedir + "/htdocs"
-server.pid-file      = "/run/lighttpd.pid"
-
-server.errorlog      = var.logdir  + "/error.log"
+server.pid-file = "/run/lighttpd.pid"
+server.errorlog = var.logdir + "/error.log"
 # log errors to syslog instead
-#   server.errorlog-use-syslog = "enable"
-
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
-
-# server.tag           = "lighttpd"
-
+# server.errorlog-use-syslog = "enable"
+server.indexfiles = (
+  "index.php",
+  "index.html",
+  "index.htm",
+  "default.htm"
+)
+# server.tag = "lighttpd"
 server.follow-symlink = "enable"
 
 # event handler (defaults to "poll")
 # see performance.txt
-# 
+
 # for >= linux-2.4
 #   server.event-handler = "linux-rtsig"
 # for >= linux-2.6
@@ -71,13 +71,13 @@ server.follow-symlink = "enable"
 #   server.event-handler = "freebsd-kqueue"
 
 # chroot to directory (defaults to no chroot)
-# server.chroot      = "/"
+# server.chroot = "/"
 
 # bind to port (defaults to 80)
-# server.port          = 81
+# server.port = 81
 
 # bind to name (defaults to all interfaces)
-# server.bind          = "grisu.home.kneschke.de"
+# server.bind = "grisu.home.kneschke.de"
 
 # error-handler for status 404
 # server.error-handler-404 = "/error-handler.html"
@@ -85,157 +85,130 @@ server.follow-symlink = "enable"
 
 # Format: <errorfile-prefix><status-code>.html
 # -> ..../status-404.html for 'File not found'
-# server.errorfile-prefix    = var.basedir + "/error/status-"
+# server.errorfile-prefix = var.basedir + "/error/status-"
 
 # FAM support for caching stat() calls
 # requires that lighttpd be built with USE=fam
-#   server.stat-cache-engine = "fam"
+# server.stat-cache-engine = "fam"
 
 # If lighttpd was build with IPv6 support, and you would like to listen on IPv6,
 # uncomment the following:
 # server.use-ipv6 = "enable"
 
-# }}}
-
-# {{{ mod_staticfile
 
+# mod_staticfile
 # which extensions should not be handled via static-file transfer
 # (extensions that are usually handled by mod_cgi, mod_fastcgi, etc).
 static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi")
-# }}}
 
-# {{{ mod_accesslog
+
+# mod_accesslog
 accesslog.filename   = var.logdir + "/access.log"
-# }}}
 
-# {{{ mod_dirlisting
+
+# mod_dirlisting
 # enable directory listings
-#   dir-listing.activate      = "enable"
-#
+# dir-listing.activate = "enable"
+
 # don't list hidden files/directories
-#   dir-listing.hide-dotfiles = "enable"
-#
+# dir-listing.hide-dotfiles = "enable"
+
 # use a different css for directory listings
-#   dir-listing.external-css  = "/path/to/dir-listing.css"
-#
-# list of regular expressions.  files that match any of the
+# dir-listing.external-css= "/path/to/dir-listing.css"
+
+# list of regular expressions. Files that match any of the
 # specified regular expressions will be excluded from directory
 # listings.
-#   dir-listing.exclude = ("^\.", "~$")
-# }}}
+# dir-listing.exclude = ("^\.", "~$")
 
-# {{{ mod_access
-# see access.txt
 
+# mod_access
 url.access-deny = ("~", ".inc")
-# }}}
 
-# {{{ mod_userdir
-# see userdir.txt
-#
+
+# mod_userdir
 # userdir.path = "public_html"
 # userdir.exclude-user = ("root")
-# }}}
 
-# {{{ mod_ssi
-# see ssi.txt
-#
+
+# mod_ssi
 # ssi.extension = (".shtml")
-# }}}
-
-# {{{ mod_ssl
-# see ssl.txt
-#
-# ssl.engine    = "enable"
-# ssl.pemfile   = "server.pem"
-# }}}
-
-# {{{ mod_status
-# see status.txt
-#
+
+
+# mod_ssl
+# ssl.engine = "enable"
+# ssl.pemfile = "server.pem"
+
+
+# mod_status
 # status.status-url  = "/server-status"
 # status.config-url  = "/server-config"
-# }}}
-
-# {{{ mod_simple_vhost
-# see simple-vhost.txt
-#
-#  If you want name-based virtual hosting add the next three settings and load
-#  mod_simple_vhost
-#
+
+
+# mod_simple_vhost
+# If you want name-based virtual hosting add the next three settings
+# and load mod_simple_vhost
 # document-root =
 #   virtual-server-root + virtual-server-default-host + virtual-server-docroot
 # or
 #   virtual-server-root + http-host + virtual-server-docroot
-#
-# simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
-# simple-vhost.default-host  = "grisu.home.kneschke.de"
+# simple-vhost.server-root = "/home/user/webroot/servers/"
+# simple-vhost.default-host = "www.example.org"
 # simple-vhost.document-root = "/pages/"
-# }}}
-
-# {{{ mod_compress
-# see compress.txt
-#
-# compress.cache-dir   = var.statedir + "/cache/compress"
-# compress.filetype    = ("text/plain", "text/html")
-# }}}
-
-# {{{ mod_proxy
-# see proxy.txt
-#
-# proxy.server               = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "host" => "192.168.0.101",
-#                                   "port" => 80
-#                                 )
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_auth
-# see authentication.txt
-#
-# auth.backend               = "plain"
+
+
+# mod_compress
+# compress.cache-dir = var.statedir + "/cache/compress"
+# compress.filetype = ("text/plain", "text/html")
+
+
+# mod_proxy
+# proxy.server = (
+#   ".php" => (
+#     "localhost" => (
+#       "host" => "192.168.0.101",
+#       "port" => 80
+#     )
+#   )
+# )
+
+
+# mod_auth
+# auth.backend = "plain"
 # auth.backend.plain.userfile = "lighttpd.user"
 # auth.backend.plain.groupfile = "lighttpd.group"
 
 # auth.backend.ldap.hostname = "localhost"
-# auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-# auth.backend.ldap.filter   = "(uid=$)"
-
-# auth.require               = ( "/server-status" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "user=jan"
-#                               ),
-#                               "/server-info" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "valid-user"
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_rewrite
-# see rewrite.txt
-#
+# auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
+# auth.backend.ldap.filter = "(uid=$)"
+
+#auth.require = (
+#  "/server-status" => (
+#    "method" => "digest",
+#    "realm" => "download archiv",
+#    "require" => "user=jan"
+#  ),
+#  "/server-info" => (
+#    "method" => "digest",
+#    "realm" => "download archiv",
+#    "require" => "valid-user"
+#  )
+#)
+
+
+# mod_rewrite
 # url.rewrite = (
-#	"^/$"		=>		"/server-status"
+#   "^/$" => "/server-status"
 # )
-# }}}
 
-# {{{ mod_redirect
-# see redirect.txt
-#
+
+# mod_redirect
 # url.redirect = (
-#	"^/wishlist/(.+)"		=>		"http://www.123.org/$1"
+#   "^/wishlist/(.+)" => "http://www.123.org/$1"
 # )
-# }}}
 
-# {{{ mod_evhost
+
+# mod_evhost
 # define a pattern for the host url finding
 # %% => % sign
 # %0 => domain name + tld
@@ -243,87 +216,64 @@ url.access-deny = ("~", ".inc")
 # %2 => domain name without tld
 # %3 => subdomain 1 name
 # %4 => subdomain 2 name
-#
-# evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
-# }}}
+# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
 
-# {{{ mod_expire
+
+# mod_expire
 # expire.url = (
-#	"/buggy/"		=>		"access 2 hours",
-#	"/asdhas/"		=>		"access plus 1 seconds 2 minutes"
+#   "/buggy/" => "access 2 hours",
+#   "/asdhas/" => "access plus 1 seconds 2 minutes"
 # )
-# }}}
 
-# {{{ mod_rrdtool
-# see rrdtool.txt
-#
-# rrdtool.binary  = "/usr/bin/rrdtool"
+
+# mod_rrdtool
+# rrdtool.binary = "/usr/bin/rrdtool"
 # rrdtool.db-name = var.statedir + "/lighttpd.rrd"
-# }}}
 
-# {{{ mod_setenv
-# see setenv.txt
-#
-# setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
+
+# mod_setenv
+# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" )
 # setenv.add-response-header = ( "X-Secret-Message" => "42" )
-# }}}
 
-# {{{ mod_trigger_b4_dl
-# see trigger_b4_dl.txt
-#
+
+# mod_trigger_b4_dl
 # trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
 # trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
 # trigger-before-download.trigger-url = "^/trigger/"
 # trigger-before-download.download-url = "^/download/"
 # trigger-before-download.deny-url = "http://127.0.0.1/index.html"
 # trigger-before-download.trigger-timeout = 10
-# }}}
 
-# {{{ mod_cml
-# see cml.txt
-#
+
+# mod_cml
 # don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-# }}} 
+# cml.extension = ".cml"
+# cml.memcache-hosts = ( "127.0.0.1:11211" )
 
-# {{{ mod_webdav
-# see webdav.txt
-#
+
+# mod_webdav
 # $HTTP["url"] =~ "^/dav($|/)" {
-#     webdav.activate = "enable"
-#     webdav.is-readonly = "enable"
+#   webdav.activate = "enable"
+#   webdav.is-readonly = "enable"
 # }
-# }}}
 
-# {{{ extra rules
-#
+
+# Extra Rules
 # set Content-Encoding and reset Content-Type for browsers that
 # support decompressing on-thy-fly (requires mod_setenv)
 # $HTTP["url"] =~ "\.gz$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-gzip")
-#     mimetype.assign = (".gz" => "text/plain")
+#   setenv.add-response-header = ("Content-Encoding" => "x-gzip")
+#   mimetype.assign = (".gz" => "text/plain")
 # }
 
 # $HTTP["url"] =~ "\.bz2$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
-#     mimetype.assign = (".bz2" => "text/plain")
+#   setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
+#   mimetype.assign = (".bz2" => "text/plain")
 # }
-#
-# }}}
 
-# {{{ debug
-# debug.log-request-header   = "enable"
-# debug.log-response-header  = "enable"
-# debug.log-request-handling = "enable"
-# debug.log-file-not-found   = "enable"
-# }}}
 
-# {{{ cgi includes
-# uncomment for cgi support
-#   include "mod_cgi.conf"
-# uncomment for php/fastcgi support
-#   include "mod_fastcgi.conf"
-# }}}
-
-# vim: set ft=conf foldmethod=marker et :
+# Debug
+# debug.log-request-header = "enable"
+# debug.log-response-header = "enable"
+# debug.log-request-handling = "enable"
+# debug.log-file-not-found = "enable"
diff --git a/www-servers/lighttpd/files/conf/mime-types.conf b/www-servers/lighttpd/files/conf/mime-types.conf
index 3d7880811717..40e26c1ae9cd 100644
--- a/www-servers/lighttpd/files/conf/mime-types.conf
+++ b/www-servers/lighttpd/files/conf/mime-types.conf
@@ -3,168 +3,166 @@
 # include'd from lighttpd.conf.
 ###############################################################################
 
-# {{{ mime types
-mimetype.assign             = (
-  ".pdf"          =>      "application/pdf",
-  ".epub"         =>      "application/epub+zip",
-  ".spl"          =>      "application/futuresplash",
-  ".jar"          =>      "application/java-archive",
-  ".class"        =>      "application/java-vm",
-  ".jsonld"       =>      "application/ld+json",
-  ".json"         =>      "application/json",
-  ".mdb"          =>      "application/msaccess",
-  ".doc"          =>      "application/msword",
-  ".ogg"          =>      "application/ogg",
-  ".pgp"          =>      "application/pgp-encrypted",
-  ".sig"          =>      "application/pgp-signature",
-  ".ps"           =>      "application/postscript",
-  ".eps"          =>      "application/postscript",
-  ".rar"          =>      "applicaion/rar",
-  ".rdf"          =>      "application/rdf+xml",
-  ".rss"          =>      "application/rss+xml",
-  ".rtf"          =>      "application/rtf",
-  ".azw"          =>      "application/vnd.amazon.ebook",
-  ".cbz"          =>      "application/vnd.comicbook+zip",
-  ".cbr"          =>      "application/vnd.comicbook-rar",
-  ".exe"          =>      "application/vnd.microsoft.portable-executable",
-  ".xls"          =>      "application/vnd.ms-excel",
-  ".ppt"          =>      "application/vnd.ms-powerpoint",
-  ".docm"         =>      "application/vnd.ms-word.document.macroEnabled.12",
-  ".odt"          =>      "application/vnd.oasis.opendocument.text",
-  ".ods"          =>      "application/vnd.oasis.opendocument.spreadsheet",
-  ".odp"          =>      "application/vnd.oasis.opendocument.presentation",
-  ".odg"          =>      "application/vnd.oasis.opendocument.graphics",
-  ".odc"          =>      "application/vnd.oasis.opendocument.chart",
-  ".odf"          =>      "application/vnd.oasis.opendocument.formula",
-  ".odi"          =>      "application/vnd.oasis.opendocument.image",
-  ".pptx"         =>      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-  ".xlsx"         =>      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  ".docx"         =>      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  ".vsd"          =>      "application/vnd.visio",
-  ".wasm"         =>      "application/wasm",
-  ".xhtml"        =>      "application/xhtml+xml",
-  ".zip"          =>      "application/zip",
-  ".zstd"         =>      "application/zstd",
-  ".7z"           =>      "application/x-7z-compressed",
-  ".dmg"          =>      "application/x-apple-diskimage",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
-  ".pgn"          =>      "application/x-chess-pgn",
-  ".deb"          =>      "application/x-debian-package",
-  ".dvi"          =>      "application/x-dvi",
-  ".mm"           =>      "application/x-freemind",
-  ".gz"           =>      "application/x-gzip",
-  ".iso"          =>      "application/x-iso9660-image",
-  ".jnlp"         =>      "application/x-java-jnlp-file",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".rpm"          =>      "application/x-redhat-package-manager",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".xz"           =>      "application/x-xz",
-  ".aac"          =>      "audio/aac",
-  ".adts"         =>      "audio/aac",
-  ".ac3"          =>      "audio/ac3",
-  ".snd"          =>      "audio/basic",
-  ".mid"          =>      "audio/midi",
-  ".midi"         =>      "audio/midi",
-  ".m4a"          =>      "audio/mp4",
-  ".mp1"          =>      "audio/mpeg",
-  ".mp2"          =>      "audio/mpeg",
-  ".mp3"          =>      "audio/mpeg",
-  ".oga"          =>      "audio/ogg",
-  ".opus"         =>      "audio/ogg",
-  ".spx"          =>      "audio/ogg",
-  ".sid"          =>      "audio/prs.sid",
-  ".mlp"          =>      "audio/vnd.dolby.mlp",
-  ".dts"          =>      "audio/vnd.dts",
-  ".dtshd"        =>      "audio/vnd.dts.hd",
-  ".flac"         =>      "audio/x-flac",
-  ".mka"          =>      "audio/x-matroska",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".mod"          =>      "audio/x-mod",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".wav"          =>      "audio/x-wav",
-  ".otf"          =>      "font/otf",
-  ".ttf"          =>      "font/ttf",
-  ".woff"         =>      "font/woff",
-  ".woff2"        =>      "font/woff2",
-  ".bmp"          =>      "image/bmp",
-  ".gif"          =>      "image/gif",
-  ".heic"         =>      "image/heic",
-  ".heics"        =>      "image/heic-sequence",
-  ".heif"         =>      "image/heif",
-  ".heifs"        =>      "image/heif-sequence",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".tif"          =>      "image/tiff",
-  ".tiff"         =>      "image/tiff",
-  ".svg"          =>      "image/svg+xml",
-  ".svgz"         =>      "image/svg+xml",
-  ".webp"         =>      "image/webp",
-  ".psd"          =>      "image/vnd.adobe.photoshop",
-  ".apng"         =>      "image/vnd.mozilla.apng",
-  ".ico"          =>      "image/x-icon",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".ics"          =>      "text/calendar",
-  ".css"          =>      "text/css",
-  ".csv"          =>      "text/csv",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".h"            =>      "text/plain",
-  ".cc"           =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".hh"           =>      "text/plain",
-  ".hpp"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".diff"         =>      "text/plain",
-  ".patch"        =>      "text/plain",
-  ".ebuild"       =>      "text/plain",
-  ".eclass"       =>      "text/plain",
-  ".vcard"        =>      "text/vcard",
-  ".vcf"          =>      "text/vcard",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".vcs"          =>      "text/x-vcalendar",
-  ".x3db"         =>      "model/x3d+binary",
-  ".x3dbz"        =>      "model/x3d+binary",
-  ".x3dv"         =>      "model/x3d+vrml",
-  ".x3dvz"        =>      "model/x3d+vrml",
-  ".x3d"          =>      "model/x3d+xml",
-  ".x3dz"         =>      "model/x3d+xml",
-  ".ts"           =>      "video/mp2t",
-  ".m4v"          =>      "video/mp4",
-  ".mp4"          =>      "video/mp4",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".ogv"          =>      "video/ogg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".webm"         =>      "video/webm",
-  ".m4u"          =>      "video/vnd.mpegurl",
-  ".bik"          =>      "video/vnd.radgamettools.bink",
-  ".bk2"          =>      "video/vnd.radgamettools.bink",
-  ".smk"          =>      "video/vnd.radgamettools.smacker",
-  ".flv"          =>      "video/x-flv",
-  ".mkv"          =>      "video/x-matroska",
-  ".mk3d"         =>      "video/x-matroska-3d",
-  ".mng"          =>      "video/x-mng",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv"
- )
-# }}}
+mimetype.assign = (
+  ".pdf" => "application/pdf",
+  ".epub" => "application/epub+zip",
+  ".spl" => "application/futuresplash",
+  ".jar" => "application/java-archive",
+  ".class" => "application/java-vm",
+  ".jsonld" => "application/ld+json",
+  ".json" => "application/json",
+  ".mdb" => "application/msaccess",
+  ".doc" => "application/msword",
+  ".ogg" => "application/ogg",
+  ".pgp" => "application/pgp-encrypted",
+  ".sig" => "application/pgp-signature",
+  ".ps" => "application/postscript",
+  ".eps" => "application/postscript",
+  ".rar" => "applicaion/rar",
+  ".rdf" => "application/rdf+xml",
+  ".rss" => "application/rss+xml",
+  ".rtf" => "application/rtf",
+  ".azw" => "application/vnd.amazon.ebook",
+  ".cbz" => "application/vnd.comicbook+zip",
+  ".cbr" => "application/vnd.comicbook-rar",
+  ".exe" => "application/vnd.microsoft.portable-executable",
+  ".xls" => "application/vnd.ms-excel",
+  ".ppt" => "application/vnd.ms-powerpoint",
+  ".docm" => "application/vnd.ms-word.document.macroEnabled.12",
+  ".odt" => "application/vnd.oasis.opendocument.text",
+  ".ods" => "application/vnd.oasis.opendocument.spreadsheet",
+  ".odp" => "application/vnd.oasis.opendocument.presentation",
+  ".odg" => "application/vnd.oasis.opendocument.graphics",
+  ".odc" => "application/vnd.oasis.opendocument.chart",
+  ".odf" => "application/vnd.oasis.opendocument.formula",
+  ".odi" => "application/vnd.oasis.opendocument.image",
+  ".pptx" => "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".xlsx" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".docx" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".vsd" => "application/vnd.visio",
+  ".wasm" => "application/wasm",
+  ".xhtml" => "application/xhtml+xml",
+  ".zip" => "application/zip",
+  ".zstd" => "application/zstd",
+  ".7z" => "application/x-7z-compressed",
+  ".dmg" => "application/x-apple-diskimage",
+  ".torrent" => "application/x-bittorrent",
+  ".bz2" => "application/x-bzip",
+  ".tbz" => "application/x-bzip-compressed-tar",
+  ".tar.bz2" => "application/x-bzip-compressed-tar",
+  ".pgn" => "application/x-chess-pgn",
+  ".deb" => "application/x-debian-package",
+  ".dvi" => "application/x-dvi",
+  ".mm" => "application/x-freemind",
+  ".gz" => "application/x-gzip",
+  ".iso" => "application/x-iso9660-image",
+  ".jnlp" => "application/x-java-jnlp-file",
+  ".pac" => "application/x-ns-proxy-autoconfig",
+  ".rpm" => "application/x-redhat-package-manager",
+  ".swf" => "application/x-shockwave-flash",
+  ".tar.gz" => "application/x-tgz",
+  ".tgz" => "application/x-tgz",
+  ".tar" => "application/x-tar",
+  ".xz" => "application/x-xz",
+  ".aac" => "audio/aac",
+  ".adts" => "audio/aac",
+  ".ac3" => "audio/ac3",
+  ".snd" => "audio/basic",
+  ".mid" => "audio/midi",
+  ".midi" => "audio/midi",
+  ".m4a" => "audio/mp4",
+  ".mp1" => "audio/mpeg",
+  ".mp2" => "audio/mpeg",
+  ".mp3" => "audio/mpeg",
+  ".oga" => "audio/ogg",
+  ".opus" => "audio/ogg",
+  ".spx" => "audio/ogg",
+  ".sid" => "audio/prs.sid",
+  ".mlp" => "audio/vnd.dolby.mlp",
+  ".dts" => "audio/vnd.dts",
+  ".dtshd" => "audio/vnd.dts.hd",
+  ".flac" => "audio/x-flac",
+  ".mka" => "audio/x-matroska",
+  ".m3u" => "audio/x-mpegurl",
+  ".mod" => "audio/x-mod",
+  ".wma" => "audio/x-ms-wma",
+  ".wax" => "audio/x-ms-wax",
+  ".wav" => "audio/x-wav",
+  ".otf" => "font/otf",
+  ".ttf" => "font/ttf",
+  ".woff" => "font/woff",
+  ".woff2" => "font/woff2",
+  ".bmp" => "image/bmp",
+  ".gif" => "image/gif",
+  ".heic" => "image/heic",
+  ".heics" => "image/heic-sequence",
+  ".heif" => "image/heif",
+  ".heifs" => "image/heif-sequence",
+  ".jpg" => "image/jpeg",
+  ".jpeg" => "image/jpeg",
+  ".png" => "image/png",
+  ".tif" => "image/tiff",
+  ".tiff" => "image/tiff",
+  ".svg" => "image/svg+xml",
+  ".svgz" => "image/svg+xml",
+  ".webp" => "image/webp",
+  ".psd" => "image/vnd.adobe.photoshop",
+  ".apng" => "image/vnd.mozilla.apng",
+  ".ico" => "image/x-icon",
+  ".xbm" => "image/x-xbitmap",
+  ".xpm" => "image/x-xpixmap",
+  ".xwd" => "image/x-xwindowdump",
+  ".ics" => "text/calendar",
+  ".css" => "text/css",
+  ".csv" => "text/csv",
+  ".html" => "text/html",
+  ".htm" => "text/html",
+  ".js" => "text/javascript",
+  ".asc" => "text/plain",
+  ".c" => "text/plain",
+  ".h" => "text/plain",
+  ".cc" => "text/plain",
+  ".cpp" => "text/plain",
+  ".hh" => "text/plain",
+  ".hpp" => "text/plain",
+  ".conf" => "text/plain",
+  ".log" => "text/plain",
+  ".text" => "text/plain",
+  ".txt" => "text/plain",
+  ".diff" => "text/plain",
+  ".patch" => "text/plain",
+  ".ebuild" => "text/plain",
+  ".eclass" => "text/plain",
+  ".vcard" => "text/vcard",
+  ".vcf" => "text/vcard",
+  ".dtd" => "text/xml",
+  ".xml" => "text/xml",
+  ".vcs" => "text/x-vcalendar",
+  ".x3db" => "model/x3d+binary",
+  ".x3dbz" => "model/x3d+binary",
+  ".x3dv" => "model/x3d+vrml",
+  ".x3dvz" => "model/x3d+vrml",
+  ".x3d" => "model/x3d+xml",
+  ".x3dz" => "model/x3d+xml",
+  ".ts" => "video/mp2t",
+  ".m4v" => "video/mp4",
+  ".mp4" => "video/mp4",
+  ".mpeg" => "video/mpeg",
+  ".mpg" => "video/mpeg",
+  ".ogv" => "video/ogg",
+  ".mov" => "video/quicktime",
+  ".qt" => "video/quicktime",
+  ".webm" => "video/webm",
+  ".m4u" => "video/vnd.mpegurl",
+  ".bik" => "video/vnd.radgamettools.bink",
+  ".bk2" => "video/vnd.radgamettools.bink",
+  ".smk" => "video/vnd.radgamettools.smacker",
+  ".flv" => "video/x-flv",
+  ".mkv" => "video/x-matroska",
+  ".mk3d" => "video/x-matroska-3d",
+  ".mng" => "video/x-mng",
+  ".avi" => "video/x-msvideo",
+  ".asf" => "video/x-ms-asf",
+  ".asx" => "video/x-ms-asf",
+  ".wmv" => "video/x-ms-wmv"
+)
diff --git a/www-servers/lighttpd/files/conf/mod_cgi.conf b/www-servers/lighttpd/files/conf/mod_cgi.conf
index 982333a007c6..9897af78eafc 100644
--- a/www-servers/lighttpd/files/conf/mod_cgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_cgi.conf
@@ -3,30 +3,22 @@
 # include'd by lighttpd.conf.
 ###############################################################################
 
-#
-# see cgi.txt for more information on using mod_cgi
-#
-
 server.modules += ("mod_cgi")
 
-# NOTE: this requires mod_alias
+# this requires mod_alias
 alias.url = (
-     "/cgi-bin/"	    =>	    var.basedir + "/cgi-bin/"
+  "/cgi-bin/" => var.basedir + "/cgi-bin/"
 )
 
-#
 # Note that you'll also want to enable the
 # cgi-bin alias via mod_alias (above).
-#
 
 $HTTP["url"] =~ "^/cgi-bin/" {
-    # disable directory listings
-    dir-listing.activate = "disable"
-    # only allow cgi's in this directory
-    cgi.assign = (
-		".pl"	=>	"/usr/bin/perl",
-		".cgi"	=>	"/usr/bin/perl"
-	)
-}
-
-# vim: set ft=conf foldmethod=marker et :
+  # disable directory listings
+  dir-listing.activate = "disable"
+  # only allow cgi's in this directory
+  cgi.assign = (
+    ".pl" => "/usr/bin/perl",
+    ".cgi" => "/usr/bin/perl"
+  )
+}
\ No newline at end of file
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
index 5d5ea51ef252..515e7c52aafd 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
@@ -4,13 +4,12 @@
 ###############################################################################
 
 server.modules += ("mod_fastcgi")
-fastcgi.server = ( ".php" =>
-		            ( "localhost" =>
-			            (
-				            "socket"		=>		"/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
-				            "bin-path"	=>		"/usr/bin/php-cgi"
-			            )
-		            )
-	            )
 
-# vim: set ft=conf foldmethod=marker et :
+fastcgi.server = (
+  ".php" => (
+    "localhost" => (
+      "socket" => "/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
+      "bin-path" => "/usr/bin/php-cgi"
+    )
+  )
+)
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 850aeea6f28e..440cebcae7e1 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -4,6 +4,6 @@ DIST puma-5.5.2.tar.gz 302778 BLAKE2B 5911accde19aaed34cffecc71eb2db02f0d9f9ea7b
 DIST puma-5.6.1.tar.gz 308896 BLAKE2B 0fa28fee64da577965c16fa564275760fbb3ebd04ed3eff583e53733b2f674ec6d29c20d2734bd16cb83aca8747ff5049e86d692bb5dd70fa5112a7a2c64ebf4 SHA512 262f17343668f5bf68842664eb6445208755385428151354fdb4039411e339c5c686f684bdb32c974516add3ca86af5693d1e169cf2bf74a8614be3cc06eccb0
 EBUILD puma-5.3.2-r1.ebuild 1851 BLAKE2B 56e2293d48a3a862bea7b875afb7bc86d743996abdb0d9c2f7db0b962e5bd1616ea213b2c8eb6f4cdbaa6b2c0a9ae1d7a1f87e2943931c05cd14c9efd4acf095 SHA512 d3de6f6d1c5ace870b89e08a9169dd05ce10e5cc65e8c7013bcb1cd7b6902e9acfb73ce6d95f3ca7806c1b8106460529a51000f3e6b49296fb38c4c6780faa73
 EBUILD puma-5.4.0.ebuild 1853 BLAKE2B 7568cd85ec3925a107a4f4c6dcfff0764eb307bf211b3c0c1fa4b340ef29f8a3a8cf617009ff6382fed5db8d06a3d93fb6d256404649d616b4a655023ea392b6 SHA512 28ea6e783aeacd7f33451b5600fb33921760b2297b236e8f141caa01b8f807d05093ef1b910f260a22e9c2eed293e21d287eb27dd274cff46a99f8bc56b3a8b6
-EBUILD puma-5.5.2.ebuild 1865 BLAKE2B a9a6274ceb2d5929de42324cbe3b129a38e71f554917fb88bd50a7a6eaff5490c83240a0cf2d0003de57e88d6fa6a2eb89f4a37e3a61368fa44d4c38a3f19d40 SHA512 e2a3f8f21e38b312e78a9b9249e0b719163dfbe19d6fb7f185774d659bf7834804cd0430377b00d651434bd5b9e47f96018dfaee7f58a5ac677415ef99e9a374
+EBUILD puma-5.5.2.ebuild 1863 BLAKE2B 1d9cb33e05bfe334291017f89b5d2cce2d8a45d8926345b75aa64781c7d0278825c9688478926dc16c8c126d909d71d1bcc4688599f6a5222f7dfc14261d747f SHA512 dbe571b0eccbe16e3f801c85fbcaada51ff7c3fb470f776a00c4d169b785d4b80037a6df12d6bf154571387793f1cb7d04c3931a865e04e97c6eaeacb5915204
 EBUILD puma-5.6.1.ebuild 1865 BLAKE2B 127a5cb8ef8094bb53fee94296b13627bfe0ce423dc16c2aef68c87df56da6bd7eb166559f10621e98d0d5d466321fec589bd44e95dd26bf9710f8b5626c8919 SHA512 9789bb869f6c5de66122a547fe4d4dc54ed65dea0d11c0d7ae43b284a5adc11cf2eb99a766facdc78045a6f47eb3d4bfe1658caea285aeab2951fad6ad5a2e0c
 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/puma-5.5.2.ebuild b/www-servers/puma/puma-5.5.2.ebuild
index 0401ed1bebcd..e02658c5c849 100644
--- a/www-servers/puma/puma-5.5.2.ebuild
+++ b/www-servers/puma/puma-5.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index b961df999405..04f1db6e165f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 25098a2b2d9d..b5dff91b7569 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -15,6 +15,7 @@ DIST NVIDIA-Linux-aarch64-470.94.run 183639436 BLAKE2B a2e7af432e9d6a65e44c6b0af
 DIST NVIDIA-Linux-aarch64-495.44.run 210477242 BLAKE2B 8fb5419be19ab4feab158fb43f142fdc1471b756f7d43afac1c9e787465a991e291cac725dda266b2f454022aea7cb3e249c6f132963a89c97564ef378e876b4 SHA512 4d2ed853bc3d7812652f3e677ca1cf56f1b2563bc0a43cee2cf4544f8d3b30d8f29ccc994fc8f95e2c8b40b04efdca066b616983bf2e2fb9247d2d9a8503d4ea
 DIST NVIDIA-Linux-aarch64-495.46.run 211122869 BLAKE2B 2193f9de186b727af4f22999f6890c1b06a89e88308d5f0cc317b5b1088c62313b34efb4cbd782bc9565083191c443e5cd10b6c8cf89a988153c1abff4e9b1ec SHA512 c830482fa75e841f33a32bd28e842892613968e3e23928f1e1fa45672ef2349fbd33af59341cc4e789f702163b17b10a861b071b42f90e037050769c83ae53b9
 DIST NVIDIA-Linux-aarch64-510.39.01.run 211307577 BLAKE2B 15d6a21ac81edbaa939044eb2654b77bb6aaa223853cb8fdc7633467da0bb120a738dc8a63d4f541031444a3f9184d8de6f9030a6bbaacd49ede3db0b06d7b15 SHA512 c61e7d0e83c00f2225c170b8ccfdf63c9fa9fc2bb09df88a8e113e30c765582c1f93422a190d325d9a2cb8922d8b9166c88ba3fa15c4c85043b7436dae03cd37
+DIST NVIDIA-Linux-aarch64-510.47.03.run 210713072 BLAKE2B ee775c9022c76adcb8e39661830d832b12ee53e5b6a33c9b98bf1532ef26bb49a2bb9e09bdd869517e8dab712af162e0263c3989b7023b4c34e27eb135fd9136 SHA512 1079910394542a123965f09a741a3690f68a96a8251995a6ca66c47711acbf93cef79f98110595667e19f895e024dc6fb6f57c470f80fe8075ffea74cfe05f94
 DIST NVIDIA-Linux-x86-390.147.run 49303088 BLAKE2B 5a3a02b88af1ee8699b0c6c3fa222d9176338f10437a88c874126c7bacf64ddc44d03d8a44542cba989129af6336e46cae775713458a16d78ea75e4e004dfffb SHA512 c5d47e2a8c034e158093feeefa2455ec49d676fbd1700118aedba0c3b84be4e2060402d0e27e50d1a674de10f369f8e5ca2da8c61f1d0560d2105d33d7238359
 DIST NVIDIA-Linux-x86_64-390.147.run 85930997 BLAKE2B a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc SHA512 0d8bda32e916d71da2ea74bc12a4f3cb0a0c2ddda27511cf3c89bbf4aeb28db68f6b7261639d88dd1c0180b91213c09de930d233158268c5d9ab3b223510e964
 DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
@@ -24,6 +25,7 @@ DIST NVIDIA-Linux-x86_64-470.94.run 272262854 BLAKE2B 23785ec9d434f48793547a3a0d
 DIST NVIDIA-Linux-x86_64-495.44.run 282259831 BLAKE2B ca11406a5b1b25d9691ec61d4125457c22438b8f0af0651043235f72ee75c4b264cfde7b04840bbec15c22bc5eb657a46326b49941e6c776a8990430cf052818 SHA512 bc9054e6028ba172906e6eb9a0b8f5cfc3ae74d57f3e95e0f9057879e3af07a4b19479e80d81e948872bc47bbd674f77f5f81d4debd2e2c3ce45058cd9211802
 DIST NVIDIA-Linux-x86_64-495.46.run 280886811 BLAKE2B 156917245f37a5da9121cf570616d6367eec66998a50136f1db0c521fc725e68db27acd5741a9fc3e3d502a2c7e90ccde68a7e56346cb8f5fc65ea419c2f0576 SHA512 859548fa81478acb994b40434fc85824976b1f83bc15846290898854db84ea3c6550586a1d7e89ff3afa248310d2bcf4d2d52d5d8e91cf74e3f7e4108a7002ad
 DIST NVIDIA-Linux-x86_64-510.39.01.run 328334484 BLAKE2B 8c765d5660feed9f36760e142acb54e933097f69744c470cb3f9ac9aeae744a6198cf0856eecbe31bd0eae8ef3008b1b8bba2eeb93b6e46b5b31b6b7acb6978b SHA512 0c7ec6dd585d339f44ff10475abd614c9487bf399aed8bf1546cd95bbcbe3b2938cd52cea402d46e439252fc5fe0e03908f9821fa66f475ffe5573b266047a14
+DIST NVIDIA-Linux-x86_64-510.47.03.run 328823536 BLAKE2B 1693b505ce019074394e508dac14c2b5e281f3f871ca84db180fbfebc96c04b2f51feb8fbe0358d4cc2148c14c37c1b603737bf27b794d9d23b2c49a2f36f956 SHA512 7488b1ae99acfa4cd6f8fd071a0e7652dcc9e499ff587d1dfdaf5d202a5b9daa43ed014876d2b2c9caf7f7c531ec380540f30833bb9790395cf159d177f2e803
 DIST nvidia-installer-390.147.tar.bz2 150157 BLAKE2B 3bf5317aaa3bdb0e6dc3b3e21ad3dbacf6dc782a643b0fa9badf354361891ab25660b57dd408e346f219d469af317a4851937e1cb77ffe59a39e9d98a92f3a40 SHA512 24bd8a2959062551abf2ea039ac95eba224d58c175f59f1386a6d43459ad43b2bddf17f00b53c1c71c45eca3b7a2281dcf05cc65030f6f8bed16d0f0b9f9c282
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
 DIST nvidia-installer-470.103.01.tar.bz2 146121 BLAKE2B 06da3693cf8edba849b802f2255dcf2086ba3846f83ef19a02cb813ea2c07a6904f8a49e263018fb8b40c9fece7ab4422d95a50d12030ae6815ec60a7edac055 SHA512 b080f32394a6163c34e152561b80cca9277a53e0b38c5225b91daddc2169403e2ff4cf63a30b488ee0c3a954b21d32065b5624fb9dd33e672313909b9096de02
@@ -32,6 +34,7 @@ DIST nvidia-installer-470.94.tar.gz 201064 BLAKE2B e8cdace018638567094e377731eaa
 DIST nvidia-installer-495.44.tar.bz2 147036 BLAKE2B a340d1629ab133d072cd7d673a474ec834c2cd71f35b2e98d837deaa6535a784c93978ec484c5060ff28cf845d5cffa08b368b3b8b18a7ddabb4a7cb1c7a0ad0 SHA512 9f9f592b2d73515a484720eb421774a28b39af0ba3fbea127d1987533ed0f42104f640da6211f9eee63cc1063aad68dddfe8d378e3ef590c7f77d54e56bbb8bd
 DIST nvidia-installer-495.46.tar.gz 202462 BLAKE2B 2ad427e0c4df3ba1ef2faa7b92c4a21465961b6fb6d5f6f1997a8d1039b35341789168f82c0b9397f57f1574cb97418b69823fe5b5d321188a841e7347bb0f8c SHA512 c2fc5935e6736ea6e146a711ff05267ec42da6b1f7286589556a77f97fa02e30dacf098f9e23319ebf70808ae93275bdf3309740c6210a7d57636b483f11be74
 DIST nvidia-installer-510.39.01.tar.bz2 144519 BLAKE2B e87128ccd71f891339407414d2f02a3fb2aa2bb5492900c40967382ed2cee498b8f8faa7dac80cf0465575ab7755e58e31108dca847e279c554eb5b0cf82733a SHA512 fe6057aaa1138d7a5dd78c73a02d7ebebce6857f6ad1cbca424e4d419abc81bb47ba6167dd2e9af0a8f76eb19dfa0ea906a50eab7c19200de43f6930068e738c
+DIST nvidia-installer-510.47.03.tar.bz2 144264 BLAKE2B 1c0f5b2840794252f6458b4db9d293da265508e0d165a0c04487e9efa8f727a4b08a5b6a7fc36ded4efba18dd9f71a2b9a8bf13fc81914c63ba85d117da38139 SHA512 c91832d29e3b5f13bccc4d24533b5e8ffc7c71312fba1264332344b359c312a755c678b6ba76e6740aadbd532046822c73ae16a80b77b461a88bba4f863938fc
 DIST nvidia-modprobe-390.147.tar.bz2 35340 BLAKE2B acb49dea0c5d9d802b7c2f9f8127106bd6f9e2aaa7875941ca94c1d81377411e8d9c53357e7f9aa0170c87e349f6379a45391965e7897d0158951a4c0056a835 SHA512 a731fc990557f40fdd0fba45bcfeb99c315d0579a2d2f49bf6f84c55c91f52a9e65c358bc5a3882483ab8e9d66b546de31adcaba46a494bfc0836a0690c3d0db
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
 DIST nvidia-modprobe-470.103.01.tar.bz2 38347 BLAKE2B bd86b8f76d040ea9bad06312b24d839413515c24867e88174d40e9dd0d9006d42fa57f8e789a8a0e8859dd1c1122ef6e57ea25fdda08eedcba10d9291181245c SHA512 ea86b083dd82ff7d8926d337f2aeccbd73cd614a85579cfcbb4ad7225565aa54f151e6d2b5d35b96eb413c3673158025348416193db5045809d743cc98d65281
@@ -40,6 +43,7 @@ DIST nvidia-modprobe-470.94.tar.gz 43366 BLAKE2B b8e5fa22ab229eab0107f89b4f8f19e
 DIST nvidia-modprobe-495.44.tar.bz2 38377 BLAKE2B f1695c778c25d41795b1bda43df68a1dea9c3d16fc00acebe5948aeffd8aef174cb864d85260565fad8ac8c454ad3ad0cfb76529d9f88c3f10547de11492c61c SHA512 cdf7331609ce2a400f2b0e987bdbd2450a07e837971ac94b5ab746874259e6e7a4bff5eb8b9518f786365af74e8650f1c5ddfb745f867a6777825f550a6a74c0
 DIST nvidia-modprobe-495.46.tar.gz 43480 BLAKE2B 32b6592ca1df822227adc9a05848e98b09cfbde676b152d432aaea43ba753ccd8451515b37e275ef58159c468502b7e6d8020ce82d140c63176cd2bbdc65d1aa SHA512 1b6ba93ea72a6dbe345d360fc189ab3be038e2bf1bc93c8be2656aaaf0a81cd3a71aeefc244a71ad20db42a9e5f3145934a6c4cae70f0e8935d9891fe784676b
 DIST nvidia-modprobe-510.39.01.tar.bz2 39072 BLAKE2B ec169397415d3c003f4212b4b0221e820dce8bb9b1857d58397c1857fffe5829f49b644ae78766bc91860b9652f515f37eedd2adf1c0620ba258ea6b64f40d8f SHA512 9f236f16c07008129fb328e65d66cc93e668668848bca233e9972615a7deb18387c0937f09d7830c59d8559766943d27e84fc1488a6042cb5ec2f69dca2a817d
+DIST nvidia-modprobe-510.47.03.tar.bz2 39064 BLAKE2B 6d8ce559474d5d7898af4274ead2d5c3846eda120e36ef6652de586bca6af7847b95c9fd40a9a935ada5fe452ef1b9ac1ec62f5ea9262faf241b6c20950cd5e3 SHA512 97166aa4ef1757ba60a75257f64f86cee1b50f4d4ee51bc38efdb75cdd99602fae1efe926de505ee1015fcffc1dab5c6830cf956ecf16d6a1c37f49e93677a8e
 DIST nvidia-persistenced-390.147.tar.bz2 48712 BLAKE2B d8b2587c8b4374dcff198d8aae1468d30197d9b097badddbec34f0c41e3c4ab4f27b568f152a4c7a4416b3ee15194ae07442c45c50d086a6f4e7e69a5c54f42d SHA512 5877f7b0a40d54b1ca746b2fa1f1270d1ff605068dcf944e078d4cb547bc6f79c08ea9d4fbe3e94e8cd528b9721a89147d43ac849df71b2dc1d903fe1439c4a5
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
 DIST nvidia-persistenced-470.103.01.tar.bz2 46549 BLAKE2B ad25193ba3abe1a5a30233aedb1596822a4af1aa74e6862c4449567408bd84ab40526301f600bfeae938c443f26dfdabd7f912888cfd2e307fc7867d7750180e SHA512 00ab77bb84b90bfeced488353db674334796b10bbd9c8da9ed682d668db800aa7bbcba20033d21bbee6663f0659dd17daf3298cb1384f41a89409a5f3a162de6
@@ -48,6 +52,7 @@ DIST nvidia-persistenced-470.94.tar.gz 53991 BLAKE2B 461fd202d58036f205ef4ad80a5
 DIST nvidia-persistenced-495.44.tar.bz2 46259 BLAKE2B ed34bb3b82a24fe7e651eaf671469988f32a9fa4782f0a8d8f08499b85cee596996611f08fe8e26a295a3073ae6a5bd59c44a1d9c6db41138339656e932aa7df SHA512 d295caaad65336495e22ebf890f6a1d323b9fabd0fb4900c8d4e37044f472836327743fceb6d433bd1ef61dffe8a84a655ddf81b2eff085c7e913105a05cb47e
 DIST nvidia-persistenced-495.46.tar.gz 53692 BLAKE2B 0c449f2a870d3e29d7119250ecab962dca55a81f6cbbd110be05a7b8a739ca1f130ba255712425fe7f3d770a83f819c40c2464df2ca4c03b94df075d33f034b5 SHA512 402db637fff090dfea2bf26d44060297e21f53c23bb2abdd22e945f90d2fb5141621fa73b732257bb2fab488522b669af9b03c821467dc23f6b9f4dc00998917
 DIST nvidia-persistenced-510.39.01.tar.bz2 47087 BLAKE2B ab1db89a075f13095b8a377bcdb78fb749b934262805032a885b0fd16894218f0306d58a339aefe64bcfe85aa3f0fa5b9429fa6c4ed1674c9fe598fd1cfe45a8 SHA512 1e1cbe6a8842f4740a9b63180ebc58ef9c09390061a70d7ccc3f2791ed0e4b74ab9b7d0dddc94f5292576a6d3d518bf8365b6ca439b6eb8cbb3fdb8da33b843c
+DIST nvidia-persistenced-510.47.03.tar.bz2 47100 BLAKE2B 89a5ea2be6787868224134129b5f97c37d7cb0d17fb2bc4c49ce5dea0fac3c7555f08c0f850bc0487208d2b8d570406526812c01fbdb7bed7cb4669dd31e3f0e SHA512 00e65a042bd590a119b0952ea587475ca3fc6cf1baacf7a97f813ab343800145cb8ce4baf809d7f4c955477cebdf98b300364501df67f625b5143719399ea0a8
 DIST nvidia-settings-390.147.tar.bz2 1109104 BLAKE2B b0a2e0c832901db65f41e54d66d61abd9afbc528d1e8095e314d7ce5c1bf73c7bc8cc1857d909d9eab2e3b9ee97831c15c52f2725a8c9f84e00416c4e3db23d1 SHA512 67c30df042b9a9b923f05a26bd2e0bd85487fab0fe2c730ac48025561d652ff0f7455a56cc7951ed8ba2a300e019fa0e52fcd912b644d0d88fd2ac0e63de2327
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
 DIST nvidia-settings-470.103.01.tar.bz2 1062124 BLAKE2B a9b95174a2309668951bb090812c9d2098d7bdefa210b396523eb59887fb3ea62f517398ab63cc9cfb395f90e6535c308fd43fb0ac406afba17713e01e98b19d SHA512 62be59eae75965762b5caf6bfb71ca993ee23cc0d12d385a7e67e62c8f9180555078dfae736cc6d6bc0b52525780e32e0b76152c5e4a1be669c6dd181c0f2465
@@ -56,6 +61,7 @@ DIST nvidia-settings-470.94.tar.gz 1235132 BLAKE2B 7f46d7225b18c2e287d1d6aa72408
 DIST nvidia-settings-495.44.tar.bz2 1062420 BLAKE2B 98d5ac73f279bc3d415e3902946eca15fe4d61978dde5b21a96e9e1367129b9949078bd2c3778d344237ff4b9cf65a2921025a6410394f007dd97f441dc320f4 SHA512 e69bb32e47a43368de1959a0c8a877281bba0139119b1a34f6da86e006a8b0dce5bafe0fd017221be40a6bddcd93934e9479cbb8f04fb979b84f5f206835118e
 DIST nvidia-settings-495.46.tar.gz 1235052 BLAKE2B aa4396b56a41f19f0876a135b6c2de0f74b3d8a50fb7ad51b00394868c3354cb85d0cb54dac146537010ea4d091daf02149e5ffc5d59f8ca27f2e08b9d798dd3 SHA512 f9019d651f482aa35ccade111dabcc6d21e2dcb229a6102d5b8c9c72df648fa053a01bf0d3efef27d974aed2a23cbfc5022ebb6e9a93eba309b0863068d2423a
 DIST nvidia-settings-510.39.01.tar.bz2 1074854 BLAKE2B bd1fe4ce6c04c1be4925744e309e2bdd4f31f2de6abba8e7a32014a93a9da6b776ff1dbb2f81ccb6045c975a37614305825b19e519b8969a53d54a16cd9eb06d SHA512 24a2e576fcb47e1f2fa596426d2ef3181afaeb9739f2782af4878840bcfcf54241a6d5f4df2902f70ede0164a46733d19eb7022d399e1419e2f14a5bdfc75c0c
+DIST nvidia-settings-510.47.03.tar.bz2 1075444 BLAKE2B 6b8b215ec94e12fbb82f4468cb8b3368eee7185840ea64d388c9a556d2355d864f32c66cb7ad4b9132b7494e642c2804ee1736d3ffa337ff7240dc950854a7bc SHA512 6e522bfa39f74556d315fb04c8f2ba7e9e7bd0adbc5a73a926b33fc8ee367ac07a9020cbaafe2dbe574e1b07f27fd03c9ac920df1ac6bd42be80335d04186b31
 DIST nvidia-xconfig-390.147.tar.bz2 107426 BLAKE2B c7004dab351581176a4e00fc099a12374cb29f3306769724c874a17600d6c11e79ac807fe218022d72ccf83ed33789d2378b0cdba35e5f94458e30631d725384 SHA512 a530c649ff7e75706ba37072ee58d64d4758348a45b953396a0e9d2608e1d7c3d299298cb50b1e8ee0bf2f6f8817bca64637b77e18aab0685a4edd630f18fb9a
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.103.01.tar.bz2 108687 BLAKE2B 2e5de637f9ba7bb516fd1a6801f8ee5be2934f99503bd20a62eaf87c0105d7624ef8de993614b1316ea8d203f9b7a6be07d3c9d5005d8a6306b7fc89cc0bb443 SHA512 abbabb3bf650395237759cbfaa39565893156ae87d07855bc96bfa0f46e10f34fd9efb628ef184f4dd525f80c63c62938b9661c9a4f3f5e1e5420ae1fdf26f0e
@@ -64,6 +70,7 @@ DIST nvidia-xconfig-470.94.tar.gz 142577 BLAKE2B 0687d78a05d4b990bad18a27544874d
 DIST nvidia-xconfig-495.44.tar.bz2 108699 BLAKE2B 8027d9b14f16c792e0839746c549979017e52724a5826cad3b53cda0fa2638b6f7dfe72353e36b84084f4a56a004cd91f87ff1d1d9e542b5d760e47092268993 SHA512 624aa71f319d7d8e3383580eda5c6cfc986ef4c3a9c14493cd561cd3ba758763d79731bb7e7e03fc89d3b8a3a8b65cee324de1d9980b5725678ccd50cb26175e
 DIST nvidia-xconfig-495.46.tar.gz 142633 BLAKE2B 1df2a080dba81b3c9e984a1d2e7d49f3e8adf9f1afb28dfe6a41a9f54b03e4830d42851a16583703c2bf88f11989851aaf23fc8dad0d3b5f2f8c3885dbb5db7e SHA512 b60d65e421460e4bdad579b36a141e82b869d34ca21849bdc33a445466c1b8ab505ab4ab82d6801e05f85dcac286566ec792d8c7708ba511aebfebc29ec0447d
 DIST nvidia-xconfig-510.39.01.tar.bz2 110127 BLAKE2B c2f3d7e61e7e64eb29a29ac632074ca8d27d65d29f590c7f95102858f41ab4da9dc11bd7947c366bbe54d66b7e0d63dad5032fdbc056fa3212db080f56be5ec2 SHA512 fcb2f8c99401c2abbee541645daaf296071b860fe3ba797f00a1c68f281c58923517635cb574927d7d0b5dcfa7144e5620c175171855a0966481348c4400dcb8
+DIST nvidia-xconfig-510.47.03.tar.bz2 109758 BLAKE2B 503ea2850ab5f64648f84675da66e4d0fa50bccdc10355df9295987cc7c3c744076671030b9bda619c22e9c8e824be13dd852d33227cabacde102282acf95796 SHA512 45ca5ddcb744b27ba4661aef38496782ced640945f659894e262b239f565afd1ec5aab254b62ab87c00ca4cda346bc91ec70738736724aedf79c7845b4a0b03a
 EBUILD nvidia-drivers-390.147.ebuild 13562 BLAKE2B ff41c408432184ccc0a1e9f8a60b48f28d765bfdd137440be4619b15cc2e6a0f027879bb1cedfffaeef0fbe8f1ba75ed8008875cfd44ac796bf1814cd4b4e143 SHA512 2840f0deecaa91037b83f1a621a847df4e413e92493498ad9f428cb6f66873a0233271ddc6a2b3d30b9a710e1a7cafe67c35b3e2c2c78acbd162c58552d0f6d9
 EBUILD nvidia-drivers-460.91.03-r2.ebuild 12810 BLAKE2B 7b1017151230b8843c20dd4d0afe0ad835664be021b7ff80fef8eb29cb1e256f30f399a4cf31175f1d6089606e4620f76f4fb91597e19a9d569eb9eac41a7a9b SHA512 00d0b76e82cc6c224c7e1b83c905b7fc091d6c9006e43431cbbb320ce7c69c0abd020c333cf026a503b5ddc3ad4b3033c8714a5524e27efd61a8c96951104c42
 EBUILD nvidia-drivers-470.103.01.ebuild 14200 BLAKE2B 3988792d6835e7eedb227422eccf46d60114de42233c06fef3a52e411268f8a2f5b41b1ef4a26480a9a6bfe8366328faa5ee8bead416bea56992c1c2062218b3 SHA512 83551f94e5b3800c714d9d33e9dd00d823b798682d7359b8283ad932345619f1c5082a6327d99ced75542645606ad77beb7bbe48321ff59d8ff8583d40c71785
@@ -72,4 +79,5 @@ EBUILD nvidia-drivers-470.94.ebuild 14303 BLAKE2B 462d654b8a0f32566858cca4a81385
 EBUILD nvidia-drivers-495.44-r2.ebuild 14381 BLAKE2B d462d428fc157be69ef103599582a0e4e87b86607a327462b0ced9fdbfecc8f1d982af4db5eb09d8b4c456a93961b9b3144d1ae8285d6a5f95e77c5aecef35c5 SHA512 004dfe3513079d26a917f653b4c8e53fe59299a4eb9ef2b3ca3724f95aadd88dccc0a23121f1cdd0eaacfc545cbc834f6f51bbff9f5fe728e96d84acf451fc2e
 EBUILD nvidia-drivers-495.46-r10.ebuild 15109 BLAKE2B f3459eb86473a538c40140cda664b464d9c0fcabbfb1a869b8cf1f861e9b1206799cf829bb51f5a3ae7620d6d1b4689f5bcf7e97b988848aae892b146f1e1241 SHA512 293694e263d323905178540f16a1274ee11b6ba5f8c1f7a5a7d6a569e22f3adfa9cdb8ff96363746ac7aff8a06f758d43df1a8f1665f398abf0a7f450dae27db
 EBUILD nvidia-drivers-510.39.01.ebuild 14466 BLAKE2B b7bdf14baf2402b7c8760cec0acec4122113db4749162d9380690013f809eef4982b7c6a9ef335df87c2bae5304aa1017b8a0e188138a453f7755af654e99376 SHA512 520195d0ad664075f3a73a87df1bc8d94cdac1bf1e7cd7a4722d0a096403b86e1259e7523eda2f39633025a125ff06663ccdfc30c62861bdf9d68027d2d156de
+EBUILD nvidia-drivers-510.47.03.ebuild 14556 BLAKE2B 026b15f15e745f4002e47ee3a3c4c40a3da20c7d039a5a2c7ebc0f92010af206067e166b631185c9b4837aeb3c78972ec0f9ae1fb3d4f742e1849d63d992932e SHA512 145f1a325a154ffa19ec471099387a8cc1a9f8ad84d130b818f49cb0e1ad6da34f71e18917bd23a776961ef44dfbda17ca72654efada361c51190c443e60ee91
 MISC metadata.xml 1006 BLAKE2B 1dc4f01e5eae548e70fb0ef6f816910ae0d282c7a97e552de62354bef162895d60f87dc21306523e530325b55b646b1d4c16182a710c5bb01389521c36e408f4 SHA512 5db62ce94374226c20e67aa89c61c83b581affb7383b082076db69349d0a76aeca806593072d1ae2a9ac01d34955c826dd8145081988adee4069aadae654aff9
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild
new file mode 100644
index 000000000000..b71ac82ae868
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
+	systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.16"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
+
+COMMON_DEPEND="
+	acct-group/video
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.7-r1
+		media-libs/libglvnd
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
+	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
+	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+)
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!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 for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules"
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental"
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+}
+
+src_compile() {
+	tc-export AR CC LD OBJCOPY
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	)
+
+	use driver && linux-mod_src_compile
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# cflags: avoid noisy logs, only use here and set first to let override
+		# ldflags: abi currently needed if LD=ld.lld
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		$(usex X '' '
+			libGLX_nvidia libglxserver_nvidia
+			nvidia_icd.json nvidia_layers.json')
+		$(usex wayland '' 'libnvidia-vulkan-producer')
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-gtk nvidia-{settings,xconfig} # built from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+	)
+	local skip_modules=(
+		$(usex X '' 'nvfbc vdpau xdriver')
+		$(usex driver '' 'gsp')
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usex driver "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options." '')\
+$(use amd64 && usex abi_x86_32 '' "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For general information on using ${PN}, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			eval '[[ " ${m[0]##*/}" =~ ^(\ '${skip_files[*]/%/.*|\\}' )$ ]]' ||
+			eval '[[ " ${m[2]}" =~ ^(\ '${skip_types[*]/%/|\\}' )$ ]]' ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v paths[${m[2]}] ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} =~ _BINARY$ ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+
+	# MODULE:installer non-skipped extras
+	exeinto /lib/systemd/system-sleep
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use amd64; then
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then
+		elog
+		elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to"
+		elog "use nvidia-drivers for acceleration without it (e.g. commonly used"
+		elog "with app-emulation/wine-* or steam). Re-enable if needed."
+	fi
+
+	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d1687e8493bd..6e7ab8e208b9 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index a6106729cb6c..7eef417691c6 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -2,10 +2,10 @@ AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a3
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
-DIST rofi-1.7.0.tar.gz 902294 BLAKE2B 281f48702650f65e4b037fdbbe6861e173dd3465cf6a80a1d2038271511a9f85ebdb19d8e7a1854f82d52172bbfea6eb1b1685228fc4ff874773033406c9267b SHA512 84a42ecf519c7eed8093c4af3b66731b890939a2bf2a63290e599103705f6bacaba59ade1b8a1bc854f6b767e8d44ee42c20e44f63886bcacbfdbe0468d350b4
 DIST rofi-1.7.2.tar.gz 921356 BLAKE2B 88daaac60f4deab18b9ca00cdd490c57aef7ba103ca947a25a204c4e1da9d5b5a3eb2af4e88cd0f0c920315ee30a49982f521fdd9fde2f5de99b061d52ca410b SHA512 5a3d2b118c0d74e6f9499709000e7d6de270d7c51abcc1a376ecd3838b159ff311cc171e8a1968d6872fcbb6deed565e7d777b687f49756c5ba85351f2f089ea
+DIST rofi-1.7.3.tar.gz 935184 BLAKE2B 66585b5542fcf59f22c68ad753a04051a188524c8008435f75b28f923cc46ecb9a0d41a98414577dc59b5a899488de77a6301544fc5af35a7d14a4d8ec930dad SHA512 5d1b8fed868a7fcf372298800997d4aeeb9b428858448a9b9e4c523af8d878aa172dc63ad788cdc950af89a1f3ea850bc4c98a55c9e8ace29e67050ac0c02078
 EBUILD rofi-1.6.1-r1.ebuild 1247 BLAKE2B d92fbb93dad604d5dbe58a90c1c63825952246d5581478578c056f82372d84ab5cd26fe4954601383193714cacafbed45371f913f4a311676e12069e68349324 SHA512 3b1bb1ac88c01a84841a3266fe86aa7c22101c85ef022356768eb04c49740b63b1469c83080dee49cda61260b18e16e24acbdb51f8c37dafbab1d020bc60bbe0
-EBUILD rofi-1.7.0-r1.ebuild 1587 BLAKE2B 44ed97ed37a9dc18cbb2658166d0952beaeaa273de0587c4a4ae6af75dda5e6bb2c8202f8f34ef68707e3bad840a6b547261b39638cc5a4d39fbcc753a07d3b1 SHA512 3ce1f53a2aa7762e518af54d7552e0fc7381e21c6ec7b54fa2aff0df141ebe4f3aa7e9043bb09c916af921b15500096ec722410237fd3611ea1c21bcf3351a9c
 EBUILD rofi-1.7.2.ebuild 1623 BLAKE2B cd07923bee065e0905590975b075537139086bd45caa23a73e29010b01dbf50eaf11e250e980076edfc17c9b16b7b670cf7a725059ed593f456bfc0e8452c485 SHA512 7264a36a857648f9e3d4aa92988c5949869b2213b1a146c7332c531901eb9138526ef01e02d0a7e4a194c8e44b68a2b814a76eb63eae78bb8276b04be6522c0c
+EBUILD rofi-1.7.3.ebuild 1626 BLAKE2B 5a46b4ad0a383cec9d19293dbcb11cefc1a22e5affb70a28d087319d29cb67537a1f8f0b2f70d8527036c06c7d47d53aa8a8954ab2699b4b81240b19f1981527 SHA512 dfeed7b7095d519747b1675c5d6b41d82e86583b95c28e874f1f84f1b0dfd591c10450a6c76c4a3b039502a32c515a165e30bd9274ca50d699f5b4952c8cfb66
 EBUILD rofi-99999.ebuild 1091 BLAKE2B e9a2cb5c5699f6c7e16644354209293797ed90a12166768e9174aa7d8ec8273a3dabb972e6d88e639aeec8bc7e3feb7573c6cd53ff15212a2c9d6923cef4c8ef SHA512 7dcbe7996939338dc8a3db8cb415caa574fa0a3eaae0b5b678912564c6263d814fc2e6fbd2a3b790e66fb33e54e2e940ad34a545c545b3c0306a831b7b967a63
 MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/rofi-1.7.0-r1.ebuild b/x11-misc/rofi/rofi-1.7.3.ebuild
similarity index 91%
rename from x11-misc/rofi/rofi-1.7.0-r1.ebuild
rename to x11-misc/rofi/rofi-1.7.3.ebuild
index 4a3d7dce86d0..7f2f90372111 100644
--- a/x11-misc/rofi/rofi-1.7.0-r1.ebuild
+++ b/x11-misc/rofi/rofi-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,11 +11,15 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2