gentoo auto-resync : 01:10:2022 - 07:10:12

author: V3n3RiX <venerix@koprulu.sector> 2022-10-01 07:10:13 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-01 07:10:13 +0100
commit: 42ff81a7480d9bba317b42fcca03b46da2a622ce (patch)
tree: 5a0ccbe2b71a4ec6c160b568160999a6afe316de
parent: 290844d409ace33d948956aec3c542ea6f4a7b13 (diff)
456 files changed, 2070 insertions, 1243 deletions
diff --git a/Manifest b/Manifest
index 9445ae4de322..9be4c4300deb 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29598 BLAKE2B ae0ec6101199dd52483b98b6df04a38f96ab486a85f0771dd94b52e3666b556c0d0a4600ce8c4ec2f305bf6826801d70ab7d4e633d484e96a75039c22d90e2b2 SHA512 1306e7b1f87ed4d17a97ca5fa1b056ae5df90efa278202b8328788423593b682fb36f33a53eef8915f90ba40874ca74f2e2f712cbc23ec032be50ef70f96782f
-TIMESTAMP 2022-09-30T23:09:44Z
+MANIFEST Manifest.files.gz 29633 BLAKE2B 9c870f411b7605a8e512abf633f5262f850783b767c982ec7f3c9e8798a1885d31a9e39273d72436c2f3bb9b41c44dc4acca82ca31f3655d31880fdb822339ed SHA512 e75632483adb27c0a5ba956e2359a04a600f8f5c297fcfe07fb8964e4b37fc282e74eef81d9399434cdf1a1ab069d9323076aff59a25e2c867dabfa33c8d349f
+TIMESTAMP 2022-10-01T05:09:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3dzhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3y59fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAiqRAAlcagqFY7KB9RVAWd9FBejlBkY6zcjt2W3oeTqn/s7PPalJGMuCHYsfD/
-QRShmzgOaFua5WFSn0w9BkN6U7RCrAwvaT+UT23gaP+4SLzvZw2i55+FWZoc18YO
-4XDnVezun9NANDO6ZDsAqg5k/UHkLiSOVqKV7ceLcHTlKTZoOoyiVW1F7sFeaPNe
-HT0nePLPYod3bDHZfTqurVUjiMagn1dkQIa1TjFHnF0q4h74fXeONNcAUTZHh7G9
-2KtdH9m8+Tp+r0H5VBJW6Ehl0HaGUd+zdnjq0V3FwFKWiJcHMIx9+AUTsgWltubs
-xXsN5wxky70SBMPGnNkMulb6eHhUpkimMSORM5eMsRI4sadOVyoumT5p/37qcA9K
-7X454ZUXucwrEK4uh3lHWtCbDqPCrAwuRk9g2kSI++KYCDMMquWUoEqSNP9C8A5E
-yGE3trjyntGKrpp40W+Rs5Vh2Neq9XVON9lCsnt7VH/BVzgO7cD5ac1uNoy3NO7r
-i6/yBlpEjxzubTdvC26/62DUS+WZXqFsfcSLWj8nMq1MtwKs9Z7U1nJLxU24fe9Q
-DXLcHydhdJ74miG/ZDRGGpS1a1y8IAa8VNT1z5WDkOUlwqlpEPqqvOgsIWlhVpdk
-bCphfItuhySpl/aCmmuliU1tx9GhP9VZyU67EzwBjGk/SZU8nmA=
-=fA6g
+klDgQg/+IgCPxQZUxIoQRXExYjpP8WiB2qh5u5WmphIDlCttTRc8wodZhqOqvKpS
+h6vXbGC1VLwKyD6igbl9UAaFKWMIdKa2rP5XDx53EtqvEX6a+HFHOke7Q1lv+rUo
+1sNgQtSe+dZ90YROmZuaiKD5tbPx9ATxXsYrHbduDRcAHpiCOhHYFKeYx80ijyiS
++luMPYhitbG6fKz7ILH3cYIv9hXEAKpPCX9dlFkCXz2722yYE3TK7mJXO+2U3D7V
+j6bSz/4FrTf56+FZF9J+aG3YT7PusrETAdBE9qQf/ensCbp9V3f+Kbr3fnsnbl7j
+NtXpov8HZk0OjRDEXBsVm/FMqEzZ0mVRmwEXNt/pCIZgytC7w4QRPhnTcB3SoXR7
+yqV8Dzr/YX2kEoR/jU4X6R9L9o4LzMDSJGax0R5jtyBoKzwf6lx/abJz0gjkXEHE
+9p30wrwqdZBz6xq7yrT4fbJX9jA6vx0dS11IODFjfPPQyVRzh1AwZoFJpnZVBYee
+d0PezeEnrKN7JbW/LNump48szIkfxc5ZPzk1eCmj/fdz6Qm+Q5zeqNFeYVpS3b9A
+89aZVSb3VQMa5kSX9cjtdAucxMGTkQ6XIldQnQB4bzXdeW5rHp/SDKZrQw2L1TN1
+Uomik0N+oeS06Gh6Mjx8uIhfSR+MtZ5RcbX4M93K7lRfYpeV+Wg=
+=rd4N
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3f4e41d3513a..647eba2788dd 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 078a322e0496..2a1991f58d05 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 578dbf4e82b6..de8b2d10d96c 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -10,4 +10,4 @@ EBUILD brltty-6.1-r1.ebuild 5612 BLAKE2B 5622e19bd95f3d30a0797aac52e3e28efabaa4e
 EBUILD brltty-6.1.ebuild 5601 BLAKE2B e26efd68d25484109eac679fe9ee28a86da220089f5a642ac412096476727d967f594465c31e2001e5119b5b35e0ac2a092c428844c4e79bec3a923a385a5019 SHA512 a1e938b5e8648286c03ad10164cbae3b3f07ff9faebc6c09f38f4ebc0c4ce6ac8890d6e9ee222af854a603003773de73583b1fdde96b1d54256ced864cdb71b2
 EBUILD brltty-6.4-r1.ebuild 5629 BLAKE2B 4099388966dacb394cf6ad83276136c690c4b4728f8acd8f1243f3abdaea9d4dae08868204944d4bb4489f60561696da2f347ba50589882284044180e977aedd SHA512 22562ce8d7918b6d89a8e29eb452195aa9140457f4a9bfcdc2bb1756b1862c6e61a617cca25828428ee6a93da9e85d9f4e7432cc2bdb5a6938fc46601981b4d7
 EBUILD brltty-6.4.ebuild 5372 BLAKE2B 892ce75770f4795a469fc939bbd102643cb00edbd4fd8e1179d969c4a81d0ba15f88dfe75624fca08bebb5603b6d30f05f6b3a2f14ad8c8caa0325e53b939237 SHA512 60d4da4739317681fb772ce6fe04c9614c409da7c8552ce9de87dc41046d1bee93f981328d6793599ebbaa55392fa2226005aa5c793b305856378163cafab435
-MISC metadata.xml 1663 BLAKE2B 8e06dbd802713f8ec58dc4fed6aee6ffed135df23776e0c3d6ef7885ee4f8a221d1b0a8c605150d59511dcf11f673ed2f388d5c11ac35c9c54d51392d57c3e7d SHA512 b0dc1e72a17fc4ebf7c9abb4cd545f6e65d963e775d8f8c7c140d6c2ca325f20ab3ba4ef70404978f37bf6ff8c6da6f34f0d2afa95e44a5c7fd34e835c07253c
+MISC metadata.xml 1716 BLAKE2B ed682382453994ecc32abce819ea08090a44cfa8ee3ba468947d2da7f1051eab5a39514cfb0347a5c39299fba44d8e6af6f6e8dcf343e0c6ad1caf35db0c9ad1 SHA512 a06a879a6858edbcb390e347e864a901e7cb59d95a10967082804ac990fa9256e089379f21130ee3a8cb412cb9372716678d4e26e87de191addf7c2182199418
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 32eb443cb936..80c6f6744309 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -17,6 +17,7 @@
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id>
+  <remote-id type="github">brltty/brltty</remote-id>
 </upstream>
 <longdescription lang="en">
 BRLTTY is a background process (daemon) which provides access to the Linux/Unix
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dba02639177e..d1ab9a6a02f2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 0202a7383a9c..70d5a3075bba 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -3,5 +3,5 @@ AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb3
 AUX analog-6.0-undefined-macro.patch 997 BLAKE2B 9ae68f90acfa81e861a6fddbd588ed4cbfdf9b4ad26355894bc3aaa0df50e5bbd180096c4baf393f6dcdd7d91d28b4e6a85e5b5c65714ff540e9ae127a08905b SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f
 AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f9144bc39df17ea380ebd323b2ddb891dd968078fd3d7bae6b29a90cb5ec2051a10722489d0d83d2 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
-EBUILD analog-6.0.13.ebuild 1375 BLAKE2B 3b6f888be02e244019ea70e138c3e3bd43a7b533e9ece7591cb06ac05beaa84f5263753bf77fcca57e57d1b9fa43208621df030553ff9c764d203828215f0418 SHA512 b781befa4fb74b1c29de90a1432530d42763173c8335fcfa4cae86a25321f04ea85a443187ddc39901a3932f21a487f05984953e685b9bb497e54cd924951e0d
+EBUILD analog-6.0.13.ebuild 1383 BLAKE2B bbd44a6d6d1ca1bdb5579da35b8e0fb6d046fbfca3b5f74f645b40870be7d1707c745d73f1df5bf5f5053e9eb2f544533996e579f45075622dd5dd18c7eb98ab SHA512 80d15df7353c61a33614d00b37abbb1695e84fe13c3d554bb69e11072fae8e8c0794a9ebcb356fc5d6b36f035b54c3c64682b9a4d3a6920e7907927affb948c0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 1fff147bc6ce..55d754de8956 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-MY_P="${PN}-src-6013ce"
+MY_P="${PN}-src-${PV//.}ce"
 
 DESCRIPTION="A webserver log analyzer"
 HOMEPAGE="https://www.c-amie.co.uk/software/analog/"
-SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"
+SRC_URI="http://www.c-amie.co.uk/static/analog/${PV//.}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index b718fc748787..991d3524559d 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Bitwarden-1.32.1-amd64.deb 72752286 BLAKE2B f7ea64bacb85820872c026d4f4bc6e7b70533bc64af85cea71beac4cf5da559a2178775a2eb31c805837ec5b7fc853c5c097fe3fa71bebf796ea165f62723a4b SHA512 514e9da98a4987d7a65e4b8a5f00fe9154a5e7558edc8d14360a1e7e21a24d4ad2ee82c38b029976d6671af991a82d54207cbfc73c7e246b7c18e5ddceb9394f
 DIST Bitwarden-2022.6.0-amd64.deb 64084380 BLAKE2B 8729385160c07be0056ee9b17f70aa53b5c5e240fbe5ecbc20d3f4b5e2af69524a4042b07d619c04c6521cd1696459346e6812796bea78f5ba7538de22ff7965 SHA512 70de5d3c626543bfe3f8e3ecde1abe427154e73456f989b6b0219db79c2f61d09a72d37034f9f37a14bd2ddd82ecbb23515551fc7eabc6bc1aa87bc8b44d4474
-EBUILD bitwarden-desktop-bin-1.32.1.ebuild 1661 BLAKE2B 9199f0a289c649f8e24d909ad4fdb820d7ebb27d41401159ed33f57a49e28bf2ccd8654f2b465a1e06a6afa5b1568282d2c779002bbfb250763981bc7540eb4d SHA512 94971cfb181947c11b58bcdcb06f48df502b974ad7b0d8bb24e34bb2c8630a8045197df642a85ccbafbd0473a61395d7cd0e77b6566c065e5166d09ff841892b
+DIST Bitwarden-2022.9.1-amd64.deb 64957370 BLAKE2B 05d1f206503b41ed2a118948b3bd74cb6418dde661f3e620644abe15108391fcd48e3211cb6ff48560eb6092dc2bd08620f3df24bb92de5b832301202456ecb9 SHA512 5907b58d4da1933809342f482f26833b4513e2b2d2a62a7f2ddec02e571069f3d0a5b509a57c4390f00677dd9c6a6164217e32a5911268da683ef94713345505
 EBUILD bitwarden-desktop-bin-2022.6.0.ebuild 1709 BLAKE2B adaab9ab789d48f4e35e6d2ba08e371072651412a5c968a049e7192b25cefd1de1201b2f9344ba3f0ac5dfe8b9ea582aeeede9bb4770ae8f9499112514a99a10 SHA512 d67fa57b7801687fca76638a629bcc9501fe56981dba1e000eeb72875d6454a7ef3b0f073056836ad8005c347ec341dac490e13e0e9357b3ffef981e47c27ead
+EBUILD bitwarden-desktop-bin-2022.9.1.ebuild 1709 BLAKE2B adaab9ab789d48f4e35e6d2ba08e371072651412a5c968a049e7192b25cefd1de1201b2f9344ba3f0ac5dfe8b9ea582aeeede9bb4770ae8f9499112514a99a10 SHA512 d67fa57b7801687fca76638a629bcc9501fe56981dba1e000eeb72875d6454a7ef3b0f073056836ad8005c347ec341dac490e13e0e9357b3ffef981e47c27ead
 MISC metadata.xml 336 BLAKE2B f78a5036df5cc4dc407d59fbfb0900eceecb4532926d24e0b1c32371214742bbf7a5596c24c473bb4e85a864cac453128e52097024814aed9104753cf1061e20 SHA512 457031ca1a915ab598497cc84944a4c1379ab74df3c7cae62051258bbb0ffe64203dd71b19e698df9b0afc931d56d8bb910a9dcd40c29f8a00eb2abd759c41cd
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild
index f20778c037c9..6803b000b970 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild
@@ -9,7 +9,7 @@ MY_PN="Bitwarden"
 
 DESCRIPTION="Bitwarden password manager desktop client"
 HOMEPAGE="https://bitwarden.com/"
-SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
 S="${WORKDIR}"
 
 LICENSE="GPL-3"
@@ -60,6 +60,7 @@ QA_PREBUILT="
 	opt/Bitwarden/*.so*
 	opt/Bitwarden/bitwarden
 	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
 "
 
 src_install() {
@@ -71,7 +72,7 @@ src_install() {
 	domenu usr/share/applications/bitwarden.desktop
 
 	local x
-	for x in 16 32 48 64 256 512; do
+	for x in 16 32 64 128 256 512; do
 		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
 	done
 }
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 412f9283a3dd..f553cd5f38a0 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -6,6 +6,9 @@ DIST consul-template-0.29.0-deps.tar.xz 37430348 BLAKE2B 9e0af3e245420bb3166a56b
 DIST consul-template-0.29.0.tar.gz 244446 BLAKE2B 9ff2b33d9a3ca296913bf4f5e6928b789341438a566b63e841e04b0ad528d13588bcdb34994a1d3a829c7d64593b9811480fcf9395d3527a09d473d90bdf4e23 SHA512 e562d89c753ca2bbd14ae57e084e7e2b0aac28c92c210357e22d32d5c3c138054a46f5fb8883a44f64bdd8e9654f457230cef3b24513fa7eeaefd177fd8004c7
 DIST consul-template-0.29.1-deps.tar.xz 59041120 BLAKE2B dd822c41cf9fdfe773ed48edbc02eb409b4840c9bd6f6b66c590d2fa6a44ccea3bcac89569abf318abd2c97e7515e600ee2f1f6c469c60d068959f90e3487831 SHA512 37fd93e9ce064251941626c6ac6b6770e7c019d82cd5f6c113d2adb09460a02fb1644af26714b34f9634e6312346edb98cd841aee6b6805f7d06a07fc7c997d7
 DIST consul-template-0.29.1.tar.gz 254592 BLAKE2B 4ad5e7c1bf2edc06d72ec1ed48f9546c698d22f8562c4c9924106891c44511b912abecc94517ed2359592b709f1f8fd05fcb00cea52893de29c62b34b61fd71e SHA512 edcfe45a3d98b9affda8b5d07fb375a647a78473c7041a87f1f5a2aa2faef2bfdef26a7037d228f6a86d0c446397e7452e7005ce16beff2bc68edabf2268a6f9
+DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
+DIST consul-template-0.29.4.tar.gz 262539 BLAKE2B 487902c2a05561db325e6d2638a70d2733a27dd31f678b65883d0b4925b4efa38fe4fbe6c7128c9473af4d4a21f467288a2c1945da399f6feab39216b67dd5aa SHA512 3bc5fcd1877fe125398d6bf0bd4938af88cacf726441af3e82142e651ab458185593eec3cb7c5916669a0e39dff8059c049556509ec279bf572f03b4c915d757
 EBUILD consul-template-0.29.0.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
 EBUILD consul-template-0.29.1.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
+EBUILD consul-template-0.29.4.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
 MISC metadata.xml 317 BLAKE2B d2427e36d0eec88eb97a7db510b4b45659b3d07b24228903eb5ed80807167c66cde6a3f1e63b1f55117974242ea9c06a78d58cca62359c775750ee34fe328ca0 SHA512 1e6e09983a77466e8671cfd7c848df28c2f35830a28a11c6c78369234fd35f35cb1dce8cbedfc97d2e5b1c4258db730e94c4d452d88b9841dc37e306d68d65b2
diff --git a/app-admin/consul-template/consul-template-0.29.4.ebuild b/app-admin/consul-template/consul-template-0.29.4.ebuild
new file mode 100644
index 000000000000..612bb41f3539
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.29.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 4a6bad9dd5ca..ad6559881d07 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,4 +1,4 @@
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
 EBUILD webapp-config-1.55-r2.ebuild 1676 BLAKE2B 8d70400043148747cdef86388c14fdff7d04a50fe1d45973ac8b4e951d2c91ffef5f22dd2202f053d0a249a954fb2f614ffc4b6435317f54d98bb5403050a981 SHA512 f9711092d2661dc25ef8a2bd3b71d23fe215e255ffedfd2e01b19c9e72269ae78ba1f07c7d5f8c9959004636d0e80f914f550f57e6492aa8b5e9f82b739480cd
-EBUILD webapp-config-9999.ebuild 1778 BLAKE2B b61dcbd5cc8be73e5fa13261608d1da27eb4bf8a4a6cf4d12220969f356ded9ddb3d87623af7f087842861e321f4c34b4761da528e7827b8cd2c8c911e400c45 SHA512 c8c6140dbab39c27f5eb57dcf3457c0756b2aed698ed68488aeddafc1698810d115e4fb2c2571bb28821bfde9fc5ad6ae26adc52e986dbc5b587b0ca797bec3b
+EBUILD webapp-config-9999.ebuild 1780 BLAKE2B d879969feab7415df88df8aabbcaf1d430eae801043ca61adf4f74c3b08ca8e8e37a93a99ba563c5921e021b51088f3e531baf1b86a93de7baeeec3a72c96d78 SHA512 d76800ccc3b31b705d2bf56b587b1697736b00ee2c89882ad36a01ddd18ea1858d10a033b3477d96a4fcbeeba44e4e80cb6981cf1d278d4a435912b4350cec71
 MISC metadata.xml 448 BLAKE2B 14bff33f87640b065d72b7bd98742c602e1cd30be80cde6bbc5bd923cb8529f55e4296e83e630e55a9c8342da063dc3762f515bccd2614fc50d68770260fd727 SHA512 20db75371335720225afe0111925fe6ba3979448987a27459786a4490b862073ac23374ba29c218e523ea465fb811c7686d5a36e073a35a2a2b2c4521b6961f2
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 3b46bc38c9e2..8d1031b56f77 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 prefix
 
 if [[ ${PV} = 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3b7c5f44f5df..d621a4876d4f 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 97ad1df67c78..5625a3d4640c 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,3 +1,3 @@
 DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
-EBUILD duply-2.3.1.ebuild 540 BLAKE2B ce16e342ddf3c9f30c9803f59cb9e981e6481c79e3f223d73af37ecf57fc36643124ab84d076667b1b769e8688bdba64b57c2bf53da854263d348c75ad26eda9 SHA512 681bd875e939295b2df0ecd3da8e84a7707c0f7b89e97a63c8ed63d6688f0f4182e45f93a267fae5ee4b3062a6209b28be5faabd7c81276e53edb86b33c6da7d
+EBUILD duply-2.3.1.ebuild 551 BLAKE2B 7ab7434564882e7542aefa62d6ddb8d375e3f8b8da294a5e9ec82f3f189ecddd1c18a23a7421704cbc1974854c7e3507026626da8f544bdf1466cc08e46e4926 SHA512 b4d702da9b3363bc5d7eee86a811c955c1d252750c71249435db18ec32e56ac942668160362ef9b62c9713ae8ef2ff50b1ea9f2324f125c8d622440bd9ba0937
 MISC metadata.xml 247 BLAKE2B af0a187f2d6c21a00076afa286d6e90e20bafa0db638595d13aa55cf04b9f295777101b5b595efafa81789922eee3712f6dd8dcd245e540fa5a541dcd930f8c7 SHA512 d168f8eb340ad623ee65ecee03f37e5bdfeb01170cbe6bba1386b83d041577b9e71424f0a99b28ddf12378b530d2b5b59345cd8816d4d8004af9e502bbb4a18a
diff --git a/app-backup/duply/duply-2.3.1.ebuild b/app-backup/duply/duply-2.3.1.ebuild
index 68e3ae211d57..0fbf1c602199 100644
--- a/app-backup/duply/duply-2.3.1.ebuild
+++ b/app-backup/duply/duply-2.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="A shell frontend for duplicity"
 HOMEPAGE="https://duply.net"
-SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/2.3.x/${PN}_${PV}.tgz"
+SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/$(ver_cut 1-2).x/${PN}_${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ab3f10b9548a..d3ecb1e28572 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index cb4f382ecf17..6d8aef707714 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,3 +1,9 @@
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-2.0.ebuild 601 BLAKE2B 8136f606f96547c0a0065ba4d3bf7f3e9d191f768bd0069738b5a5dd52a6b39668bbfbb1acd330cf9dcfcff10103e99c3577e66d324c94a2a54ae9414b130946 SHA512 5431e4d15ade5a789cdc42698911cf3715171dc67d7af046549b4b3619b0a9b5a4c3d8b829fc7f26156d6e71d2ef69c69af1026e74ea96e090723a3421fc418e
-MISC metadata.xml 250 BLAKE2B ea4ec0b34929b5f8fddedef23fbaf1f6dfc2631a649df885ee34a5812d7206ad97921dcae8b4f595399d712a9f2963a28d392cb744dc433b7e388dec62c75689 SHA512 ec5f078202a9044b99b2f8c6653e9f4c2b67dba5f59de32d60502edb179ba4be6b30d4953dc8cf144ff7f8cc0c4395eee8fb7dfc13eb6fa10fe0566a31118f44
+DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
+DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
+DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
+DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
+EBUILD osslsigncode-2.0.ebuild 603 BLAKE2B a220a6abfb3e99119e00523d7de4793bff91d7d87eaf8bd8841d73b3403045e6acbc1899e999913bdea5ce03f1bedbfcdfa0d831dbf1032c8427c37a8fd1d0a6 SHA512 3719b291d6364621604238ae957fa0a27124a044cd94bd49c250bb1b81759d9c780d6ddfb54ba4808aa85f8bce95dce0f689652e0218bf0527acd4f9ceb3998f
+EBUILD osslsigncode-2.5.ebuild 1292 BLAKE2B c7c35d8e889274bcda6840f172a6ad239988a3bb1b463c33febc495c02d4fae4e9c9e370831b91c51d2ec05cc47b995b144f05ff903a67ca6c2a3bb4c97d0d44 SHA512 60ff3797595987f6c6aad5f6b2e37aa3aaa7cb8dc9717c9a6ddbf177f1fc2d937255c5c11ff22a02a4e03b8a9ab238d9197e1c7344a7f3c16b68dedbf5124bde
+MISC metadata.xml 311 BLAKE2B 2125050abed07efbfea727f3e45728531290dc032a0a54beb102d5b8a74c07df7d291c22293107286da9563d4de5d08edb8f61cd6fd8a11abd0bd465cf31d854 SHA512 93b6f00f2ac04656afecdb12a85b1736559247eeb9855835e90b0b79437e93c10e0bb6a2324f067ba37be9293e3b41406d7901ffa32f22e462b01eef3ffa1953
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 8a5edfb125c9..7c529bd10048 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">osslsigncode</remote-id>
+		<remote-id type="github">mtrojnar/osslsigncode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
index 5f3e86ad8cc5..a00e248085ce 100644
--- a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
 HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
new file mode 100644
index 000000000000..3b1e4827338d
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
+
+for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+	SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
+done
+unset test_file
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	curl? ( net-misc/curl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test ; then
+		local test_file
+		for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+			cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
+		done
+		unset test_file
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package curl CURL)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test -j1
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ce5c52f53b6c..f7b2aba7ca50 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 2e9479e2ca20..b4a7391c574a 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -8,7 +8,9 @@ AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771f
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
 DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
+DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c25808901034f073945c3977dde4dda44b03869be1f530398d549f0b13dafae0eb82766464875ced2cd26621a0c5d88 SHA512 e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
 EBUILD neovim-0.7.2.ebuild 3139 BLAKE2B e7d19b040ba9d94abe6a1a89b0c59f25d1b9907782924e43f912dab8e9d7fc646ebd7b63c2474e1e33c9064f670b5366830b68f937b9bb7ebc9dfca418effeae SHA512 fe34e9673f54ede295abafc363eece3537fa5ce4e63a340565a871c8f0bbaf1d8bc3f19aadb5b3447ce87c1bd5db849e37e815c0911c56eb85ea9f3ca58b0c71
-EBUILD neovim-9999.ebuild 3361 BLAKE2B c31ca7c2e75b0a5cc256ce793ae8b325245b304975ce17614174cd391da82f6dbd5af10b9aa599f0b892362a325fac188cb5472b5d89420720506ade06c0ceec SHA512 221190288e5b9e6cdb258ee275b5b7a8a7a12ee950661cf24181f72451fd22d4a79bc2a10cd3f4ba79553ec829b032bcc265293143918ab6463310a91c01055f
+EBUILD neovim-0.8.0.ebuild 3384 BLAKE2B 314d26df7cb2ddacb41a4ea9e3d4f602c52a278734314f80cf76ae3f23bfd39887eb3c490e6dc660665cb8fcfb4b2e0c46d90afdcc679a620f004930c2075a69 SHA512 c9af2bd6a04ea486c8a9f433cc08bfd75e99ea6ecfa49bec01d2a36bcac5c9b32bc41f613c369c1316f75aecbabfac7e1ba936336d6b6a613fc5e83460a9e270
+EBUILD neovim-9999.ebuild 3384 BLAKE2B 314d26df7cb2ddacb41a4ea9e3d4f602c52a278734314f80cf76ae3f23bfd39887eb3c490e6dc660665cb8fcfb4b2e0c46d90afdcc679a620f004930c2075a69 SHA512 c9af2bd6a04ea486c8a9f433cc08bfd75e99ea6ecfa49bec01d2a36bcac5c9b32bc41f613c369c1316f75aecbabfac7e1ba936336d6b6a613fc5e83460a9e270
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.8.0.ebuild b/app-editors/neovim/neovim-0.8.0.ebuild
new file mode 100644
index 000000000000..2e5948e10f45
--- /dev/null
+++ b/app-editors/neovim/neovim-0.8.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager test +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	>=dev-util/gperf-3.1
+	>=sys-devel/gettext-0.20.1
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	>=dev-libs/libuv-1.44.2:=
+	>=dev-libs/libvterm-0.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.20.2:=
+	tui? (
+		>=dev-libs/libtermkey-0.22
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+BDEPEND="
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+	)
+"
+
+PATCHES=()
+
+if [[ ${PV} == 9999 ]]; then
+	PATCHES+=(
+		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
+		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+	)
+else
+	PATCHES+=(
+		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
+		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+	)
+fi
+
+src_prepare() {
+	# Use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+		-DMIN_LOG_LEVEL=3
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index c1e19411b835..2e5948e10f45 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -32,6 +32,7 @@ RESTRICT="!test? ( test ) test"
 # Upstream build scripts invoke the Lua interpreter
 BDEPEND="${LUA_DEPS}
 	>=dev-util/gperf-3.1
+	>=sys-devel/gettext-0.20.1
 	virtual/libiconv
 	virtual/libintl
 	virtual/pkgconfig
@@ -39,7 +40,7 @@ BDEPEND="${LUA_DEPS}
 # Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
 # new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
 DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.43.0[${LUA_SINGLE_USEDEP}]
+	>=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
 	$(lua_gen_cond_dep '
 		dev-lua/lpeg[${LUA_USEDEP}]
 		dev-lua/mpack[${LUA_USEDEP}]
@@ -47,10 +48,10 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
-	>=dev-libs/libuv-1.44.1:=
-	>=dev-libs/libvterm-0.1.4
+	>=dev-libs/libuv-1.44.2:=
+	>=dev-libs/libvterm-0.3
 	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.6:=
+	>=dev-libs/tree-sitter-0.20.2:=
 	tui? (
 		>=dev-libs/libtermkey-0.22
 		>=dev-libs/unibilium-2.0.0:0=
@@ -76,9 +77,9 @@ if [[ ${PV} == 9999 ]]; then
 	)
 else
 	PATCHES+=(
-		"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-		"${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
+		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
+		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 fi
 
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 9ec915556cc9..a6a6076108f7 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index bc31639bbe90..c09d976fbc3d 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-python-20200719.tar.bz2 47313 BLAKE2B 37270b1f5ad3dfcd4e19c71ae74da585e803afe89c43f8b912bccf0fbdb936916cf58fc780b654692bb9e6ab44310514bae5f10d19dcde6a0e63042f76abe81d SHA512 4b205a099ad079e5e28d3fdbe774c22f54b7c16bff2d28b54d0e20ee36be2339e928d4050eed74ef969d5815bf4bb691bf5ed6e98023b28972da6d5c7d8a2545
-EBUILD eselect-python-20200719.ebuild 1056 BLAKE2B e82f9d9529d7270714c3826cae96d426f8a830cc523b7f2218bbbbb2475a344b0a51e3489133d856de5f16248767bf41bac4ea2eca942da25d8e0012314adfba SHA512 ed9b2cc467bd34b1d3f417878c74b52480ca4a60ad3b9b5fd5dd36148d78d6f67f1a0c76e42d6153d3ec8dffa4d8c64446d2d03f4c1e2754ffd4acb3b041bbbb
+EBUILD eselect-python-20200719.ebuild 1058 BLAKE2B 6a7c97c61984479324989eef24ba3e348b56bdb3296355a8c90a4a10d23d9d4fd4faba2f34f90a76fd1391a1b9db6f6e3583a68ae8b038d20f26dcb4509e9e0a SHA512 856c38cffaf2540fa6b454775206733a41b9953e559a732a2c1052a88016195a56c50645133944c46030ab2cfdc9e082c567e4e49b5d8783abc1732218ab9c7f
 MISC metadata.xml 265 BLAKE2B 369a57fab1283b596588a82815bfe567fe7617b5c0cb17e97f6694beefdd1e932b0d9ffc1fcb23c6ef05b33d97b3c1d1bb3960618ffdf4924c4ebad262794282 SHA512 a682dac348f2d95b986749f4d33e5702c1e8f66cf2ff7a32a5c2a8d388ddbfde2919d97345028c2007415368d395c7cf657184be89f7def27c949f1af5c30170
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
index 491fe41f0407..f7f045ffc546 100644
--- a/app-eselect/eselect-python/eselect-python-20200719.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 54f607b3cdc6..97cde3dc91a8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/jpipe/Manifest b/app-misc/jpipe/Manifest
index 3ac2d4d0746b..c0c4bd2efb91 100644
--- a/app-misc/jpipe/Manifest
+++ b/app-misc/jpipe/Manifest
@@ -1,4 +1,4 @@
 DIST jpipe-0.2.0-deps.tar.xz 1216464 BLAKE2B 1e4f5ad82ffac2ab759675293f0eebcb31a9458fb70f5113941829604e71f1971e7fc1ac20828f1b41fb350f0637dda07758abff4fd367852158d655f89e2ab7 SHA512 e7f6565ba4304256fc650d9786be587d8827f922cab481bb0a578c0d55717b618980e822f92af97a7da94f3a8953c1987ba917637236f6823301ca184b42a9a3
 DIST jpipe-0.2.0.tar.gz 25188 BLAKE2B 427de1de0f6cc8e716065eda71d13bdae69e939e54dbdc8cc86077898d0d8f3feb4e77b4e8bbbe3f2c9218a7dfe8fbe2d20e6fcdf03f900dc09676610c58847b SHA512 8028eb555bec9fd590207b5052d14b8735deeead9e027cec3ae5e8d3a40aa05495857db8aa60a41cd405f279b823f74474262b55bb7e91316df790769f1950a6
-EBUILD jpipe-0.2.0-r1.ebuild 2212 BLAKE2B b3449007a016341ec575dcf8c2780bee1af6ebfac9faaf554380dd83c3e3d34a95d3b8fd5c784ae2f09d64b487c45c1dd48c523496e5bb4dabe89d21ceb03601 SHA512 9757fe49b391630c6df6d4286017c79d068052b6f830828d7644c86dc6a891caa2e41201a66347794b6525d183e83c8a8be537d590ec55555fd51e32c111d33f
+EBUILD jpipe-0.2.0-r1.ebuild 2205 BLAKE2B 36f98c6e0badf761822ec3ff3e0193fe52fd3eee5753d3698828d657fe21991a6f03d9af65bb77fdb3b7a0e4106511277dd2d0ae6982ae00c0eb6e8f37c37187 SHA512 e8c67545f6e7fb5ef1dff5cf8d4c50a9dd472052ea8929baf90eb571bf625891f55d87686b47e8f918bc27a91fb1c8d28e74cc2e4c9ffe80f051f09f3fd18eef
 MISC metadata.xml 523 BLAKE2B 531998e8d9ced9d9230fc6b0bb7b66406223f0bac941757cbef18b70f3843063666ec47459151f21bc330106286d4a0899e773761712fa1ea8eb990e6c0a9545 SHA512 dc667dede0ab53da577e565255daebaad2a725a22c00a1a943107a6d6d0fb42ff59c9b732bde11a47b766272314c0910425258a4ae246c11d17f6f1c9c43880e
diff --git a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
index af7dafc3fcb3..1043ced048d3 100644
--- a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit go-module distutils-r1
 DESCRIPTION="Command line interface to JMESPath"
 HOMEPAGE="https://github.com/pipebus/jpipe https://github.com/jmespath/jp/pull/30 http://jmespath.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	!python? ( https://dev.gentoo.org/~zmedico/dist/jpipe-0.2.0-deps.tar.xz )"
+	!python? ( https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz )"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index ca980005a1b4..e86d1bb7d21d 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,6 @@
 DIST livecd-tools-2.10.tar.bz2 9999 BLAKE2B 866bb49d70b8008df30357beb0be7692cee44053bcf25f9544f67ad3ef1f53ddd38604d70ea7db791e6a81cba8de4bc62cd31753bacd01d45d5e6cc558da3d7c SHA512 dbd66a9a6e94b90d06231af2e4d677d97394b765502a72e81a7dcc7ad591d458ad28c69f1de96dc8c9fb10e7ac7031f6595aa89ab8d343f6bfcde875889fdfcb
 DIST livecd-tools-2.9.tar.bz2 9987 BLAKE2B b24ee78aa0111950322b4424d630f640aa2d525c5c87b5ff3397628ed3e1c55eb2dbb71c32cbd5e57fa3a4310af1f541c1acd370b4f829dce49d2beb6f1be442 SHA512 89e892dfa8581e0f1f8208fecb7a686f19da100751e3430b014e90455c391efd2a3d25f3fff046576f8f739090715a2c14bc8c0b1fc9fe7db03455d84426a889
-EBUILD livecd-tools-2.10.ebuild 1035 BLAKE2B 37203d2ff2a3097bdec561bc210e8cd0ce9067984d8280857d69e2b5e0a413d1e179ca19536f97366909c24bf7693fd252d557af19966f13aaea4a544b65dcb1 SHA512 1e60b1afe4ef41ff64d43c111e0aa02d1afdeb3b3d6573d4f62d1b4516437479109ecffad6a1cc4be600b42a6b1d1f9f604fff85e018bcf79476d103a7b541af
-EBUILD livecd-tools-2.9.ebuild 1024 BLAKE2B ead007f9eb78af83357aed50233e83833e5e378bb251345b3315e1b3b4c2640d0dfd6d8ad386336881e67a5cbfc7dd641cebfa6c60b4b3b7e2782022df28e3ca SHA512 bf53ddb65432d50bfaf104f66cc5ab2962532a3784b2784c7d84c7ec762d58fc90a4b63249dff50b9f422d1686c3aae9de78e211e512f170484abe3ebe3ad3e7
-EBUILD livecd-tools-9999.ebuild 1037 BLAKE2B 7eebc450c503399fce5def421d569bbe7dd61a1cd3b161ae04dba3c9ec4112dca246e91ca42179ae3b6aec29851f62544c611948b233094baa805e1f0c145300 SHA512 b574e0f34ef76c14e20f0e18e8ede1683ae48990a5959e7b2ebffc53b3e22efad93993c09fd159e31e77bab0e3e474a3ee3b723707bd278294c91341a4d08b75
+EBUILD livecd-tools-2.10.ebuild 1037 BLAKE2B 896eaacb2972e432799ba9fad007320d439c52710c948a365faf721758ce39106a20c09b0f290204269684d70ce94c4a6479d295c4f10b21ddb8abb8d9c72c74 SHA512 6efa771d3901508b66da16574e4752984d61064bbf3a120db383cedca4c89483e84a55d723180b21aa93ad501b6fc2437894a8199f0f817496082f7e0838ffd2
+EBUILD livecd-tools-2.9.ebuild 1026 BLAKE2B ce880fcb8ccedfab74688952d6ff2250a3fc0c0a98a3101fac95d1a7d3420ef951627df5c7fe7271fff6b31035ef87fa2ca13577a379578b43fb2e9f13a0ba82 SHA512 2554192c952b4a3ca201c7cd430705b66cf47fd4c06a1b69a7a4aad0ab45ea147c9bdbe1ebfa21b6d888fc42c026c317bb2a994072c3ce6905d3fc8076ee620c
+EBUILD livecd-tools-9999.ebuild 1039 BLAKE2B 68abe95b0a449ac204c1d2af158262f1034acca824594a45631ffc682ee42f4dff7a6104d810a284341da63b96035ad3f76678d3aa564f6029dd3e0647f46a10 SHA512 4d74d4bfeab45fe447ab8042cabe0714bdf5f395c77116f0835fb513eed3fc1bb4643078150bcef87a868761003c89c19296161599eb8f5ea7a7812856d6cf07
 MISC metadata.xml 257 BLAKE2B b9901b8caec50c3348db0f5bf23d8b69576570ab12219f1360d78f98ca20b858a0324ff0cff52f85859ce8ee383d6837a670f3957f8d475cfb80eb4a47427c13 SHA512 c89180536fb53175fe55ca76a3fe9d0fece5ae0cab281e0ad0fbfb4135bab69a0dde45f97998372d3d2ddc16c948f074f45661fb1b946265fc6b94aaaf880489
diff --git a/app-misc/livecd-tools/livecd-tools-2.10.ebuild b/app-misc/livecd-tools/livecd-tools-2.10.ebuild
index 48c7feaf4132..b938fabd53ed 100644
--- a/app-misc/livecd-tools/livecd-tools-2.10.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.10.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
diff --git a/app-misc/livecd-tools/livecd-tools-2.9.ebuild b/app-misc/livecd-tools/livecd-tools-2.9.ebuild
index 9295d5fdc649..28340d004b27 100644
--- a/app-misc/livecd-tools/livecd-tools-2.9.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index c53fe41780f3..e1bd53e34ea2 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 37ce753eaf28..0373d07bf940 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index ce1b07b6bb16..12b99638dbc9 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,4 @@
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
-EBUILD layman-2.4.3.ebuild 2190 BLAKE2B 5e4c53ca2e32c5c747b563495d06c252c63aa78ce9c4d19fcbda174ccd1684718e984ce76c23d22226f3c0f95c274df21a00badad5ca8cd13048769f09407d03 SHA512 d43fdad8ef6ee9ab30c107c11abf49ce2b7b4e0f575cd445a834c15d6cb63f55b9244b2be2d65527d8db57a1712d133a3b282e3040c70292514b322e84cb68c7
-EBUILD layman-9999.ebuild 2398 BLAKE2B 3e8375b9d076a6fc3fb76ecd4c6dbe497c77881014d4120c0258e3d3edbc1f262084d419c8eb97b51e4f44ecf85f76fd698e7bb0d57e0d03e4c81422693fd469 SHA512 d5c72406321b6fb3f3a616d6d8a8b48f8e5434c9bfe76d9c0b07a6b7830b18b488d69bef6906085652f124c8feae785429136c951a9b44ab77e61aabd32da580
+EBUILD layman-2.4.3.ebuild 2366 BLAKE2B 09e1ac426eabfd9b1a2a84b863b6c87d71e77ef93341082e48f28470fbab5058ab24835417b740820b11b99247a8e5b2b9b93cfe526e3f172b459c0f43ebcc6e SHA512 5047c533b4ae0c0190358ec9e3788f9ea0b8c28cdf9610b83b9da212c00db71aeec773f5426f6b826bafdc53478c1bc6f42c9e4fbfdbd50a3c756798d1393dbd
+EBUILD layman-9999.ebuild 2373 BLAKE2B 1d2630864e851b469d568e12aae01926b55448aa95c2c77f21ceeae78add5b672a9150901faa2f8cce5493a331e846192bb2c16c1379cc6db9a476b8d160b663 SHA512 1800110551b04db9981b998f0735b9798446c1fbc6d21f180fd1cd0057a8eeb9de5efcb886898a31610f6f07763d192838c00cbd007e7e171b844d2212ecd24c
 MISC metadata.xml 1103 BLAKE2B 3a719da18a59c5262d096af809af56f9f905ab14434cb4b29affd031cf463d69a203c73b10268bb74280d5627788d3d2a4498fa3a7ec573ae4188025919f1bfd SHA512 53a40e4f7697ad39a8eb274c68af4dc5b95f8f1da741b8fdcd034e4ee3ac20a63e3b86005ec17dcfe3a78eb7dcc565fe431f8393f15c8019993070c0b856133d
diff --git a/app-portage/layman/layman-2.4.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index 298dc099aaf9..241864865100 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -3,14 +3,14 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info prefix
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/layman.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -68,6 +68,14 @@ python_test() {
 	unset suite
 }
 
+python_compile_all() {
+	# Generate man page. only required for 9999
+	if [[ ${PV} == *9999 ]] ; then
+		# override MAKEOPTS to prevent build failure
+		emake -j1 -C doc
+	fi
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 0f5addf3ecee..9045c9189761 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info prefix
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/layman.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -69,7 +69,6 @@ python_test() {
 }
 
 python_compile_all() {
-	default_python_compile_all
 	# Generate man page. only required for 9999
 	if [[ ${PV} == *9999 ]] ; then
 		# override MAKEOPTS to prevent build failure
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3465816b5cda..5fbdabefd97a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 8e3dd04d132c..44a9401632fc 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r6.ebuild 2058 BLAKE2B 8ba3bdf929deb7955b1626bf9904491f8a5c5640488bc465b2414482db3846b38ca8aa7cbda39d078521e116af30ee7ee8fb95957c7a1f846f49a8744c8088a9 SHA512 e41b040bd14104b88cd9bc7023c227fba0214195e87fafa1d1ad1a3a56f506a093321ca9e3b117aec384f68e025aa3e31518f90c30afbf3d675853be541c80e1
+EBUILD fbreader-0.99.4-r6.ebuild 2047 BLAKE2B 2b6816b1db445c7a4d68caab776ee1ceb2f252b44dcd751e3e6e3ee144a2ec9a7a3a2b25fc63a6c45bb59c849b140255838a73bf61a898a47179e5a66bb36586 SHA512 fa262cdef74b3b379d083898e640f95e29c64e535a1f4c5d165e8957f9ba8be618e1c29550ae5e77de4fec1bd4500cceecfd43c73d8acf2bf1c14c444f2f95d4
 MISC metadata.xml 300 BLAKE2B a3ec1e9fd7a06ee661f79b8b7296673807f6886d1615bdca34342bdbf6804f408be32775f92a3201f6244150376448c9027bfd598a18b72bd2205406e53f3c83 SHA512 95cf37aa6b0dc778091e1b899af1cd7031deb5f24d0d152c8c11244be68d87e7d2fc8a5a0fa5aa539a89244c8f1722443c365bbe49070c9605f69d17953ba2a9
diff --git a/app-text/fbreader/fbreader-0.99.4-r6.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
index 5ab017db26e5..7b1a9042d69d 100644
--- a/app-text/fbreader/fbreader-0.99.4-r6.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit qmake-utils toolchain-funcs xdg
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/"
 SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch"
+	https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-combined.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 6b17468c4e41..3b7a1da21ae8 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4224ced6cc05..dc55de4759a2 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -8,6 +8,6 @@ DIST mysql-5.7.36-patches-01.tar.xz 6396 BLAKE2B ed9783f207d40fc220992c4193bdd8e
 DIST mysql-8.0.27-patches-03.tar.xz 9864 BLAKE2B 03136477a97a5bff0c5f1cbc7921a77d9b36e148e94f80463f00f0efd1a6859af4595f9cf15aa492bce043fdc9d6c6328bd64102f8b0127eacbc7795b1785ecb SHA512 8c00c8fef2b01389f59138eaa29399d8a9ce7930b6bdfb7689d1d7bf14a32fbb10a2b8dbe91933b805899ef3af0cf0bda704d4be14249991b381054bcc496058
 DIST mysql-boost-5.7.36.tar.gz 52968383 BLAKE2B 4d5e4fcf8d56f4a1d1d54ee889d432ee3265f55ff9c0ecf6fe216e67790a49ed052b94457680daef4cb42df29f14db7b0e678e0f0443c20b7e2324c772c24313 SHA512 a95580efd5b87776ee7f1aae9b50d50d88c70a48c16e7a2d8c6ada0b1cadc5ec6074a859291a65caa1b50a00e08a9e350df342bb0c6ef74edaf21055331c081b
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-EBUILD mysql-5.7.36-r1.ebuild 38618 BLAKE2B 88cbf474a83eb94fda420147ea1de13018e75662dba65a285d047e42c4c5207ee98b9db30d536549652d6d9b68bb5b965c1328fb9588886a228170dd61d7a175 SHA512 44bc69ac677e4f3f57310ea7c2837ab9bd0b7da046fdb88a2e5f6e65831e081d79051efee50878d3a372db3a9e246a1b90aa9c059cfbb37c7e24e332dcfc3d75
-EBUILD mysql-8.0.27.ebuild 40648 BLAKE2B f1dc5d44098a367e8ca6aa0384b67548b23a320862599b10e3a8786d6a6b1df6ad7710e724b04b4a7b0a6721fa1e60bb2d518832992235eff7a20eb80a3b3a19 SHA512 1be53499c7171a5fad96f6e16dd12b3cd385f74aefc4df6bdf0f11472669f985c4a1feaca5693eb10d2a7ca9a9744265ebfd7518e336bbb21972dd6e432d5da0
+EBUILD mysql-5.7.36-r1.ebuild 38643 BLAKE2B 8bb0254c476cfd7a8f6b247476a57c7979a30eb60d0f30595a7b5c235f827c7ed6309c3956b42c22300f87f8ff020b4726aa8cb914da645e46d8fb0231b56a2f SHA512 09647ee0e65ad611eca9b0e60a14ce1e83926cb2d090b7b778d0b23a7609197eb0cf7f4d8af1c7583fb655de2d02f7936f912cdf31943f6d3aad0592366cc343
+EBUILD mysql-8.0.27.ebuild 40673 BLAKE2B 7d4186450e56ab73f5d8b7844a80f00b3e978eeae80dced0342c021913d8e4999acce91a68167570d956cafa2f2c634f122bd5a88383fd3880024cc726d6291c SHA512 08fb21ecc87a040ef7ddf0af5b5e24e7180c162c03c745a52b2cdd81a331c2876fb12cde11b0392d7ff62a0fc2a3b8cc78ca271a80f5961088b9f6e9439a52b9
 MISC metadata.xml 1352 BLAKE2B 81b263eaa05ac8a0bd2cf0e84bf51ff4a07d8ca74e6febf8cbfea7b85f78a3d682549b1471c9d5a96ee21cdcfffcd4376246b5c9f964e73d7ebc68a4e026f5d6 SHA512 f9566f7d6c4892eda73587ac70eab66b98437d3a9512a7a036590a2347ef2a98946bf33bf22f6270b50a54966db31b079cf217dc6bcfe9087bb72ad95c9bb327
diff --git a/dev-db/mysql/mysql-5.7.36-r1.ebuild b/dev-db/mysql/mysql-5.7.36-r1.ebuild
index ee5bc3f04468..2e9a483d39a9 100644
--- a/dev-db/mysql/mysql-5.7.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.36-r1.ebuild
@@ -9,11 +9,11 @@ inherit check-reqs cmake flag-o-matic linux-info \
 	multiprocessing prefix toolchain-funcs multilib-minimal
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-5.7.36-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${P}-patches-01.tar.xz"
 
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
-	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${PV}.tar.gz
 	${PATCH_SET}"
 
 HOMEPAGE="https://www.mysql.com/"
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index 18dda6ee1678..d90e79f15aa5 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -12,11 +12,11 @@ MY_PV="${PV//_pre*}"
 MY_P="${PN}-${MY_PV}"
 
 # Patch version
-PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${PN}-8.0.27-patches-03.tar.xz )
+PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${P}-patches-03.tar.xz )
 
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
-	https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz
 	${PATCH_SET[@]}"
 
 HOMEPAGE="https://www.mysql.com/"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 04f7fe537810..6be4b106051f 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index f1d17ecf127a..804dbd249e3f 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,5 +1,5 @@
 AUX foldl-1.4.12-cabal-doctest.patch 2371 BLAKE2B e3a402b7bbd433e2744810f56aa9d467a72d90941ee8b7d760c4a56513f8aff75aadc34e6b9bf1fd7cd573078d774df92401c44d04cf82161f9c334bb3930ad6 SHA512 773aaf5ddd1743398fd26a33702455de1bd470130855e763c3352006e8f0ea67ad5599efda38878f2572023e9d3fb5209f5e6efb4e3ae68dd381602ee5995dec
-DIST foldl-1.4.12-rev2.cabal 2668 BLAKE2B 4255e285bade060ee547a96c6db7a7d92b85bde3ca0f496fa7750b42df7e6382adbaa1ee7c2c8327f39eec6aba3eb44b7d29c9213e6595160bd8743fd364f73e SHA512 44ff1cb8f31c9770d78139053f2f31dcba76998339a9d07cd681994a0c34d862a750de2e5afa3b42a16528f38a6f9007a5481b9b52b481258006cd8466060ca1
+DIST foldl-1.4.12-rev5.cabal 2682 BLAKE2B 616f3b1d69892cdf30039db5c82842d858b58d227f96e301b594e51b2052c7f423264b11a82c82669cc736b337dca901e242177064b0bf2b4cf128da619935b2 SHA512 394fe8ba15a59a270bc70deed3438a2d1e5193bfa3ec266dbdc3bac48e0b32279cbaab6dfb550cc551f48ce466a9bc553d1ea3748f90836f95f158818d267bd5
 DIST foldl-1.4.12.tar.gz 23210 BLAKE2B bbdd9a0b74d5b27b4b8800090a1b2dc717d023d860af8f26846a86866756211b30c755f6a1c3e604d6d1db91e5afa35ee943e014672c0a6e65712e0fbcfd29d0 SHA512 6b345b59c52039e914ea703ab88a08a8bba0a18bea91fcf4cf379ce678e5a97044f563c7b285cb656a764068756b4fae8321308e86813f86d04c462e9889e6e0
-EBUILD foldl-1.4.12.ebuild 1745 BLAKE2B c215929d918cec43c4ad817405a7f5b8a847ccdc483a1ffbdd87d18d20f510b4b74b7533a461b0a6d960ea5a9f5d931a5d754f05e44cacda8363f8bd3a41ebe7 SHA512 78055aae2efb3cd196b483714eeb18f7c7a8c5bd859d6e3f01f365ca153ccb4c0b8d8ada90f58953df5235a0b6df12e4276d690fc6277965af91103645cb12a5
+EBUILD foldl-1.4.12-r1.ebuild 1257 BLAKE2B 74a9b24c760836c40385951a8169502ca36c828da592e13b92a333895b3afc9aedaf8fc5e62ef643ae4451609668ada3c6e8454320146c88604edfa75a9e46bb SHA512 c6401efdbf788b20ad0d3370f431e6b874cbbe55fcad8a09b956a5bbaee63227eca78fc397c733cf13fb2c966841c03fe708ab610b6e4611de46b3027e90e5c1
 MISC metadata.xml 546 BLAKE2B 671ba01a8895c38c93d2bc5d5ca16470c8e14557a19cc96e6122b11a147dfa8da2247c6a780d412e609c59fbc0314c1a2b65ea80a2783be3f4b784cde9462704 SHA512 5c329503486cadd2127fd72c09e9c1bf4a06ea5bb2c65390ae21784ea0db74ccc81b9118829180c6991f57fe91cd445180513797e63563a26cbd23bb218dc9fe
diff --git a/dev-haskell/foldl/foldl-1.4.12.ebuild b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
index fcf3728bb42c..21f98c77fee0 100644
--- a/dev-haskell/foldl/foldl-1.4.12.ebuild
+++ b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
@@ -3,20 +3,15 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.1.1.9999
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=5
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-CABAL_HACKAGE_REVISION="2"
 inherit haskell-cabal
 
-CABAL_FILE="${S}/${PN}.cabal"
-CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
-
 DESCRIPTION="Composable, streaming, and efficient left folds"
 HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
-		-> ${CABAL_DISTFILE}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -24,6 +19,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-1.4.12-cabal-doctest.patch" )
 
+GHC_BOOTSTRAP_PACKAGES=(
+	cabal-doctest
+)
+
 RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
 	<dev-haskell/contravariant-1.6:=[profile?]
 	<dev-haskell/hashable-1.5:=[profile?]
@@ -32,7 +31,7 @@ RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?
 	>=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
 	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
@@ -43,15 +42,3 @@ DEPEND="${RDEPEND}
 		dev-haskell/base-compat
 	)
 "
-BDEPEND="app-text/dos2unix"
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
-
-	# Convert to unix line endings
-	dos2unix "${CABAL_FILE}" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-}
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 90105df3cbf1..f3c20dcdc92c 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,5 +1,5 @@
 AUX vector-0.12.3.1-cabal-doctest.patch 2520 BLAKE2B f211e31c01be3c7ef16b394f12f3326e9623b266b3fb19a205727888f1b3510220d93c02acd979af020caca29b8d59d2d6965fcfaa6146d6c8d62cef7705eb06 SHA512 e74d99c8b6384c43f426a071b7d6fc7bd8e9e5d4af7b824cce62f64793866f2813b69a0539f8ac0b200418451d41761e5f897ff467e6ed697129756d4f72e4a1
 DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843
 DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98
-EBUILD vector-0.12.3.1.ebuild 1813 BLAKE2B 1559b409f18c358e71bc776156185441455d98cb6f118acb3cc55fd8a16f7570e302df64dbd3ef27832f97fb0b4cfa8d87fe5378968b5402e4040a315fdde376 SHA512 f75fc51dae23d0c70704c3f40fe33e7b69f894967f194cf94fab8dc3ac92fa81f060fa51343649c564fd14044a3ddaaccf14fc39e78d512a93a65d269cfb937f
+EBUILD vector-0.12.3.1.ebuild 1855 BLAKE2B 021f94e3967d1f5d8a4ee35bae909f3ba67de4a4ea015df2abb48a997c47d46a1e03d0ce5a88c93ae4172518f1efc98c4dd92c5f7e92e83c972864bcea4f6ff9 SHA512 11dbac6e6e2875089c3d0fa1a55e4e0589e7e14931e0a4f26b59e2695b986e58c0f25c3e076827e155a059a104940778ce6ce0d870a02493ca794593966d8113
 MISC metadata.xml 2432 BLAKE2B 68ccab0b08c3cd848b1e68df59d703e82da74bdb819471f8c867edffd33dd3832340b7bfbe255892ca0e81a810c8c6232154f8262172d71bb54e20341f48bcd1 SHA512 a28490c454bd52bdf1e2c1ce972eab4bf89bcef23f8f4b7e943ffe6be452bc65a51469a8645bb9505ff531af8bad9132afa2475ce067491296b535830cd78fdd
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
index 3dbc48989ba2..2c1244b38023 100644
--- a/dev-haskell/vector/vector-0.12.3.1.ebuild
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -65,3 +65,5 @@ src_configure() {
 		$(cabal_flag unsafechecks unsafechecks) \
 		--flag=-wall
 }
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index 3037d9f70efc..26632d6121ce 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST xml-conduit-1.9.1.1.tar.gz 42901 BLAKE2B 2dacf27f6373827b779492130b837d3b5bc7adce599820b310cebedc8b1cf525ef300c5d6e65acafb5579a6f0922a47c749fbd8c49bbb623950d08dff63079c0 SHA512 4d75960eb400a4ac8cb13bb70f59b554659fa2a6165906f73097a2bc564505a1efa78e72b121d9ed0fd8b424ff25cd1d8368e6c1f2b6ffa4b0aa36f584727687
-EBUILD xml-conduit-1.9.1.1.ebuild 1312 BLAKE2B 2ad445b43ff977304e6b0d59f083af2e7877ae887d850fe4b9a6b2c0493285824214e281d883a3d42b9175b53346ed106cd7bef327d79bd250df6dcb8fcae91e SHA512 8d4f70b2032c372697086f83b187d1cb7dc4cda5423eb4bff729e4654ac26ca0d9637d1a54f95d3696c3659a3502ace289eb630e56149b6a7d9c635ffe3c84a4
+EBUILD xml-conduit-1.9.1.1.ebuild 1354 BLAKE2B 9c40ba608b4b8a17523cda28997501f7d4bb2142a9df3501d325b8c65c3a3580554eb781866bcfef99d1da18e8cd9bbd0f13f0ce72919706e615d15fc3a2aa38 SHA512 4d2dca26edeca8582878c9a84d3e4415ffef622d05438e9736a337e74daffacccd5e23ef203cff76bfb5799b024e11e6206b6a8d16ed8c7feff814b425354582
 MISC metadata.xml 1537 BLAKE2B 4b746fb46271d06bbcf556b3659ce3f9461235f2f7d57ef64919b32381693fc905362d31e559abcdbd0521ef2b08abc7aeebeb85324af780bb3d144f35b29582 SHA512 4ef9db27939ef5822ed5eb95fa1c87e0e7d79434b9cab3729d088e87013b971486526b279e9f47629351395d5046abd92d7a5dbf74f7d9cd56649bf40096e636
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
index e2e73b0194bb..1c45577d438b 100644
--- a/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
@@ -35,3 +35,5 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/hspec-1.3
 		dev-haskell/hunit )
 "
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7f2b908c7e48..5d132e66cc47 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index 66375ed5fae1..77e62a7ebfd1 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1,3 +1,3 @@
 DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799
-EBUILD janino-3.1.7.ebuild 2531 BLAKE2B ae499ba288a32289cc580df385fb0ad4c5c8a91a3cc6438dacf7c27f1fbbf9ed777dbbbfd75e7e092d0f453a396cdd45803b8cc5087b039b265a48c8244cfec1 SHA512 f8a736543205c5f471196d02cd01af3b5746118f091ee12e024ce2b2d8c4438d6bcfab5476c1c3a75c37a89e95811e9a39d947ad629f3eab3402c1dd8614ed4f
+EBUILD janino-3.1.7.ebuild 2531 BLAKE2B caf33b93b566fae939db016e12aac84d89be6c7ca0d876a7fdf660584873637d0ec2557997195e641c10608b8cfe918c2506284ea7afa586fef31ead7efdbc48 SHA512 705a2509e4d16abab317edbae29dd688b99ff1eab1c832a8503d33b03d1d76dc9e90db0908c70d5e92faf2502b84ad64ea311d5abcab1cba9e05387bceda3a14
 MISC metadata.xml 402 BLAKE2B 24ce6bf4574089a37f3f65f463269ffaa05cc5491b630b69ce205d62967d9dda038caa1af286974c908921c57819e59c4f63a1377c3c6d4dc5ab87fbc20286da SHA512 c26dddfc7e65fcfe8cd2d359acecc410592cbe1b73453110b3c27b360676d3ecdd247e05c936bef1125d19d97e78ccaeaff9707f52be882e5dd14b9b1b04df56
diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild
index 46f3e8c96ec4..b0fbd7ad85b3 100644
--- a/dev-java/janino/janino-3.1.7.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="An embedded compiler for run-time compilation purposes"
 HOMEPAGE="https://janino-compiler.github.io/janino/"
-SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f8a8265c0fd3..d5ef1606f151 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 039afadc3b2e..51640600d795 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,8 +1,9 @@
 AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14
+AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
 AUX ispc-9999-llvm.patch 1688 BLAKE2B 1eb6cfa4a8c42bed5e5472a0e81962edb4d823af34f67025a782833a5211c3e9925a68d0fd7137ad58ff21f113fe9cfedac47c29d04dad7c1c934d4fc7f238f3 SHA512 8f986ef14bb138a8777c6d82bbb0519a6722eb34fcda86107b268d5e63c7283cdc1242162fad57080a4cb32e0ddd0fa0010400211cd731df63aeeb6f198e26b7
 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
 DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
 EBUILD ispc-1.17.0-r2.ebuild 1647 BLAKE2B 3bbd313fa23a85cea4485fbabf738b1b01b9d122f244d6fc803e85b37ea640deb79db2fe8b7e8770d758d7ac133d45fee2849dc8d81ac7983fd5ec055837e635 SHA512 b5ea8de5c77453f06a582c0a6732c19558d923265d71670f1be2fd2a5af6bc6fb2cad78ef1541a38b295a143a9ebdb08f931c75f66bf77477954719dc66cd44a
-EBUILD ispc-1.18.0.ebuild 1757 BLAKE2B 323ddc0204c7ec7400264beff9338779531375704be59345b9c7a05d4b06016e10aaca110e29aa86df8df320b1ae3235ae7318b6da0304e9c0810cfd36f7d5c6 SHA512 15ee87c9229562c65598762dae831678b7d0a8908ee898e594b256632c44026e11eeff64f844d09f13a5751c97d633b8d38835a75511346ce797f0867fdf0ddb
-EBUILD ispc-9999.ebuild 1648 BLAKE2B 7f0b26c1b4ccfeccfa890d7e966c1c39796706852b3d50289d45725dc64c2172487d155574b5d648d9ccdefdf2fea992cd4d921a292127c9897b25a02cc47541 SHA512 c5acd4eb5f00aed9871534209c17bee053692efc47aa3566cfcd637f546601bc84b02b1d666f9900e18f4fea645d287306d78b86d72c50610bd63e1a8133faef
+EBUILD ispc-1.18.0.ebuild 1760 BLAKE2B edbf2f8025e123d8583446c4a70c4c50813c211ad2e97dfa2d67721a9362ea4e6edf1a42542b9cf33a515b924c422a1cca51697108007aca0d3afc77922e2897 SHA512 61119b85df7bc9146c526b1c30c3a208a6d25f97f6aae311c011fd674e8e8742e7e03a2263cf36c1c7edf672b3523c768d6629b84f09787e6c1000a37afc4697
+EBUILD ispc-9999.ebuild 1648 BLAKE2B 56880e3e248f4076448c04fa4b7110512e70def2543db428fd9f7be0143edc9d067ed43f00de35784c1d287a8818fee0058c9dc9c75e460fce96f1f46984a725 SHA512 7e8ad11ea8422f1f7d551643c6d247646d2d52da99868f5aa5b464638ee2c55da89fce97d501fe21337c814c6116eac518ef88568222d08897ee0e107ccf3eaa
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
new file mode 100644
index 000000000000..7303ac0fd6e8
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,7 +218,7 @@ if (WASM_ENABLED)
+     list(APPEND ISPC_TARGETS wasm-i32x4)
+ endif()
+
+-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
++set(CLANG_LIBRARY_LIST clang clang-cpp)
+ set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
+
+ if (X86_ENABLED)
+@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
+ endif()
+ 
+ # Link against Clang libraries
+-foreach(clangLib ${CLANG_LIBRARY_LIST})
+-    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
+-    list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+-endforeach()
+-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
++find_package(Clang REQUIRED)
++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
+ 
+ # Link against LLVM libraries
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
+index 06fab989..57a7130f 100644
+--- a/src/llvmutil.cpp
++++ b/src/llvmutil.cpp
+@@ -42,6 +42,7 @@
+ #include <llvm/IR/BasicBlock.h>
+ #include <llvm/IR/Instructions.h>
+ #include <llvm/IR/Module.h>
++#include <llvm/Support/raw_ostream.h>
+
+ #ifdef ISPC_GENX_ENABLED
+ #include <llvm/GenXIntrinsics/GenXIntrinsics.h>
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
index 47d74e37d160..ec835cb94bdb 100644
--- a/dev-lang/ispc/ispc-1.18.0.ebuild
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -32,8 +32,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-llvm.patch"
-	"${FILESDIR}"/ispc-1.18.0-curses-cmake.patch
+	"${FILESDIR}"/${PN}-1.18.0-llvm.patch
+	"${FILESDIR}"/${PN}-1.18.0-curses-cmake.patch
 )
 
 pkg_setup() {
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index 8da425ce2b9c..843faa818262 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.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
@@ -31,7 +31,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-llvm.patch"
+	"${FILESDIR}"/${PN}-9999-llvm.patch
 )
 
 CMAKE_BUILD_TYPE="RelWithDebInfo"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8bfea8b31554..c495249f177d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index c3a3b2ac9c2d..e4791250dfa1 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 668 BLAKE2B 762525f8b0f4de2f5200235a2dd6b115e1ba25d9d00cdfa1365e0270930fd47512f338a3723e5df80c4d4dc1947a3e1f266d28bf9765b29c21b357127f20cddd SHA512 8d09d20f9384442a4701918bbe97028d854ae6c4bfac2802daca98ccdd0c29b5af7545e9307218109604df896798c822b068861be5491f33b4add932f0151c9b
+EBUILD eventlog-0.2.12.ebuild 678 BLAKE2B a62e7066e6aedb8a93717851df8e8ba2ba9277732bc3c0fc7c924619c723bbd5bdc002c61b004fb401ee9e8d5e80bc5c3af0f819c1e55a911e717c401ecdb8bf SHA512 d1830cb2c659106545a53418ea19f64deb1d47a3441caeb4bfbf50f221bef7800c1591b6d33f51b6870084c51f419aa58131d75963cbf2c353d1db93765f0cb1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 528c481f39e5..63c44c31efbd 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.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
@@ -7,7 +7,7 @@ inherit libtool
 
 DESCRIPTION="Support library for syslog-ng"
 HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar.gz"
+SRC_URI="http://www.balabit.com/downloads/files/eventlog/$(ver_cut 1-2)/eventlog_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 7828abc03a97..4dfcf2b1e48d 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,8 +1,8 @@
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 DIST libmaxminddb-1.6.0.tar.gz 605099 BLAKE2B 6868e42b8a166d75f6fa3a1da0fc2bd47a381ff960496ec9348b88c72b1bae180e3c0ce8989149e60d7d9c795d6baedb8e9d984098914064db985f2d201983c2 SHA512 9394e8dd959982d4ef5d15a928d32700722ed9d6c9988d9cc1bf2f4e67de0a53cc6987e90aaef3a6926c9ff36ac378f7a1fe47818fda4f5a3a22539210b2d004
-DIST libmaxminddb-1.7.0.tar.gz 609484 BLAKE2B 7210b32e591116d6e5b3127cde082aace3080ce6ce0182908eb3c85fe36ae574633d4b99ee1a19f770ed6bd2ebb6dc478c1d94f1d60c607ce76f34d71eefe74e SHA512 b1d6bf8dc3f5d3cc594f670c8a51100d7f032ce40d6e8a620b90133d1f27c668a7362146e7973cb0e3b84649ec60fe145e82e85b459dd50ae1e168e87d936109
+DIST libmaxminddb-1.7.1.tar.gz 609542 BLAKE2B d67e09aecb1b250bae59c4165571e1ffdbea36e10a9994c5f26b5139fffab35b5e31dbe105b4f60eca3ed694177f623f471231d0b8b9d2777dd0daeb27596f17 SHA512 5ad6e5f20dd0fd094d2e44b950256e3e705f6b7d1a5ffcc08f46d92917a540ac23796c670fdd7292b040fd78d2fe0dc10b16cc07ae941b00140e6301d8c2ac30
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
 EBUILD libmaxminddb-1.6.0.ebuild 886 BLAKE2B 0bb0544733b440fb8d2dd3aa9b25078fce928b58bd665c96f6c98d29f35e878cc64e75aaeff55c2a4351ce786086e54e204305f433fdb6ef655c153fad48b81e SHA512 d14c592c4977dd04bbb7d6473918bdb3199b327484e7186ba999fab021baabe46d3eb55c4a5e89823c46d1e277c694b5c8aa78bd2fab445e0a06e8ea28d6b27f
-EBUILD libmaxminddb-1.7.0.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
+EBUILD libmaxminddb-1.7.1.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
 EBUILD libmaxminddb-9999.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
 MISC metadata.xml 366 BLAKE2B 391a64aa942bf9e1c352b404d253771843370f5d48da01f2e85e54af03eea10d66796adde9a158aa828877c9af021f5cfd58623f623fea9ae5cdf6b226e408d5 SHA512 c0d26d2b5100832047831580d41157b4cb0bd6816b009e9051edfb615548f115ad0dbed8c2267a7811f22c3610a79e809bf9b3b7bb6efb278ea693c06cd73ee5
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.7.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
index 0b83ce40a0f6..0b83ce40a0f6 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.7.0.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index c9ebf1cb0dae..7253bb361653 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,9 +1,7 @@
 AUX libvterm-0.1.4-slibtool.patch 2251 BLAKE2B d8484447c8a7e352514b298634d3e39bf606a5669cda67ef906f29b4a411737d81277e060fdd01cb14d1d04d329af1207dbeee475baff5cabc7afe9b5573ac78 SHA512 dd8d3b8c192bd6f6b357f7c5849a0b2a94661410e7f3cf5f6301a3cd34884362a54dc3ac593895f186ce3ce3628c2a8804f555107fb57d9a82a91ddd8cdca39e
-AUX libvterm-0.2-slibtool.patch 2328 BLAKE2B 9a03c8fae1228e07eb7245c06f46fe489760a6c2e4b183fa27444169254369f8ce71e27b011b9b6370eed6422d04993f0bdf3662266ac5f88e16d567aec55230 SHA512 fc714e88f3dcbaf48667e49377639ed2d58bdc9000b1f909108ee6d98dbdadd390f6b66f311524a57ce2ca83488d3d745e431816b572cdd73f9d63714eb85d16
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
-DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
+DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
 EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05
 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
-EBUILD libvterm-0.2-r1.ebuild 941 BLAKE2B af9950eb2c5ecad18c968814394ffac2cebb41199df8b06f208ca58594a884f6b95f3f62c9ca2d42313998b4181aa2852cfd0aee43da9eedfed4d18e62d4a19b SHA512 d9d6fd02caf0e0541ccd74f2690237216664c5d6a6eea928b2c6b4c4a88ab89ae80f7ca7737cb82295213f1dfcbb9d8b743cb96b6afb9d24e4137806166073e5
-EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613
+EBUILD libvterm-0.3.ebuild 777 BLAKE2B a25765bcd54f73ac1f6bc552e253675bc69edd372b2851f130d51705e8c8679d4e080a2051b608a41d97dc327a76a3132b08657cebac2ce973974a6976fabe95 SHA512 f125bf30f72d4ea72cccdbaf7ce2bc077f533dd0bc0cb6ad1f451c1d9c86d3685d5b54d56b3da9cf121889a4b46db96e685ab6ae9eb26abf364d64799f617b1a
 MISC metadata.xml 326 BLAKE2B 1ede96c6ed5288e9f8603f2c1fd2daad8bf48384c09b01de355628fd970e3f252b6d064cff58d70fb5838cdf0edaa71c6d83e65f240e0ce48559ef74cbff43b3 SHA512 951e8795d8482cd230a256c4084f5d0e28d9cfb7fdae75f239f72b7d67d900c9545b47bdafc8260eec393c302eed4fdd70912e965521312705fcb4ddb281d814
diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
deleted file mode 100644
index 5f6356da2761..000000000000
--- a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: orbea <orbea@riseup.net>
-Date: Thu, 14 Jul 2022 13:18:26 -0700
-Subject: [PATCH] build: Add a minimal configures script
-
-When building libvterm with slibtool using the rlibtool symlink the
-build will fail when the generated libtool is not found. This file is
-required with rlibtool so that the build can determine if the build
-should be shared, static or both.
-
-This can be solved by adding a minimal configure script.
-
-The build steps are now:
-
-autoreconf -fi
-./configure
-make
-make install
-
-diff --git a/Makefile b/Makefile.in
-similarity index 90%
-rename from Makefile
-rename to Makefile.in
-index e3c1c39..70e7ca2 100644
---- a/Makefile
-+++ b/Makefile.in
-@@ -1,13 +1,13 @@
--ifeq ($(shell uname),Darwin)
--  LIBTOOL ?= glibtool
--else
--  LIBTOOL ?= libtool
--endif
-+top_builddir = @top_builddir@
-+
-+LIBTOOL = @LIBTOOL@
- 
- ifneq ($(VERBOSE),1)
-   LIBTOOL +=--quiet
- endif
- 
-+CC = @CC@
-+
- override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
- 
- ifeq ($(shell uname),SunOS)
-@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
- 
- HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
- 
--VERSION_MAJOR=0
--VERSION_MINOR=2
-+VERSION_MAJOR=@VERSION_MAJOR@
-+VERSION_MINOR=@VERSION_MINOR@
- 
- VERSION_CURRENT=0
- VERSION_REVISION=0
- VERSION_AGE=0
- 
--VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
-+VERSION=@PACKAGE_VERSION@
- 
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
--INCDIR=$(PREFIX)/include
--MANDIR=$(PREFIX)/share/man
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+BINDIR=@bindir@
-+LIBDIR=@libdir@
-+INCDIR=@includedir@
-+MANDIR=@mandir@
- MAN3DIR=$(MANDIR)/man3
- 
- all: $(LIBRARY) $(BINFILES)
-@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
- 
- bin/%: bin/%.c $(LIBRARY)
- 	@echo CC $<
--	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
-+	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- t/harness.lo: t/harness.c $(HFILES)
- 	@echo CC $<
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..39f7767
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,14 @@
-+m4_define([version_major], [0])
-+m4_define([version_minor], [2])
-+
-+AC_INIT([libvterm], [version_major.version_minor])
-+AC_CONFIG_FILES([Makefile])
-+
-+LT_INIT
-+
-+AC_SUBST([top_builddir], [$abs_builddir])
-+
-+AC_SUBST([VERSION_MAJOR], [version_major])
-+AC_SUBST([VERSION_MINOR], [version_minor])
-+
-+AC_OUTPUT
diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
deleted file mode 100644
index 84e1e689e51e..000000000000
--- a/dev-libs/libvterm/libvterm-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-
-	append-cflags -fPIC
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.3.ebuild
index 3e8037c9ec7b..5011f386127d 100644
--- a/dev-libs/libvterm/libvterm-0.2-r1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.3.ebuild
@@ -3,38 +3,26 @@
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/pkgconfig
+	sys-devel/libtool
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch # 779034
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_compile() {
-	emake VERBOSE=1
+	emake VERBOSE=1 PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
-	emake VERBOSE=1 DESTDIR="${D}" install
+	emake VERBOSE=1 DESTDIR="${D}" PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
 	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index f16b96170079..9655fd583680 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,6 +1,6 @@
 AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53
 AUX unibilium-2.1.1-libtool.patch 2273 BLAKE2B f6104f56510f2b876bf05f6985f1d8c8d0cf4282329999c3c2b911549f46bc4c4dc2a3b1e503dfa3146c8c1cb43f22f724a8dc4235a9a8d7a268c4ecbd8b18ab SHA512 8229eac14a6cf7859a08fd12eca00a2849a1872564d4313a751c4d618e1c784ff4ecb31f5a92c103c84a0ba9c96b98c7d73f30006ed51754170fdfd8cf23fa87
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
-EBUILD unibilium-2.1.1-r1.ebuild 651 BLAKE2B 5273545f3c0ed05837ebe803eecdc87f4e02a83d6df4193c9e598d81a5ddd5419877821efbd2c151a60ef357b4a10c852557222927764d57fdad994002eb7a1c SHA512 c2e62a9855b1366decd890b2975c11c2217e5612d6a31292c5c93d32549f14b02b17f0ee6e39d52c647dba874531eeb30dd9d2c27b5b518a103252b84095c535
+EBUILD unibilium-2.1.1-r1.ebuild 649 BLAKE2B 2ce91b37e60326eaccf582183d65a45f6a86a0f8de9d0ec9d94a1d4f83611bb8932d2c260e8e70de8e61d7c26a0561c8a3716a82da7296f837ae9f56d8d7beae SHA512 05c70f5080878cd907e42ab6be2aa14193cdb0b906ffb1caf68152de4841497f0ec9d337166cc5475dc4c1411ddcf7d2ce604137d227aa3d6f34e647590a5fec
 EBUILD unibilium-2.1.1.ebuild 883 BLAKE2B c3621a4920d75123cff0e4b1cffbdad962e52984f7c20d186a1b5c7203f83e11b66a5658c4c6f9438cd5f4d17a9d5efeab254151a62e8fc3f4febf40d148b757 SHA512 03746e24f81a6700a4dd72d18417bf1d795ee96464850491719cae7ac51e5f9398a98516e056de16854ad2bbf271dbf3f25a4ee68bbd2f32460e96b36eed46ef
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
index 361950435198..faef5821c970 100644
--- a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/dev-libs/xbyak/Manifest b/dev-libs/xbyak/Manifest
index 2f1ecca63ac6..eac4a08f9bac 100644
--- a/dev-libs/xbyak/Manifest
+++ b/dev-libs/xbyak/Manifest
@@ -1,3 +1,3 @@
 DIST xbyak-5.73.tar.gz 214021 BLAKE2B bf7ab78df7ac3f5a8860b3a613957bad8b6faba523126f6f4ce94be4ce25da8b91a418ac2445d8d706f09fc7434a8ab9ef6f63c56ef0b7860290fe6801849fe7 SHA512 1c2eb73c2e9b66d4b4f7689e071ea8ba8a3b7f0e05ef885ad35ca89f706772bd6e8ad448581c954b1a24f424ebd2db4e420410450a951fda7e02d6fd2e5e9a67
-EBUILD xbyak-5.73.ebuild 467 BLAKE2B d826f6cebb8f5bbe2cada4325e58e44df2c1f7834586a236bb41aede02737047938c741d336a519e949f604fbaf276c6cfa3caea2a1cc35b8cc1ae2a67456876 SHA512 678b36a0a5eca831168cf6d97b4495d592f0114003c6104c108e5546acb9e09093fa98a9b24d69e32244a80e3a5fb638a88f32990406787bafc5b0431d5c4bef
-MISC metadata.xml 213 BLAKE2B 836159b1fcb0071741f6524eae1f052532c6853928f987ae8a032163b087f4a0d715a3f71252dcdf0e86b9ff3badbf2835b5af788f240569b82f840303f69590 SHA512 ee88ccf1397b9d29bc34982bd9acd7477e6faf8b70400695d4d492d4b1121a3ceb806f2f87574bb923c73adf30c77ac6e8a150a4f76da1b244c7aecef77b3ccd
+EBUILD xbyak-5.73.ebuild 468 BLAKE2B d11002414f35a75260141eafeede0f8ac7a0e1f96a0689f574493ef793c8048b77ec8b02db3cc675ac0ab8c496ccfeb3a7f4fcf34f60f6ef62679357cc1e0000 SHA512 8a2bd5194914eb0123fe7edeba613c2e4d8431beb8b1226b0d824a24ce7700fcc9516838b4b7e6b28602239416df4c0d670be93238984c161c32f9dd74ae6c66
+MISC metadata.xml 294 BLAKE2B 6ff08f098a11aeedc66f4d1a7f11063f90e97707b1761c18859dfe849ad5263b251667eb9076df58a0a3abde48a0e3a468a7df22230df38bebedb62ff3cfb68e SHA512 fd0a122d24814090c80745bf2ecead1fe87722bcdd19464bd3a48f4d09d067c9dae8153d8c04c62cbf5008ba13f44509080a950f2acad9710bed04e6fc040b76
diff --git a/dev-libs/xbyak/metadata.xml b/dev-libs/xbyak/metadata.xml
index 1b142c23f268..afe279a31d30 100644
--- a/dev-libs/xbyak/metadata.xml
+++ b/dev-libs/xbyak/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">herumi/xbyak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/xbyak/xbyak-5.73.ebuild b/dev-libs/xbyak/xbyak-5.73.ebuild
index 4cfd5772e810..751793158e94 100644
--- a/dev-libs/xbyak/xbyak-5.73.ebuild
+++ b/dev-libs/xbyak/xbyak-5.73.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="JIT assembler for x86(IA-32)/x64(AMD64, x86-64)"
 HOMEPAGE="https://github.com/herumi/xbyak"
-SRC_URI="https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/herumi/xbyak/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index bfcba63edac6..43cefb3fb0d3 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 3a7eb5085ef3..318291b30df1 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -2,7 +2,9 @@ AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60
 AUX luv-1.43.0.0-cmake_lua_version.patch 458 BLAKE2B 39e8f045b261f2a2acfb86b3cb5c1ee875fc44061e59b00e3addc6ca2437be3c2279176908d2f9500a4728fd8d0d786d2903935a8048398e1e6580a462ee63ad SHA512 cbfff6f4ed3ceed5fb14205c512baa6e2c6d424f5b4998bcc4db6ed776eabe87e5b7ccf69ec75cbb3336908831f0cf908dd6cefd0d1d540c2dc2bdb8c5b0d660
 DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420265a27756b0613781621c78c18edc272072cc29c46336787b040453cc9a06195264c0a72a985e49c48202022 SHA512 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
 DIST luv-1.43.0.0.tar.gz 122337 BLAKE2B 435334d869487de38215ce9b551f586d4017c7f83497bc90637fc8acb8e63d1c36f6678a3f2c4d5b24b76fd904b2fa8c364a31bc1bd544416f60f2b8290903d3 SHA512 f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff
+DIST luv-1.44.2.0.tar.gz 124180 BLAKE2B 0a46ffccd67bf04fb60c7aa3685fef328da1323437640a04b36748680aaf4074300097c53206915d8a1133defc61a359cd88062f1661899dfa8c394c183f0d0d SHA512 0744590de941ec67e23e04811ed28de5e5ed8b6dd0d45e52e8e0efe0551d007f28cdada8e0d69e0d59bd37d4026102271a8ef977b12cfac1e84f6c8b57e6adce
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 EBUILD luv-1.36.0.0.ebuild 2303 BLAKE2B 516f7e876698b6b15639e648778d59f044d89ec216e2152fa607e24eaebeb0f3c6f5150de367aee211ac3c08b00407b325ab4c3289f873de3abe72f139ea9458 SHA512 732a3d8900cf3695a7ea65ab75c2f05c6cef120d43295a12413ea76c0a838dab4f18e64c815c38a634651af000b9219ee164d52814cf06c0ca5076945a45adeb
 EBUILD luv-1.43.0.0.ebuild 2302 BLAKE2B ff752f24faf4d0939cd4954ba6e52beaa09bcd78da6d960ee01995554b6a1ea7019a9b991255fe7f1abc98c86d30055b7d2c6de25ace37155aca7a1243d8b107 SHA512 1b23f6a3c63e42895f9457c8676510a74130c3baf51dbc1b0c9294f510db3cc848c2b6addda3bd6fc9650efa2130873ec4b8956e7362ecc2e88e09fba783fcb6
+EBUILD luv-1.44.2.0.ebuild 2313 BLAKE2B 0c8fec8ae0b3ccb3ba59d95dc623e1bb14f7cce8c6891e76350f357d9401386d809ed4567d7d3f2c97543ac8e0dfd9fd250845338535d9012447090b8969c126 SHA512 0663fc0a9bdf7ed974b000c71f968c7ca5bf638daf26d22da3ce4d7f59adc2af0c16b7f71b706124e736fa0e0b4d8286fc07195d53beec5d06dc3bd7c5c6a850
 MISC metadata.xml 484 BLAKE2B eb035fd19fe978128b6742025f44fc233348a496de2628c80f67db2ae64717e4a3685eec1456f920052e406d15855e225987389a4e33d7caaa5b938418849ecf SHA512 4bf472b91b176e1af730ffb84fade9ab49590726107c73f6c37dac491df394b6779a50e658d062b1cedc0a05f1fb89463817945bc075df572e3e9d6adab04a2f
diff --git a/dev-lua/luv/luv-1.44.2.0.ebuild b/dev-lua/luv/luv-1.44.2.0.ebuild
new file mode 100644
index 000000000000..44e933cb5b2b
--- /dev/null
+++ b/dev-lua/luv/luv-1.44.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake flag-o-matic lua-single unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.10"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+	>=dev-libs/libuv-$(ver_cut 1-2):="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.43.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake_src_prepare
+}
+
+# This could in theory be multi-impl (and we have an ebuild in git history,
+# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
+# app-editors/neovim, actually links against luv instead of trying to load it
+# as a module. We could probably implement some sort of a hack for this
+# - but given how messy it would be, don't bother unless someone actually requests
+# luv multi-impl support.
+src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_SHARED_LIBUV=ON
+	)
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=LuaJIT
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=Lua
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# We need to copy the library back so that the tests see it
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 9c4d393e0457..5f5520027eda 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index 8f4654893d00..bce929ce9129 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -4,6 +4,6 @@ AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7
 AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
 DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
 DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
-EBUILD theseer-Autoload-1.26.0-r2.ebuild 1899 BLAKE2B 86b2bc050608453b82a255fe266c1ea4ae11320fa524bd0fbe7f0bfe96f06d0d277601485ab440f329f504366ccd78cd86605b63dd524512fa96cd81a60df2b0 SHA512 2995417228ae2b27c38c27b3c84fa0b99b822d9314f55e8c0931ff8239d1dfaca1752e78d23427a50878df9e2ab7658c6b65e064a5bd16df152f63c1f8fc069d
+EBUILD theseer-Autoload-1.26.0-r2.ebuild 1898 BLAKE2B 0733a275a384271700b29b0d9e1ca8ea2dc1e6fe9d8340cde24e32247245852f162f3c18f63c2f3575dda82490fa59157042c2a3c1d599d3e2264a43faa7fda1 SHA512 b1944588d2162d7338feabd03cffa657db38155712aee504d90452c04fdcd7db85ffc6df06bc3094f8c42220fd061ae189aea8813b10081cd18c10e1ada413bc
 EBUILD theseer-Autoload-1.26.3-r1.ebuild 1904 BLAKE2B 1bb125f2c6ccaec288fb2ca3becd3b774260c8ac94b112893e25ed22fa8867f4ccddbf8ef1eaf9db92ec2623957fa73ae3c92d95360b276ba971b0cb68ad629c SHA512 d1e12bccf23695a7f2573ae3475291cb46998117322249df88544643f8d36e8ca3bc1e3fc23de66be3655d79cd1d01145cd61ff7e046419f3db6f569434e08be
 MISC metadata.xml 345 BLAKE2B e2e404685b07fc6ab5b46ec994c6ebc2abc49478222497f1597694155a82cd95a9178a7d413c19116811fc867b8374559ccf6e8a40d66b8084e487fa5fa66bc4 SHA512 78871e1e73ac6750b628955d2a006663def9b50e79faedc98f1dd4c557d3f16d866278de861ebe727c1f080e510730b909fd0db0948f374401abed7065f44358
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
index e93e6a8a10b0..91671fbd91d6 100644
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ MY_PN="Autoload"
 
 DESCRIPTION="PHP Autoload Builder"
 HOMEPAGE="https://github.com/theseer/Autoload"
-SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7c104aa5a8c8..de9deb73f789 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 5b6016f1d4fc..2034cac7a954 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55
 EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
 EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
 EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7457 BLAKE2B 52de4a25744bcbbea9e4486a2ab824212ed5885f638361055c2e0d708c44954f7ffd2149d88f99a897cc355a45be5d1d2daa2c937db7f1196914ae3acafdf56f SHA512 2e5db4b3f205982bdbc3e6a379223198c5aca088a81fddf3d5af49e4f3375064fb28c19b7123418e25a75c2c8f61cc736d4f0836758cecfda0da7b35d2df4ea8
+EBUILD matplotlib-3.6.0-r1.ebuild 7464 BLAKE2B b0dcd0d4b13927c0ece6c30e232f3b680cf9c56f62c248e674bfb2061d598e7e7f61613601e0257dce5241730d0fe86b6ff379822400ecf3b5fcacc4e1774913 SHA512 1b640f28bbc65622c37fffff99b503f196ed873dfd6dba7bd23ad72b6e678c00dcb3d7ee7d8eb44552cedcfecede761eb106dddeaf61fc84536f7fc88361c889
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
index 52b294df2d92..031baed90541 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ce0c4c865e15..7b285b8b7d6f 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/owl-lisp/Manifest b/dev-scheme/owl-lisp/Manifest
index c72deabdb877..05941d5c75dc 100644
--- a/dev-scheme/owl-lisp/Manifest
+++ b/dev-scheme/owl-lisp/Manifest
@@ -1,4 +1,4 @@
 DIST owl-v0.2.tar.gz 515574 BLAKE2B 054a06d33554cc31f5e1c756bf3ff5ea4fb5cec220048fb939aa9dcd19c586cef54ae8ddc80e1ee8befedfa2e42fc1bf9ea4bcfe37e6743154ff678346444e87 SHA512 f0dc4badc84be1ebd1ad8f6a84c8fc292449b0f66a9416f202f9010e89aa2971c6470599173db67bf3db3e4b6a61d777ee369eda76fa7c42114748e8fe48b7b2
-EBUILD owl-lisp-0.2.ebuild 830 BLAKE2B 91d68f94474cc50f35de085f529ed6d3c90f984f77d2eaaf5ba933af942d26e3105839080d20ad2e7c0ecf18d06665383b356d0f7ef1e9f866c1370242e467cf SHA512 fe2b6e7b6909aa81f7c97772a0396e70979719cc6302662df3126ebd898ff4b6863ad766bf9ca8be8f7e9ba6f69ed53b7774ee1c4dfcb02bd3fdbcaa2eb36da2
-EBUILD owl-lisp-9999.ebuild 742 BLAKE2B 1ec3b48a1178c5d9f33303356114d382af0dfe7e1541ad260b20e744b87d00b57887c465f7b9b2cda737b505730b1b1977a29781b94e21acbe917f65414dcaf6 SHA512 ca4bba07795fe484d8ac8258970968c0164b7b7f4bfaa5ba53469dce57ad4960d7c2111f15f41e8fd014d9cd4a7e5bcbc955daa6b5701fee9a129877a68725d1
+EBUILD owl-lisp-0.2.ebuild 832 BLAKE2B cdccee2f7ebaae77bf3229f758e751319b28b9d486cfe9925303f7c11a2c480ad8cf9d72bb0b1bfd4b52ca16a983d9007e65b3c19ea1195cf52ede7865c677c6 SHA512 d91dac0bbf14235e62510f6d3a79de1b380b5990d5bda492176529bab2ed0436cd58162966f535b9b379f4f1aad67f3c0a592013fe3106bdb82ee94566830272
+EBUILD owl-lisp-9999.ebuild 744 BLAKE2B d779b2bbb626900c9d5108be0d4bfaa90752d6d8a374f6e7b39eb921b800476285ccb6ebd80a6d7a8e54d4b4fcefa538d0d46c73bbca159c1c7dcb5f8b8db557 SHA512 323b47dc6a45f0452b0ccf26396847110fcb65bc1b923969d0272333affb45cc256670b20e9c9e47bd8dbab43fcec4cd7c9454a4a7328b0f2301c1326c3378a6
 MISC metadata.xml 793 BLAKE2B 54cc42daf49b4f39ad4119e2128e9cdc9e2749dafbb5a1ff63c84e60a6d410caa39034de5fcafd82ca36ac7291b6f3afe92cad929c4c59270f0fec01c0828d4d SHA512 7e360c32aedf4ec42abac5b1df86c1225f863a885087363d0f16ba5c971b342743f49afccfbb9d81c821ba180c4f6033b27ab46dedcbdbafb597dee8a1820c15
diff --git a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
index 0ea693d0dc04..05adcbd2ae8e 100644
--- a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
 else
-	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/owl-v${PV}"
 fi
diff --git a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
index cae7c2bb43c6..551dda855179 100644
--- a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
 else
-	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+	SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/owl-v${PV}"
 fi
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 5f8471a1fca5..ad80b1159a1a 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index c2c66f288c69..635654b39ed2 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -5,6 +5,6 @@ DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bc
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a SHA512 a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-EBUILD tkimg-1.4.13-r1.ebuild 1992 BLAKE2B d4631bb0d43bddea68dc4cdc452633a2ca803b36f6e1fc020b72119925bcb7a4e7d6c45a1778c12b4aeee03ba8562787e3a6d72aae5df2ec0d1e6dcd65cec8b2 SHA512 83736752c7349d2ff120651f86e94b31870440ca36bf85d5d43faab9256946666a524bb945bc2df3cc5c8c90fc93e60027cb8e9030d18293987c15f73c978f40
-EBUILD tkimg-1.4.9.ebuild 2289 BLAKE2B 1a1dfcee3443ac6e22bf4bda087750bc4356a7d07d2cd95af4d501cdcc5c03d5b2523f4650caece002bbd18692cac6de954fc51801d282e009b2229d48b64fe7 SHA512 e8a89550f0564a32de16471d410b6d9601c67360b49b38dbe034a97115481be0101572996ebee3c0dc921909b923fc42b4e6d3beb7a46c5a48027fc57b3a72d6
+EBUILD tkimg-1.4.13-r1.ebuild 2003 BLAKE2B e81a8ded396a4661fc597dc93f7abad03f3e663c8066d3a151bfbe59ff23ae1718ef1a9e7a0c3db07a305b016cad7c4f84f1c0691efd4570bee2db60624d1b1c SHA512 47def418f5ebbc14886d5debf8c9e1ed86c0af6d3ba4f498fa826a565a567678847165f918badd5d722496e0e75ba10666d7e075f2840d971cafef08eda4bea8
+EBUILD tkimg-1.4.9.ebuild 2300 BLAKE2B d926ab7095ce806a1de5f3407b3bfda019a0175fa929a1dda155aa707a42f6f3f160d44784f764ce644342956f65deb8a59718626fb48dbf3b601277269e0b30 SHA512 f8621a14a5e8ded8ca3e75424fd7492cc9af660629bb600f03ae1e5eac387fe7314e09022e95df2409aad9a7540d551830ce60d92935c9c9ac34bf45be4802fc
 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index 1c0e9a4c3422..db7ad94098e9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -9,7 +9,7 @@ MYP=Img-${PV}-Source
 
 DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index f021bfd25d40..efd7538c429b 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MYP=Img-${PV}-Source
 
 DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
 	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
 
 LICENSE="BSD"
diff --git a/dev-tcltk/tklib/Manifest b/dev-tcltk/tklib/Manifest
index e4a45585a63c..58b04db7ee3a 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1,6 +1,6 @@
 AUX tklib-0.6-doc.patch 447 BLAKE2B abd5a279a322ef7bbe44b8bcb0faf5729045e04903c2e152b79fbc05086dd7964bc7bc821cc527a9e39422229cb9f6b54fab2802cf32681dc7179d0aa291c664 SHA512 6848833a63898168d23b91a66052e8459b70e22dd5be9b6f938de5b3530473507ad2e65beee2258bbbf6d698d5162dd57af947fa112ccc9d2b678481679157a4
 DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
 DIST tklib-0.7.tar.bz2 5967953 BLAKE2B a7f6fa366045e78043652eea983f143cac78d847ce8b69575b1f0738b1da7e90cb3566b13412521edd62bf7beb3b92a582b2e3f0e71745bd95bd95232ff7d3ad SHA512 0322611c1dea8eebebe3f8f15ec33b695b074329ce9602aeb93d04985f486237f3ce89f1c42a5c148e12ae00b51be8c889c7db77977a0cc4204ac5eaad2cfec2
-EBUILD tklib-0.6-r2.ebuild 891 BLAKE2B 65a975a67d340c8d6849d85b6b30072a47fa7da931fa3b965bb182e4f4e17e65b9bdbf2c11aab8dddab1dde6a86b9c4da0bfcb5f917a3272747fcb1c042e4fd9 SHA512 14f3babf945f2ccbdaef9450720fd6d37aad6ac5657b0a75a5a10208f163b69991aa25fbe93e61267c9095e47c56d46e7e4c923687823c323c063f341f6bf84a
+EBUILD tklib-0.6-r2.ebuild 886 BLAKE2B 30cd0439da3bb115d6218a17b506bd8ca486b8ef0c8db22e21770d082da87df24f8a1e2371c79abc53a4aea72fa48413a03dda31ca565d718b7eb5185d1c2a54 SHA512 1036812e42455dfb9e3c448b08fcc9d1e15d67f9d916d6dac4a0eb98c79846e92bcc38e3a5d32644ff1729a32f8839cefee72913cdf9ce86b0f27489404d7426
 EBUILD tklib-0.7.ebuild 780 BLAKE2B a5eebeae382961e3ff10c57fbb2fc1aa4d77c988a2325879a619574e015343a4759fef673a806ba85d49646d6fbb0f92d9c7bee40dc680cd12aae30894c33658 SHA512 b81addb18ca29cb1e2a74ea14dd0654356dabab00cdee4a6acb05eed4c5b14a7db106e177b5a5523b474f89b1adc0e2ccf278fa94fac9a0cf735b2cbc9e62e99
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
index d1240d9ba41d..09f72a4a67e0 100644
--- a/dev-tcltk/tklib/tklib-0.6-r2.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-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=6
@@ -7,7 +7,7 @@ CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
 
 DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
 HOMEPAGE="http://www.tcl.tk/software/tklib"
-SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+SRC_URI="http://core.tcl.tk/tklib/raw/${P}.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4ff8b99e6075..6f0b7855799d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 556f11323d48..d60cc13348a7 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -9,9 +9,9 @@ DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c6409
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
 DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoin-tx-0.20.1.ebuild 2415 BLAKE2B d1cfb32b21bf45a8a959142dd626a4af52f4d337d634adb097445010bfce0ac6083668df98d5235c5855f3e8338d426859cce96c7ff58dbeb93246a1e0dd6e3f SHA512 b43abf41e16e98e8dda8c58f5a5ecb8ef893246cdbb1f03082302cf766e7dce621d3e1e28ab8d12d697a834c675c0e3fd5c949176af9428b509a439bef302e96
-EBUILD bitcoin-tx-0.21.0.ebuild 2423 BLAKE2B 387727ab303936d1bd1bb989ae83baa0222dc9567784f865527e4acb144751eade9eb7802b02450aa59d9cb36aa01cf684bfb33bdfce14217a905afcb027d0d8 SHA512 cc5f82b9beee66432fc030941bdae2323e5f22bc879ad5cd1a50b87b86fde452188787187ac6138743cb285fd73b9db2a853516028cab3184aea01a67921d402
-EBUILD bitcoin-tx-0.21.1.ebuild 2359 BLAKE2B ddc52b1fa52c9337a6c31d2793b56f156c3e29d9230b1e68c38cd9209cfffc38f74b32f7159835cf98572b80910ebbbcfe487a18982b526f75e0903b28027244 SHA512 c8693b488dc7a6d26819422e0df355c2a627f7c20354cae0c886330969d87afd978ec6f97c0caaa9d009bb7e0fb149535eb96023468ee522478522154dd1934c
-EBUILD bitcoin-tx-21.2.ebuild 2328 BLAKE2B 8a177f52e4e1070833317ec68f91a7d75c7c93b62194ff962334f3313433c747af3720eee8dcfe2e31c16ed147b9c9e0fd45de2f7fa8a5c6a4fa2fd2ddbc82c2 SHA512 edea6078667ae4b457a14e500be75f9ce2588bde461b4d3808616f22e8dfecc96103ba6940607365538d2d28a6bb8e5eaef79be17d747d57c08c49e2942a750a
-EBUILD bitcoin-tx-22.0.ebuild 2689 BLAKE2B dcbda16160e96c6730a68f6d4259c09ec013442a89bc1e573c5171f49b118af143ec969c42a508b4548d0e2a5375415ad5fb20518f7db755ee4b3ae0c392e1e0 SHA512 3c353d66f97f9de87ca3031406e45e40da3e716944eb28da106a6a3eece765a80e456ac31c0e221fdc0c0fe914a002b0c76b32de4f73d3bb76319ffcb2a18867
+EBUILD bitcoin-tx-0.20.1.ebuild 2425 BLAKE2B bbee2ef80a096b1c0cbf2c1c49002849ed273b2d5d4e3cc1789cfe4510d805757861e0bdd458666098e838274efa3e1d5a3d135a1bc3eb3e6a8f806b43aef8ac SHA512 153ac9766f28887f7e5edf6c7cba62858066a319ed78c1835205f1fc83aa2bde08322f9338c6b0027bae01d98f3d2a95f2155c16cf7f48b5ae1843a7216fb9c5
+EBUILD bitcoin-tx-0.21.0.ebuild 2433 BLAKE2B ae42a797e2f2c258e0f70fa5bdde4250c14e2f9db658a6df208d4449d71bbf5fb9e5dbf3cd2364a5595b5ead60143df3504413910b2ab5a9f423ff85f916b54e SHA512 e985e69f181f72438e32eecd29bc78e70904cea6d61b053e8405c4205d48b0864fc4e0f1df004b021fbee581f7fac50f23f6d832c5d5e7f8c02ac4972a29eb5e
+EBUILD bitcoin-tx-0.21.1.ebuild 2369 BLAKE2B 6c1455f0c53116bcbadd1ca83fc2f860c1800eee6ebe09621734a9b28daa167a2256477585ea462d6c1b4c6eddd51e693e1fe8ab12efa05379f0e6fc3fc3b381 SHA512 9080a729ba701d6ec0935a800aa1fa13f8e05b629135b1ed70eb2b4420d733f4f6ff8db7cdb024222d170626383bbef0a123828e4048b2f0cf54b677dbbe67f2
+EBUILD bitcoin-tx-21.2.ebuild 2338 BLAKE2B 81581820ccec6aa8599ca4234aff79b5233b72159cc28d7d2e02df7cd04bd260a4df93b747093816a3af6e1b52d4d79ce1e1acac8781d769fbef5e11feaee556 SHA512 11537ddd5d5e1a218803e24aae12cfd10658ffbb0c35b9e0237ef1e51f2a6f4991a5e013367acb66812f807d0c0f13ede45588c5fcd1829bb311ad5f5d4561e8
+EBUILD bitcoin-tx-22.0.ebuild 2699 BLAKE2B 5957a6f040f3a07a607ff8b0e25ff8788450ea198ff394a0d593423d75cc13ec3f12bda2ff632cdd3672eb5222d8ae1c9345925e0c2e6e1a11143a400f6cc18b SHA512 4255cfa0064a3e985c90522175b780244f3336ae14f3de3106bb05359583274cdfea9f7912be610ec55ee684b7850b8f96f9ffa72def2c2f7d51327f56d98308
 MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
index 5ee8e0089dbc..e112dc6a8e41 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
index 4225b882677b..eba9ff93c5e7 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
index c4020b7738c6..c7ebffda8f7d 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
index 5f36a5d39e78..ebfc9e5de376 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
index 7f6a574275ff..9c3c211276ed 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index c3e3a09f99ee..07cfe7a5d91b 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,4 +1,4 @@
 DIST packer-1.7.10-deps.tar.xz 628140836 BLAKE2B 6cfb8409a9a9aef2130e58f2b70b1bb73b491aa9fb2d1f2b59b2c3c9e721465a51111f0e6357a58e9eed4d8b024a4fe9a0f20cf9a5b84e7d20f3a8d52ad55e4c SHA512 cd0af0f60029b7b3e887fbe4245e26e12d798fe5c3b650d63774ffeb2d5eab9609d8506a06c35d8ff4d499db1cab69d767b8b386d04136fd65ea43de3940df88
 DIST packer-1.7.10.tar.gz 2414352 BLAKE2B 7c48aaac8411dd81cae2201cf9b03eab0906b78dcc6aecf654f498b44884a0758f0d5fc10d03b9e526f7753d18db8754b74d8c2eef133b4170b872f41c8261f3 SHA512 12f032afef95be92be4f6e98cf2af5548189cb179c25d74b8f7943b4a6af0ab49c5a86523f27385e5eee05624d7e9de8d572fe19442305227c5bddd21a66f97a
-EBUILD packer-1.7.10.ebuild 814 BLAKE2B 87cfb6c771d3db81356e281bd38f0228ce3add56feb3cb0f503b8295a58bf47224694bd602320239eabfe0a4b331b81ac8c60d4619b7f40866b4f2ee75d3186d SHA512 5e9867211442b3cd8b275ed40a484530c60b43348290f5674c47c7d9b856f63968fdb98878817a9e0f1b09078ea4ff63e73e5ce34b52b75a18d63f7f4db71a68
+EBUILD packer-1.7.10.ebuild 782 BLAKE2B d07c471c1ddd43a126dce74e3f877f10978f6b549fa251c6f947a9775f5a9ec4e4688eaef370cd2001c56086b43397facf9b6dfc6a2ae63029c748716c604457 SHA512 5fa4d8825455b08c39f6c69049d6452b569b10944e4fcac6aaabae9a4c93503c8a8815e11004ff54a562e8eaef1389e9f8a3f15e11d04b4446fc0daccb0ac2cb
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.7.10.ebuild b/dev-util/packer/packer-1.7.10.ebuild
index 2805c0f9c87d..2fe313cded4e 100644
--- a/dev-util/packer/packer-1.7.10.ebuild
+++ b/dev-util/packer/packer-1.7.10.ebuild
@@ -5,12 +5,10 @@ EAPI=7
 
 inherit go-module
 
-go-module_set_globals
-
 DESCRIPTION="A tool to create identical machine images for multiple platforms"
 HOMEPAGE="https://www.packer.io"
 SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.7.10-deps.tar.xz"
+	https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
 SLOT="0"
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index 8ce6818a852e..4d6f61c3aa35 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,4 +1,5 @@
+AUX unicorn-2.0.0-lto.patch 2165 BLAKE2B 5858b3d7daf1f3654271d974f04836baa1c89a8204317c37b043e44f1c9005c2e4d1207308db253e2463f0c0b5ec2d59ef1717d941ad35feeab8c94b9518d3f5 SHA512 bd3f7e281f6c064b08dde128453da5db41ddd673fca53975a9e80a2ffe5f5fa05f5826f5027a7662ef11182e3f77680aa357341e0cbe085943047ed280af8d75
 DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789
-EBUILD unicorn-2.0.0.ebuild 1706 BLAKE2B c2d5d58fb9d2605c3d220252b04395bb8c2fcaaaa6c600c210e29eea7ab83a1aa3826195cbe8c26f40081f7e9ddbfdb8a441c4b6dbcdfd94604232547daa9849 SHA512 bdebe5e8676f92dfdf3c4fb66e1ae095f563f26fdca6932c724c665a87967cbd82f0d87a049ad47766cfb3f11176c8092abea54726fd15c34d5299871bb9f104
+EBUILD unicorn-2.0.0.ebuild 1749 BLAKE2B 964761d8c139fe79c8549715fefa2ed7a8f33928cec4eef2246143b3d690e4a2dcaec8a74cdf5c69b6da33aa1ded0958b56bf157ce355c943d090c3051860879 SHA512 5ac8715ced8967784293087a71203c12ec5dd7292ae4f2d764b90af3cf7591ba22b91935d39c873dafba670b8093cbc9b0d4485dd3dd716817f04f20c2cc56cb
 EBUILD unicorn-9999.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
 MISC metadata.xml 510 BLAKE2B 857f3ee3645ffdb28846b7305ec3066ddf49934225fe2c173a5a6b5b8354b208b6bb1337c2e11713b7c983a6fe3a1e67dae62bf64b0c9228f14ccfea8d57d5c5 SHA512 e1da17744042b95f11fb8b5f562020738c7495b0256469420cfa19fda995a24f02e806f67db8521e2f4a19a32825bf54a0865ec723d853cd5aa440c42b007946
diff --git a/dev-util/unicorn/files/unicorn-2.0.0-lto.patch b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch
new file mode 100644
index 000000000000..f6bcda2a18f8
--- /dev/null
+++ b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch
@@ -0,0 +1,62 @@
+commit 6d283cf464b82a86f7930e39c91c92ad3cefb58f
+Author: mio <ziqiaokong@outlook.com>
+Date:   Sat Jul 23 20:39:01 2022 +0800
+
+    Fix ppc symbols clash
+
+Bug: https://bugs.gentoo.org/872998
+Bug: https://github.com/unicorn-engine/unicorn/issues/1662
+
+diff --git a/qemu/ppc.h b/qemu/ppc.h
+index 7022629e..eff4b69d 100644
+--- a/qemu/ppc.h
++++ b/qemu/ppc.h
+@@ -1708,4 +1708,12 @@
+ #define ppc_dcr_init ppc_dcr_init_ppc
+ #define ppc_cpu_pir ppc_cpu_pir_ppc
+ #define ppc_irq_reset ppc_irq_reset_ppc
++#define store_booke_tsr store_booke_tsr_ppc
++#define get_pteg_offset32 get_pteg_offset32_ppc
++#define ppc_booke_timers_init ppc_booke_timers_init_ppc
++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc
++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc
++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc
++#define store_booke_tcr store_booke_tcr_ppc
++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc
+ #endif
+diff --git a/qemu/ppc64.h b/qemu/ppc64.h
+index 992caf87..c08ee2d6 100644
+--- a/qemu/ppc64.h
++++ b/qemu/ppc64.h
+@@ -1708,4 +1708,12 @@
+ #define ppc_dcr_init ppc_dcr_init_ppc64
+ #define ppc_cpu_pir ppc_cpu_pir_ppc64
+ #define ppc_irq_reset ppc_irq_reset_ppc64
++#define store_booke_tsr store_booke_tsr_ppc64
++#define get_pteg_offset32 get_pteg_offset32_ppc64
++#define ppc_booke_timers_init ppc_booke_timers_init_ppc64
++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc64
++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc64
++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc64
++#define store_booke_tcr store_booke_tcr_ppc64
++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc64
+ #endif
+diff --git a/symbols.sh b/symbols.sh
+index 2968b959..0d426c00 100755
+--- a/symbols.sh
++++ b/symbols.sh
+@@ -6264,6 +6264,14 @@ ppc_dcr_register \
+ ppc_dcr_init \
+ ppc_cpu_pir \
+ ppc_irq_reset \
++store_booke_tsr \
++get_pteg_offset32 \
++ppc_booke_timers_init \
++ppc_hash32_handle_mmu_fault \
++gen_helper_store_booke_tsr \
++gen_helper_store_booke_tcr \
++store_booke_tcr \
++ppc_hash32_get_phys_page_debug \
+ "
+ 
+ ppc64_SYMBOLS=${ppc_SYMBOLS}
diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild
index b50065f271bc..76a25d55547e 100644
--- a/dev-util/unicorn/unicorn-2.0.0.ebuild
+++ b/dev-util/unicorn/unicorn-2.0.0.ebuild
@@ -34,6 +34,10 @@ RDEPEND="python? ( ${PYTHON_DEPS} )"
 BDEPEND="virtual/pkgconfig
 	python? ( ${DISTUTILS_DEPS} )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-lto.patch"
+)
+
 UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
 
 wrap_python() {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index bc4dd869a85e..1aa877df3429 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/slimevolley/Manifest b/games-arcade/slimevolley/Manifest
index 1e0407755a08..b842f92bf899 100644
--- a/games-arcade/slimevolley/Manifest
+++ b/games-arcade/slimevolley/Manifest
@@ -2,5 +2,5 @@ AUX slimevolley-2.4.2-gcc10.patch 7504 BLAKE2B cf259bbb273fe1e197d1c711b972ccc80
 AUX slimevolley-2.4.2-nodatalocal.patch 746 BLAKE2B ff7a336c459395724931e613fab39c212fd06f578342ef7628a934a7b066c085af909bdd35dccac54b6b698f4628b594766caa8c8c814c30837da443a73fcec3 SHA512 e679365056b118e8cf6c5a6828709f8beed67eb2e84a1ce5082abfc0498f82624bbce6584f663cf371eaf81201e6c5bfb1619fedc99ab6395e3b87472e61bd1e
 AUX slimevolley-2.4.2-underlink.patch 232 BLAKE2B 29e3d0ed66ace5a588d6e0133a2427eebd225ff77100336426db8ad892f52ec552bc562f6edf6c8834e5915094558940254a5ef9c5e6444a7ffa415654bec7f6 SHA512 402baf0b3955d86768ea40a0eaa289cd160f06551392e653255c32f47d4aed22c33f57a67e98fb3fe28500ed6914f9b8e465737b5aa958fd3332721fb2fe419f
 DIST slimevolley_2.4.2.tar.bz2 2402839 BLAKE2B 5f3ca09b11721076c115af78117e8185b9c243efc23369f7fac4c5243e942b3b0cddd403f727cad1400a7ffbd77c080bad0d1ee123dfc015be7a98337bfbda36 SHA512 7a72329d9e22396f2e304d40370896b2c1a0ae22d5bf1769a46cad8fb1131b1ae9c16de0e5f847b8a31004df074cdeb710a28bfd1e1d94beceb1c8eb0a750680
-EBUILD slimevolley-2.4.2-r1.ebuild 833 BLAKE2B ada3a14911f3169e9d313511f84e437a75fe253887fb8832f151934a5751d5c20792b77a9cacebd8fe1201a9dd2bd36dbf9ac36fed09c8bb5f7f3a6eaf10cb0c SHA512 98909526cbe939b12f6d8966df1c3d5e50bf62e21de98d86346cb44541321d5ddf9abf82920afdaceb926f69b59f32740501df93ce099386c0a0c39207f2f861
+EBUILD slimevolley-2.4.2-r1.ebuild 838 BLAKE2B c1943fa0492ae2d063723e4ee11077f65d799a750e974ca69009f37e18806b6ee2c0af35c0e227e9bcf58a87a7588913bc42f0d55e730b5a5968536c1990750b SHA512 aa6ae7cf8bcc4176022f917bce86c4d109bf55f7e54d027f7a02b73875c50140383baa0b68001e0078d22a96814da6ee4d43598994ac014dbd31fefe572396ae
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
index fb1eb3bc1e45..14a3a044c3ce 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="A simple volleyball game"
 HOMEPAGE="http://slime.tuxfamily.org/index.php"
-SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"
+SRC_URI="http://downloads.tuxfamily.org/slime/v${PV//.}/${PN}_${PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 511fabb0f1d3..4ad1e3768742 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index 11f3869ef503..11951f1888cd 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -2,6 +2,6 @@ AUX melonds-system-teakra.patch 492 BLAKE2B 56c7a55ee08c79b9468f62b676f0e97f443b
 DIST melonDS-0.9.3.tar.gz 2241325 BLAKE2B 0ea7fbcce039a60a0553ae45d11f0b1550bfec2300faf1c99c3ee531bd5949c7293bec187fbf53e400bbb6280df29db141b2d1bcb294a8abf2eabb71993db686 SHA512 37f26f3a9784873ce1664645cea70049725367f5fe62f7c58842ebd5da2c73ffe423695dddb0ffd444bdf59df2a3fcd778cdf95b2bb083014b961fed282953f5
 DIST melonDS-0.9.4_p1.tar.gz 2330696 BLAKE2B f118d067505d740fef2c9f3a7761580981d43c6c63f9bfb34f48cbc5c6932e5410ee31259845787262412b040a66c85cdd4298645e2060fc6c8821a89b314711 SHA512 76886ecfbabd00ae9261c33fcd4074b20e989f4357575bf68139538136fb0ba728d7590310ce4ae9c45670ee01ec315046f03f54e7ca9a359be202709b030f6d
 EBUILD melonds-0.9.3-r2.ebuild 1678 BLAKE2B af9e763020cb2838ffd5db22a8bfd47fcd7d07611c7c37faa39e117f15c8bbf49a9dd1571ee489dc4d906e1b26c7c8d4464cb1ad6d2dd1a784020ceccc73dd4e SHA512 3b556aa85dcbf19c1b8fa0aa2109a4ff1b2ac75964243ce71427dae8bf119c442b67efbe77d6915c32c2a08bdb1e47ecf287936eb0d1cc90515c549223a1a689
-EBUILD melonds-0.9.4_p1-r1.ebuild 1685 BLAKE2B b2982913bdf458cff8a410930fc138f24685909abc6c060be1117ebc7cce4c6ddf17e13071386cff198423514098614dade9672516557d09d7a2ac0d3faf8ca0 SHA512 998747042a1e6ef196f98e73a57f9ddf196b2b7c22cc9c9857e18099969b8dda83c06242bfddb6f94aeb0c70f88a244ab997e5dc65d5bcd567a44435ade499fe
+EBUILD melonds-0.9.4_p1-r1.ebuild 1694 BLAKE2B 6e1e6c4f91f0deab914fac2f6f33cff76d3eff1c24b2630f1cb3289c989c597edf5b5691de68f8cac00c68b7a9f7015c0802b27d7dbe0adc311e54de1973cdf1 SHA512 433d14f08edf0724afb25a3ab90759a0b843ddb28f108c7aa5b709549e019318e9be3c648ccb9271bad17be04862ba6b9f7f5befbd88adf5ba72f717f9f82348
 EBUILD melonds-9999.ebuild 1595 BLAKE2B 06caca14e49f977037c752cc61ef344f03261246b393f5fbedcf6e9e56921087b65c094a42036da1590fccb2ad1a3ea7cb43023c5c0e77a34d33ea416bef9dbc SHA512 32f61f44b8fd0913440b59d066a892ecc53116e0db4a3c0496bc2c90db5a1d413ef5bd36c1e9a6b78ba991f0e816eb28b4f7a9a217c7505b496f3a6090f63bc6
 MISC metadata.xml 404 BLAKE2B e9abe00b5ee8196030846be4e7a9e224c0fb7356f88a39949b219bb7355bcac50f6ca28b299a40f056e5a105903cb156aed77731fb3ed61d2ef88becf35d0dc3 SHA512 6e2926035441d9c93759ad92cb2c026a10d28b8354e90d56361b4afc1aa6e7f0e4bb49900ad9f6025f8f9b7070df5691583074f30620196f1305919bd7cfdbdb
diff --git a/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
index c782b4a45d52..847e5ae74193 100644
--- a/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
+++ b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git"
 else
-	SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/0.9.4.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/$(ver_cut 1-3).tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}"/${MY_PN}-0.9.4
 fi
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ad41007d3faa..5aa8f46cd85c 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index b2e46f6ffd55..af663e3f1d34 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,5 +1,5 @@
 AUX gnurobbo-0.68-flags.patch 1105 BLAKE2B 4174fd00e12df7140516a1aa792a759e475b8b80c3c0c83c89c084daf8e7b96d74cacfeda6392f4df50760c5a87fe3a94676354bd24c6a9c904c88c1bf7058f5 SHA512 42a1e647fca531a952116859bc5804b27c1587510850a0800fbcd28c39239a4b3c8ca2aa14de37d4d710f92a50a2308c837677b59b803460a40b803a2ff98bfa
 DIST gnurobbo-0.68-single-variable-declarations.patch 41708 BLAKE2B 05de30e26be4c927c0ec23b2e2b9ce40dd4ef115928fc297235f10740286e9668ac67ac48d78e9ec5b52ce4c61b196407e1a0c5cac3af4d65e7031a9c69246ea SHA512 e8a498983bd5a8174e851f317088852e3f1ea510efa2377b71b9fe43005403a163c468ff7fdbaca2bd15524f51234de595d87b7791d24d0e9b871d1772f06854
 DIST gnurobbo-0.68-source.tar.gz 2400364 BLAKE2B bfc97fef53b8dc35fd21131557ab7f679890f20b1635268241ff0364262d2fdf7070fd889b6ebc62af8ae8740f5520de3d411acb91158382d6be0ff19c62aaeb SHA512 cf2ebfa556bf9852142c83f9d6fc304ed973d02983179fda0a7db8af0951116b6327ec7bbb462541f2678d32d4d9760e80b1c82c98a64138b25596cf1e3d52f6
-EBUILD gnurobbo-0.68.ebuild 1220 BLAKE2B ab8637f282c31506d0db358307c86b87fa263391bfebdf336ebe4b27a146df1463c73e200a648a14e48de8ed4a45635f00e7fc11a9c15a9ecea50b3162235be8 SHA512 e613f035090b62fd216203fb1c05e7881d61c357c38a31f8cd1f0e0ad65ed725af7fe2c2d5be238238dc8a2f2bfa005704e69e7050c99312f58eb9c7adeaf78c
+EBUILD gnurobbo-0.68.ebuild 1230 BLAKE2B 920f6070818179edc28af69545e3340164b03615b2980c491a33f891932340ae31ea5a7353dbc2eb91378fea8303d1481bd896fc4f20ddcec2e6096a85f2e8b6 SHA512 03b3c6cd5f5d6f6ae2bac1dd61367f1e53cf3ba8e0a3b98c0b55711ee6d69a64dabd828055015a6151af53085fbe8a049e0a149cd1de0114b9081d2619b35488
 MISC metadata.xml 332 BLAKE2B 5a8431b08379ebb400a42ab98c8f2252a651b08d94bd6ea18b95303fe9c91cdb96225d7d60fd8767148b578e75e01f56ff2e3034bb24b862dbc5c6e5ce9bfc41 SHA512 bf39c9e13f5d727a0a3727998e64c2e20f9b5778cbb245f3c1d4bb50ed2843b6e8e8c917e29f2f6ab5584e753a65bf637a07a45042d43540970640dd9d2092a8
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
index 2d1ba0468719..999c90a4bee9 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux"
 HOMEPAGE="http://gnurobbo.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/gnurobbo/${P}-source.tar.gz
-	https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch
+	https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/$(ver_cut 1-2)+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch
 "
 
 LICENSE="GPL-2 BitstreamVera"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8aaf1994fcef..279cdee16dae 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4e6e55d27db7..bf5fd4a44940 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,9 +1,10 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
 AUX 43.0-docs-build.patch 1086 BLAKE2B 449456236c807c28905698c5fc0f4b40b26ab300f40308d65b2889fa5f37ca8225eb564e682b5055b060529903d5c68a8a620d23ff8941229da5465918fa6b1c SHA512 f5847babcaee256c6718d499070029f3582a90f9fcb472c91d53d67fec63c0ac624dd6282ba81909f742244da5c715ba1b05b740c1ad187a75bd0b92a7f4d36e
+AUX 43.0-fix-clang-build.patch 1809 BLAKE2B 75b4bbaec1781ed8d89c7c1dcd24ec2b76b8967ef59d0acccded31e0f982d5d71b2f6d4542f94316e7139c461a1574eb3f7894adf7aeeccf8a593484f4e27b3c SHA512 023a9ff1ec8e4b376c4cd2aaa08c9873768dec0a69cf1217e73e744dba90f08cef4ca5bc20aa4b903a0f7505cdabe79dc6f681258a72c7d7704fe90d8921bb09
 AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
-EBUILD nautilus-43.0.ebuild 3212 BLAKE2B f53ce988a1b2f124f64fbf3d67713ab55f20b934e3996c084dce895b88018a2efda0f7477c69ffd1c0a45e0503572d169ea71a2942035a0281e6885a55a5937f SHA512 c458b9cd13880c81b310fbbb480bf204749375f49e5152b34627609d54caed682599eebbbebdcdb0a72afbf8744501db79a49de55513d72a6af887133e5012a2
+EBUILD nautilus-43.0.ebuild 3317 BLAKE2B d355f6b0ed01f6962e9beef61209a2467e3f74db4fddfe86a88d6d0487597fbbaa65bd5d20eac681791d8b3509c03ac6104a28ce6133bec9f68fcd1b9f51231a SHA512 cf49fed62950e4fd2abe73cd8ac79c5fc13ebc8b450e4f7f742e182bacac91ecec0f1bb6626843421c294115610878d388946209ab16790c0b2797acf05ff79b
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
new file mode 100644
index 000000000000..ec8fbd90ac1a
--- /dev/null
+++ b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
@@ -0,0 +1,30 @@
+From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@protonmail.com>
+Date: Fri, 30 Sep 2022 17:35:50 -0500
+Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id
+
+when building with clang
+---
+ src/nautilus-file.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nautilus-file.h b/src/nautilus-file.h
+index 9b0613e98..57cca177f 100644
+--- a/src/nautilus-file.h
++++ b/src/nautilus-file.h
+@@ -244,9 +244,9 @@ gboolean                nautilus_file_can_get_owner                     (Nautilu
+ gboolean                nautilus_file_can_set_owner                     (NautilusFile                   *file);
+ gboolean                nautilus_file_can_get_group                     (NautilusFile                   *file);
+ gboolean                nautilus_file_can_set_group                     (NautilusFile                   *file);
+-uid_t                   nautilus_file_get_uid                           (NautilusFile                   *file);
++const uid_t             nautilus_file_get_uid                           (NautilusFile                   *file);
+ char *                  nautilus_file_get_owner_name                    (NautilusFile                   *file);
+-gid_t                   nautilus_file_get_gid                           (NautilusFile                   *file);
++const gid_t             nautilus_file_get_gid                           (NautilusFile                   *file);
+ char *                  nautilus_file_get_group_name                    (NautilusFile                   *file);
+ GList *                 nautilus_get_user_names                         (void);
+ GList *                 nautilus_get_all_group_names                    (void);
+-- 
+GitLab
+
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild
index 44ac74e4207e..8fec2d0f8328 100644
--- a/gnome-base/nautilus/nautilus-43.0.ebuild
+++ b/gnome-base/nautilus/nautilus-43.0.ebuild
@@ -56,6 +56,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
 	"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+	"${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996
 )
 
 src_prepare() {
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1559dd05a099..1d7c61b525bd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index c8d58f9e685b..8fc2d7edae51 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,7 +1,9 @@
 AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
+AUX milter-regex-2.7-implicit-func-decl.patch 257 BLAKE2B 68b6d03f3f8bb1a154f9a0014554168e712e4d5df458129626a82126783f0df29508e6d4b06bccce21d68f83d9a33c9aa091ad17944b15a8c6549f6dfe81cd8f SHA512 7702692424435c233c4022099ae6b214580af1411ff1b7e38fa26141fa9b70ee6431c725cd25f1d06709901d89f0102522b5340357cac3f3fa9646785c4ede20
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
 AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
 EBUILD milter-regex-2.7-r1.ebuild 1110 BLAKE2B 8e3ce76e1d1db9231bd6bb2454219a85e598e4c6daee7bce7213fdfa5638db11e4a18faf2f838f528786d49005aa78de1dd0e6d48548006ae426fa11b7e85446 SHA512 2972ee083e31f5cb884ade0d0834f5610d319dca7faecef679996dbe96a32b418fbe9e4e4683e780817c7c4f66b6d0e0e849f0210f62216d54bc816c70432aa2
+EBUILD milter-regex-2.7-r2.ebuild 1176 BLAKE2B a302cbefb618972091575323ad8ac5c1d7333d80aa2c11fbb7013a186b4815aea689084e10cbb34c088ba683b2627b753f7d1b8c2c01b13b7f3995624c82193d SHA512 609ea6c034114c64a3f7909dc8addc37f09f477d6b5311876e16ddb43b00f6a2f44c0da0caf5ef2bda7c6a1a24c18c145322bf52ecbc3fc7e4312843ab26f03f
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
 MISC metadata.xml 727 BLAKE2B 46c3ce4f04ed4db2d8ce595744c16f46a0270186c4620d5245db9b0aedf4867bbd04c2b44e59591def9a01da8b5387baeaf77aae32dd9f7a18267ff2984ccc21 SHA512 a13def0da2410e52c7c63ec9cf1b72c304652e9f7ddce89cadec60285794dc70fc90c714e8a5860525426fd3768ce31a82375059c12ae42528fef57854cad282
diff --git a/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch b/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch
new file mode 100644
index 000000000000..c2edaa8e0b8f
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/871366
+--- a/eval.h
++++ b/eval.h
+@@ -107,4 +107,6 @@ struct action	*eval_end(struct ruleset *, int *, int, int);
+ void		 eval_clear(struct ruleset *, int *, int);
+ void		 free_ruleset(struct ruleset *);
+ 
++int yylex(void);
++
+ #endif
diff --git a/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild b/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild
new file mode 100644
index 000000000000..1e21636dfdff
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
+SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="acct-user/milter-regex
+	>=mail-filter/libmilter-1.0.2_p2:="
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.6-gentoo.patch"
+	eapply "${FILESDIR}"/milter-regex-2.7-implicit-func-decl.patch
+	eapply_user
+	# Change default user
+	sed -i -e 's/_\(milter-regex\)/\1/g' ${PN}.[8c] || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	newins rules ${PN}.conf
+	newconfd "${FILESDIR}/${PN}-conf-2.6" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	doman *.8
+}
+
+pkg_postinst() {
+	elog "Postfix configuration example (add to main.cf or master.cf):"
+	elog "  smtpd_milters=unix:/run/milter-regex/socket"
+	elog "Sendmail configuration example:"
+	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
+}
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 0a33d0cf989e..e40a411fb09e 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -4,5 +4,5 @@ AUX policyd-post182.patch 1567 BLAKE2B 7019004993501396bada4754b40dbbf09e507220d
 AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e6f57ed531fc8aa5c22ea05ce63767e011754d1fc4aeed03b1d0cb1ef07705bf734c4e1f3b5f53 SHA512 6fbac91a71bd556e864b70534a57fcc60bf4a838ff780ee878b257313e12205ae95402c591cc62604dad8d1ee349ecea74c1646429c39587dc0ba13a697ca68f
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
-EBUILD policyd-1.82-r4.ebuild 1966 BLAKE2B fd7c704f56a1dfe7b6fe8046a44305c38c1e19a96bdb764f9be27364a070d32bc84f4e710cbf644100361d524fb979229eba967f2df4f2c6727bfd73110a29e4 SHA512 3d0a926457a954917b76d3fa051979a1fa7ed75844ef9b0ba69c8f39a6569bd3af5c45553ea20bece45f3aad9675f572ccb7802a6e35e4ff8e905cb50118e944
+EBUILD policyd-1.82-r4.ebuild 1967 BLAKE2B 0ac173e33d2076194c9c12a837dab08624136db5a403f292e0b5a583e6f7eae597a81669343a6a6dce751887ce70436f7335634421f7a529878cd5833fef64bb SHA512 907d95d13188c8be9b489829d3b207fb54365d57c8c4ee55159b1ac26dafb931b16e324cf00c8794dd31223667d1440a1acbd900ae2058a0ee7323eb1513aa09
 MISC metadata.xml 245 BLAKE2B c594b1d103dfa62ae03d12242e3049b561db4cfed14b245169aaec7a17dfe574ef4a13cb8312eb2dd2f73eea00f0669cb90ac33f63d0500c532c336b8886bf61 SHA512 6c705301f1a41672e4d0ffc98e85f59544216548b22ef1c969a1ee390282f285338e3300a78299857aa111b0fb44c13e2098fd16a51606237ca9bb0f034cbc94
diff --git a/mail-filter/policyd/policyd-1.82-r4.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild
index c4c0e75853d5..a589b431e0d4 100644
--- a/mail-filter/policyd/policyd-1.82-r4.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r4.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Policy daemon for postfix and other MTAs"
 HOMEPAGE="https://wiki.policyd.org"
-SRC_URI="https://download.policyd.org/v1.82/${P}.tar.gz"
+SRC_URI="https://download.policyd.org/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 8939ce8abe51..d5556b401ce0 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/ahem/Manifest b/media-fonts/ahem/Manifest
index 6527194d26ad..f013b767748d 100644
--- a/media-fonts/ahem/Manifest
+++ b/media-fonts/ahem/Manifest
@@ -1,3 +1,3 @@
 DIST ahem-1.0.tar.gz 35539 BLAKE2B e08e9847aadbf7a46fc6e19dd7194d256f24d17f06002ad2c152827f2c2ee82ee40c0f8d5829477e36ebfdbd7f435ff92aa545c4870e0cb91e47a159120a96ad SHA512 626e37c3a6c8b78443e6ed4be565f1f568f3542c8a6e7587e584da21e007875a69b8a84a977f8699eb39c5755661942a7543799b789ddc795eea806195f3fafc
-EBUILD ahem-1.0.ebuild 431 BLAKE2B 33abc7e40d8efceed1c3a79ff2bfdd470068386212de6d0ae37863657dc77149daa07edda0303cb32b2ba2577d7f8b559b916e7fce7428904a574a7a71205aae SHA512 5bc1aee5d3d099b1cf15cc024297eedfee2f4500a3758b1313625262899e39c96197bb608a4c92922610e94f6053b1e511cfb560b17d252946a8d0f05e177781
+EBUILD ahem-1.0.ebuild 433 BLAKE2B 7c536ce0642bb144759a59d13e67e855b5f9e1096fe5183c9e0d69cdf49f5e9896644b9cbd6c80bd6e879f8a54b4da22e063a749b6f129ae27453375e821bfb1 SHA512 d0b85126de2801ff3ab4e367bd50a2fc64c64c4b03cd9b83d9897be4b80983dbfeeb8a871e801536635cbd1148915ea02a081ff49b602e9efc5d4e5483ebce69
 MISC metadata.xml 267 BLAKE2B c138d7ea7e732305a39de9c63ea50cee095a0a714d1de0e8b542cab507a8cac54a713b3b83a6e0a2341766bf1b42423ead9af7d2bb4feaf8587aadedf514cab4 SHA512 647d8fb0d7b888b0b9c92973433b96494e3f23640467e7514d7a1c985b3e016d28955917c3dc8250435868647f744a29d043139c4613516839f21e1ddfd75660
diff --git a/media-fonts/ahem/ahem-1.0.ebuild b/media-fonts/ahem/ahem-1.0.ebuild
index 1b9507c51b8d..5e6cafc979ce 100644
--- a/media-fonts/ahem/ahem-1.0.ebuild
+++ b/media-fonts/ahem/ahem-1.0.ebuild
@@ -7,7 +7,7 @@ inherit font
 
 DESCRIPTION="Font to help test writers develop predictable tests"
 HOMEPAGE="https://github.com/Kozea/Ahem"
-SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Kozea/Ahem/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${P/a/A}"
 
 LICENSE="CC0-1.0"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index fe21dba64b6b..51a5a4985f07 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gmpc-alarm/Manifest b/media-plugins/gmpc-alarm/Manifest
index d907c737092b..1ea718c8825e 100644
--- a/media-plugins/gmpc-alarm/Manifest
+++ b/media-plugins/gmpc-alarm/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-alarm-11.8.16.tar.gz 312427 BLAKE2B 52e1cd819dd93041c83d460672df0933d7912645b1a2001e801fc449fe092b9651027a1d388bf91b8411370c94468f1c4f89f1377446b90d65e2a77174f3eb67 SHA512 a1fbb66137d9bbbdcf5e4d59fa57628193fde049e9dde08a73ec16dfebdf84a674a643971b6be8d40f2727bf0e591f5aade898080ec5ccb39ec764ff86d041fb
-EBUILD gmpc-alarm-11.8.16.ebuild 645 BLAKE2B be1109081d3000a41571c6cfdef4e0df0c52c0f5f0ecbd66336262b4599e1863bc4eba2f57c9e16379e29c132ce58f9d29c3f18c9ad47b1a234b6bdd9fd5a3de SHA512 9916d54a4c844036eb4532a3d3ae8ab8744710e8b6e2d10bc70406aa4d68c1b5da48f5536af36bc3bb81cbbf4da9c617367968d91695a89aa82e95fabd496864
+EBUILD gmpc-alarm-11.8.16.ebuild 655 BLAKE2B f1f47aaa40f6d8a59b9570e439b1f6535986fec3f3237b06114ff87221e7bdd64e6bd5f931d198e4cafc13267a5e5bb003ff588b26f2fb08c26f327504716963 SHA512 87acecccd80e8664aa4a8a4e57184d869b5a56401fc2cab49b6bbf7bd165dbc0df796fed16f874f6e4496605cff1a90f0971b8bb790f28179bc9b86a0f8588c2
 MISC metadata.xml 252 BLAKE2B 06de70e29eaf815b8764b8461e0e8cb9a2a7038dbcdd5aeaadb87fc5eea825c32255b99944b9284c99c4a530b85b759df7a3b2fb6c896f8fbd4fe8087bbc5454 SHA512 6eed941c1491ddb29ff47d4b737fb36aeca7f92ae2844a9bd3d5c3d5ae96774e24c0367ea995fd86de317660228e6337ff9057db6761ae3816abdec86ff50921
diff --git a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
index 58bc74e7206c..275f4e2043fd 100644
--- a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
+++ b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="This plugin can start/stop/pause your music at a preset time"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_ALARM"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-albumview/Manifest b/media-plugins/gmpc-albumview/Manifest
index a4f06de68740..a922f759be31 100644
--- a/media-plugins/gmpc-albumview/Manifest
+++ b/media-plugins/gmpc-albumview/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-albumview-11.8.16.tar.gz 438771 BLAKE2B f3c82d319fd116c12d6408d94e9c0d33586e99367331157bf0792cd726599c76260491808323681d0c2540e1ce255ce61bbbf1bd12be3a191cb8910b8ef180d2 SHA512 fb77a8ea5db798b730532eb950b0003da97c5b0bfba1d32486d4c5bb40ac6661c73f37f12662b32b28e4311707c9fc7b2722c47686ebd953105d7cd2b9d86cc4
-EBUILD gmpc-albumview-11.8.16.ebuild 635 BLAKE2B 3f8845455cfe03401fef68d66b633fc91a34deeb3d8217e3f47b3cf973571295a081b6a5ab51d02b74cec1ca57d5f01ce3ce4d60a32c011a0bec80024cdd46a8 SHA512 29e8585535dee2cd3fcbb11ba999467605a6368589bbfd87692b646127ae4c9756b8cc9ef106185d38da5f8ead73b1eb317b45a85c158cff2112e1c10e0bf61b
+EBUILD gmpc-albumview-11.8.16.ebuild 645 BLAKE2B 4e7de54b00756e3f76fb6f20b993f903e62f99192e6dbe4b8231fae93debaadf140e11e26bef917ad6e3fec32457c1f03dee53e8a8af2bb18e064937578377de SHA512 9a0f7518df0a201e8827078cb6f7a8ef1af8a68f61eea90a86b55a68ea92d6c6e475f89cf0e9e57e8688e6e5a9338be5ec245cf951dd093e5fbd7ad44ff5b394
 MISC metadata.xml 252 BLAKE2B 06de70e29eaf815b8764b8461e0e8cb9a2a7038dbcdd5aeaadb87fc5eea825c32255b99944b9284c99c4a530b85b759df7a3b2fb6c896f8fbd4fe8087bbc5454 SHA512 6eed941c1491ddb29ff47d4b737fb36aeca7f92ae2844a9bd3d5c3d5ae96774e24c0367ea995fd86de317660228e6337ff9057db6761ae3816abdec86ff50921
diff --git a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
index 6731fe7d5127..9b93b17445a6 100644
--- a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
+++ b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="This plugin shows your music collection in albums"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_ALBUMVIEW"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-avahi/Manifest b/media-plugins/gmpc-avahi/Manifest
index 93ef73dd91d0..ef96d03ec828 100644
--- a/media-plugins/gmpc-avahi/Manifest
+++ b/media-plugins/gmpc-avahi/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-avahi-11.8.16.tar.gz 305195 BLAKE2B 8ee542c2bb2668b768a8aad53b53570de1090fa150f7564ac9226e0130af6bc6cf69e891ed3a74a319007b7568ff56d197dc86de646a6f496d705e9b29a4e64c SHA512 0d9177e959fc4b929ab9117c338db96397b7130f121f3990937690d6bded0c1e4b10dba2c416bb6327c1523c51a377f2fa0492f9f0c9815736d2b5b3e6c4f358
-EBUILD gmpc-avahi-11.8.16.ebuild 677 BLAKE2B d210d296d01f1e8ed6b944bb46dd63cbe73ec131d0ab5fba1c2bb4df07539d2c4b35be2ac56ef1ae399f56eea2f7f2f38400d44f5801a28d1578fdda121abe15 SHA512 f5f377c96dcdd718a055dd1894a56c1d90afabc80104cfe87e748043ab3ceb7a1b683ba6154f85c6c1233b41427c1aadf8ea01f66b6bb64b83aaad2b9a673851
+EBUILD gmpc-avahi-11.8.16.ebuild 687 BLAKE2B 48698d945a4af36a97d60113defbcd0686ddb5631ca5eba270a7a4647fa0375e847fb73e95b63d2d2e212848851f81e75406866a0a6ba7d0463f98cf89cf7262 SHA512 024a573617a2688ce3a74d7dc9a1688855616d955b010fb8a672e6b144e179edcdb05ed320002bf8e33611337705cc6c323b5894968201d858decb360bf3c73c
 MISC metadata.xml 253 BLAKE2B 28ffabdefb9bd43e6269d7a64025a2fa69e2c2fe578b98092c970a155f685ef5aa7865f4984bc8001a4c3f5b35cfd8137c9a94ec461c40a3e5d14a8349720a3b SHA512 cf54ea17afbfc9172877f6c715973917f70e34e4f7dfe613efb0e0c937d34e8c4211964b52c138d19005ed54fc12c6047da15b6a82c12e94ae939284289a4dc5
diff --git a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
index e5cad496caa7..dde51a38c1c5 100644
--- a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
+++ b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="This plugin discovers avahi enabled mpd servers"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_AVAHI"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-awn/Manifest b/media-plugins/gmpc-awn/Manifest
index ede8beecab3a..5d312803f129 100644
--- a/media-plugins/gmpc-awn/Manifest
+++ b/media-plugins/gmpc-awn/Manifest
@@ -1,4 +1,4 @@
 AUX gmpc-awn-0.20.0-multilib.patch 314 BLAKE2B 3ccf43ef832dd9a12e06862cee46a2b299d135d742e0a0ccc8c86db83c100d8cb6a9fa3c7d346d6256d52bc9eb92882b77a2d6d3e2bfffe1e927cbc723114cc8 SHA512 0310fb42849a46513e6ac19648258739462874ed7ee2a43bf1e5194c5a9558567810c089bc0eef2e2b619c9902f92c0678036b7310517ba073d8508377bbb27f
 DIST gmpc-awn-11.8.16.tar.gz 303112 BLAKE2B 737950450428e1a46aad11b04edc3f9fd837e1831a9dfcde1ad46a29ca84597f19a8611f5774ba0d8898d69ee46fbc2dbc097b801f10b4cc0f13f8e3f98f7679 SHA512 74c1eb2134fa495634b4fbdda08a314ad1b2c809355eec9e368b693d7a245855eac76c5e63693b12edf187a9bc371295831dcb7856c896ce539ce0123c5c3574
-EBUILD gmpc-awn-11.8.16.ebuild 775 BLAKE2B 2daae23393d26a885d3566b27b14c0ffb9328dd6657b8f3c83311b7057eaf4cd4581351ed1dc497cbf1c396b825756bf0411bd29fa80fd5ccaf9ee30319d96e6 SHA512 cd7bc5bf0e6b60bd70d27e885690f4cfc7530a5764a3dce907e07bce36e133011add49f53ff4e637823ba6742cc2db05d87c008924440d69459e702b64fbe0eb
+EBUILD gmpc-awn-11.8.16.ebuild 785 BLAKE2B a2458bbbdf89d10fee1b7e4aab691b1ac6d6be1915073b6ea197e763060cbdb04937cd2998df3ff4a6cae38dd9a775b2b0ec087727baac6326c173e1061651e8 SHA512 1928d91bc10b856cc27c97f2b9d2615a55cf3904932ef9fefd67a97cba69a9801c0ac72dd66d305cc1ed7a63d1234fd33b145e1d60df47f6e348cbdac0aa16b0
 MISC metadata.xml 252 BLAKE2B 06de70e29eaf815b8764b8461e0e8cb9a2a7038dbcdd5aeaadb87fc5eea825c32255b99944b9284c99c4a530b85b759df7a3b2fb6c896f8fbd4fe8087bbc5454 SHA512 6eed941c1491ddb29ff47d4b737fb36aeca7f92ae2844a9bd3d5c3d5ae96774e24c0367ea995fd86de317660228e6337ff9057db6761ae3816abdec86ff50921
diff --git a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
index d35d58a72fcf..79cb3b0ded83 100644
--- a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
+++ b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="This plugin integrates GMPC with the Avant Window Navigator"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_AWN"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-jamendo/Manifest b/media-plugins/gmpc-jamendo/Manifest
index 58c9d6291295..876af9b057de 100644
--- a/media-plugins/gmpc-jamendo/Manifest
+++ b/media-plugins/gmpc-jamendo/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-jamendo-11.8.16.tar.gz 328998 BLAKE2B 441b849fddba1802098b73085f6ad44d80d12495483b545d2f4a41e7874535941851abade370e669a4e075de950ddd4ca7d6ba89514a36797e7a70796119f269 SHA512 387b41407db868da69cab4192e353cf5bf3e281103dd0376d852fdeaad8a2e84f4a4858ceda8fe5edb853a205c7abe529b516c82a8e713a9fbd7bfbbd662a56f
-EBUILD gmpc-jamendo-11.8.16.ebuild 702 BLAKE2B bf9320d43a4ea917b0fb1365786fce9b466571b32432fa638b3237690aac3c26a18617ff13a18cc272b96387909948ec632084ac905fb831585f9ed09b122e77 SHA512 42097daea3c4fba8e2148a4cab43177795c74264a01bec7886a018debb3cb3916dea2e168dd499dcaf5b8783957395a2771aa5e3a129a06905950e4b1bc4661b
+EBUILD gmpc-jamendo-11.8.16.ebuild 712 BLAKE2B eae51b5868f71603e633946d1092130b358428116cb6f4897b0b7b510f4c000b2f0d0160c7c7198a6d7b92481d975eb02902dd8a64d9c11c7402abe015a0d177 SHA512 3339b85438542a5f8cc349e6bc26a308846a1ac1b15c540078d32db05c2c80e248dc993c3a49790e4e71a64f74200f0f75ed654f559ad5c554b05758f2e56654
 MISC metadata.xml 252 BLAKE2B 06de70e29eaf815b8764b8461e0e8cb9a2a7038dbcdd5aeaadb87fc5eea825c32255b99944b9284c99c4a530b85b759df7a3b2fb6c896f8fbd4fe8087bbc5454 SHA512 6eed941c1491ddb29ff47d4b737fb36aeca7f92ae2844a9bd3d5c3d5ae96774e24c0367ea995fd86de317660228e6337ff9057db6761ae3816abdec86ff50921
diff --git a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
index 62adbfa82893..18032061e067 100644
--- a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
+++ b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Plugin allows you to browse and preview music available on jamendo"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_JAMENDO"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-lyricwiki/Manifest b/media-plugins/gmpc-lyricwiki/Manifest
index 7a305a6ea8c7..c696e13a822e 100644
--- a/media-plugins/gmpc-lyricwiki/Manifest
+++ b/media-plugins/gmpc-lyricwiki/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-lyricwiki-11.8.16.tar.gz 306508 BLAKE2B bbc990c19fb3280abcbc227172c3b2121a3a8195f13a674b3ac529d37cac74f5b6ac9f356c47c6ba04250f973d4bb3929eab9986e2f0787603b19b9559abae97 SHA512 32d9788c15a03973725990d01ef2bdd8979a9fc17c3b70a90f42fff7bd1f5241de2824077b48adddbce66a6c7e8592bb0f729346d48f8cdaa172c1924b6ecd11
-EBUILD gmpc-lyricwiki-11.8.16.ebuild 654 BLAKE2B e70a18875c09ffd2a55fa6e65ace2498b305afa1326890a6440921491d6126456d61f2df1858974e52523880b3fe2ad13f982e65d7e285f1efdbd170ebe0327a SHA512 ed6b1670485f201c7b2b2fa3c2fd408017cda53a6a477a708e6d52c35730c7f4d0d354fcdbfc80c8d374658fa11a93c616db30866b3bcd445e55e94d69c9fc6f
+EBUILD gmpc-lyricwiki-11.8.16.ebuild 664 BLAKE2B 42ad8ce8fa55b8a615fc2e7412e23c17109f1dceae0f4762132ab75836c0908a8356e25ed8930f04aa0f8e53382fbca4a7a8dae29b0df54ba2ad7d8e494d1e5a SHA512 8e246d5c9432d866d7415959f5dc0a6571bf6dfaf1c5b67e2035fdd131114004a9ceedb8f5e2b6b29ed544c914c5b8e94fc07d9528b0a5399864b94c53c93ac7
 MISC metadata.xml 331 BLAKE2B 8bb0f2d85868d74404578902f1235ed3116ceb85fd108688c4f0885508965156705f9d9a47791e0229b4ff861ca42c6f94aa75538421ee5923603ef0279a68b4 SHA512 a6f000805f2dd871c36cecb9abb1437e116c3aee3120ba5dfa038cc74cb01e7067d0efa6965080170d726bf791644930db29458c93a4c7da142cd0ea62b85c1f
diff --git a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
index db8aec1c12b2..921a0b459e20 100644
--- a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
+++ b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="This plugin uses lyricwiki to fetch lyrics"
 HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_LYRICWIKI"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/gmpc-mmkeys/Manifest b/media-plugins/gmpc-mmkeys/Manifest
index 5563a54e6b7b..8d3b32d30b5b 100644
--- a/media-plugins/gmpc-mmkeys/Manifest
+++ b/media-plugins/gmpc-mmkeys/Manifest
@@ -1,3 +1,3 @@
 DIST gmpc-mmkeys-11.8.16.tar.gz 306983 BLAKE2B 31f33c6a01a43e312c066be57979974e78f1ee889e8ca61cae52b72d1f0cdab2b197ad9ce1c473f0942eb78ace77888d2b70243e9667ec61e7f351208271592e SHA512 d7cc1f9ae8b4556e7573495cc4a08476aa6a8222a020f59549d3fb4b89f92c910f172c26aed72be9e8a463783e54348781537bf9dfe8b637bdf6b5a3787b033e
-EBUILD gmpc-mmkeys-11.8.16.ebuild 652 BLAKE2B 45499e39291b723884b04faabfa21ca95245637b1c8576ded6520cb17c8cea99cdb6435485238464d0a7bd8a4270e3b4ab38fac1477dcff6817b7532c09dde31 SHA512 db52e3be430956b0c704f1ef6b6997d14065aaca48b9bbf52422f954193225f7d2756496dfbb7c26842bcfad5de739074c65daeadb9a86e8e7d449819019b122
+EBUILD gmpc-mmkeys-11.8.16.ebuild 662 BLAKE2B 447e2ce9adb1043cabf32da50cf0b8ceee9cbf00acacbc632df4b014b7f376092fca3f8458cd5d5cecc35150ab97629d84c6b471853ec6052db185491a6f6e45 SHA512 45cd0563daae3bb0c24fa8c81857f7f77bfae322a54e2582a410abb98a8ab06e993f5ec6dff77056fe5d99efe95948c3d14892d61a21a160a003af8794c6b65f
 MISC metadata.xml 252 BLAKE2B 06de70e29eaf815b8764b8461e0e8cb9a2a7038dbcdd5aeaadb87fc5eea825c32255b99944b9284c99c4a530b85b759df7a3b2fb6c896f8fbd4fe8087bbc5454 SHA512 6eed941c1491ddb29ff47d4b737fb36aeca7f92ae2844a9bd3d5c3d5ae96774e24c0367ea995fd86de317660228e6337ff9057db6761ae3816abdec86ff50921
diff --git a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
index 7fbd9431c4b9..8908ddc9ad34 100644
--- a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
+++ b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit vala
 
 DESCRIPTION="Bind multimedia keys via gnome settings daemon"
 HOMEPAGE="https://gmpc.fandom.com/wiki/Plugins"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-plugins/vdr-undelete/Manifest b/media-plugins/vdr-undelete/Manifest
index 70f9ef485ad5..1ed2cd6dea35 100644
--- a/media-plugins/vdr-undelete/Manifest
+++ b/media-plugins/vdr-undelete/Manifest
@@ -1,6 +1,6 @@
 DIST vdr-undelete-0.0.7.tgz 34655 BLAKE2B 81f40ad993d06386112ef46c3ba1c1402211c2ec2138aa113dfe8376340416097a691e7b5f4c4fee24e85e7a0b5c16501dc6853374c3e8b27e0a84437dcb0f74 SHA512 c4d634580d91c3d3601767bb29cfe12e0bd13f9d8fd5bab31a3388db1f8724544b371b4ba333cd524aa5243554015517f487f6e8f2de31bd747f1094ba1c84ff
-DIST vdr-undelete-2.3.0_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
+DIST vdr-undelete-2.3.1_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
 EBUILD vdr-undelete-0.0.7-r1.ebuild 958 BLAKE2B 8a8c55b0ea229acc87ec2acb11acff603c02aee76a7849e8ddb3af020fd48b6daad36bfa48b9d34e0c5045c758ce79ab358812e97b64c29f343a69838041b711 SHA512 7df43a6cd5127736f33b9969f7f448c31262fee741b3a010f481e140c94341f7631257b343b46a9293a1bbbe2f0888dbb6531dec7aa6e337a3660c05054be807
 EBUILD vdr-undelete-0.0.7.ebuild 475 BLAKE2B 7188f8fa2b3ae7ed65f954648d9557af9aa25a8687b4ef203425ee72c2d17171d80b193f20e910d17807a95d654f76ddf20768b854c7f287d27bee8b9b5a26d6 SHA512 abf36f156e2356b43e0b90343b620e6b7893baa9a9e5ba21a69c0f67145ac4ecda41bb1e59221ff9892472c369e0feee2e4ac078925f06cb86477668cbc085ae
-EBUILD vdr-undelete-2.3.0_pre1.ebuild 442 BLAKE2B 5865ad7f961a5be47b6981a6de89db5a04e1f1bfed24b6e523f8207d5afb648b4fd7c43db5cf5b6ec24b3c8245ff1a01a9bfdbe91445322446b64a1b61e380e2 SHA512 db267b6a36a9a00699eb259f34ea26bfdf497f9093dd039160ccffd62a334c4d354261d89282030b9aa01df9da7d9e7d8d58c98c5d2114934c94858a736bf535
+EBUILD vdr-undelete-2.3.1_pre1.ebuild 448 BLAKE2B ecb8f86105522dc4774c4074622c57b805289859eacad3d8692d0cfad3675dc028f561a4ba34df826c4d6ecdd3bd08793cebfae74beaed1b007ae43025f6211e SHA512 c7b0963a6a93297a824a1a09dfe828c8d9831596d8dbb8eb2eabe36d218e4f7d27d11c1c7c6cfdba759228b91cb6cbdc2708e5a6f9b970aa3aeb771fc160f072
 MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
diff --git a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild b/media-plugins/vdr-undelete/vdr-undelete-2.3.1_pre1.ebuild
index 7ea4ea0b4a86..a1c810f690c9 100644
--- a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
+++ b/media-plugins/vdr-undelete/vdr-undelete-2.3.1_pre1.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
@@ -7,12 +7,11 @@ inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Recover deleted recordings of VDR"
 HOMEPAGE="http://phivdr.dyndns.org/vdr/"
-SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> ${P}.tgz"
+SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-${PV/_pre/-pre}.tgz -> ${P}.tgz"
+S="${WORKDIR}"/${PN}-${PV/_pre/-pre}
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm x86"
 
 DEPEND="media-video/vdr"
-
-S="${WORKDIR}/undelete-2.3.1-pre1"
diff --git a/media-plugins/zam-plugins/Manifest b/media-plugins/zam-plugins/Manifest
index 85fe759f2914..27a1ce8da988 100644
--- a/media-plugins/zam-plugins/Manifest
+++ b/media-plugins/zam-plugins/Manifest
@@ -1,4 +1,4 @@
 DIST DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz 2114589 BLAKE2B c8f2cd92b47aa55a467ce14ef2adc8f776c6ce966df680b10c3efbd35ec45fd05ad3a7dee68788701a36a032d563ce2767236397daa0757095b653ecfefcb0fa SHA512 0eab116c5b57d44dc340400340d8fc8456045bdc7e8dbeaccb80f87c7c2e1784f2b24edb8e01e3b6e23807dec86f18caf7227db2c2fd491135b283e795701fb1
 DIST zam-plugins-3.14.tar.gz 23924833 BLAKE2B cdaa13d728cd7a9f7fa2ed53b04b76988bc88d0aa719c57913fd73be778186821d316add5eeea692dabfe1ca222c2f9aaf564abc1128f69da33b8aa592255eec SHA512 30c168ee855011b2f17fcc5e440039628399ab40b69bed9af284713df6155360b38d8249b3de1616e9a2f39885cff43c9e2505868aae891fd22bc92297c1962c
-EBUILD zam-plugins-3.14-r1.ebuild 1793 BLAKE2B 450af2a3b74f14307242e39196b5114f7bc6f598500502e13637f6a71c42d79fe99422a6fbf9585bf283b5f39b8c75e804ac0cb1b6d87738e6374282e65080ce SHA512 269bdd7cb55e79766dd88f16217aeb07ec9135d996d4fb92d3367318724d372830a24328cb0931be38a911c1ae813035d38842cee0d3a1b3bcb52318435b3c16
+EBUILD zam-plugins-3.14-r1.ebuild 1799 BLAKE2B 35b50d579207dd8a789995cba89c477b645dea6e4ccd3cc31eb14dc1ffa97587b38027a87e52686493226e97cf907910ac65ba9c6871e443d4627b9541656a3b SHA512 e55dee5c08779a5f92bbf954813bbba44b003d061e1725b47258c98ec6e07051136ee69cd463e922a0bed4da677d0a3cbd0f7164f00d2346f31cf722462ac0f3
 MISC metadata.xml 451 BLAKE2B 36e3813924e91d179d11969255444afd108216e96009f8e3037c3e26897c008189cc19b3840d8a6de2c907689636e0ba559a8f28277bc4a62f8315c39d973b7e SHA512 221ede2fadeaf0a08e199cc6cf3c3ac9a6bc885765f560ac4015db3bd622b204bafca10b6f4a434de2ca6792defc7148ad882bc85e59d4ad2ac5ebdab62f70a1
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
index 093b8a90f1aa..86d6659ed388 100644
--- a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
+++ b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ DPF_P="DPF-${DPF_COMMIT}"
 
 DESCRIPTION="Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing"
 HOMEPAGE="http://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins"
-SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/3.14.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/DISTRHO/DPF/archive/${DPF_COMMIT}.tar.gz -> ${DPF_P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5905f14367dd..2a3f3b45ce2e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
index 41a8c04f79aa..eecd82f4dcc2 100644
--- a/media-sound/cd-discid/Manifest
+++ b/media-sound/cd-discid/Manifest
@@ -1,3 +1,3 @@
 DIST cd-discid-1.4.tar.gz 12487 BLAKE2B ee20afdefaec407dd043b85fa6bf3cc8c9fdbbb1c63793161126935d75e148d65f59723bc8a4dfa95322db0fac3eaa7ab46c7ee0b927a9cc8dca9ce3a0ac1715 SHA512 f601ea8b7ad73e22ebafc22c392f120fe2e5ed2e275f8c53aab92b27ca1738b9f0c53dd5ed7a012915fe8f1f30fd2356f973895e2dbfe649937930e69faa0c29
-EBUILD cd-discid-1.4-r1.ebuild 606 BLAKE2B 063962c8f2f7e8850617f9ea9b13dbbaf0d57bee2d1a8c7f608c7b42fdddbff3d83b0be117daa7c11c9ec41df042811431871aa4b3f5aaf832cef5fb0522d797 SHA512 0fc70d117e8250c39e8c094a9f312cbafd3e740a63a4407839b6b9f96d7b48687c83207e02779f5b7d700e00fcb6f27e71df997ca6a09709d2846fe25159e1ad
+EBUILD cd-discid-1.4-r1.ebuild 608 BLAKE2B f5c7ce2243c449070d8378252b7f94fc08cddbad83f97331b3e72756f555475502fb714b847f3f09b652583984bef5e9babf26719afd378468355900b3eeefdd SHA512 60cca0236839e4d7fbfe8c54fc5b4138c48f675fcb831ecad2dc0a48cefb10d8057d1c8dc04bb80fc3df49363a3502565f375338b883757ff59f8c750d14a5a0
 MISC metadata.xml 333 BLAKE2B 4b1a16625fc5d8ff1b1b5cbbbb5bc82ea1ea6179368d7cbd37fa9290681940de6472b7606f4379b472a3bfdcbdb0bd39db860aa4273eb7cf70837f0fb46629bd SHA512 23f14f1ea66d479f3c5821d177f8fc3c9253a172f52f195928e7344efa2abbcf4a950266367a8073f648dd3b50a7e40960e6b9a9a81faf383c98fb42d00bf861
diff --git a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
index be503d716c86..e92d35bd7102 100644
--- a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
+++ b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 HOMEPAGE="https://github.com/taem/cd-discid"
-SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taem/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-upstream-${PV}"
 
 LICENSE="GPL-2"
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index a6357406f66b..cab63c8696be 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -2,5 +2,5 @@ AUX gmpc-11.8.16-AM_CONFIG_HEADER.patch 170 BLAKE2B 2b359e328445c00d63591e8b0f47
 AUX gmpc-11.8.16-icons.patch 7380 BLAKE2B bd546a009efc5c37eb50593763fc39231f07c611805aac08b2353ad3ce283e6b948c49b0be0f232e81d94ee717a4a3b1dd7c19177659aabe5554caa873c9b672 SHA512 cabee4790552b22e31873fdd0b2c786743fdb9fe3b5eb613ec85e83e27285116e6f05c1d8ac7013d9d2b17ec765876a276804c08b1ccc6d78051991c50b769d8
 AUX gmpc-11.8.16-underlinking.patch 241 BLAKE2B 69400fae94f780e81bdf078b26c2bdca69fe03fbff42a3600a9cba2310981a94ddd01c07f418571a6168108fde11cfd02e4a40230fbbde25d4b3868e09decf19 SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576
 DIST gmpc-11.8.16.tar.gz 7082909 BLAKE2B 913b7b55029f6fe78dcae7355bd571f4d6e95c4d1891e12251717b7fe846a69b52ba9cf2c65042a36295830dbec65128d0aa119d8503c934a3f09b86b42a0409 SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623
-EBUILD gmpc-11.8.16-r2.ebuild 1239 BLAKE2B e1d5b6e0a85c6848eb1fa5c90093844acbb4b110f57d9834e49d4ceb325c61fe63c45dc5d5edf710d62b659fcbf5be7891ec97598e67fdf6e41ad52a1c6bae41 SHA512 7104abbb94bdeda018c16839d03ea7658add1fe8431ef4cbc13e5c4195eb7080b6c612274204e20e553d31cfd0bc404b8673f43c47128ae49298c70761b6f13c
+EBUILD gmpc-11.8.16-r2.ebuild 1249 BLAKE2B 758f82f53930955ee2e6bd0084740dfa25b15801c587ae28e99e3b1cf50f33793f0f8d9b40397331399345a24881ca487d319d5a40f6b6cc6c225edbe614c819 SHA512 fabebe65db25c4b30ddc9bc5c982530411bb916a2f866a751a453a0c5666987aa381acde592e408e448cd7b44fdfb309f95722dd58fb599004f016300b99ebf0
 MISC metadata.xml 437 BLAKE2B ddfac3aab507c391c2897b974ae9737f4f0db0d29eb9a0098e2d35149fd8719fc2724b880d166fa0e15df3f5a2cc4b3ef91760fc3eb69b976ecbe80ee3060dfa SHA512 014c9b99d8864c33c3bd5217a776b0d16c92457e0ead751a49218f0a36b424a8cbe2ebb80af39ffd52ff5cd6a15406e6117fbc600b7f76b34cf1099fad9bd2d1
diff --git a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild b/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
index 911dcb5e0a5a..26780928182f 100644
--- a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16-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
@@ -7,7 +7,7 @@ inherit autotools vala xdg
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 13d5e47fe0f0..4bab4d5a01e8 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,7 +1,5 @@
-DIST strawberry-1.0.7.tar.xz 11216436 BLAKE2B f7bc53f33be53fb9d947ea4f4c29827cc4248b0249904f2e48cbd9e4440de1f7f866d83c9fddc92cfb6f56b050c4dc40f0ad5e67a58c2a75e47a9d666847e9b3 SHA512 9bf092c3990ae0c2ce63074c7f6076ccab896ae915c4ee255a7fbb6534d50467648f3e96bc029075acfd50515c45ade867e55518d9a68ec9c10a741e1976d64f
 DIST strawberry-1.0.8.tar.xz 11222136 BLAKE2B b11b4a082eb2c2d180d7d217884ac498c692df1d76e54ca41e83ea3ab456c4920d3348ee0b154f02d22902b84263fb0afb86c5e125d669fc54b6ffce1719abb3 SHA512 7d43a80d4aac16379929e147a4cc7af8b2866a3a14adee8716ff89ff255859eca197f448ff605e255f0d3d74a8e0d1babf4534cfd58b5247533c37dfae6f96e3
 DIST strawberry-1.0.9.tar.xz 11226840 BLAKE2B 4d7619a4161b422c417a69be1eede54068279a5829070a9d84d02d05c7504813710758d639901073b9567183be61ff66a6cd3aec9585b0ec2371d12440e8284b SHA512 ccfd9e451b719cc9aeca5ce2fd260681e649edfae14cfee2d7f9b2f978b3d111e8d449f16af4869c95c96f657a7d61b4d2353ed0b0fbe6734eb31271a1577ea4
-EBUILD strawberry-1.0.7.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.8.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.9.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
 EBUILD strawberry-9999.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
diff --git a/media-sound/strawberry/strawberry-1.0.7.ebuild b/media-sound/strawberry/strawberry-1.0.7.ebuild
deleted file mode 100644
index b14411677be9..000000000000
--- a/media-sound/strawberry/strawberry-1.0.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/taglib
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-sound/pulseaudio )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-	dev-qt/qttest:5
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		# Disable until we have qt6 in the tree
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-		elog "depending on your preferences"
-	fi
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 63418addf2a4..7f4b3f28f74e 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index e56216c955bc..7f373e475a78 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,5 +1,5 @@
 AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b45b835b1d27708f431fcc371e5f7763d4fcc3809d3e775a6d6a9b08077825ea5786f948c480e72931e2e7db2339abb0 SHA512 1737dc876704775dbcd361af38dce65711215a25c3e7b5c0f4f447518d9752b3488df308ef82693ce2c7471600527d49c374209bee02e1686575d15cf3ac06cd
 AUX ivtv-utils-1.4.1-overflow.patch 1774 BLAKE2B 7ec6fe101125f367a90f54b771f9ac6bd2179e94986115177e34d2fc294cffd9d893b9aeb15e629f1990c99c5d7d3d6d5b4189d3dac8cc24f572b2b2bab91796 SHA512 5c19bc5420f0e7f1f501b0e117fdd3108799607f380bc8609ccd9126eb6fade4da21a41918f88613127969afd6712ab19bcb2dbc295d93454f5da918609c66eb
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
-EBUILD ivtv-utils-1.4.1.ebuild 869 BLAKE2B 7d163c5e7a93c37320e7a6bd870e9077b3ad55df0fd968288b10e54bae249e1c96a51795854b721baf0e41ab10dfd8020ccdad5dd582bcc09e5a3f92be5409c7 SHA512 81d1f135939dc1c590cb15c9fcc585ea396efa6bf57604a7cd5912306e898746731e99ebddf563aa47cf6ad37e3e72407a770656f5fad90e7e73b68704194677
+EBUILD ivtv-utils-1.4.1.ebuild 880 BLAKE2B 3ce5fb3ea2435c2e4fd79ff513b23f3cd32ce8f073ac1ef81de65b208fe09aea4c5a77dfb1d71622fac98bee93b0a3e76f6a0ad9b455637064dbc0fb4ddd22c9 SHA512 a35cfc60ee9b2ae5cec60a8d0f615eb123f74ca899373f40bfb8b27206f0ae7bfe0088d826906c14d83d3c7a6042a4ef2a5898bf8c0e1debdf7a0998f9a73418
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
index 637e4c6bad13..f08f749298c0 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
 HOMEPAGE="http://www.ivtvdriver.org/"
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/1.4.x/${P}.tar.gz"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index d00624590306..10fccd91c8de 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 0bceab37383d..c7f2d897c6ca 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -6,11 +6,11 @@ AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dc
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
-DIST pipewire-0.3.57.tar.gz 1882902 BLAKE2B d4227c056279dca5e4a8efb17b0d3d0c5e94664df15d208cde47b882cd8f25be897c6e39833b1c2997628bf97c023d97ebdba727c81c21e05298faa6abfee1b4 SHA512 f1fdd2d4093d5696b189b59497d16fed1fdb1a8fd14a563303c20b81b861e3bed7eaddb4b029d3ddb3e7ec248ff6b9db45a76d4e7a8fa6b7aa76ce23cfc6deae
 DIST pipewire-0.3.58.tar.gz 1893021 BLAKE2B 65c93b3b5b2594799ceac4e5bd0700a15589dc13f7e8f308731b90f2514888f605f67434ef1d1248c6ce348cdde65839c1e7cf3ed68068f217e769ec78743785 SHA512 06fb308fe6a1573ccb955f6e39aef7e4ab0d1b9f4fdeee11b9d6910940f154fac8ce7f2daae5b3ba7d1eb22771590bd13a38622d316affa2cda71bfd8d91de7b
+DIST pipewire-0.3.59.tar.gz 1909977 BLAKE2B 098a75060799013e9a5e5ac4b0c7c62e788318a85df9616f6c441255b5a50acae9da01887ee20c60995878601c22a0eda4fec640bafc941cfa20e0cf751f6189 SHA512 1183dc083553ece1f9157898f437996b88dc7d13ba69aa43886f5339f330130404274ceb08ac8ec05a5ccb84dfca56b524a1d4b3fb07e28a41741c5c3333eda0
 EBUILD pipewire-0.3.51-r2.ebuild 13198 BLAKE2B 367ab8b3f5682ed707f8ad46a4959216c10ade3697661e748c90a4473f993d40f1137cf1364b35b2aa884acbf24b3989a5fd3046fdc78bc90ca4334644a711b1 SHA512 a9b4ce58ae5a13491f019d51863f2de822e642cbecdc1ca4018385a2e3a07e5bfba865df09fec6d2a5af3269a72fbcd8c8c3b13a3db310e83cf0e3cd100380da
 EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917
-EBUILD pipewire-0.3.57.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29
 EBUILD pipewire-0.3.58.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29
-EBUILD pipewire-9999.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29
+EBUILD pipewire-0.3.59.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
+EBUILD pipewire-9999.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
 MISC metadata.xml 1533 BLAKE2B 75e656bea9420a16158649d0909be5833ddd7e8f61664d4e6ef00ecaa179110704777faaa5971c1bb7d818b193474e015649468533a0699c6249c57c27f51293 SHA512 8ba9665ef28168d804c5ef3c3f353b8313dbbb12fc9d3bbdfc09771a13a690ae4af903a73670789a2d17c9d3e0566575140d6f6b104279771fd374fab90338d4
diff --git a/media-video/pipewire/pipewire-0.3.57.ebuild b/media-video/pipewire/pipewire-0.3.59.ebuild
index f8327c0c3219..1b29ff8d3bec 100644
--- a/media-video/pipewire/pipewire-0.3.57.ebuild
+++ b/media-video/pipewire/pipewire-0.3.59.ebuild
@@ -217,6 +217,7 @@ multilib_src_configure() {
 		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
 		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
 		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
 		-Dbluez5-codec-lc3plus=disabled
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index f8327c0c3219..1b29ff8d3bec 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -217,6 +217,7 @@ multilib_src_configure() {
 		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
 		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
 		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
 		-Dbluez5-codec-lc3plus=disabled
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index f3f2157e8f43..2d37b8418753 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -28,6 +28,6 @@ DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f66
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
 EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f
 EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f
-EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 4ee4c05630a0a0133def40460d97839fe2c9346b162f7b9415c48e544c476cf4cf94a66e905f6176dc23478567aec2f0bf5a738cb1b5fe4a9e005f168e75e751 SHA512 c2e97f014040c1f0af8c56e1aeec947b3cd9f428bda0d8897f2de4531445593fabd53dca7e33c0be958147f7cdbb31f9fc8a15e91923d6317ddaf4f8a54f2e1a
+EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 92c996b62c17c3496befa2698023749d89d8599ea2e9cc2eeb03f2c989cd531075bb7c89b19dd16ebf4f7f33bf3e9c5914f6cf40bddf6aebf23db8b101e934db SHA512 46e7e9ea9aee587428ee639ddc280f00685375bad4de92368637583ef855566a7215eedc6b8b95ce67bc3543943cbd36699ec2cf6f422b546a40681053f84323
 EBUILD vdr-2.6.1.ebuild 5514 BLAKE2B 7d9006b725d1ebde1aa139cc36adeeba1e4836d602dabe528ba089c3238c22b6acb1b800460ed4055626fa712bb5b66032b318fe066dae32fdd389f7aeb104c6 SHA512 72b36b33c9a6120c9df2fce4c7572ee6ffe58266cfcd77b607449d8655c154c47825915568b744151778dbf8aa3b0f49f05ac8b736b3054c007edd81e91b4df0
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 992581e9e7e2..a7db9e18f489 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic strip-linguas toolchain-funcs
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> ${P}.tbz2
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2
 	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
 	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
 	naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 87537d10ede3..7186fe0a372a 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 59737b1a8a54..fa5c71474624 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Sep 2022 23:09:40 +0000
+Sat, 01 Oct 2022 05:09:46 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3dc444479cb6..7da1a30f05f2 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529256 BLAKE2B a8ad285bac1cf4317c62825ad52e916f3d77cdd05175694abbde87461cf015178a8cf1dd6c3af6013668089990ee96f6cb9be7de7409b13ba538d09d94cde515 SHA512 3502c0b489efa2b78e07af6e3b1c1c817c21c7435c1db2224f9b91f9d0ce815b1514a1e3062680326c8a33813260f974b3b492221b06b61e7499b2dcad6eaeb1
-TIMESTAMP 2022-09-30T23:09:44Z
+TIMESTAMP 2022-10-01T05:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3dzhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3y55fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDdVRAAq+2rDr8Cc69hj/uWWKrKL3GuKM8xKbcafTN18AugthAj5SsZSIRFllf4
-N9/FoelOF07C49Qks2zBcuNsYHJ7CaGhGRT7f0LUFsTwMtPZjJK9yWYm5C1uPy3Q
-u/wRIVerP7y8gwEkYtYZHOA4J7ZPCXXhJOqjH0ZOtHMGIBU94dBUWOZ4r2uPkNk2
-5IlZS6vW70PF+iWQEV3XdY/l24HicwgA4OYDTCdutYWKraSNAHvpmA9mQHr2NAtK
-t/kw4SCpLkbVQC6Lhpf4lnbGq54orU3XA4Ez/NiE+Cs5QcaI0UvfuNmm9EAq+KOA
-08MhNI91/u1+3peGm5HdafohE1mfwRE854JdqiNE+yhe6C4GFjh7gYSN2w8H8nrO
-5JECTPapDD5W9GoqehYNmKnrzvqITPazic50SXPbxC3lesxbtpACY0Cfcgo5ZppM
-zChTD150m0gAx3bu7et0n2tEx1yMVbMP6I8wYo3SNbrPTaMXZS6SoIzVE77xZDX4
-3V+Su8JFpAUIYSxNV8EEgjgVmPEM5ybwFvCaYvVYYkGPytmwN7hO0WEyhpi0eFPb
-rT0/sTqwlFP0rxGqXlH1RWdyN3MaLVcLQ3VTQc71wMjf3ORDV6oh3Xqe1L8rPR3v
-RpE4ra9NzD2oa0ajT48lgBhIV1QIiJcg6Qh1bg9X66DNeWmaPnc=
-=S+6M
+klBT2A/+MmQaAnO9x2AWfIpvsKBA+1zFMh1kBia6Gqso7Hsw1LEhXdTZUWxPIkr/
+7/Y3wUh833oa6tE324VHDQvc1BdU2mehgGvbF4QjvsVO+R12M4w5m9A59gTGsByC
+mERN+fk0y9Ef6mNupH3VBsdHH1cvrWuloFsR6bM+3gD2OP4Nfp3b5EDKarQT1AgC
+mws3rHnv2rSwaPXMFeAlFEJoUS5P2TL/v+hAk7CCi2kcAaEYmnSK1XWN+HZDXFgP
+De2xiD5nr1Emim9UKu2VXop8Uyf43r9SeeSMMKyF3Uw5UQtteKQxKoc9ut8FpwPL
+xKJa5NRkP81AHOIJL/i/KZLIe3sm6VieNylVfF/KAxtWxJXO8ji2Z3nkptx85KAI
+wTEQQuaAOBJWvAdXQ0L1N8N2JQJQeX6S6eZ3WfV7ClUX7kxSre5pE4Z/zepVOBqX
+D/kXkl+gu5UQVh3WiE/Qg4aarux9s4/Uzlier2t/IrVY7xXbNX4X/scj89fg/D7k
+1tci1Gbvm2+WmXhi76hlGT6FG0gsBWfo48B4ujLvMy/a0lEK4MLlL2R0qyTHOlLd
+yz2IAkYI9hdBbXjFV1odX17JO1iaVTo49OtGpoYkl1MD7VLVEwfj6NOUgZuD83X4
+pdDXQQFeQV7fTANxNNcTEFGE49yW7+hy3Hg5sSVS+qx3n7Ez2ic=
+=3Yrb
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b5ea3fe9cfb5..fa5c71474624 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Sep 2022 23:09:41 +0000
+Sat, 01 Oct 2022 05:09:46 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bf8b9d4455a4..d201ff723e41 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c7ba895adfaa..7e9d13160ce1 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/analog-6.0.13 b/metadata/md5-cache/app-admin/analog-6.0.13
index a66b3ad84bd8..bb4fa74f341e 100644
--- a/metadata/md5-cache/app-admin/analog-6.0.13
+++ b/metadata/md5-cache/app-admin/analog-6.0.13
@@ -10,4 +10,4 @@ RDEPEND=app-arch/unzip >=dev-libs/libpcre-3.4 >=media-libs/gd-1.8.4-r2[jpeg,png]
 SLOT=0
 SRC_URI=http://www.c-amie.co.uk/static/analog/6013/analog-src-6013ce.zip
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f0c520e85a5f42421206b6744f31a36
+_md5_=22503883c55e014302a96d9b334ed22a
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.32.1 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-2022.9.1
index bbbe5dff78c7..d93036ca4f03 100644
--- a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.32.1
+++ b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-2022.9.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib sys-libs/glibc dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb 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/libXScrnSaver x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango
 SLOT=0
-SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.32.1/Bitwarden-1.32.1-amd64.deb
+SRC_URI=https://github.com/bitwarden/clients/releases/download/desktop-v2022.9.1/Bitwarden-2022.9.1-amd64.deb
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	3c8380796b325aa1d33b234a04924d52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7227bcec7bb70326ce5596dc3932934c
+_md5_=1f40ed447f3653d56d7fb02b479d1638
diff --git a/metadata/md5-cache/app-admin/consul-template-0.29.4 b/metadata/md5-cache/app-admin/consul-template-0.29.4
new file mode 100644
index 000000000000..e46802c3655b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-template-0.29.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-group/consul-template acct-user/consul-template
+DESCRIPTION=Generic template rendering and notifications with Consul
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/consul-template
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
+RDEPEND=acct-group/consul-template acct-user/consul-template
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul-template/archive/refs/tags/v0.29.4.tar.gz -> consul-template-0.29.4.tar.gz https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz
+_eclasses_=go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9765149f446d9b92f64855290893a3fb
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 74be5d31977e..a3107340fad8 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -12,4 +12,4 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d69f89f16e29378577e4b1abba798e26
+_md5_=a9fddeb222be408af1f1a005941e653d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 5799a51a14c4..7ad1d84c7640 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/duply-2.3.1 b/metadata/md5-cache/app-backup/duply-2.3.1
index 3d2e4805edce..d10be1545c09 100644
--- a/metadata/md5-cache/app-backup/duply-2.3.1
+++ b/metadata/md5-cache/app-backup/duply-2.3.1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-backup/duplicity
 SLOT=0
 SRC_URI=https://jztkft.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_2.3.1.tgz
-_md5_=7fc04a8554c81f61bfdcbf3dd2296d89
+_md5_=db126c2c53e956eb344f114ffabde305
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 50e4751e0850..1f76909f758d 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-2.0 b/metadata/md5-cache/app-crypt/osslsigncode-2.0
index b88d89a56241..e2ce1e638360 100644
--- a/metadata/md5-cache/app-crypt/osslsigncode-2.0
+++ b/metadata/md5-cache/app-crypt/osslsigncode-2.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/openssl:0= curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz -> osslsigncode-2.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e9f7b324d39bf0ca546025eacbfddcc
+_md5_=b7ca9587c2c2943fac36004b5462b800
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-2.5 b/metadata/md5-cache/app-crypt/osslsigncode-2.5
new file mode 100644
index 000000000000..13df6c35652b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/osslsigncode-2.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/openssl:= curl? ( net-misc/curl )
+DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
+EAPI=8
+HOMEPAGE=https://github.com/mtrojnar/osslsigncode
+INHERIT=cmake python-any-r1
+IUSE=curl test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/openssl:= curl? ( net-misc/curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mtrojnar/osslsigncode/releases/download/2.5/osslsigncode-2.5.tar.gz test? ( https://github.com/mtrojnar/osslsigncode/raw/2.5/tests/files/unsigned.cat -> osslsigncode-test-unsigned.cat ) test? ( https://github.com/mtrojnar/osslsigncode/raw/2.5/tests/files/unsigned.ex_ -> osslsigncode-test-unsigned.ex_ ) test? ( https://github.com/mtrojnar/osslsigncode/raw/2.5/tests/files/unsigned.exe -> osslsigncode-test-unsigned.exe ) test? ( https://github.com/mtrojnar/osslsigncode/raw/2.5/tests/files/unsigned.msi -> osslsigncode-test-unsigned.msi )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5391a3a5ef02f37174234f1c233d573d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d71cee2eaf4c..b14219e59889 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/neovim-0.8.0 b/metadata/md5-cache/app-editors/neovim-0.8.0
new file mode 100644
index 000000000000..60cf9375d7ea
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.8.0
@@ -0,0 +1,18 @@
+BDEPEND=test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+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 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= )
+DESCRIPTION=Vim-fork focused on extensibility and agility
+EAPI=8
+HOMEPAGE=https://neovim.io
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake lua-single optfeature xdg
+IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0 vim
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
+REQUIRED_USE=test? ( lua_single_target_luajit )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.8.0.tar.gz -> neovim-0.8.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=33fe06c9ddd92080a151380d56035033
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 86dac433be86..f465c28051ca 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -1,6 +1,6 @@
 BDEPEND=test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.43.0[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.1:= >=dev-libs/libvterm-0.1.4 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.6:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= )
 DESCRIPTION=Vim-fork focused on extensibility and agility
 EAPI=8
 HOMEPAGE=https://neovim.io
@@ -9,9 +9,9 @@ INHERIT=cmake lua-single optfeature xdg git-r3
 IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
 LICENSE=Apache-2.0 vim
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.43.0[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.1:= >=dev-libs/libvterm-0.1.4 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.6:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=test? ( lua_single_target_luajit )
 RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3f218aacae69198549730d863a716b4b
+_md5_=33fe06c9ddd92080a151380d56035033
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 15e58a079f84..4ed1046f6b49 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-python-20200719 b/metadata/md5-cache/app-eselect/eselect-python-20200719
index 1c5838b158a9..e5140b204127 100644
--- a/metadata/md5-cache/app-eselect/eselect-python-20200719
+++ b/metadata/md5-cache/app-eselect/eselect-python-20200719
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chutzpah/dist/misc/eselect-python-20200719.tar.bz2
-_md5_=2328bebc1562c28fb1d45a7b35445a9e
+_md5_=9c344be104ef581b4b038f5964fe4826
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index ef7dc1a73514..05db6091db8a 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/jpipe-0.2.0-r1 b/metadata/md5-cache/app-misc/jpipe-0.2.0-r1
index c635240293a5..e42e609ba220 100644
--- a/metadata/md5-cache/app-misc/jpipe-0.2.0-r1
+++ b/metadata/md5-cache/app-misc/jpipe-0.2.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jpipe/jpipe-0.2.0.tar.gz !python? ( https://dev.gentoo.org/~zmedico/dist/jpipe-0.2.0-deps.tar.xz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	go-module	b088539f282ed242c23f38fa65472184	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cf77503b2dfc4c8c4250f41fc58d7dd6
+_md5_=d550357c0b25b3019031d32d0800c0e3
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.10 b/metadata/md5-cache/app-misc/livecd-tools-2.10
index 02eb31bc2072..9523dae4f99f 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.10
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.10
@@ -9,4 +9,4 @@ RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/open
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.10.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1852283a9c52cfb850908858636e3243
+_md5_=c621fa826ab8099a13279256a1002eee
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.9 b/metadata/md5-cache/app-misc/livecd-tools-2.9
index 3e1a90da23da..8f6974c45e38 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.9
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.9
@@ -9,4 +9,4 @@ RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/open
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.9.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6893433d0d6aba6c022016606fab4269
+_md5_=1c8e5df35b30a3d04f448189904d71ff
diff --git a/metadata/md5-cache/app-misc/livecd-tools-9999 b/metadata/md5-cache/app-misc/livecd-tools-9999
index fc9f79f82bbd..ace329fdbabd 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-9999
+++ b/metadata/md5-cache/app-misc/livecd-tools-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/openrc sys-apps/pciutils
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=81018e417e5b96794b01c57312beb18b
+_md5_=16107f1e9a3b09bee6839847a7f151c3
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 568949802911..65832806fd87 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index ce686857f8ad..00cb1cfc8df3 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=11384e2c90768979c6108e87de0482f5
+_md5_=03bc1294eaa28a7ac0f19644cac44817
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 036208b01d27..fc407241d79b 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fb9fe88be39ba5b61eeeac2f9ed34143
+_md5_=99710fb7b28253eb04e2be094fac3fea
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 863111464ac8..7cdb0e5d94a8 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r6 b/metadata/md5-cache/app-text/fbreader-0.99.4-r6
index d48d6689c4dd..1cc4d14b0613 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r6
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r6
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/li
 SLOT=0
 SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74633e9ebebf2af781f17b9a2aa58b88
+_md5_=32fc54260fece8f91c96e23d2f28fe2c
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 4a9aa4ec5ae2..d7e718c94fc8 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.36-r1 b/metadata/md5-cache/dev-db/mysql-5.7.36-r1
index dfefd60d7bb2..bb600c39230f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.36-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.36-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.36.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.36.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.36.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.36-patches-01.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=77ed1a2dc23a04bd76b232a8ba383d59
+_md5_=d94c8fe586aa02c89b750cdebfac9ec4
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.27 b/metadata/md5-cache/dev-db/mysql-8.0.27
index c3034399b8a2..df45f7774d60 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.27
+++ b/metadata/md5-cache/dev-db/mysql-8.0.27
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.27.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.27-patches-03.tar.xz https://dev.gentoo.org/~dlan/dist/mysql/mysql-8.0.27-patches-03.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a3ac85ac88ee918e6cb7c9d26f587c40
+_md5_=1807d019146f9372010f0ec847d38bbc
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index bdb233632dc4..076dd2ce2aaa 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.12 b/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1
index a735eb10228b..9b6e759b0d2d 100644
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.12
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1
@@ -1,6 +1,6 @@
-BDEPEND=app-text/dos2unix app-text/dos2unix
+BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 dev-haskell/cabal-doctest test? ( >=dev-haskell/doctest-0.16 dev-haskell/base-compat ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 dev-haskell/cabal-doctest test? ( >=dev-haskell/doctest-0.16 dev-haskell/base-compat ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Composable, streaming, and efficient left folds
 EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/foldl
@@ -8,9 +8,9 @@ INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
+RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.12
-SRC_URI=https://hackage.haskell.org/package/foldl-1.4.12/foldl-1.4.12.tar.gz https://hackage.haskell.org/package/foldl-1.4.12/revision/2.cabal -> foldl-1.4.12-rev2.cabal
+SRC_URI=https://hackage.haskell.org/package/foldl-1.4.12/foldl-1.4.12.tar.gz https://hackage.haskell.org/package/foldl-1.4.12/revision/5.cabal -> foldl-1.4.12-rev5.cabal
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	19b560c1c5a28963ab209b0991132da2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1f6a7becfce37f522223585d069a9a49
+_md5_=e17c56715a824894dc04dffa1beabea1
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.3.1 b/metadata/md5-cache/dev-haskell/vector-0.12.3.1
index 04743443c096..b40e7bef4018 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/vector-0.12.3.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.12.3.1
 SRC_URI=https://hackage.haskell.org/package/vector-0.12.3.1/vector-0.12.3.1.tar.gz https://hackage.haskell.org/package/vector-0.12.3.1/revision/1.cabal -> vector-0.12.3.1-rev1.cabal
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	19b560c1c5a28963ab209b0991132da2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1a8c8c6d6abda78c12f142d810a1fa84
+_md5_=22c236a3d8ea3da202bbce8364acc4dd
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1 b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
index 35d4e2d75547..609d8cb538e9 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.9.1.1
 SRC_URI=https://hackage.haskell.org/package/xml-conduit-1.9.1.1/xml-conduit-1.9.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	19b560c1c5a28963ab209b0991132da2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7e46218a900e772d0063ab39ea6e05b0
+_md5_=6b3947749e329b1e5f7865c265935760
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index fb4a1231b13e..bd6c3caa2e49 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/janino-3.1.7 b/metadata/md5-cache/dev-java/janino-3.1.7
index 9cc0d000ce78..f9fda99a458a 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.7
+++ b/metadata/md5-cache/dev-java/janino-3.1.7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> janino-3.1.7.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=9a316cac77b7c200d0729ce0cfa2fa7b
+_md5_=7a96833bceb5c0e26b9ef0a7c97261f2
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 43568f950c81..ccd7e8e79d44 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ispc-1.18.0 b/metadata/md5-cache/dev-lang/ispc-1.18.0
index f0860e5a142e..3ebb81f12bf6 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.18.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.18.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.18.0.tar.gz -> ispc-1.18.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8a3cad780fb091feb651526c8818558e
+_md5_=0db0a2d14348107bfe70cbd597962278
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index 8a59dbea8f61..e6141b9192bf 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=<sys-devel/clang-16:=
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=eb4d29e9c814af8b96828fc78308f03f
+_md5_=04f90cb788f33450e1c638b316e9c400
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d8dcd520ffb9..e9466b66896d 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/eventlog-0.2.12 b/metadata/md5-cache/dev-libs/eventlog-0.2.12
index d4eca8e8eace..87a20037effb 100644
--- a/metadata/md5-cache/dev-libs/eventlog-0.2.12
+++ b/metadata/md5-cache/dev-libs/eventlog-0.2.12
@@ -8,6 +8,6 @@ IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_0.2.12.tar.gz
+SRC_URI=http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.12.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=94564a3f29c88705640014adf77af3e7
+_md5_=86a1fb176116b45efb2a108b226bf1da
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.7.0 b/metadata/md5-cache/dev-libs/libmaxminddb-1.7.1
index 44bc1816f687..fc83c6cde276 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.7.0
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-1.7.1
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/0.0.7
-SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.7.0/libmaxminddb-1.7.0.tar.gz
+SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.7.1/libmaxminddb-1.7.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=bac70b9b350c46f6a369f400c4a32573
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.2 b/metadata/md5-cache/dev-libs/libvterm-0.2
deleted file mode 100644
index 465de77b559b..000000000000
--- a/metadata/md5-cache/dev-libs/libvterm-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/libtool virtual/pkgconfig
-DEFINED_PHASES=compile install
-DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
-EAPI=8
-HOMEPAGE=https://www.leonerd.org.uk/code/libvterm/
-INHERIT=flag-o-matic toolchain-funcs
-LICENSE=MIT
-RDEPEND=!dev-libs/libvterm-neovim
-SLOT=0
-SRC_URI=https://www.leonerd.org.uk/code/libvterm/libvterm-0.2.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=507b26e528b76c03ec059d73cc4982da
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.2-r1 b/metadata/md5-cache/dev-libs/libvterm-0.2-r1
deleted file mode 100644
index da7750a72624..000000000000
--- a/metadata/md5-cache/dev-libs/libvterm-0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
-EAPI=8
-HOMEPAGE=https://www.leonerd.org.uk/code/libvterm/
-INHERIT=autotools
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.leonerd.org.uk/code/libvterm/libvterm-0.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e8c5cde4a80d399e88b7e27c2cba158
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.3 b/metadata/md5-cache/dev-libs/libvterm-0.3
new file mode 100644
index 000000000000..498ed1aee7ea
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libvterm-0.3
@@ -0,0 +1,10 @@
+BDEPEND=dev-lang/perl sys-devel/libtool
+DEFINED_PHASES=compile install
+DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
+EAPI=8
+HOMEPAGE=https://www.leonerd.org.uk/code/libvterm/
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.leonerd.org.uk/code/libvterm/libvterm-0.3.tar.gz
+_md5_=047050c29d9636c20f5c6ea1e2f00822
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.1-r1 b/metadata/md5-cache/dev-libs/unibilium-2.1.1-r1
index ec494014ff97..2feea665ff50 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.1.1-r1
+++ b/metadata/md5-cache/dev-libs/unibilium-2.1.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A very basic terminfo library
 EAPI=8
 HOMEPAGE=https://github.com/neovim/unibilium/
 INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.1.tar.gz -> unibilium-2.1.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=764b2c800869325e1d2d6a6b62a3828b
+_md5_=3469c616d4cf3f2d4eafd19f992bec49
diff --git a/metadata/md5-cache/dev-libs/xbyak-5.73 b/metadata/md5-cache/dev-libs/xbyak-5.73
index ec09aeae7de2..fb89e2118c33 100644
--- a/metadata/md5-cache/dev-libs/xbyak-5.73
+++ b/metadata/md5-cache/dev-libs/xbyak-5.73
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> xbyak-5.73.tar.gz
-_md5_=249e2610e33ba7242f817586eb468927
+_md5_=a37516ff487bf874396bc2d8bc81e538
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index f1825d61cffc..415913370e3c 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luv-1.44.2.0 b/metadata/md5-cache/dev-lua/luv-1.44.2.0
new file mode 100644
index 000000000000..1ae08ed75821
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luv-1.44.2.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.44:=
+DESCRIPTION=Bare libuv bindings for lua
+EAPI=8
+HOMEPAGE=https://github.com/luvit/luv
+INHERIT=cmake flag-o-matic lua-single unpacker
+IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0 MIT
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.44:=
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/luvit/luv/archive/1.44.2-0.tar.gz -> luv-1.44.2.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	3c8380796b325aa1d33b234a04924d52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c18b3ee90e497fef97b3dfce4e6d6010
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 29c8475bde3a..6b5207c475ac 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2 b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2
index 6e7d4b5d0ca9..7cf2966bb3e9 100644
--- a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2
+++ b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-Directory
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/theseer/Autoload/archive/1.26.0.tar.gz -> theseer-Autoload-1.26.0.tar.gz
-_md5_=48a8ff864e003a6ee3cf3bdd567ccdcd
+_md5_=191ab8a545a8cae007081c1ccb017607
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b9498b6ab7b1..b61b59ac5523 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1 b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
index 3e58c69b5cfc..9e8e8418bd4f 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
 INHERIT=distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs virtualx
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~hppa ~riscv
+KEYWORDS=~alpha ~amd64 ~hppa ~riscv
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.6.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=06a70e0cd08970db45c246d7f94aef57
+_md5_=08c59bd949b09da6bf192b7a58d20c13
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index c311a05f792e..bc3eab8b36fc 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/owl-lisp-0.2 b/metadata/md5-cache/dev-scheme/owl-lisp-0.2
index 7968ee66d6af..b0fff488535f 100644
--- a/metadata/md5-cache/dev-scheme/owl-lisp-0.2
+++ b/metadata/md5-cache/dev-scheme/owl-lisp-0.2
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v0.2.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=75654f09ed896084d56a6146d212547e
+_md5_=e2f8242fcd0a489d52a694c8c400009d
diff --git a/metadata/md5-cache/dev-scheme/owl-lisp-9999 b/metadata/md5-cache/dev-scheme/owl-lisp-9999
index b2849f168e1b..a7d3017adc70 100644
--- a/metadata/md5-cache/dev-scheme/owl-lisp-9999
+++ b/metadata/md5-cache/dev-scheme/owl-lisp-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1eac98fcc257ba593e3fba06c6cba633
+_md5_=4f7f76959254629674f2cd0a47caa8d5
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 629a3bd22a72..de016568fb3e 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.13-r1 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.13-r1
index 04a976b58d28..6b5bb9424e8b 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.13-r1
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.13-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.13/Img-1.4.13-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.12-patchset-1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2a4af4d521aa1f40e4e9c3f8908d72f5
+_md5_=1b3a4bce29a2dda3c14b53a197f3b9f7
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
index bf18a972ba65..f32fc48c3c79 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.9/Img-1.4.9-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.7-patchset-1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6923ac02e468795bc479d410c004365
+_md5_=e5304edeba1ce9790056c0517b15798a
diff --git a/metadata/md5-cache/dev-tcltk/tklib-0.6-r2 b/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
index b999904f072f..cfb9cbc9e433 100644
--- a/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
+++ b/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
@@ -9,4 +9,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk:0 dev-tcltk/tcllib
 SLOT=0
 SRC_URI=http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=6a397dec6188148cf6a6fe290cf2bd92a9190c42 -> tklib-0.6.tar.bz2
-_md5_=7680325e1d1bce290828d5f67e3bb70a
+_md5_=22eb24d281e29a4484cc18697478caed
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c18f8b194529..e5f40cf17d7a 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
index 780495b5f1a5..c68a3c707430 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.20.1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] >=de
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fb4c2aa4cf9f24c162ca6151a202340c
+_md5_=cbccd570d8896e781b12d6285304c75d
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0 b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
index 5aafdcb25e3c..939bbcebe443 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schno
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=48c4089d69b798091bb959d9ebd3afd5
+_md5_=26a6bb17f418ae10f97ea296d3fdebb8
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
index d6c6e1a8ee84..a052274aea5f 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.21.1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schno
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ca10629deb5a61a0845b6968220d7cb2
+_md5_=8b7af428fa42810013dcce31620d6bfb
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-21.2 b/metadata/md5-cache/dev-util/bitcoin-tx-21.2
index 17294b455a12..78a6093d59dc 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-21.2
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-21.2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schno
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/af591f2068d0363c92d9756ca39c43db85e5804c.tar.gz -> bitcoin-v0.21.2.tar.gz https://bitcoinknots.org/files/21.x/21.2.knots20210629/bitcoin-21.2.knots20210629.patches.txz -> bitcoin-21.2.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1fe63694b0c9aab0d087faf77a8ed9a5
+_md5_=373baaa537e60081f27d849a010b6734
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-22.0 b/metadata/md5-cache/dev-util/bitcoin-tx-22.0
index 14563fe18a4f..77737e431005 100644
--- a/metadata/md5-cache/dev-util/bitcoin-tx-22.0
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-22.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schno
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/a0988140b71485ad12c3c3a4a9573f7c21b1eff8.tar.gz -> bitcoin-v22.0.tar.gz https://bitcoinknots.org/files/22.x/22.0.knots20211108/bitcoin-22.0.knots20211108.patches.txz -> bitcoin-22.0.knots20211108.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d1033f56966b1f0eb6a663dfa074e2b0
+_md5_=30f7f68bff5cfd470c91566fa5f50245
diff --git a/metadata/md5-cache/dev-util/packer-1.7.10 b/metadata/md5-cache/dev-util/packer-1.7.10
index 7ef0abef69d0..90d0146209f9 100644
--- a/metadata/md5-cache/dev-util/packer-1.7.10
+++ b/metadata/md5-cache/dev-util/packer-1.7.10
@@ -10,4 +10,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/packer/archive/v1.7.10.tar.gz -> packer-1.7.10.tar.gz https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.7.10-deps.tar.xz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=17b336e4c9fabe57dd2105b91e57d4c6
+_md5_=6cb42a4dd0396a1857f46c81e6ca48cc
diff --git a/metadata/md5-cache/dev-util/unicorn-2.0.0 b/metadata/md5-cache/dev-util/unicorn-2.0.0
index 1bc1ae3724da..21bc7705e29a 100644
--- a/metadata/md5-cache/dev-util/unicorn-2.0.0
+++ b/metadata/md5-cache/dev-util/unicorn-2.0.0
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0/2
 SRC_URI=https://github.com/unicorn-engine/unicorn/archive/2.0.0.tar.gz -> unicorn-2.0.0.gh.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=63ff81467b4e4c41b75059c8e288a8b3
+_md5_=23919192a0ce4df5396e737a99b47663
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 07d5cab47f85..c4aab030fbf2 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1 b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
index c47f4f91f619..93767de14301 100644
--- a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
+++ b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sd
 SLOT=0
 SRC_URI=http://downloads.tuxfamily.org/slime/v242/slimevolley_2.4.2.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0b097b4abfe882050ef95692748ef04
+_md5_=7f03b50625c9b524cc7b920c84231fee
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 967fd2c00bb0..3909d9b7e728 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1 b/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
index 94ed1a9e93ec..149e58da589e 100644
--- a/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
+++ b/metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
@@ -13,4 +13,4 @@ RDEPEND=app-arch/libarchive dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-q
 SLOT=0
 SRC_URI=https://github.com/Arisotura/melonDS/archive/0.9.4.tar.gz -> melonDS-0.9.4_p1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dbda5412897b7500a3cc9ec292be5154
+_md5_=ddde9daa47c67b3e19bb286e199396a1
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 0071e6a1d87e..693c7e61682e 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/gnurobbo-0.68 b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
index 062220965f05..b39305bf9d0f 100644
--- a/metadata/md5-cache/games-puzzle/gnurobbo-0.68
+++ b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-
 SLOT=0
 SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.68-source.tar.gz https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> gnurobbo-0.68-single-variable-declarations.patch
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ecf152afbfa4780c409e4956a18077dc
+_md5_=91c93c77aa235be332d8b767d57f234d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 4873a5ba038e..137f25b588f6 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/nautilus-43.0 b/metadata/md5-cache/gnome-base/nautilus-43.0
index ce3bf0ebea32..395a71fd5af2 100644
--- a/metadata/md5-cache/gnome-base/nautilus-43.0
+++ b/metadata/md5-cache/gnome-base/nautilus-43.0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/43/nautilus-43.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=07f9df7426ff9b11af2628f1fa945108
+_md5_=1671be63761ca2a5e802100138ce3628
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index f337d3fd2122..c0ac1dfc63c3 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.7-r2 b/metadata/md5-cache/mail-filter/milter-regex-2.7-r2
new file mode 100644
index 000000000000..5b606d068735
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/milter-regex-2.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/milter-regex >=mail-filter/libmilter-1.0.2_p2:= virtual/yacc
+DESCRIPTION=A milter-based regular expression filter
+EAPI=7
+HOMEPAGE=https://www.benzedrine.ch/milter-regex.html
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-user/milter-regex >=mail-filter/libmilter-1.0.2_p2:=
+SLOT=0
+SRC_URI=https://www.benzedrine.ch/milter-regex-2.7.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=09c95bf940b6746c7b289404b99fbe02
diff --git a/metadata/md5-cache/mail-filter/policyd-1.82-r4 b/metadata/md5-cache/mail-filter/policyd-1.82-r4
index feda7f5beef7..fc7e2667e425 100644
--- a/metadata/md5-cache/mail-filter/policyd-1.82-r4
+++ b/metadata/md5-cache/mail-filter/policyd-1.82-r4
@@ -10,4 +10,4 @@ RDEPEND=dev-db/mysql-connector-c:0= dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://download.policyd.org/v1.82/policyd-1.82.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b17a6ac1e349a6e776d13db9317f3508
+_md5_=3c8d35bcfc6d5e3721aded7caa293d1a
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 1e687e036243..363a9170ce2e 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/ahem-1.0 b/metadata/md5-cache/media-fonts/ahem-1.0
index a9c83aa013a3..e2538a3225f3 100644
--- a/metadata/md5-cache/media-fonts/ahem-1.0
+++ b/metadata/md5-cache/media-fonts/ahem-1.0
@@ -10,4 +10,4 @@ LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ahem-1.0.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=d5a1a89f12420497517da5ada56334d7
+_md5_=1b4b08ef529df16120b32ca868170fe2
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index caf3c7700fad..3eee8c485090 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
index d45570c972e7..ee3412243376 100644
--- a/metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-alarm-11.8.16.tar.gz
-_md5_=0b1e279956fa5ca8aeebbc9ff356fd8c
+_md5_=439662696d11baf11c21fad3d14e0b0b
diff --git a/metadata/md5-cache/media-plugins/gmpc-albumview-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-albumview-11.8.16
index 0bc4e17b84bf..215a3806e97f 100644
--- a/metadata/md5-cache/media-plugins/gmpc-albumview-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-albumview-11.8.16
@@ -10,4 +10,4 @@ LICENSE=LGPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-albumview-11.8.16.tar.gz
-_md5_=1eb22f841d4791032945e24fcf2b7e28
+_md5_=ff1796c7f4f2bbdf2de39ef7d7009bb0
diff --git a/metadata/md5-cache/media-plugins/gmpc-avahi-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-avahi-11.8.16
index 812c9da70d17..6a92f00286a6 100644
--- a/metadata/md5-cache/media-plugins/gmpc-avahi-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-avahi-11.8.16
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16 dev-libs/libxml2:2 net-dns/avahi:=[dbus]
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-avahi-11.8.16.tar.gz
-_md5_=c0a3e652fbaf367c27e3d38eb831683b
+_md5_=5b5574c571a574c6a8db4ca32fa952c2
diff --git a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
index 3bf44f4c41a3..10a2843bcacc 100644
--- a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
@@ -12,4 +12,4 @@ RDEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-awn-11.8.16.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=489f9a114d674a41e13f262832bb117d
+_md5_=386015e9a77051f6b418c8186594c390
diff --git a/metadata/md5-cache/media-plugins/gmpc-jamendo-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-jamendo-11.8.16
index 22ebd6c0621a..e80c28a8d048 100644
--- a/metadata/md5-cache/media-plugins/gmpc-jamendo-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-jamendo-11.8.16
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16 dev-db/sqlite:3 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-jamendo-11.8.16.tar.gz
-_md5_=cfcdfc6874c2cd539c310d356a613df0
+_md5_=d0fb594d610822ebbf19568a4f2d7c3d
diff --git a/metadata/md5-cache/media-plugins/gmpc-lyricwiki-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-lyricwiki-11.8.16
index 07fe60f1ffb6..d257020390f7 100644
--- a/metadata/md5-cache/media-plugins/gmpc-lyricwiki-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-lyricwiki-11.8.16
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gmpc-11.8.16 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-lyricwiki-11.8.16.tar.gz
-_md5_=c35d62e5de4fb5055ef105ad16382c80
+_md5_=ce03af3646c26acf3c121c8c9ec05890
diff --git a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
index 67a8b575d24e..87a9e62f0427 100644
--- a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16
 SLOT=0
 SRC_URI=https://download.sarine.nl/Programs/gmpc/11.8/gmpc-mmkeys-11.8.16.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3d43bbd405aefb8407fe46701d2bc5b6
+_md5_=c696af96923df8d39ec7732e86b013cc
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1
index 7f82e640b23d..f6e4e669b987 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.1_pre1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
-SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.0_pre1.tgz
+SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.1_pre1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	3c8380796b325aa1d33b234a04924d52	vdr-plugin-2	071552253671f8678f5291b896526b9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=af628f6068126780a5b5768e6f41d06c
+_md5_=31d7ce73b3b62ff890a61ab2ead1bf98
diff --git a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1 b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
index 6b190af5b111..9aef01fb3222 100644
--- a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
+++ b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
@@ -10,4 +10,4 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
 SLOT=0
 SRC_URI=https://github.com/zamaudio/zam-plugins/archive/refs/tags/3.14.tar.gz -> zam-plugins-3.14.tar.gz https://github.com/DISTRHO/DPF/archive/9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz -> DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz
-_md5_=72b2289edeb3d0ad8fac023dc3ee3fe1
+_md5_=dcd92ab719210796bc66aacd67c2a1f2
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 47c504d6f810..b6214943aea4 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/cd-discid-1.4-r1 b/metadata/md5-cache/media-sound/cd-discid-1.4-r1
index b3195474c88b..e284038bd91f 100644
--- a/metadata/md5-cache/media-sound/cd-discid-1.4-r1
+++ b/metadata/md5-cache/media-sound/cd-discid-1.4-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/taem/cd-discid/archive/upstream/1.4.tar.gz -> cd-discid-1.4.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bd1b04862b46f52018afbb40602363a8
+_md5_=680d3ee902d7422d215ea55ba0fcc50d
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16-r2 b/metadata/md5-cache/media-sound/gmpc-11.8.16-r2
index 1e8ce651073c..f93baa2f7509 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16-r2
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16-r2
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite:3= dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libmpd:=
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c53857a4a5f21712cb0dbfe07ce6f04c
+_md5_=8d6838d6013712116f620c3c30ae06cf
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.7 b/metadata/md5-cache/media-sound/strawberry-1.0.7
deleted file mode 100644
index 241d3c821e3c..000000000000
--- a/metadata/md5-cache/media-sound/strawberry-1.0.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) dev-cpp/gtest dev-libs/boost dev-qt/qttest:5
-DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
-EAPI=8
-HOMEPAGE=https://www.strawberrymusicplayer.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic plocale xdg
-IUSE=cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
-SLOT=0
-SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.7/strawberry-1.0.7.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=14f8ec08e4bb6fa2a242cd148d35d401
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 4b292eb1d885..b92ef7a9f271 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/ivtv-utils-1.4.1 b/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
index 19b21ba00640..5cf9ff8db49f 100644
--- a/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
+++ b/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
@@ -11,4 +11,4 @@ RDEPEND=!media-tv/ivtv media-tv/v4l-utils perl? ( dev-perl/Video-Frequencies dev
 SLOT=0
 SRC_URI=http://dl.ivtvdriver.org/ivtv/archive/1.4.x/ivtv-utils-1.4.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ea84ced79c3265a57bb8e5c7b25dbf7d
+_md5_=af235a9b013f7c5660a7bf30122eab59
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 7fc029a22865..e87dfaf45bd8 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.57 b/metadata/md5-cache/media-video/pipewire-0.3.59
index 688a0caf7244..494f61221b7a 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.57
+++ b/metadata/md5-cache/media-video/pipewire-0.3.59
@@ -13,6 +13,6 @@ RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurse
 REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.57/pipewire-0.3.57.tar.gz
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.59/pipewire-0.3.59.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b7198c97919b265951588bbe4b6f6819
+_md5_=43ca35cd8959cf31c34028cef514193f
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 0f73ce60116d..e874e3be2019 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-serve
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b7198c97919b265951588bbe4b6f6819
+_md5_=43ca35cd8959cf31c34028cef514193f
diff --git a/metadata/md5-cache/media-video/vdr-2.4.7-r1 b/metadata/md5-cache/media-video/vdr-2.4.7-r1
index 622aa99d44e5..de23068b15f7 100644
--- a/metadata/md5-cache/media-video/vdr-2.4.7-r1
+++ b/metadata/md5-cache/media-video/vdr-2.4.7-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> vdr-2.4.7.tbz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_ttxtsubs_v2.patch.bz2 ) permashift? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ad385a212f590db0688c1922a8095caa
+_md5_=bfea6e0b301e72f8da8de7e31114057a
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index bdae4e5bca4e..cff37b4cae02 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/ike-scan-1.9.5 b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
new file mode 100644
index 000000000000..843540f2ae04
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=ssl? ( dev-libs/openssl:= )
+DESCRIPTION=A utility for finding, fingerprinting and testing IKE VPN servers
+EAPI=8
+HOMEPAGE=https://github.com/royhills/ike-scan
+INHERIT=autotools
+IUSE=ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/royhills/ike-scan/archive/1.9.5.tar.gz -> ike-scan-1.9.5.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4054e5ceb19d032cbda6b2e892b5e943
diff --git a/metadata/md5-cache/net-analyzer/ike-scan-99999 b/metadata/md5-cache/net-analyzer/ike-scan-99999
deleted file mode 100644
index 3b0562c489fc..000000000000
--- a/metadata/md5-cache/net-analyzer/ike-scan-99999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A utility for finding, fingerprinting and testing IKE VPN servers
-EAPI=7
-HOMEPAGE=https://github.com/royhills/ike-scan/
-INHERIT=autotools git-r3
-IUSE=ssl
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=ssl? ( dev-libs/openssl:0= )
-SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ddbb5d958e42fd3f8e6eff4009c96d11
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.23 b/metadata/md5-cache/net-analyzer/nfdump-1.6.23
deleted file mode 100644
index c80b94f8caa8..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=7
-HOMEPAGE=https://github.com/phaag/nfdump
-INHERIT=autotools
-IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-REQUIRED_USE=?? ( jnat nsel )
-SLOT=0/1.6.23
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.23.tar.gz -> nfdump-1.6.23.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=db25d56a21d02f93454819b578ad6bfc
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1
deleted file mode 100644
index d6d2cd61fc78..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=8
-HOMEPAGE=https://github.com/phaag/nfdump
-INHERIT=autotools toolchain-funcs
-IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-REQUIRED_USE=?? ( jnat nsel )
-SLOT=0/1.6.23
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.23.tar.gz -> nfdump-1.6.23.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ea0241aea29dcd2b2b48f2a7326913c
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1 b/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1
new file mode 100644
index 000000000000..dc9288c341da
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+DESCRIPTION=A set of tools to collect and process netflow data
+EAPI=8
+HOMEPAGE=https://github.com/phaag/nfdump
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+REQUIRED_USE=?? ( jnat nsel )
+SLOT=0/1.7.0.1
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.7.0.1.tar.gz -> nfdump-1.7.0.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=54f7e22b4c182f5ce3bef63c86cd0377
diff --git a/metadata/md5-cache/net-analyzer/sniffit-0.5 b/metadata/md5-cache/net-analyzer/sniffit-0.5-r1
index 198540fb9adc..7f04d4a5d32b 100644
--- a/metadata/md5-cache/net-analyzer/sniffit-0.5
+++ b/metadata/md5-cache/net-analyzer/sniffit-0.5-r1
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/
 DEFINED_PHASES=prepare
 DEPEND=net-libs/libpcap >=sys-libs/ncurses-5.2
 DESCRIPTION=Interactive Packet Sniffer
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/sniffit
 INHERIT=autotools
 KEYWORDS=amd64 ppc sparc x86
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap >=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/sniffit/archive/sniffit-0.5.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d41d9c782430cc45e1a9e3b78aec9d3e
+_md5_=75c62f042180ac23736e1abf06f8f34e
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
index 76d44ee76aa4..4aeb64b026fe 100644
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bf91567a47415208e0f88c132ed88941
+_md5_=657780c0af9fd4b9ac8288e97562cd80
diff --git a/metadata/md5-cache/net-analyzer/testssl-3.0.8 b/metadata/md5-cache/net-analyzer/testssl-3.0.8
new file mode 100644
index 000000000000..829152db0995
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/testssl-3.0.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Tool to check TLS/SSL cipher support
+EAPI=8
+HOMEPAGE=https://testssl.sh/
+IUSE=bundled-openssl kerberos
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 bundled-openssl? ( openssl )
+RDEPEND=app-shells/bash[net] net-dns/bind-tools sys-apps/util-linux sys-libs/ncurses:0 sys-process/procps bundled-openssl? ( kerberos? ( sys-libs/zlib virtual/krb5 ) ) !bundled-openssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=https://github.com/drwetter/testssl.sh/archive/v3.0.8.tar.gz -> testssl-3.0.8.tar.gz
+_md5_=ab2f6b6709116878f4c861584e62b252
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.43 b/metadata/md5-cache/net-analyzer/zabbix-4.0.43
index bf5fa7e0c66c..01f3501538bd 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.43
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.43
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) pr
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.43.tar.gz
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=e7e73b54365e9288b2c98859a6ee4b4f
+_md5_=c8d22dfd70c8f35f19b29211fffb51d1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.44 b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
index 4a511845e3b6..bcffb3b3467b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.44
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) pr
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.44.tar.gz
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=e5a47bf7096a357ec6d711f6cdb1e2d9
+_md5_=3a4c8856e3996abc1fb1241afe5c0b3a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 8b062709edb6..83fa4139e368 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.61.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.61.1
index 1a03911fef1f..f93583acc0a1 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.61.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.61.1
@@ -10,6 +10,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.61.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.61.1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	3c8380796b325aa1d33b234a04924d52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b23d1a2ff25c054d469a9abe79059bd5
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4
new file mode 100644
index 000000000000..92b1e8ffdb0e
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-4.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature xdg
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.2.4.tar.gz -> tdesktop-4.2.4.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.2.4.tar.xz )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8c5b3662dbf775ac2ac2522054261d7f
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index a43341aa6f1f..31fe8d80b865 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48 b/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
index 5e2ebbd568e1..abde01ddb27a 100644
--- a/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
+++ b/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=net-irc/znc:=
 SLOT=0
 SRC_URI=https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz -> znc-clientbuffer-1.0.48.tar.gz
-_md5_=42737844ff2a2d5d7a69c7f7e1cc08d0
+_md5_=240b1d196fcb744f4fe9582418a47218
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a66e670254cd..711a396e9d3c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.20.1 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.20.1
index f703fa61c6c8..6fb192040662 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.20.1
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.20.1
@@ -12,4 +12,4 @@ RDEPEND=>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d8a42347d5806c36db5a4e57de84e63
+_md5_=95cee1980c2713e0ea26e5410d452ff5
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0
index 08184418c74c..17e94449e4b6 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0
@@ -12,4 +12,4 @@ RDEPEND=>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d2cbdad10d1f08f9aed2549e98430e38
+_md5_=62074d95ce3afd3ac4387bd5b146712a
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.1 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.1
index 2914a4ebe2db..372904dc12b5 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.1
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.1
@@ -12,4 +12,4 @@ RDEPEND=>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8fb19fd3f247fc15f73f3c8dfd6d3147
+_md5_=206315a6a675173f84d7e18a91b94865
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-21.2 b/metadata/md5-cache/net-libs/libbitcoinconsensus-21.2
index 41852df94a1b..0952cdd9a780 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-21.2
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-21.2
@@ -12,4 +12,4 @@ RDEPEND=>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/af591f2068d0363c92d9756ca39c43db85e5804c.tar.gz -> bitcoin-v0.21.2.tar.gz https://bitcoinknots.org/files/21.x/21.2.knots20210629/bitcoin-21.2.knots20210629.patches.txz -> bitcoin-21.2.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=12fd1464fe7bbdb14dc1bd610114a722
+_md5_=b6426945db55789feb0739afa8980e06
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-22.0 b/metadata/md5-cache/net-libs/libbitcoinconsensus-22.0
index 24a9b3665c8b..1d6b541b23f7 100644
--- a/metadata/md5-cache/net-libs/libbitcoinconsensus-22.0
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-22.0
@@ -12,4 +12,4 @@ RDEPEND=>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/a0988140b71485ad12c3c3a4a9573f7c21b1eff8.tar.gz -> bitcoin-v22.0.tar.gz https://bitcoinknots.org/files/22.x/22.0.knots20211108/bitcoin-22.0.knots20211108.patches.txz -> bitcoin-22.0.knots20211108.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c077e45940526d685fecce282a61c237
+_md5_=6174cb22cf5507bbc26abdf71f722664
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 918733ad44c7..9718b0eaeeed 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/notmuch-0.37 b/metadata/md5-cache/net-mail/notmuch-0.37
index e946936fbf37..49bdff99fb21 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.37
+++ b/metadata/md5-cache/net-mail/notmuch-0.37
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.37.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=15d30d5183e75a592106cb42d14c5e94
+_md5_=93d8f94e75fbcd7a3ffb9a2ff0494e3c
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2c27028c2ea9..155788b8cccb 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/drive-0.4.0_p20210208 b/metadata/md5-cache/net-misc/drive-0.4.0_p20210208
index b3e4f42f7592..64500c4b7e9f 100644
--- a/metadata/md5-cache/net-misc/drive-0.4.0_p20210208
+++ b/metadata/md5-cache/net-misc/drive-0.4.0_p20210208
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/odeke-em/drive/archive/bede608f250a9333d55c43396fc5e72827e806fd.tar.gz -> drive-0.4.0_p20210208.tar.gz https://dev.gentoo.org/~zmedico/dist/drive-0.4.0_p20210208-deps.tar.xz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=043c9b1668fcf11ceee27b25acd626ed
+_md5_=52987d8ade4cc8e35f5995985f18a99e
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index aa0b37ffcdab..9bde6a94ef26 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.3 b/metadata/md5-cache/net-p2p/amule-2.3.3
index e07a8353f17c..efa256be56ca 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.3
+++ b/metadata/md5-cache/net-p2p/amule-2.3.3
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 ) X? ( dev-util/desktop-file-utils )
 DESCRIPTION=aMule, the all-platform eMule p2p client
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.amule.org/
 INHERIT=wxwidgets xdg-utils
 IUSE=daemon debug geoip nls remote stats upnp +X
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/amule/aMule-2.3.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=376f81cff0a85f02076def87749accdc
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b1f16fcae7d73b7ce27cd010e199080a
diff --git a/metadata/md5-cache/net-p2p/amule-9999 b/metadata/md5-cache/net-p2p/amule-9999
index 2e79b4504ce0..86c9266798a0 100644
--- a/metadata/md5-cache/net-p2p/amule-9999
+++ b/metadata/md5-cache/net-p2p/amule-9999
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-p
 DEFINED_PHASES=configure install postinst postrm prepare setup unpack
 DEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 ) X? ( dev-util/desktop-file-utils )
 DESCRIPTION=aMule, the all-platform eMule p2p client
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.amule.org/
 INHERIT=wxwidgets xdg-utils autotools git-r3
 IUSE=daemon debug geoip nls remote stats upnp +X
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e6fbfb7df064a96d0ccf2f1ec3213f6
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1ecc632b1eb59b2eb3cadc7570141f6b
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
index 77177944e722..8d7c00f6efb2 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/bf0dc356ac4a2bdeda1908af021dea2de0dfb35a.tar.gz -> bitcoin-v0.20.1.tar.gz https://bitcoinknots.org/files/0.20.x/0.20.1.knots20200815/bitcoin-0.20.1.knots20200815.patches.txz -> bitcoin-0.20.1.knots20200815.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b135ee9e0b4a984885f390cafdb26499
+_md5_=18510985a1b37ab2de8da8151430d204
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
index 8d33489898ed..249f303daa25 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6e728784cc5de0987a34b32ca5485333
+_md5_=bf97e9180d692dfd131ad0b3eded405f
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
index 725295fa5bba..2bbdd770fc12 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.21.1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a737df8c8e2ba8a9266b5ba077d13570
+_md5_=90dc2c71133fd2579ebced409ef17d4a
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-21.2 b/metadata/md5-cache/net-p2p/bitcoin-cli-21.2
index 32eda96047dc..00da3d439f82 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-21.2
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-21.2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/af591f2068d0363c92d9756ca39c43db85e5804c.tar.gz -> bitcoin-v0.21.2.tar.gz https://bitcoinknots.org/files/21.x/21.2.knots20210629/bitcoin-21.2.knots20210629.patches.txz -> bitcoin-21.2.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc5780403c9653aa4ad3c64c15125ef6
+_md5_=9030c55ce371b0473ddf66d32c64c2a5
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-22.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-22.0
index 65532b76202d..7d802bd3212d 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-cli-22.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-22.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= dev-libs/libevent:= >=dev-libs/univalue-1.0.4:=
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/a0988140b71485ad12c3c3a4a9573f7c21b1eff8.tar.gz -> bitcoin-v22.0.tar.gz https://bitcoinknots.org/files/22.x/22.0.knots20211108/bitcoin-22.0.knots20211108.patches.txz -> bitcoin-22.0.knots20211108.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f71bf2f2d3d7b8361e2474ec46c5c536
+_md5_=622f427bb288d7ba7db44fe837b1ad84
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
index 3f060bb66115..f3fe19a3283a 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b018e781690cda62460c9f1f4c78f023
+_md5_=91e1d606af5474fd9223154bc3e5254d
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
index 1be250ff0719..5e9dd4989d3b 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.21.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5a9604b0091cf6d871d5ee40cd0278e7
+_md5_=f5bb919e613f72fddbc792a6c74317c4
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-21.2 b/metadata/md5-cache/net-p2p/bitcoin-qt-21.2
index 7a107435c279..960673996925 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-21.2
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-21.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/af591f2068d0363c92d9756ca39c43db85e5804c.tar.gz -> bitcoin-v0.21.2.tar.gz https://bitcoinknots.org/files/21.x/21.2.knots20210629/bitcoin-21.2.knots20210629.patches.txz -> bitcoin-21.2.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2dd04514f8db0928121b928a5102ed87
+_md5_=78dde169105dd6e2f5bc92147860e5b2
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-22.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-22.0
index 5889bc4c5934..bbf799c59eab 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-22.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-22.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/a0988140b71485ad12c3c3a4a9573f7c21b1eff8.tar.gz -> bitcoin-v22.0.tar.gz https://bitcoinknots.org/files/22.x/22.0.knots20211108/bitcoin-22.0.knots20211108.patches.txz -> bitcoin-22.0.knots20211108.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ce2bff8cf70421d809be42881f9d80d1
+_md5_=55a15b7e21931c0ea13da86ecb2e6a1e
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.21.0 b/metadata/md5-cache/net-p2p/bitcoind-0.21.0
index ebb2aa4ca0a3..f364ab97ac87 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.21.0
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.21.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/95ea54ba089610019a74c1176a2c7c0dba144b1c.tar.gz -> bitcoin-v0.21.0.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.0.knots20210130/bitcoin-0.21.0.knots20210130.patches.txz -> bitcoin-0.21.0.knots20210130.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8fe84d91f4645ddc96e903411f384dc0
+_md5_=da42ad08f2cb6dbace882db89e4de64d
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.21.1 b/metadata/md5-cache/net-p2p/bitcoind-0.21.1
index 897e805fff58..9202724d78e2 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.21.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.21.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf.tar.gz -> bitcoin-v0.21.1.tar.gz https://bitcoinknots.org/files/0.21.x/0.21.1.knots20210629/bitcoin-0.21.1.knots20210629.patches.txz -> bitcoin-0.21.1.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=baf62e8fbea3c29cb640873959bc3ea7
+_md5_=164354f5cb7d086f3eb1d2c138884daa
diff --git a/metadata/md5-cache/net-p2p/bitcoind-21.2 b/metadata/md5-cache/net-p2p/bitcoind-21.2
index cbc771dfa303..f804390a0cbb 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-21.2
+++ b/metadata/md5-cache/net-p2p/bitcoind-21.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/af591f2068d0363c92d9756ca39c43db85e5804c.tar.gz -> bitcoin-v0.21.2.tar.gz https://bitcoinknots.org/files/21.x/21.2.knots20210629/bitcoin-21.2.knots20210629.patches.txz -> bitcoin-21.2.knots20210629.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ddb6fc031d3013b44b9cfca19539942d
+_md5_=7f4de0a35f8b9a7891b19dcef42bd0c3
diff --git a/metadata/md5-cache/net-p2p/bitcoind-22.0 b/metadata/md5-cache/net-p2p/bitcoind-22.0
index d098ad15d2c0..9ee5ea9a2580 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-22.0
+++ b/metadata/md5-cache/net-p2p/bitcoind-22.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/a0988140b71485ad12c3c3a4a9573f7c21b1eff8.tar.gz -> bitcoin-v22.0.tar.gz https://bitcoinknots.org/files/22.x/22.0.knots20211108/bitcoin-22.0.knots20211108.patches.txz -> bitcoin-22.0.knots20211108.patches.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8ff182ab96c0edddab1e94581be8c777
+_md5_=18c589d0c8840c752f2211ef430a9dd7
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.5-r2 b/metadata/md5-cache/net-p2p/deluge-2.0.5-r2
index 86b189f4aa29..295b7b622b1c 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.5-r2
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.5-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.5.tar.xz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3a325c8e523e8771133416a49430ef62
+_md5_=d92611f27487667818d34330bee6ec53
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 2b22c5a6755b..c3b039a09120 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.5.1 b/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.5.1
index 6008a704ab61..90814fc19328 100644
--- a/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.5.1
+++ b/metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.5.1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/haproxytech/dataplaneapi/archive/v2.5.1.tar.gz -> haproxy-dataplaneapi-2.5.1.tar.gz http://gentooexperimental.org/~patrick/haproxy-dataplaneapi-2.5.1-deps.tar.xz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=774e98156971497cc2cee77446ac7118
+_md5_=e45bae94bb1690c6ba2dc0583b85fa54
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 0991d473ed63..3a3f96c9d219 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/siril-1.0.5 b/metadata/md5-cache/sci-astronomy/siril-1.0.5
index aafcf3d83002..e292f55e9cd1 100644
--- a/metadata/md5-cache/sci-astronomy/siril-1.0.5
+++ b/metadata/md5-cache/sci-astronomy/siril-1.0.5
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.0.5/siril-1.0.5.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f3673e5245112b4ded9dd38f0a61ba4
+_md5_=3969d5f8c58691d874a12797e5e63cee
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 7d31cc21d3d2..04f4e723fa19 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3 b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
index 108a8e9be29e..f73efb27f836 100644
--- a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
+++ b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/0.5/tv-0.5.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=14493f936bb599dd7faec748cece70f3
+_md5_=c86f5cda4344605df8072acf1799776b
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 2c93c2d234b5..7caa4f29db54 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/p4est-2.8.0-r1 b/metadata/md5-cache/sci-libs/p4est-2.8-r1
index 35b6c0bcfdb5..d814fa825286 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.8.0-r1
+++ b/metadata/md5-cache/sci-libs/p4est-2.8-r1
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=~sci-libs/libsc-2.8.3[mpi=,openmp=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio] )
 SLOT=0
-SRC_URI=https://github.com/cburstedde/p4est/archive/v2.8.tar.gz -> p4est-2.8.0.tar.gz
+SRC_URI=https://github.com/cburstedde/p4est/archive/v2.8.tar.gz -> p4est-2.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd99e6b616ac92443664351ffd539507
+_md5_=cb4bb5f9f4b267cf762ffa2b89b788e2
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 145d92135d97..221851b0b03e 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
index 79ff3a24f3d7..4716b15005f3 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
+++ b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-604-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1ad1c05f1b19001232df01c4ba399f96
+_md5_=62856477931af321aeb53da4b38415e6
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
index 8775a2038335..469958b04cd8 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
+++ b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=53271f6aa4f53190f5e9dd76f2fbdd9d
+_md5_=4043c58ee5d9408ca58fde9d60502ce9
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 227698bf2d0b..fac42fcc9bf0 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.18 b/metadata/md5-cache/sys-apps/etckeeper-1.18.18
new file mode 100644
index 000000000000..94addbad00e9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.18
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/bats dev-vcs/git ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=A collection of tools to let /etc be stored in a repository
+EAPI=8
+HOMEPAGE=https://etckeeper.branchable.com/
+INHERIT=bash-completion-r1 prefix systemd tmpfiles
+IUSE=cron test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-portage/portage-utils cron? ( virtual/cron ) || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.18.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f66d3f4eb656cbcaa9d9f36efa96c30d
diff --git a/metadata/md5-cache/sys-apps/ifd-gempc-1.0.8 b/metadata/md5-cache/sys-apps/ifd-gempc-1.0.8
new file mode 100644
index 000000000000..8b230a2500b3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ifd-gempc-1.0.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=sys-apps/pcsc-lite-1.2.9_beta7 virtual/libusb:0
+DESCRIPTION=GemCore based PC/SC reader drivers for pcsc-lite
+EAPI=8
+HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/ifd-GemPC
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=>=sys-apps/pcsc-lite-1.2.9_beta7 virtual/libusb:0
+SLOT=0
+SRC_URI=http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/ifd-gempc-1.0.8.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=34686b459628370fb578976eb590be12
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.38 b/metadata/md5-cache/sys-apps/portage-3.0.38
new file mode 100644
index 000000000000..797bbd9be863
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.38
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.38.tar.bz2
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6c07f27909150a45e897f0a73f535fd7
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 233608953e48..40e127b9588d 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r2 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
index 06f3897fe200..96909aca1154 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpuse
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch https://dev.gentoo.org/~sam/distfiles/sys-cluster/torque/torque-6.0.4-glibc-2.34-pthread.patch.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c83fb12f824456066204e8e0694255f
+_md5_=af28043def939f24989fbe3ec7027cdf
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 476c17311388..9063e4f159d3 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9 b/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
index 2144c9dee97d..a1fa5a9760d7 100644
--- a/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
+++ b/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://yaffs2utils.googlecode.com/files/0.2.9.tar.gz -> yaffs2utils-0.2.9.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7a7935f2fc43cce49b257ad0f9dcc028
+_md5_=3c92eeb5cec73cdab7224fd8d244db89
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 2001bbe7f0dd..6bd7b5cd1167 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r3 b/metadata/md5-cache/sys-process/numad-0.5-r3
index b25ec9fbbd7a..b6742e2e1a4f 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r3
+++ b/metadata/md5-cache/sys-process/numad-0.5-r3
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=114e3112fd84991fabc37b0d48a1822c
+_md5_=e4fd72458b4f9680c6d936b50930a160
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r4 b/metadata/md5-cache/sys-process/numad-0.5-r4
index 4bc18acd1d0c..2d4113fd20d4 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r4
+++ b/metadata/md5-cache/sys-process/numad-0.5-r4
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dbd6348d950c7803dc392fb176ac1156
+_md5_=7c88e4cbfaf5b72a081a0064b717bdeb
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 63c9f513aa62..ae4f80f806bc 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a8325207a0ec91e6f17948d6fd87e0a
+_md5_=54459a8d4ea2fd531a17d38f95d6f4d4
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f296ff99c30c..f9e78460b9b4 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5-r1 b/metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5-r1
index e2741af2f6eb..82a5f0fe18d8 100644
--- a/metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5-r1
+++ b/metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14.0 x11-libs/gtk+:3[aqua]
 SLOT=0
 SRC_URI=https://download.gnome.org/sources/gtk-mac-integration/2.0/gtk-mac-integration-2.0.5.tar.xz
-_md5_=d37e40023313fadd05a3086db58cdae3
+_md5_=6d43d55bd9d2269cf863581ef1b8e036
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index de5f814d753f..079844cba5ed 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-09-30T23:09:44Z
+TIMESTAMP 2022-10-01T05:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3dzhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM3y55fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBh4A//bWIq7jSqAjn2biEy74WgjeQ87vK923c3AlrWO6DfPAWkn/qa8A8W9IYr
-KSNUBkxtIIQyovqPWGhuY2SqK0KkoqSLpd6WoLoyxh0dhQK2zCpqcfdjN8YVPGAT
-sjIrL7SeGYizPeRQaKLKvpeVYJO2WeTG7TP7L+lZcM/rbWnGbR+atgeLKs6s+ORw
-JMCfomFLj/a3ECT74AgslOco3npKhrwrNKbjt+N4rto7N1gxpFGVy4Fh414pW2k0
-/g2JDi/K0fq7NIKnz3qKegxaD8Js7ypAb8c6ZeD+fsVTMw4TdKdHO1bTSXTEg/JB
-vADlaO2e2wCFFc/fhGTyF8/jqEuR9dCkK9XrCcJxqSHQy+rVFnpD9+LnsJBkQzLF
-scOazobQAfUC3K8HVCnqNPRrti7HYFIm2oyUyYjg6dVcd8GfAyPGA/LQSIALVGvs
-wGOVGQNWyApe68HaqNgfMzHKU/Iiuo2NAKFf/oGW3y089kaqRk644wHXdkCuAb9e
-c8TJtgf0tOB1v2SPWQMXprgY5LamSIG4T/p+v4jSlC6yZltLE5W5RKGIHMZsXSbY
-LPklGXVpHbF1TJpxSNFUlX5RK+kDMC6hI37nKTjpTzB6FTZTRZlLjvdnWmKmCnkt
-ptFcDp5Q2x6zMzjUTrrNEpmsa0SI9Y/I6efXZJ3OsX3rt0X+hMw=
-=F+z9
+klDMOA//QnJJBdhqKeVGa+W0J2xo51MeshFo19XWY3qTVRrUM0XQYuapzdRQfTji
+z+5ON5L+yoPU9CL0P8bTexUHj8Qq0FQhCj1WeNg7ojNa6UPZGJaKcM48/Gag61E8
+ThxNLrStC7P3v7doDEij2Be2MFVZlJ+eo5+sFdsoBixGjdSVA6bDxS4o/vQpYLzr
+vemDMblOLSTmacOuWfyfkCr89TnQaszX2HfFKSvZO6ID1Ba5VXwT1l0AIcVZ/JEl
+x9j0CSGrQBPoYKLfEukYDWmPofcCWSfJsxzb68wzoRjdfoLxbLQRL9Uuus+SzXyF
+VmrtZiQzJmALFhjKap880dyzY+rJ/FPT3hyinpjE+h/aQl/kaXUSEBdASXGf9scR
+HG3nT4Brw7kl0TYJRuDImh7C2CzHXCqAqmMZp+6XLFXzftugzn6KJbcji4T4OAsB
+5gVyPbFiVma7ttB1hAkq8+1xK4k2dZBZakxGsWwqIVFZPpY1GjRJJCj+r6bz04PU
+Y0BChhGO2AXtO+qotVXrlSI/gRe8aSh4TCyZhrOtU+6ZAyPuUOUeNqurbi8wBSxX
+M+/UxizWWSN2AxcVsQ+4rUJshcUih0DwttD0IqcCG/3w8yX5NN/kE6S89fkYTohP
+bLuAielXdImDBT7ERFglw1rch73Zm4AHkYDA23ZQSIawDfE8+OQ=
+=36oZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b5ea3fe9cfb5..fa5c71474624 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Sep 2022 23:09:41 +0000
+Sat, 01 Oct 2022 05:09:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d4f6d59232f1..3b0773cf9e0c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep 30 11:09:40 PM UTC 2022
+Sat Oct  1 05:09:46 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c6fc6508466e..1410c56bc9d4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Sep 2022 23:15:01 +0000
+Sat, 01 Oct 2022 05:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index db11a6c163c5..20ef89db4a01 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c68b8835f51762b1f8cbad06d3af825663326b69 1664575927 2022-09-30T22:12:07+00:00
+6185a73c8a11a8f9ff823020f676c2d4f4af9755 1664600265 2022-10-01T04:57:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 10529ea5d343..3076b1afdaed 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1664579401 Fri 30 Sep 2022 11:10:01 PM UTC
+1664601001 Sat 01 Oct 2022 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 59737b1a8a54..fa5c71474624 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Sep 2022 23:09:40 +0000
+Sat, 01 Oct 2022 05:09:46 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 889874dcda47..061d7b07dde3 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 8354a70e8bbe..2f9830a26384 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,4 +1,6 @@
+AUX ike-scan-1.9.5-clang-16.patch 3150 BLAKE2B 1ed607aee9003ddb07a49c96ad14e882d3e5135ca5f0af07212bb60dff25854b5104ce35b2bc9c7c286b34d1feb1fcd2a0b8ee6da18a35c04f800671431352ca SHA512 9e84734e60ba0bcd2ef714e5051d486ed7594b33e99447fe8ee9a6b59eda57ccd7311b01781d5e5096b98df45ed141644a94bc78d69747e5639b19cd89b0df79
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
+DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590
 EBUILD ike-scan-1.9.4.ebuild 738 BLAKE2B f73bc5fb1a446a3f9cf97ad85a1cd68db0be95bbf3200ac4530763d0c696569092ef7032c03633cf051fb2a7d01eb7cd106c0718a76b619cbaf341e1122683a0 SHA512 aed95ea1d8511de9b542394d5f5ae41df0408dde189e95a1a255d554524e0099b0d262b1b32daaab8fc15121120400d2767dd2a57763b1bc5ec22894c75089c9
-EBUILD ike-scan-99999.ebuild 700 BLAKE2B d808a7c999fbb3bd203134643b76ef627eebe81e9c23bd5c889a68199482441cc4b9f05e46a4411b00f3ca5fcbe815b09206def835c4d6af8553fdff146f5161 SHA512 72c46f8bc360ab68bb47391b65fc59086aaac5c2bc4cd4a27c795f8f494298ec1c36eac99a2b98bbcc31b9968f1e874ed53323829d131cefe95db826e9093403
+EBUILD ike-scan-1.9.5.ebuild 784 BLAKE2B 82997a6df4449ab79ceb62d06d6605e57c04a7374d70128780f2f7772066451b7b035f48662f7b7a3dead619707a01a61f682d3f89694b01443640e41cd168c0 SHA512 b8d8a1744aa6f3107384d78dfa77f4c00f15c0185085ea40040eb18d83e1f3b810e038bc690332ccb987bdbe9c93195125ea750762e2966810a7141176665635
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch
new file mode 100644
index 000000000000..c4aec2836ba0
--- /dev/null
+++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch
@@ -0,0 +1,92 @@
+https://github.com/royhills/ike-scan/pull/39
+
+From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 05:22:18 +0100
+Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+
+ compat)
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -144,7 +144,7 @@ int does_int64_work()
+     return 0;
+   return 1;
+ }
+-main() {
++int main() {
+   return ! does_int64_work();
+ }],
+ [Ac_cachevar=yes],
+@@ -200,7 +200,7 @@ int does_int64_snprintf_work()
+     return 0;			/* either multiply or snprintf is busted */
+   return 1;
+ }
+-main() {
++int main() {
+   return ! does_int64_snprintf_work();
+ }],
+ [pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
+
+From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 05:23:06 +0100
+Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check
+
+Case doesn't matter but case does need to match on left & right
+hand side, so just choose uppercase everywhere to match what
+the rest of the file does.
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -278,7 +278,7 @@ dnl in <features.h>. We don't use __GNUC_PREREQ directly because <features.h>
+ dnl is not present on all the operating systems that we support, e.g. OpenBSD.
+ dnl
+ AC_DEFUN([GCC_FORTIFY_SOURCE],[
+-   if test "x$CC" != "X"; then
++   if test "X$CC" != "X"; then
+       AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE])
+       AC_TRY_COMPILE(,[
+          #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without
+ dnl warnings.
+ dnl
+ AC_DEFUN([GCC_FORMAT_SECURITY],[
+-   if test "x$CC" != "X"; then
++   if test "X$CC" != "X"; then
+       AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security])
+       wfs_old_cflags="$CFLAGS"
+       CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security"
+
+From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 1 Oct 2022 01:24:04 +0100
+Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with
+ Clang
+
+Before:
+```
+checking whether clang accepts -fstack-protector... yes
+checking whether clang accepts -D_FORTIFY_SOURCE... yes
+checking whether clang accepts -Wformat-security... no
+```
+
+After:
+```
+checking whether clang accepts -fstack-protector... yes
+checking whether clang accepts -Wformat-security... yes
+checking whether clang accepts -D_FORTIFY_SOURCE... yes
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,8 +34,8 @@ if test -n "$GCC"; then
+    CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings"
+    GCC_WEXTRA
+    GCC_STACK_PROTECT_CC
+-   GCC_FORTIFY_SOURCE
+    GCC_FORMAT_SECURITY
++   GCC_FORTIFY_SOURCE
+ dnl Uncomment the lines below for testing with stricter warnings.
+ dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline "
+ dnl Uncomment the line below to check malloc/free with electric fence
+
diff --git a/net-analyzer/ike-scan/ike-scan-99999.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
index 4e89ede7807a..acfffd464bb0 100644
--- a/net-analyzer/ike-scan/ike-scan-99999.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools git-r3
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="https://github.com/royhills/ike-scan/"
-EGIT_REPO_URI="https://github.com/royhills/ike-scan"
+HOMEPAGE="https://github.com/royhills/ike-scan"
+SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
-KEYWORDS=""
 
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.5-clang-16.patch
+)
 
 src_prepare() {
+	default
+
 	# Fix buffer overflow, bug #277556
 	sed \
 		-e "/MAXLINE/s:255:511:g" \
 		-i ike-scan.h || die
 
-	default
-
 	eautoreconf
 }
 
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index d797cdf18f0d..57c0e934e22b 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,13 +1,8 @@
 AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
-AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-AUX nfdump-1.6.23-autotools.patch 6579 BLAKE2B ea194c79ad584007b5c2e19a4b7b5cb94f381220e5c04120c5700b33075da831428d98af0b3fac574d61414c6285da05268660033d2411a87eaf047156af4442 SHA512 c7bcc7645542d1d3273def4a7fa5881e30763b38773ceb3fa5eef3e7f0a60fc0aaa14cf66df7f72dd154a3ccce1ab9dfaf2ef955d149136a1bb8e014ffe7574f
-AUX nfdump-1.6.23-m4-dir-automake.patch 579 BLAKE2B f77f624bfcd108e048ee215d85968fdde380720de90979cca81c45c64e022c872983f0d0d370bec8c16c1111948748d959662eab494a2c660fdb8d63377bd3ab SHA512 90df4adaba5deaf79d93eb05dcf3f364837bf7b60175a325ac08bad056bb356dd23f414132e23c068579a9fa9ad46ec74ccab7178022e8fe3bbead3f8f0be07f
-AUX nfdump-1.6.23-m4-dir.patch 477 BLAKE2B 1ef4634ad61efc372da5bb92657826ed45112121e98dbb8971e51df33d50ce312e841659cf01fe949f5ce9998b75bd1037be9ffe1a95a6dbb2aca73e5be6bfac SHA512 b50cb179373a6b37b4122a0b77e6d321b6e992430f4fbc5178cbf867bf4cc0740e2c7a4b01c075f3d8c4339b0690781f1df74f773993cedbe44ff041c9bb6091
-DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
 DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
-EBUILD nfdump-1.6.23-r1.ebuild 1719 BLAKE2B bd83dea93bc0d33639a92015249f15ccebda61c0870481c30fae667516a8dc279a69eea0008e1490d4d81b123b3c7edb8189c5460774f1e44d9d7c49d2d9b2a3 SHA512 ac32eaa741fe3482056fed7481b087806ad3b2fa8cbd94ad945e982871f35bfb8031d61a73b2e54ab08bda7e30d46ea1acc9eaafda9953a9a0bf0270a79b817c
-EBUILD nfdump-1.6.23.ebuild 1713 BLAKE2B b0a76ab56f3a696d1828cd8241de89238d824c13f7cdd3ab22b052732c76f9660d60ef6114e54ab7f2ccb30c0608fc33ae448df1a4fd191b9e7c74347c477804 SHA512 013079b47e1346c7b057572687cda6a1b39e5966da05674e2329cd55e14fa8ea36a894f18b18c7a4485841da54201ebe5e7d0832355e4e01447b524cc56d5f74
+DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8
 EBUILD nfdump-1.6.24.ebuild 1748 BLAKE2B 3a58d5995e4a54416486998612d5e4c028efd51a77a7aba6aa68d699714ecc66ad392aae75ffe936bb77dc13871b30b199a0c991f7836bd17f7a2033f25b2d6b SHA512 c1a1b1f67d544f0f6176b006d6ae9fb0d00e34e14c2073634d0385afa47f641e6f730fa9a238f1a2d54fea54c57809d8fa63e77a887d80942ae39721b148437a
+EBUILD nfdump-1.7.0.1.ebuild 1750 BLAKE2B 0e45b982a493537ae16e62621f3b855b84cb603a62906a3c493fda0661f2e5597268b72cac8aa172bb7c8f85ec4c25b7e599d5f322800373ab2c923642690963 SHA512 58ac64c1cb777dfa68bca64270337168350308663f125613fb675723a673e15fc6c31712de8c0f5a12799c0d5a6d925fd5b9989682efcc11a1dbb7ab9ee848f6
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
deleted file mode 100644
index 8826c50c9dc2..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,8 +9,6 @@
- AM_INIT_AUTOMAKE([subdir-objects])
- 
- # Checks for programs.
--CFLAGS="-g -O3"
--AC_PROG_CC([clang gcc])
- AX_CHECK_C11
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
- 
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -30,7 +30,6 @@
- LDADD = $(DEPS_LIBS)
- 
- #Add extra debug info for gdb
--AM_CFLAGS = -ggdb 
- 
- # libnfdump sources
- output =  output_util.h output_util.c output_raw.h output_raw.c 
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
deleted file mode 100644
index 65558bbe7dfa..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
-https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
-https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
-
-From: Peter Haag <flow-dev@pyxis.ch>
-Date: Tue, 22 Feb 2022 10:54:19 +0100
-Subject: [PATCH] Fix issue #304 - accept CFLAGS
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
- 
-+if test "x$CFLAGS" = "x"; then
-+    CFLAGS="-g -O3"
-+fi 
-+
- # Checks for programs.
--CFLAGS="-g -O3"
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Fri, 25 Feb 2022 09:12:27 +0100
-Subject: [PATCH] Cleanup automake files. Fixes #304.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,12 +1,13 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ(2.59)
-+AC_PREREQ([2.71])
- AC_REVISION($Revision: 244 $)dnl 
--AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
-+AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
- 
--AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIRS([m4])
- 
- if test "x$CFLAGS" = "x"; then
-     CFLAGS="-g -O3"
-@@ -15,7 +16,12 @@ fi
- # Checks for programs.
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
--CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
-+AX_APPEND_FLAG([-Wall], [CFLAGS])
-+AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
-+AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
- 
- LT_INIT
- 
-@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
- fi
- 
- AC_PROG_YACC
--AC_PROG_LEX
-+AC_PROG_LEX(yywrap)
- which $LEX > /dev/null 2>&1
- if test $? = 1; then
- 	AC_MSG_ERROR(No lex or flex found on system)
-@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
- 
- # Checks for header files.
- AC_HEADER_DIRENT
--AC_HEADER_STDC
-+# Autoupdate added the next two lines to ensure that your configure
-+# script's behavior did not change.  They are probably safe to remove.
-+AC_CHECK_INCLUDES_DEFAULT
-+AC_PROG_EGREP
-+
- AC_CHECK_HEADERS(stdio_ext.h)
- AC_CHECK_HEADERS([nameser8_compat.h])
- AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
-@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
- AC_MSG_CHECKING([for union semun])
- AC_CACHE_VAL(ac_cv_struct_semun,
- 	[
--		AC_TRY_COMPILE(
--		[
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- 			#include <sys/types.h>
- 	 		#include <sys/ipc.h>
- 			#include <sys/sem.h>;
--		],
--		[
-+		]], [[
- 			union semun semdat;
--		],
--		ac_cv_struct_semun=yes, ac_cv_struct_semun=no
--		)
-+		]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
-+		])
- 	]
- )
- 
-@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
- fi
- 
- AC_MSG_CHECKING(for the %z format string in printf())
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <sys/types.h>
- 
-@@ -438,28 +445,38 @@ char	string[16];
- 
- 	return i == 5 ? 0 : 1;
- }
--],
--[
-+]])],[
- 	AC_MSG_RESULT(yes)
- 	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
-                                       [Define to 1 if you have a printf() that supports the %z format string.])
--],
--[
-+],[
- 	AC_MSG_RESULT(no)
--],
--[
-+],[
- 	AC_MSG_RESULT(no)
--]
--)
- 
-+])
-+
-+AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
-+AC_CONFIG_FILES([doc/Makefile])
- AC_PATH_PROG([DOXYGEN], [doxygen], [])
- AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
- AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
--AC_OUTPUT(doc/Makefile)
--
--#AC_CONFIG_FILES([Makefile])
--AC_OUTPUT(Makefile bin/Makefile man/Makefile)
-+AC_OUTPUT
- 
-+echo ""
-+echo "----------------------------------"
-+echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
-+echo "----------------------------------"
-+echo "  host type            = $host_os"
-+echo "  install dir          = $prefix"
-+echo "  CC                   = $CC"
-+echo "  CFLAGS               = $AM_CFLAGS $CFLAGS"
-+echo "  CPPFLAGS             = $AM_CPPFLAGS $CPPFLAGS"
-+echo "  LDFLAGS              = $AM_LDFLAGS $LDFLAGS"
-+echo "  LIBS                 = $LIBS"
-+echo "----------------------------------"
-+echo ""
-+echo " You can run ./make now." 
- echo ""
- echo "* Many thanks for using nfdump tools"
- echo "* Please send bug reports back to me: peter@people.ops-trust.net"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Thu, 3 Mar 2022 09:25:15 +0100
-Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,7 +1,7 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ([2.71])
-+AC_PREREQ([2.69])
- AC_REVISION($Revision: 244 $)dnl 
- AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
- 
-@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
- fi
- 
- if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
--	AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
-+	AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
- fi
- 
- AC_ARG_ENABLE(nel,
-@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
- AC_SUBST(FT_LDFLAGS)
- AC_SUBST(LFLAGS)
- 
--
- # Checks for libraries.
- AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
- AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
-@@ -447,8 +446,7 @@ char	string[16];
- }
- ]])],[
- 	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
--                                      [Define to 1 if you have a printf() that supports the %z format string.])
-+	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
- ],[
- 	AC_MSG_RESULT(no)
- ],[
---- /dev/null
-+++ b/m4/extensions.m4
-@@ -0,0 +1,4 @@
-+dnl Define to empty for the benefit of Autoconf 2.69 
-+dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
-+m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
-+  [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
deleted file mode 100644
index 755db8b7cf5d..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/phaag/nfdump/pull/336
-
-From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 24 Mar 2022 22:50:13 +0000
-Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
-
-Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
-we need to include ACLOCAL_AMFLAGS in Makefile.am.
-
-So, let's set ACLOCAL_AMFLAGS = -I m4.
-
-This sorts out an automake warning.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = . bin man doc
- 
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
deleted file mode 100644
index ac25ee094653..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
-https://bugs.gentoo.org/832420
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = . bin man doc
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
- 
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- # Checks for programs.
- AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
deleted file mode 100644
index dca53c21054e..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
-
-REQUIRED_USE="?? ( jnat nsel )"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	ftconv? ( net-analyzer/flow-tools )
-	nfpcapd? ( net-libs/libpcap )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-	"${FILESDIR}"/${PN}-1.6.23-m4-dir.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use doc; then
-		doxygen -u doc/Doxyfile.in || die
-	fi
-}
-
-src_configure() {
-	# --without-ftconf is not handled well, bug #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfpcapd && echo --enable-nfpcapd) \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable jnat) \
-		$(use_enable nsel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow) \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
-	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild
index 34bb2bd90adb..db24ffe43a66 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="https://github.com/phaag/nfdump"
@@ -19,6 +19,7 @@ REQUIRED_USE="?? ( jnat nsel )"
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )
 	ftconv? ( net-analyzer/flow-tools )
 	nfpcapd? ( net-libs/libpcap )
 	nfprofile? ( net-analyzer/rrdtool )
@@ -36,8 +37,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-m4-dir-automake.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
 )
 
@@ -56,6 +55,9 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 
+	# bug #853763
+	use elibc_musl && append-libs "-lfts"
+
 	# --without-ftconf is not handled well, bug #322201
 	econf \
 		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index 383f77603abb..1ce2eb8b456d 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,4 +1,5 @@
 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
+AUX sniffit-0.5.0-implicit-func-decl.patch 1225 BLAKE2B bdcbb01058a2cf973bab5272de76f837c34e83e78034bc4fa7c11917efe09542c18a27c45e7c052fde3347104d70fd6cdcc2d3051b0b8baab792b12bac116b49 SHA512 26f995be95f5debfb551e0d45aef181cdd934a64381250c74cf0807ff208a87740cc8c11040c02280ea5a9dd716c9815c00c0f0c1f1902397efd6b26481c62fe
 DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc
-EBUILD sniffit-0.5.ebuild 583 BLAKE2B 2203a79bd787f3669c808478a1b3cad5593fb7b2b68b9b856f674f41fa5cc8cb6c3f05fe064a59b3099bb3b2f241fbdac618738d25e7b980d33053f41a37966e SHA512 63dc04674e45be650d1376afee4306005e8815cd3e32009575aab5f50c689e4832bb250fa884beb4c1aefc1c9bbdfd475eb82559e3fd513b2f89d06527d4b660
+EBUILD sniffit-0.5-r1.ebuild 637 BLAKE2B b075c7035505c04199aec242fe2b155f9eff125c1b9b19762e595c8f6a03a18488fe1248ac6dc71aa7617d7c29195197886a112b552f90d87d51e56ea0231406 SHA512 d25bef1176604296913e2fd0f9422139ed8afade3fb4744110d3fb0b8970488dd7cc9063f4d2e19ff6812158fe0e77830b4e41588b96a423e5128c90155e8d4c
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
new file mode 100644
index 000000000000..e6ee580d6e33
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
@@ -0,0 +1,50 @@
+https://github.com/resurrecting-open-source-projects/sniffit/pull/3
+
+From a05340968343d9f61f57506ed00bff0a62d3f38e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 28 Jul 2022 12:14:44 +0100
+Subject: [PATCH] Fix -Wimplicit-function-declaration
+
+--- a/src/sn_cfgfile.c
++++ b/src/sn_cfgfile.c
+@@ -2,6 +2,7 @@
+ /*   - by          : Brecht Claerhout                                     */
+ /*   - improvements: Shudoh Kazuyuki                                      */
+ 
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+--- a/src/sn_generation.c
++++ b/src/sn_generation.c
+@@ -13,7 +13,9 @@
+ #include "sn_curses.h"
+ #include "sn_defines.h"
+ #include "sn_structs.h"
++#include "sn_packets.h"
+ #include "sn_generation.h"
++#include "sn_interface.h"
+ 
+ extern volatile int screen_busy;
+ 
+--- a/src/sn_interface.c
++++ b/src/sn_interface.c
+@@ -4,6 +4,7 @@
+ #include "sn_config.h"
+ 
+ #ifdef INCLUDE_INTERFACE
++#include <ctype.h>
+ #include <signal.h>
+ #include <termios.h>
+ #include <stdlib.h>
+--- a/src/sniffit.c
++++ b/src/sniffit.c
+@@ -3,6 +3,7 @@
+ 
+ #include "sn_config.h"		/* Config header file */
+ 
++#include <ctype.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <stdlib.h>
+
diff --git a/net-analyzer/sniffit/sniffit-0.5.ebuild b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
index 3be66ceda23e..1247440f794f 100644
--- a/net-analyzer/sniffit/sniffit-0.5.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Interactive Packet Sniffer"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
 SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz"
-SLOT="0"
+S="${WORKDIR}"/${PN}-${P}
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="
 	net-libs/libpcap
 	>=sys-libs/ncurses-5.2
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.0-tinfo.patch
+	"${FILESDIR}"/${PN}-0.5.0-implicit-func-decl.patch
 )
-S=${WORKDIR}/${PN}-${P}
 
 src_prepare() {
 	default
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 339237d102a3..9aa1058ac30d 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -2,5 +2,5 @@ AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p6.ebuild 1247 BLAKE2B 56e12c7951701d56ddbd5302bab3cf6c483d962cf79c144ad1488c998cdb27e0026a8602f1100c80f8b921bf5454c5877df345ece9f5b652a6f9f28880ce740c SHA512 b78443aae2c40aa7d9276ecae12496af52c0939f346562062968619c05ed97d6b680fe64ad79d0bce3688403d031594975d8f28868b19e951527256e5bcb0490
+EBUILD tcptrace-6.6.7_p6.ebuild 1258 BLAKE2B 50e31667149561f66e255ffc1679c5b10dca42d209b4cfdf60b6eb8a27dbc0414b5415d803abaf0e09c303a4738a01bca431f0b5fa516d331e922f3e0fd5a33d SHA512 5e11ec5bdc8bb3a85b0e3ffb4ca896e2d71a66599e9be97e99260cafdc6d64ebc84955cea753a875c6cf0e151f0696150855f68c5c253c8e1d35d535014df64e
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index a96afb76f58e..fe3dd350d447 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="A Tool for analyzing network packet dumps"
 HOMEPAGE="http://www.tcptrace.org/"
 SRC_URI="
 	http://www.tcptrace.org/download/${P/_p*}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
+	http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz
 	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
 "
 
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index d57b7c727ac6..eeefd5b2c516 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,7 @@
 DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
 DIST testssl-3.0.7.tar.gz 9219774 BLAKE2B d3b6abd5bb46e26ccb13afd9c9440e80fd80566db2bf04bb72b254dbebdc69957a0bae82436ce0b3f826f7c829a0cf73589eedc60735c629d010c8cb76e196a0 SHA512 703099f3c7d7d040f064466c721e30ee594a8d495add113b899b14d21848c8488e2d447c1af87ecd3d0d2b00dbeecc3a7914c26721b5b1936cfa818cf6599d53
+DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080
 EBUILD testssl-3.0.5.ebuild 1508 BLAKE2B afa8231522f3c74583cf7797859ef851eee280702d7d5c642188add2114e2ead7d653e1837f0f973ec77861be077f11ead26a05bd0743e7e8a13a4adf3e998f5 SHA512 8f60fce722b2dc13c5c1079f7434c55fa497261bae039bcceba1ba728c0c39910c87a174f2b58a68be1fc6013c9eeb926ddf208dfc432338f1062323e7a81359
 EBUILD testssl-3.0.7.ebuild 1525 BLAKE2B 2d08576b382583963ee09a8d8e16e43c7645e797cb53908172574358a5a9b87053a8540218ae62fc4faaabee12787ca17f86e3dbcd9b02f2f16cb3ebc403810b SHA512 4d2f3b6d8214134c7fe5c1336e178e885a6b9b065673b5dadd5e313aa649cbc1d0f3a7927a450589b12cc84b98ca37e0b576fa74749bfdb0c908060ae8343190
+EBUILD testssl-3.0.8.ebuild 1525 BLAKE2B 2d08576b382583963ee09a8d8e16e43c7645e797cb53908172574358a5a9b87053a8540218ae62fc4faaabee12787ca17f86e3dbcd9b02f2f16cb3ebc403810b SHA512 4d2f3b6d8214134c7fe5c1336e178e885a6b9b065673b5dadd5e313aa649cbc1d0f3a7927a450589b12cc84b98ca37e0b576fa74749bfdb0c908060ae8343190
 MISC metadata.xml 460 BLAKE2B 110fe91ebd724eaed5e5cd10273c420b16bd410189b58166a7f922ce5495785d26afe44e7da288c1ee1c17e6740d1fad55d3c0c2d0f325f572f63cd4318539ad SHA512 c30db71d85634df9484b943a4651f0e0d04352ba3c80c84a93ebb5fd538a131817771c8e7d1a51a02f96205449ff23cb5a6567c38ee5c38b6c0743023e5afacd
diff --git a/net-analyzer/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild
new file mode 100644
index 000000000000..a3a082296157
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 526bf70b930e..de9941a1f178 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -36,8 +36,8 @@ DIST zabbix-6.2.2-go-deps.tar.xz 35354668 BLAKE2B 2fba7e9ee2c04f74d0fe041489136a
 DIST zabbix-6.2.2.tar.gz 34995538 BLAKE2B 749e43f23e06f9ad84bea2bae82fc1b8a499df3b873d26fd4fbfefd28288a3f17c1f05207d143516787cb1417107dd8594c704ea79b1a3d745affc787e723ff9 SHA512 b9ea0fb8fbfba6ecba54ad3abb68b10a005098cbbdf7130c6f9321cabcfe60a3b3094214a84e1c9d18fc4a0c959cf238eea43b400af027b9f200fb99c088658a
 DIST zabbix-6.2.3-go-deps.tar.xz 35349056 BLAKE2B 1548167558be12e7519e59e011eb6e761a0a5e1625fb460bbf3106ca5a895277789ce4b2f649884ebb0f236997771378ea47919f3e6fb6a4f4908a29ef34385e SHA512 a8934a5bb2367395c1ba6bf7ccd830c951fb585e7dc054d29f2667bfc45d18eed13889f4c31f8f417aba1920df06512e927c77975f70ab419e7525768caece7f
 DIST zabbix-6.2.3.tar.gz 35252249 BLAKE2B fdc9bd32c1aa632b266d26d88cdc08ac40d2663823730298ae2a136730ad4646a38921b0425ac87ef2c4dad7c62f5d41c2955cdf6b275204e26306b115ae3568 SHA512 9a8d3021f0e2929897c2f6d3e05721a9dd55ec5778c39edf7af9fb99590f8eece6bba40cb085426373837409d690646254fd2a3f0b151224532226dc46df14f4
-EBUILD zabbix-4.0.43.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
-EBUILD zabbix-4.0.44.ebuild 9416 BLAKE2B c594ca9fb069ef5dc5ef2dfa4f5136e0a66257dd171b056a9073391451b4742e04d4bb38da379f0c0998a30d3a1c0ca8138f62909bba57ba06cb4130521f9b0b SHA512 a650f9c0496c8e2ffd76bd2e1b37071c097aba69f6bb71612570fca5c71049b8f51e3865152205e73c1889a2b1fbdaca192c36109ab1ebd111698f0f90b1eebd
+EBUILD zabbix-4.0.43.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
+EBUILD zabbix-4.0.44.ebuild 9427 BLAKE2B 7bb30080c7b1c389f9728ab2b936d86b040ead567e94b8f28bdf046a3f1831ee7c2a54738121242469b480650090131bd2e44e5aa0d5450e2855c16397391950 SHA512 0716dbad6709d88b4b39583d7ad82365b1242fed4c74a9941f4fa328cb246a290f76ecb27cfe631cbe4e0665a66e1b15e043a5214f2b6e1be1919600c2a907a4
 EBUILD zabbix-5.0.26.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.27.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
 EBUILD zabbix-5.0.28.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
diff --git a/net-analyzer/zabbix/zabbix-4.0.43.ebuild b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
index b6f830af64d9..8436fd2d7b37 100644
--- a/net-analyzer/zabbix/zabbix-4.0.43.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 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"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-4.0.44.ebuild b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
index 1e0af68937f8..b24c08490b7a 100644
--- a/net-analyzer/zabbix/zabbix-4.0.44.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 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"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 074629d41a60..5efdfd55e239 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index b08f1716c502..4dd503988dac 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.61.0_amd64.deb 124773110 BLAKE2B 23b5453156de39bdcc99668bc030aa15d61cfdb096055a6803e18e35c28f81967f65d7b5ec2d4fbe6f7bedae169a087172f9ddf7fec8fca15f677a18d1ec1d63 SHA512 bc5a17c6dd922d495715327d21c4aa326d914c4fdf40309892dfdf7e1aace8afd11c7484af8dae6a4932dc27d59d6d4314e54163606b261d93468d042e381753
-EBUILD signal-desktop-bin-5.61.0.ebuild 2422 BLAKE2B eb3decdf00618f91782f7bc232bbbbb256f45dd3c1df5db89c3a6bec34ed91a2c313f8fd7d49a67c250a8f3a283be1580a09a2f839ecacda754dfacab41a4f50 SHA512 d1a77313a6a0ea7e6cac2fa01ffa8c244af15de00ed1b86a54426cf192b7c9d361b4f485deb2b6bbc304a2cf7e77b4225cb9fa98931a3d57802c00a7a679a2b9
+DIST signal-desktop_5.61.1_amd64.deb 124785488 BLAKE2B acf6c88c75bc31ef0abf8e045b8608c649ce511aa4e155483e377e4826f78365496dc9466e4b8197655f353f49683ebf4e6bda0499c0c449744e18149992d0a4 SHA512 9d49ae2dcfe3ecd7d8e96eff08113f5c475e1edbe2cb6001bbcf4b2b8dd687bb8914a64e76bc76f90bdf3216a90a669d885f65e69b79a17a188eab29f780557b
+EBUILD signal-desktop-bin-5.61.1.ebuild 2422 BLAKE2B eb3decdf00618f91782f7bc232bbbbb256f45dd3c1df5db89c3a6bec34ed91a2c313f8fd7d49a67c250a8f3a283be1580a09a2f839ecacda754dfacab41a4f50 SHA512 d1a77313a6a0ea7e6cac2fa01ffa8c244af15de00ed1b86a54426cf192b7c9d361b4f485deb2b6bbc304a2cf7e77b4225cb9fa98931a3d57802c00a7a679a2b9
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.61.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.61.1.ebuild
index afc13100c980..afc13100c980 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.61.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.61.1.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 45e7cde48bc9..c4bd16fc7400 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,7 +1,10 @@
 DIST tdesktop-4.1.0.tar.gz 16990380 BLAKE2B f037dbd8a3a7e30d906a8b4a1244b15fbad7304924033751dd89a0d7aa4db7d17d08821cfed53ff00977793d0974c675c7fea96e614d9a5cbf4d7026beac7ec1 SHA512 50c61a22d0953992cfd6a9eab0ca1ed87e2367e06cf47d51ce7339b93cd49a57ec6a6b5a4a4496f2e8ab71fdf968dc1850844e005eae48fb34ae35040225fbb1
 DIST tdesktop-4.2.0.tar.gz 17060742 BLAKE2B 3f85f903e07bf3a18357c7ec184f9a87863f50306715ad1c1dd03a88b6dff245b2bb7bdf7caf9d31e841f4dbee91be23dcd7d733f53c71b66ede5b9ec252d594 SHA512 48164145da0b6ff54260cfa9c07750da2461ff1c9b6abe0579f35e59dc16f87caa050a464c705b0f6afb186b8d7ee5d30e01be8033c777a4db4c0cd2dcd36382
+DIST tdesktop-4.2.4.tar.gz 17065673 BLAKE2B d2fd5db5d216b369902f697f8b2613fbb62ae7b788e08dc33f410a62547c335a8c20f2099989bb8eaaf92a81320e4fc24a3aaf266c6632b2264271e95c8b01ec SHA512 cc4cc3be490de750cb3a048a861d492bea1d2484160ee70b102979b8b446349333effe29f1b51fa014c7a65a4901779fa58f6b0d86ae12864f85d014e8f36d20
 DIST tsetup.4.1.0.tar.xz 43918764 BLAKE2B 05a34d44583aace5ae261d46a1c7382a63bb8a52f8ca07513011d6221b67f835a3f5a4f38a0c9036614cf8e944c71c9be16e344b24c5cf41b293f3b02bdd8170 SHA512 f226a98ea4ba97a3643adcbe2c883082dff72de25a5aa3a246beef78930eaed4e45fa1b4e46a179444660c7be06c124dbe27802271fa6ff0991ab3ac60f8e470
 DIST tsetup.4.2.0.tar.xz 44483976 BLAKE2B ca48fe1e4e92d4cfcfc7601a46ce72dbc3db3fb434ce5c04a4cfdaa6f6b9facc8d5973132798d456401125968a404a5f8b22f872dcb4f7ae07a925d6b8d68469 SHA512 e07f8db5eaa0c46a795887f0bf9ea96bd10c0d48fb1d4a496eb51beb487e92432512839466126067707f2314a6b9d021e15958271f8eeb2a9ad6db86780b997d
+DIST tsetup.4.2.4.tar.xz 46792948 BLAKE2B 20ebef199dc526de1e786ebd76dfd40d557f4211ae4c37d080f010738a710efe4ed2e5100c81249d49efb4902f7333f4548bff00a50eb284269dbd2aaff1bd21 SHA512 3397e480334605ebe7a8a3f3c6211adea8be0b759749e4beb579a6c4a75cb13accc3be5fa62c1d784fd6f0b92c66be15e986ed83c4fde29a38766b48a013b104
 EBUILD telegram-desktop-bin-4.1.0.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
 EBUILD telegram-desktop-bin-4.2.0.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
+EBUILD telegram-desktop-bin-4.2.4.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
 MISC metadata.xml 501 BLAKE2B 94aa66404772e94f51d8c59e36d19e6454f37173aaac352fe3539bcc09e72c267e69001c41f8356f19ca2830107164144d907865ad7fb3ad1def8771f5ef6d9a SHA512 3cd8e818062cd40787f12c9530ed202ea23c3f60a70f1ab50c95a7b3310197590be5a75378c598dabe5a1fce310fa8acf409a36e7446b66c2046a109d59a5ff8
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild
new file mode 100644
index 000000000000..d0558b783945
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 0afefaad5de7..6f4ab2ae1b2c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/znc-clientbuffer/Manifest b/net-irc/znc-clientbuffer/Manifest
index 4a651889209b..50219d7189ac 100644
--- a/net-irc/znc-clientbuffer/Manifest
+++ b/net-irc/znc-clientbuffer/Manifest
@@ -1,5 +1,5 @@
 AUX CMakeLists.txt 356 BLAKE2B 334684d49d81258425935399e73d597ce038d2d685341df15766469a0cb03d8324f7b7b697930e05871b6eaa467804ebbbde98bf26126dd495f78a315f3c6a03 SHA512 d935beadd25cdebe3dc0b793d7057b1a10fbfd39d5340bdd51071341500f9db2cc272c9702a0d84f5e8146895888ef36b04fe69f2cf4f10c3645cae17540bbc5
 DIST znc-clientbuffer-1.0.48.tar.gz 5602 BLAKE2B 16a2c807df7371619f9e8456e3a65226dfd60e37872a86af11861d2130aa75fbfcfdc1c326baa0676cc253f27dda32893110638d4747a283e224bd672a49e0b1 SHA512 eac4d748b670a8e3563a424fcb5c9c411af6c9b1f9965f065936ddfcfbff946783e34e0d6b32de18fb3b87fb27db129ff58bedfb179473c804750a9b770897f6
 EBUILD znc-clientbuffer-1.0.48-r1.ebuild 679 BLAKE2B 5406a7dbcdefa00962d42f3e6be1b0d8eca2904370ba40cc9ca4dd146bde26e543bfbd6b10ff702ca8f23053ada9cce547793b746c2e06f25c734e549e62636f SHA512 9ac441b75a2ced50175e21605f160754bd97820019e53e80de9bd116e027f61bcf1e1c6a786fd84b9fc618b1f6dfa192d28dd71da73f580dfc3f35cd003cbcea
-EBUILD znc-clientbuffer-1.0.48.ebuild 635 BLAKE2B 1a9b17f40c36972941b8dffa5440dcb334fd691ea4914d9f5e4aebd3f3c7e62438b26222945696c8b09fd597439b2ee65bb6b74c1e53493775c7d2e28c5b0b0c SHA512 157909102e799181feaea3033d743c579865740e8d41bffd5b830fe6b6eb2c4c3a36d7a91dc81e764b411910f278893ab20146e6c52a0bf7da947d910be7db28
+EBUILD znc-clientbuffer-1.0.48.ebuild 634 BLAKE2B a685483c5143345830ee703147417ce2d0592434b3fc96a3bb891752b36bcce20d1cb9f14c3a5b2c31c6e3d3c20f917493da30f6ccd81bb749586df5d25fcd21 SHA512 0667b46890b5a885e5ed12cadbf2f97c51851f8f9120b9634328ee777c81380c245de894a7e07e5b2038c4f2bdf70746d447e9964d857fcc5ebaab178416ceb5
 MISC metadata.xml 557 BLAKE2B 26d334308b729dceee1f3e11f5883a4a540aecaccd7143d7d29761a05aedf0d22aa38e9a47f54755eacf28d19c6f625ae8671c4fd118dccc4775c01a7ed4f602 SHA512 9f6a7e3b0d7d1c4e41b75ab87cf2d66cb34ea03df5b8f23d29ad4e70647192821311c0d93438db5744277ca969dca3aa69e7688c8586ab3e6d00d6ba374dccd6
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 2491cc61317b..217f9c0703cc 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="A ZNC module which provides client specific buffers"
 HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer"
-SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7f1c2e0e6bea..609ca8f3c3f9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 2186ef78977b..0db4abe2898f 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -8,9 +8,9 @@ DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c6409
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
 DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
-EBUILD libbitcoinconsensus-0.21.0.ebuild 2346 BLAKE2B 8cc7e7119962ca3598ee292773e10f4f5cd1c6a2c4079f55866b346e8e458bfc4ce7d122454f62461b81f5468b286e354c5a2ee61a39d427e8fc684c09f39cdd SHA512 95f09e34f4ba134ae829a86bdd9d0b035b07aed4af6d1ad085b7fed6d95edc5b718f3523084391ff7af3c560717fe3d485664fe1394dd72c51855798a0eaf029
-EBUILD libbitcoinconsensus-0.21.1.ebuild 2981 BLAKE2B fc9f64b99f54afe25ccad8de115012c50384196e85788a698093a72111661a6ab12753b79fe273719e204710bb5f975352a3715d1610977823e8a2579db64c05 SHA512 f984e35fb0c069c2cfc29856ff2b96619711fe039126de5bb37e66a877f5c5eb8b74be89fdbf38cb98428d81b3d072127717ff80181d4493cf2a8562e309ab18
-EBUILD libbitcoinconsensus-21.2.ebuild 2884 BLAKE2B fe68c6f4aa8914056f54312b1a252176b46408f70df0b5183522170f32a557959e13d044b528d39a04fc58bb7da4f30a4b1c772b12f8ace7503fa465e2bae497 SHA512 8e0ef5b549cdd683d3f2b69a720db82fe841e1955938d27ff5bd35867cc8a6fc430187ddf418b1f50d54042bc1351a08d066bc2a3ed3523b94c123e3ad2ee58b
-EBUILD libbitcoinconsensus-22.0.ebuild 3185 BLAKE2B 1e9d3291a2fa7e4658935b5c5cec55a9390956b7b47a4ee0d5ce241ce77e722cbdfb773746592e3fb64dc58fd7a763abdabdfd91d8906cc4f03beae5e5c383fa SHA512 7ea138cf0736ba7a9cfdc59d53a2e70af9fb4e1f0c2141ae30006a2ae6396bb1648adba51c8312f56940254b0f350b5218a041627a53d12da5a69e00ea932c83
+EBUILD libbitcoinconsensus-0.20.1.ebuild 2348 BLAKE2B 875b4120ff44b0ca110e7a43a4b3773d574498659595d2eecac8f0b59dde01b83535b29643524a5d84db3ad853e89068e5fca628ada8e1bb57ca82c19b9389d4 SHA512 58cbf3b4038fb6cbc31580a0baafc1863e917d0710bd2ac6b40ede7f96b7e13f42e653a91c95a9677260d35dd21c001fed3dc153464e8d65a265498d5a489d59
+EBUILD libbitcoinconsensus-0.21.0.ebuild 2356 BLAKE2B bde74c3275a7e3855fe37f91c50f4967c239dd0f56a0119b8567e87cf13bc40505407e0c51ac830a148f1a67c351a8797d27dd8f4acdd4bb95f299b971272a00 SHA512 87596512f29bf5d38fae4890fd3baeab25a2cbefa53bb110e534176fd579b55612f61194bc76b4b651c4b81c7e403ce0c30f368f2d49ea0d5e217d8dddd13f20
+EBUILD libbitcoinconsensus-0.21.1.ebuild 2991 BLAKE2B 050b1510408469206a70314346959ef2509bba7513b5d7ec5e27ddd5daa631579d78c0a22db25bad426d0adfc27109c2fbf3a39123312d33be3e5cafdde88fb7 SHA512 7351e2c1c0c0ebca1ea718c0c191f2510eb5037321523f0c78b48d76c4a09e31586720dab298391be51c6212d00c3022103c2cb8cfb1a7354ee368e081c4c875
+EBUILD libbitcoinconsensus-21.2.ebuild 2894 BLAKE2B df6320f8070171fb16033e80000e3d481bbcf02bca9a7df8d7134ec74a45a26e122c14cc283ea0339e84e1723694306379a4e17a504b1f2cba3b8e1a0af579e2 SHA512 b762e099f60df5f18c43bbd019bdabaf2497c15a5edb99df36f5b22e1139ffbfeaacbc2076f74ff6940568d127de808aa0231532d91c630b51a773be224cd658
+EBUILD libbitcoinconsensus-22.0.ebuild 3195 BLAKE2B 4d72eba1e8e15a6f95260f0c906019a24e53c7e6cdbf1b5588cef592b72e3e27c5d73cfca039895cd77cd0cc5aa2957c7b1567f9fc63828e195174be421b190e SHA512 fdef0ed87e22953004faaba2fe085bb5ee34e1fd89cf833e87c0ff8ea9911b55bd26219c27eefa574f9a7ae55a05fe87fd75b5479584bbca5dffa86fc2ae69d3
 MISC metadata.xml 710 BLAKE2B 3d75198b842caa94dd3de1bca5cabc08559fcf3d03cea90602ebc8eabb4f1be96ee9aca89500096048655be67c4d09ae466e2d7094c77d905bc0b19ef2e99c6a SHA512 0384b791e087d1b2475d0c4fc355d5d9c160d7841e85d41a0c3c827269a0ec2d71e05f81fe68c65f32a1eb57aaf6609dd1c3a6663171e312650e5461ef563518
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
index 7a0ea42117b5..ce497ba3df66 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
index 7f080957ecf4..e977b9486557 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
index e88ab219ffae..f152ca146cdb 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
index 2fa948c0c2f8..7ab55f50ba8f 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
index a0b6796e935b..1a956bd0c44a 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2fba199e9bc6..50882ae54110 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index c8cff2aea038..d2c845f1cd40 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,5 +7,5 @@ DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171
 EBUILD notmuch-0.32.2-r1.ebuild 6695 BLAKE2B 8f01ac8bb8bdef61b1ebb254b3f28d8045fd6261f4d7c811953ede24c95679d63ca8bca74751c9782460217203ba84b024df2797ed78c19ab0cfb429b0e517fe SHA512 71abe966ba3f07cd291cce8deb512278631b7f3ef49e6d1d604ee825ecbed2e2e57859ec54e23832f2196852888440360c91705ac20c833fc0918dd6e7b15783
 EBUILD notmuch-0.34.2-r1.ebuild 7229 BLAKE2B 7c88a7bebd72f79845645a811d1f29f92caf44177a01ebbaf40ab1fa8e09127c6e071011e3c9154a8b1068e8c5e153fc7d99048fb599d5e1c026bc7120c5dc48 SHA512 067f8e32d6fa44b29c406719f69087d27f6efda2a4663e5480ef442d03556d8fdea3f8688c94d39c9e38f1bd3020257eda0f9ec3137c2cc5992ad2d152cb1ca6
 EBUILD notmuch-0.34.2.ebuild 7211 BLAKE2B 397c301e4ca03e8a0d4495bf243f511d59bd77f93a397d6a154ff045b40f7bd9728831a58fd2fb95d95ba566f2b4dc28ad8d80ec94921558c235581794c4e3f4 SHA512 1b35bbf1cda635a3c74eefbc323bd22f71a60db93fa7a36b25447045d3d16d1d83f6d84e60cf0a4caf6cfd4196cdbf3e6336931ad49758d6bb60d095afcc1bf7
-EBUILD notmuch-0.37.ebuild 7118 BLAKE2B c90fd3f023e358c42de554be8c4ceed201dc226bd48779852270199b1f8cd85c3a346f61bf07a2f2bd4436e0b066ca29926ca967528918e19e86097a076f13ce SHA512 43092ee6f0e4625079322260eaf9b96cbe47410c07eaea5c1588d4c9425fabf69380453ee21f62f36b6f89c2d228c10d37b9fa1370bd3948799669413103fd51
+EBUILD notmuch-0.37.ebuild 7102 BLAKE2B 5b5696a6f6ba5e658e03dcfad6c1ac7436d48ea203b301d03e27c0c33cf1ebff9be229d19cee1f9d5a8ff392b84e73cd0aa78badc4fca59409fbcefa75cffc6f SHA512 a4e8f19df19a04f50a9df0ab7fcb8a010c5ee4c351965ef0f5b7a13fc8888b12a57e5d2e070e4a05e18070e24d60d0dbe63be983097038fdd0747a67d9fb58b9
 MISC metadata.xml 1314 BLAKE2B dbeccb72a51c0cb074bfddbea94e1a4f0e14e0394c560fe3629787fe9cc024b94a1d503946abd564e7eb9a0580cee631a5088eb87cfcfd4cd46dfe47e5016b36 SHA512 cbecafe046938be93263a796161ac2e0fe3bf0f17bd3ceb6ed9d3d8521d87948b299e6352bf9f796f429f75a76ff67a411d41aafc95fad659adb591dc1d02431
diff --git a/net-mail/notmuch/notmuch-0.37.ebuild b/net-mail/notmuch/notmuch-0.37.ebuild
index 67c45dcc26f7..82de22415b12 100644
--- a/net-mail/notmuch/notmuch-0.37.ebuild
+++ b/net-mail/notmuch/notmuch-0.37.ebuild
@@ -250,8 +250,8 @@ src_install() {
 
 	if use nmbug; then
 		# TODO: those guys need proper deps
-		python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
-		dobin devel/nmbug/{nmbug,notmuch-report}
+		python_fix_shebang devel/nmbug/notmuch-report
+		dobin devel/nmbug/notmuch-report
 	fi
 
 	if use mutt; then
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 36e149388088..b651c35be008 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/drive/Manifest b/net-misc/drive/Manifest
index 0c7b035bedc7..4e5ed463b385 100644
--- a/net-misc/drive/Manifest
+++ b/net-misc/drive/Manifest
@@ -1,4 +1,4 @@
 DIST drive-0.4.0_p20210208-deps.tar.xz 61397376 BLAKE2B ac6352f97e312b71aab714406b0a62e62dc6cdfa66c262cf9c7b2cbaa8027f5b62aabc5d9706e5447199f06fb586257c2efa79c6bbf66e7cb5ac15bf5eb6a4aa SHA512 d65553ba6e6562aa28630020b924149ea6656164b102ff6e4dea0b0d3b89fbd11cb75ce47f5e9d04b5818c407485872828c29981b56176cdebf1c09d6f1fa6cd
 DIST drive-0.4.0_p20210208.tar.gz 353706 BLAKE2B 67af7651e7024109e3b4a64104d89c8ff349ad5cb28e51ccc30cce9c4c4591527c153779cef726522999c9308d461c9fa4340137aa8811ca04501dc80f129434 SHA512 ed34f88ff6fe2c77efe06c53102282bbdcb33fe3a95f275d1755e33172f3cc262a180aa57d50ee5b1a465fa8bcb3e37d34e00aa92a422c8c3e7226c1d3d27774
-EBUILD drive-0.4.0_p20210208.ebuild 871 BLAKE2B 3c7671e671fb0f9376c45041df95ee38180a81976e7b00a2a85a08cfa780dd97bef4cf22c6336cf63fb1d2b82edd115db80f830d811c6eb9fbaf04fd5c3e18e0 SHA512 bf16b6b491a70bac0643cbb9522325030eb9d4c262020d4041e392e48e5305650941b3732d3adbbffd7478801bdbb27b1def33bed2e08adfa9d1d1b8c3275a08
+EBUILD drive-0.4.0_p20210208.ebuild 854 BLAKE2B 94c861941f404c06eebd4beb6478b6a1704cf0de86e0f94f9cd129da890d9add44fc6a2e87204b3ba9ab6676362cec60a8dc0e39f47f2a9d60da6d93464acd2b SHA512 bd29a66950dcb3ad165e1a7c68104f5eda63db220c87f59ce676977ac928c63413160e903f9b1912ee25537f74ac9495253a712ad5d5fb3e9528fd110f717044
 MISC metadata.xml 324 BLAKE2B 26ffdb6c654e3e4078c8eb7c28a66f5e081b1ea23c5dbce35dc933a8ace8d58c9b273c1c0f0b0af24e2370afcff00311bc8d1c7af3faa5bfd3b8e3cb11f5b25e SHA512 07e07223942945915df006bb9bf24cdfa735a3d1f49fbf606a445435a55b98d292a25a39fc62d24f05b3e926d3d7f36141bd1f7293a3ebacaf9587ea8b15bfe9
diff --git a/net-misc/drive/drive-0.4.0_p20210208.ebuild b/net-misc/drive/drive-0.4.0_p20210208.ebuild
index 0e830cdd3de4..8430cba30ee6 100644
--- a/net-misc/drive/drive-0.4.0_p20210208.ebuild
+++ b/net-misc/drive/drive-0.4.0_p20210208.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Google Drive client for the commandline"
 HOMEPAGE="https://github.com/odeke-em/drive"
 EGIT_COMMIT="bede608f250a9333d55c43396fc5e72827e806fd"
 SRC_URI="https://github.com/odeke-em/drive/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/drive-0.4.0_p20210208-deps.tar.xz"
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 
 KEYWORDS="amd64"
 LICENSE="Apache-2.0 BSD MIT"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 7e231c39ea4b..a6bb9a65369c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 3a5208dc39d0..853afa032e6b 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,9 +1,10 @@
 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65
+AUX amule-2.3.3-fix-exception.patch 259 BLAKE2B 9a9ebb025ac3f553432215bc0f2c34bd1b6eeaaf9b436bd19870ba4412326dd37ce372bd5a3866e6cd65f0e98e8aea09025dd751d6b6849c37dd527b1af56da0 SHA512 5c8580f0d294a828b2ce42c59bd3079d9bf9735a88337d2cb3aa2b014c6bb8cecee891e35431b9e22a6ae8ca91f816de89a532fe6c10eae2ecbed33212e4604d
 AUX amuled.confd-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6
 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6
 AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e
-EBUILD amule-2.3.3.ebuild 3051 BLAKE2B 6310942531d1808aaa4a2b8e81434d5c86709424d3a27e0b9b8e0626947667b13064bf6e0c17f7c072da79d83199799fe9592d800ee74bcb0b9185ececca5633 SHA512 9a060dca3741e14a4fde83b35191a8ea4f5acad5c02e3bcfadc5ce26e46cc94262a2f524b687230cbe9dcb52582162e6fb3df9a9ba9d65dd745427956024b86b
-EBUILD amule-9999.ebuild 2993 BLAKE2B 092bff5f6c925f5a4b76d5d1152cec75e450737200393a4103c6f6c618acf9369f7c8421eb80fb97a505261f17083a86edb6a0fb0b736728b9fadc4723f6a822 SHA512 f54c20bdfe58fab7e2f231f1ebbc4b1a6a55bbe3264b3d3409e9d6881a3bf94ad48b016458d5c7367ed7bc1c4d0fbc2f385b4a23f94c921adc78e90893d69b22
+EBUILD amule-2.3.3.ebuild 3098 BLAKE2B f0205804d79db0f9c72a7df5ac44a0a85d308669011d6dde820a8a6a084e00f81ae04a3c98b01521ff43471968a42a3148be005140110b94360d8ba908437cfa SHA512 97d37e98bf7811d83bbd0e4d90d60105eca0a35a4ab316c6330022d64f77604c727a42e9adfbd31d023ffd653ed94eb160396f6e9a1321826484c99291c2ba0f
+EBUILD amule-9999.ebuild 3095 BLAKE2B 37bddf35f3418d98e9f2c4197de85bcc732663d5b426e319c628d2cd6b79fb8f07c52fd65aea5a209d5aa113dafc2d1c14e908d20eacf04d97c17ab57929a075 SHA512 62c8a5d91fe9a800117a9dc048e0bb0f07ffeffa04bc2d0725e995d952cf1903e2eb0692b785df31043da2477e7145c34571e217ad5b3137b57f449baa776f45
 MISC metadata.xml 667 BLAKE2B 02d50ed48afb0a80ae7f2642c2dcdb41b78f720abb63235a7f7461e6799d2ad59dbb93d298cbd4489a89d93b7d9aaa1bba26762ce0cd331dcf3af6fac4a06301 SHA512 17f85058c777a354b83cd63cf54971cb6c01b6e57c54b2681759b5257afb64698302c4b47c17e59c7ea3de3f46cf3769bf69f9659f0b10f9c47362cb92b8979f
diff --git a/net-p2p/amule/amule-2.3.3.ebuild b/net-p2p/amule/amule-2.3.3.ebuild
index 1c0c098150de..292872783ad9 100644
--- a/net-p2p/amule/amule-2.3.3.ebuild
+++ b/net-p2p/amule/amule-2.3.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 WX_GTK_VER="3.0-gtk3"
 
 inherit wxwidgets xdg-utils
@@ -50,6 +50,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+	"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
 )
 
 pkg_setup() {
diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild
index a108c9752909..392ddb148410 100644
--- a/net-p2p/amule/amule-9999.ebuild
+++ b/net-p2p/amule/amule-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 WX_GTK_VER="3.0-gtk3"
 
 inherit wxwidgets xdg-utils
@@ -49,6 +49,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+	"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
 )
 
 pkg_setup() {
diff --git a/net-p2p/amule/files/amule-2.3.3-fix-exception.patch b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch
new file mode 100644
index 000000000000..ef38f94cfccf
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 4b023815c..19c172e61 100644
+--- a/src/libs/common/MuleDebug.cpp
++++ b/src/libs/common/MuleDebug.cpp
+@@ -55,6 +55,7 @@
+ #endif
+ 
+ #include <vector>
++#include <exception>
+ 
+ 
+ /**
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 2246d44c1b93..b8c545fa67dd 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -8,9 +8,9 @@ DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c6409
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
 DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoin-cli-0.20.1.ebuild 2382 BLAKE2B bcd450a3343cc00131945fce37d7874a2a9a4aaaa680655c28c82b6b4ee72631f97ad8dc9fc9f679d59f59427d5fe910e53fde82fa9117928120ee31cfc29245 SHA512 8e15036bdab0ab3a0df42a54b0b4ce0211e3b906cec67c9de8588e71043dd2a673445f452db2e2ac8be571923dc43b8b1a4323527264112713641609dd1d0f93
-EBUILD bitcoin-cli-0.21.0.ebuild 2382 BLAKE2B 24e44010d913fca9876c912001d59c9ffcbb797562e307ad4b10b82fd45eae1357dca8dcfd786039daf550c55dce8806e34b87376f34d98d97b3f859314a7245 SHA512 a634075e900db690b850dcbe7e2f2aeb148c84b620c456d9fc1d413be93f5177a7469c734e0d19406401774195869f6e17e9f460fee27d04e971719e547c6904
-EBUILD bitcoin-cli-0.21.1.ebuild 2318 BLAKE2B 2a69277d6b45ce853cfa1b8a5a8073668b00e24b1fb95934630dc5e140b1dc77078e989556c72c15fa85c5b1813f3ab8b1cd2b16290d8ef5c061ba07e376db1e SHA512 c58fb70ed81376ce1a9eada319c8b3287e4d015f710413b2e39ad7e1d6474cdb2ec7599e8ce92be333a5bdb7a166876b5157f0432052600a568b7e7c6be771e0
-EBUILD bitcoin-cli-21.2.ebuild 2287 BLAKE2B d4cec3e613e36b826ac84a97a52f48be2afddd6f04c2688175b8a5716e6edc3a20a984e21f67c66a88236b173a2898f3ebacdffd0e9f81742320cae255bf64a9 SHA512 8fad2e19e6b12e3221bb1fc38c246df1293f98448b7d2a9c8914704a2644be41be134c6297eaee3981f121cef4c2efb06133a7e12ce6f2420b912311baaa234c
-EBUILD bitcoin-cli-22.0.ebuild 2588 BLAKE2B 0fc4f80ba36c9b1035c54f3a47e8152f4096fffb0e5c07f0f83e03d06d685036fe116d2a027d8ef29a571f4da2638d9d89c20b54c6646a99e4edeee2fb31d3a7 SHA512 e21d17a53509f46261aeefc0248fb28d29d838ba7ca7609d44e2ee90d6e7216502575e20a916d3e37713ba7a4931cb9646771d35cf7e40d08e69317deb80190c
+EBUILD bitcoin-cli-0.20.1.ebuild 2392 BLAKE2B 3b2c1d5114dcf4cc08f8ad057803c0ce8c5ff6db89f29f0fc78c02312e02a754776119842ced75efab6dc233e58f433d633fd382f6db4f7e8bcbae3178a305ba SHA512 18ba3bb3afe8cc29c1b39e2362ff6956122131353dc54447ce7777966caf1a1f57eb2e431b2c551c28279232118339b6a3ea9bf6e942581694f9fd548f78d008
+EBUILD bitcoin-cli-0.21.0.ebuild 2392 BLAKE2B 814a5a4e662a5d6f4f382535b57137404361a460f8d88130677d574c7ce54926b147a5d3cba2775393f10a41a826b77b3ea612ff599dace61bc1c2eb07511ce7 SHA512 078f07ea656c7db87b4266d188c5394cf45266c40a5ee63fb070b7a3abfd83366df5ca18549ca3b2af5261cdce1cb208a8fc8a232277c7b8e394fc1b6889f95f
+EBUILD bitcoin-cli-0.21.1.ebuild 2328 BLAKE2B c2b711fcffe555e6db8b973edc9157809a8843e2eb412d2e769798ae71237686979de3a96c33da8ec116ba42a32e4be2b15b41359eda81e8b83e801e701edeab SHA512 8468c9891297e51c5e836d364bc5b05f198448316eac9652ac58f9746abdb93732deaaf70fdaf7b43322d8d655ada77fbdc1509c37a93341bec68513a6dbaf05
+EBUILD bitcoin-cli-21.2.ebuild 2297 BLAKE2B d36b3353aa9f48b70620a9bca60c78986753de8fefead6f911577b79fe2323689c5d2903940ca248b4daf3255c7769c81b44c71af3da46dd57c51355b4899e62 SHA512 937909e8aa9cbfaa80c8f479a938df758e58e81777d6465462f78b67d92189b2511398d131603c68cb4433fa8f019933ae6ba49c341401d84bfb197a1b929355
+EBUILD bitcoin-cli-22.0.ebuild 2598 BLAKE2B ac299eea586771c7356e64b6fa004dcb5776df50c04882850f44d6894e90fdff7ad6e4fd40a8f5d7a79600badb10e22d50bfaff4dbbf60101bfa166c8716282c SHA512 8cbbfcea4cd99bb3de00f998133d5dc89207cb9d06eef7400ddbeb133a2a88959ab692119faccdfdb8ad25f52d56189965bf3d162d0fe11161842eba36a91e1c
 MISC metadata.xml 794 BLAKE2B d7258cb6e38b7f95f72212b3d67f2a6c4f69b8a94a55d46189b970bca6c56ba23ec44b1c36a6b4bce19ba65be0b8879fd8240a48324c296d72d0d87e52e41568 SHA512 ef417ee4a492db03efa50d88b16b35a1b1768b7b04aaecd8676539572f25b96a427caab6dae9f5568241e5f1eda06159bd9a52b12a9002c0611b349ad2656470
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
index 0d0b3da5862a..573e29aedb9b 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
index 113fb8d8b046..74c885b4f4dc 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
index e87439f533d4..a79ddadfe6a8 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
index 64860f8f90a8..009bb9330bba 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
index 13129ac9d061..1fb7fd08c62f 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index d19f88358a5f..ee2687afc6a0 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -9,8 +9,8 @@ DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c6409
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
 DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoin-qt-0.21.0.ebuild 4925 BLAKE2B eeffd746d2119419a09cb5e95b9667c268ea926ee98a90f38fc10873bf1dd9be6bd17c055289d6731cb4a4afd1fecda0e256e7911e577fb09bf99dc5642c65f6 SHA512 41edd94a82f41c3f2d4e7cddbff2026e3cc0e72fff40bb9a804e469e96b14aa58983ae909381acddca53dac33a852572b5501c410f8e9f3de36b96769825b3ec
-EBUILD bitcoin-qt-0.21.1.ebuild 5689 BLAKE2B 636f992438d35430fe75b6bc7294ee2c5a430c1dea1ab3d0e695c9bbdb8dfcc0fdb8ef7a44c3e3db01543aa1007191a976a51cbcb8f57fe98c58b6082bfca271 SHA512 041e963d33e23d1bc526216945825e4ba459dbe51b327c410e5ca4847d5f8114adf98bbd073e92095d71e3ef42bc90bd15c0a7022630bf0186980224771b22a7
-EBUILD bitcoin-qt-21.2.ebuild 5707 BLAKE2B 5d77cb50258d0bd860e7c50814dc5aa985bf455a0d40fd673fd57a39fd2f5222dbc526eab25a85ad8fb292b177fdb4240d8ef33915158133ec7d697ab36338c1 SHA512 d009b06549705c8f43b03521c662d80c533eb24d662d9d6eca43248c3fb4f63d8722ab22058e92dbd098c97150b5052b51036c817de5877d374dba149e6429fd
-EBUILD bitcoin-qt-22.0.ebuild 6208 BLAKE2B c4d66422a8ec7372d2523e05015c85642160ce33be4cac200b2c183e2e94e949dc9522016c0adc1cac89204aa720575aad184c820e58c91067e53227e462e134 SHA512 f7a5310a7b720038bb64ae964735ea6b96e89b171c343f67469b7c0a0a4c0097b6c938c9a860cae0f8c6d7a3f190fb2f84cbc6f1dab2393f3a5a87e265dda1cd
+EBUILD bitcoin-qt-0.21.0.ebuild 4935 BLAKE2B 5483b44409cac50b71ee0298be28538e25ebc3e40ac50730a1d31575f9f82c165edca17ae0b43da6c9023c3e0f0088b18df0fa7f0d9a83ccacb6380b04620bab SHA512 c04215777cd7ac8a27c965151bad35ce89b4d7f1d4eb5b9c2a120ca053af6be640516c810d3f42c9c1fa1c6b6c0cb7a5d030ba5bba00757dcbcf6a47c230b61b
+EBUILD bitcoin-qt-0.21.1.ebuild 5699 BLAKE2B f43767bc4e9c895d57d8641a046dfd65b596e2a92fb03ef502d466999b628e3c6cdb241224f123d062c9d3a125139f3cb1cede0da80236d1f9c201c41e863cb6 SHA512 5ba54e65a7da0e2f5a2fe73cd96fc649c803fd540b2987b36c9ad5a1a886a2990c63be5c1c3fa78be0db4ef8c03f6d19d549e7cfdb2f8249c1f189ad78500bed
+EBUILD bitcoin-qt-21.2.ebuild 5717 BLAKE2B 22ddad5e009172b3617ae79f668f167a16b44c2cbd9bf23d8d794216dda00a7313d50f352064927ec4085efe1bb61f2f80f8d61cfd8314f9e1a8e07138df163f SHA512 e89fb07a2386d5ddc1852e6d80639dcbb9eec8f02254b2305239ea5bc59c87e314f561201f168ea98448b09c8d89bb7e1b99a9b31b7ca2c1fc0da969d3284338
+EBUILD bitcoin-qt-22.0.ebuild 6218 BLAKE2B ad82d2a34faacee6051ec3b04b6f274231500e2a9fd8fa6dd74ebdacc1903fa390229b7ec31465a715c5d5e015705091e8d063a5ff4fb8ce5189c30b957bd1fc SHA512 a0b6de3ffe332fe095b88a296c48ddcf83edb9a05a578780b64d8f1e979fca5b9e5f1b2774e8737c7e6fe93c51aa551afd628f0a390a7842e2b7a9e43c8fe087
 MISC metadata.xml 1434 BLAKE2B e6e1f0ffac2e6be3bc19fe8bb8e9b18b5b50da6255d70d92fdc28a6e040b54ed4d5b94643835043eb64eae0273111f73c30e93a6d9b7203368aeedb880961c8a SHA512 5e7f2f044b27e4ac21d1e18d177bb1bd493feaad5598ad44abed8a0053403565100877498da29aa4f35e59d570d2a499daea58285dd59f3e62eafba7ee3460e7
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
index 758d084787aa..75b9007e2706 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
index a746f5216fe3..de71c4269920 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
index a223b7c13eb9..6f24b1ba161e 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
index f4d6aa690672..2cac510fe6e8 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 988fed8d1b8a..89520c4b8d7f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -10,8 +10,8 @@ DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c6409
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
 DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoind-0.21.0.ebuild 4836 BLAKE2B 43cc9eb1b3eb62f9dc5289516bfb14216f24ec82eda37551eda98a6c445bfc064525f8a4590be393b6f286fba26b77d71840d5345108a29bbce4afec233b350e SHA512 6c25d6b96ea28ced27de06a9332c5e4c0badf24f6e68174a013f58e8c2273b6c432f77778229f4ab4d43b320f6b450783bb92cd4b485979c6e5b95ae67abeafa
-EBUILD bitcoind-0.21.1.ebuild 5601 BLAKE2B f5ceb9ad041e8a45cd9c5da55d987e9050f559f659a12a06512b02ff1a9f121cbd890724637a0bb8e99e411ae108293144d74d3bb15a8d785fee4a9e7852128d SHA512 4c84cf2e7e76248f8186496f9e2b224607b910e5db4d2f6c380dcd79cce6245bf01c5bd2ac2a9e1d1967f57f485d40ec0af9cd4e34908e6bd2b07c2ae2e054f7
-EBUILD bitcoind-21.2.ebuild 5619 BLAKE2B 782327f917481adcaf993e65cbef7602254619d464dbe192f015f30e9b5aab7d7c2e37f0546e8596b051bd279250f2df657c78f9115092b8c4b09b742ba91bf2 SHA512 1c76b9e36998b2fc6ceb124d6d20d3865925cfd2b50c365176ea836d6c102a3bcbf7ed40e4a394c1bed0f860a6766e209b57c5fd7c24a80908cd6b4793aa929a
-EBUILD bitcoind-22.0.ebuild 6121 BLAKE2B eb63d2b805270089bef2d5e032a4ecaa354fc4dc71a7e93d5b717cedac8fc234b1f8ef0f90f613a83e3d1a56480d4dfb7abb3fcac7c710c2c8246de581bd86f1 SHA512 7e4a9b0c384a4ab15f343a29e8c20ff51cf7ee5beed91e451f657effee483343ead0ac8fcdc21b8fc3cb663b5e41ed43885174baf0a743c09d965b25dc3f1d23
+EBUILD bitcoind-0.21.0.ebuild 4846 BLAKE2B c3c34145dbec98868341d2b7ea3e70f3cd7b6319a86a5b301ccc2ec4171abaad281bc6b6e8ddfa2e82ce13023775cd38b09072bca63361ccbf43433783640ee7 SHA512 81758d6d8710c53afc970ab2e66e1784c6ea9871dcb57d465de3359e24375a2e7f79841821a4cf0695802e814b1c8ff3324a0081f17a9e7099a3024d325627a1
+EBUILD bitcoind-0.21.1.ebuild 5611 BLAKE2B a44f816d7ea9503a943504c3ed3850cc351685f6ff445385c8cb324a454899d4c6cd360b86a335b2204f5d8c78bedc023cb55b5e568b8f7bafca5a2d45b57cf9 SHA512 15efc5b03de232296a0ef7d9d03bcda2f82a65548daa1baf6f8752c7d585a32830cd629a56c140763c1546637557281712658139d604860ccd33084873fc0842
+EBUILD bitcoind-21.2.ebuild 5629 BLAKE2B 38339e11144f83bb382b4eb6dbeabc719319a932d8202a700b527c29984133f03c6f11342254d94d33cb20da11752834adebf45a55e39b17685e1d4ca99564d8 SHA512 53744e76801dd355d538c91f3ef0532a5cd563475453e6e7ded817b4606a5e2714e54fd894ba87565c516129d496af6d7bb8f49f660d2d014253234f37f65a4d
+EBUILD bitcoind-22.0.ebuild 6131 BLAKE2B aa34f7a729034a50feddc9748cc14170bf33a9d953df003bde5cbc1141a510cd0f24703b1c92a622914cf9cc23bcde3ba1c8329b46d2c8fa3e5c2144c10c4547 SHA512 d34bdf4d20dce84bd5f3b0c1f0c6642772b9e15574d212ca864e28292fb4cdad7723465a6ae682f7fe08f023167fbc8c6fd481b311faf8648994aa92a6834f93
 MISC metadata.xml 1352 BLAKE2B a924424d5811e88d1dbc6cff68289695e270854d8afb811c4d5d682fc893d2434d166f26c229e5f8ab62e4161944940ee6eb55aa3149b93d69f288a023aa6d3d SHA512 a024d33e339da9e75e10137568503187f186fc717d6bc1f170e478f06fb577340b36a7f13fea070ef98faa97c8bc52e4f60698df4a09b28050656ddd06d842fc
diff --git a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
index 70bebb6cd408..2d24cac58585 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
index 56d810b91a5a..421be18661fa 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-21.2.ebuild b/net-p2p/bitcoind/bitcoind-21.2.ebuild
index dff2239e6a07..f986861dc036 100644
--- a/net-p2p/bitcoind/bitcoind-21.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-21.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
-	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-22.0.ebuild b/net-p2p/bitcoind/bitcoind-22.0.ebuild
index df9b06d5f7a8..510d66a3ecf4 100644
--- a/net-p2p/bitcoind/bitcoind-22.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index d908614570ef..7010e4243052 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -10,7 +10,7 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588
 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
-EBUILD deluge-2.0.5-r2.ebuild 4454 BLAKE2B 25716e62d58d1a7a00c2a2cd1fea17499989baaa41d0df033666a9185aec345b9a33aea3d716e99d66a358a156f2ca668f3012cd9373c99aa7957e2bc34e6a4c SHA512 f3ab9fcd00befbc3fce304dd6469f5b4bb1ff56e1aa06ce1542277a2913639ad200fb7fa8d34b07fef392f1f9d515a32c683030324945435ea18bfff6ea424ed
+EBUILD deluge-2.0.5-r2.ebuild 4465 BLAKE2B f5cf7688b3b3fa3d7c71968db2bd2d440143e968cd3e372d706e32e1332683f88657fab3dcb0c91303d8f2560f37e8b2100b820ac2c20fc41a9e5a35ffd6f3ac SHA512 ba0e72b842538b088dc463802f15a8c8a0b2684b0e6c35335096acaa255b818fde719a442ca0fa2d9b82c4cdb74459de777efcda9df44e6ed3fb552659a10a35
 EBUILD deluge-2.1.1.ebuild 5730 BLAKE2B 01949be06bdb0460438c418dfe428115b412b36516eede367510f531e9a5dd2eeaa8a39e8691fe28b082d4712c0ec32570826c6b3936f0e09eb9bf5c15663d2a SHA512 dc2e2c9bc09ea8c6e3c0fae62efd003e8c9604f36c0cf60a53ba651dcc73437173a860a0e6551fe1a21b3b812231f567cded16db16b18f12bd771ba02b6c783d
 EBUILD deluge-9999.ebuild 5730 BLAKE2B 01949be06bdb0460438c418dfe428115b412b36516eede367510f531e9a5dd2eeaa8a39e8691fe28b082d4712c0ec32570826c6b3936f0e09eb9bf5c15663d2a SHA512 dc2e2c9bc09ea8c6e3c0fae62efd003e8c9604f36c0cf60a53ba651dcc73437173a860a0e6551fe1a21b3b812231f567cded16db16b18f12bd771ba02b6c783d
 MISC metadata.xml 675 BLAKE2B 79c1f6e56c1e5331a1722d6b98da4431e0fd9e19d1c1fd00677c20e3d2214f97d4f71b751edac9ef70e2552abac2b650ed704121275a218374386ff95ef404dd SHA512 1da3e3937d14728111aff841900bcb33912ffe29cae6c14dc401547897d777df37e373f2f65ba0fde00624855d33222445ec3a4edcc0478976bb992ac915d5b1
diff --git a/net-p2p/deluge/deluge-2.0.5-r2.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
index cb1b052dce3e..f7144d94500d 100644
--- a/net-p2p/deluge/deluge-2.0.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 fi
 
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 3bc36c671939..327a5117fa00 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy-dataplaneapi/Manifest b/net-proxy/haproxy-dataplaneapi/Manifest
index dc7ec4671ddc..0847d28c39a2 100644
--- a/net-proxy/haproxy-dataplaneapi/Manifest
+++ b/net-proxy/haproxy-dataplaneapi/Manifest
@@ -1,4 +1,4 @@
 DIST haproxy-dataplaneapi-2.5.1-deps.tar.xz 42850336 BLAKE2B 76cc7fedcfaf4f45383195835066146e78bd55d8c9859c7465e56829af004017e4c090ea6ed67f75e1fa3ecd764016a19f05028dfd66610e9a2d33ae3294f6a6 SHA512 1f7071cca8035ae11f29adb86e56c30a8f596f0bd96c7544f2f6099cf331b6d0b45dd8194477faad88db9deedf4cc85b5590b07be9613192e373bfe1f047d8b1
 DIST haproxy-dataplaneapi-2.5.1.tar.gz 558942 BLAKE2B cae018e048ac6585d3518b114c96df69e31d335a5b26ea2b474a6c3172b1f37014d45046543b2d088921e2a160915b5abb8a0a07ea7578f1430147c8b3672f12 SHA512 36b7f850ae89a4f65d5c8a8d50d38e6190ecd1f9c42f7f91997305b87a08fa20a816fd2e5cba18b2408a3760846f2d6d79fdbc8119fa2efcd4c9958324bde2f4
-EBUILD haproxy-dataplaneapi-2.5.1.ebuild 658 BLAKE2B cbe5125d45d37895af4aef4d11d72d97d55c0454daac82c52fe610f952d17a6d05001c619bc519831b224799df9f2b01a022dd47c38c535587cc83f8ff950214 SHA512 8806e35c21b427057f1e675b6a8606f09fa116ced6871198350529be670b182e34d1ab38398755191e04f82338904bfafb16a969f3da011e819d96c3d388923e
+EBUILD haproxy-dataplaneapi-2.5.1.ebuild 636 BLAKE2B b14f3cb4624ffc61270979a4443342a2a09cd056688e8ea6090b8c69d505e24bb73a85d14439718de4e5501be7114c392bd93334918c6ddfaf02240d1d081427 SHA512 1ead4c7d1c4d54f73ee3c5121fc4621a2acd4a233f740eb250be8c6e9206a9976b8a0bbb0c9df48e53e48256485c32ebdb9b9c7cde14399a53bb2ad3434aae8f
 MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
index cc101b866c2f..133bf26371ba 100644
--- a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
+++ b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="haproxy dataplane api / sidecar"
 HOMEPAGE="https://github.com/haproxytech/dataplaneapi https://www.haproxy.com/documentation/dataplaneapi/latest/"
 
 SRC_URI="https://github.com/haproxytech/dataplaneapi/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	http://gentooexperimental.org/~patrick/haproxy-dataplaneapi-2.5.1-deps.tar.xz"
+	http://gentooexperimental.org/~patrick/${P}-deps.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6e7c781707a3..ed3b738c7bb5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 11026d6ba4c8..0019b7039d08 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -30,10 +30,6 @@ media-libs/imlib2 svg heif jpegxl
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell
 
-# Matt Turner <mattst88@gentoo.org> (2022-04-16)
-# sys-auth/seatd is not keyworded
-dev-libs/weston seatd
-
 # Lars Wendler <polynomial-c@gentoo.org> (2022-04-01)
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 6fdbdd874c40..d0252e32de15 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-09-30)
+# No ruby on ia64 for dev-ruby/asciidoctor
+net-misc/chrony html
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-08-15)
 # deps not keyworded
 dev-util/pkgcheck emacs
@@ -27,10 +31,6 @@ app-text/enchant nuspell
 # net-misc/freerdp is not keyworded
 dev-libs/weston rdp
 
-# Matt Turner <mattst88@gentoo.org> (2022-04-16)
-# sys-auth/seatd is not keyworded
-dev-libs/weston seatd
-
 # Lars Wendler <polynomial-c@gentoo.org> (2022-04-01)
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 734395f077dc..389ffa139d63 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -32,7 +32,7 @@ media-libs/freetype svg
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-16)
 # sys-auth/seatd is not keyworded
-dev-libs/weston seatd
+<=dev-libs/weston-10.0.0 seatd
 
 # Bernard Cafarelli <voyageur@gentoo.org> (2022-03-14)
 # Now requires dev-java/rhino which is not keyworded
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index dda0c67f231f..4886580c1d6b 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -38,10 +38,6 @@ app-text/enchant nuspell
 # net-misc/freerdp is not keyworded
 dev-libs/weston rdp
 
-# Matt Turner <mattst88@gentoo.org> (2022-04-16)
-# sys-auth/seatd is not keyworded
-dev-libs/weston seatd
-
 # Lars Wendler <polynomial-c@gentoo.org> (2022-04-01)
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 2a07a1b73b79..4459cba8caa7 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 08d5ddb7f86a..9c302dee5ec4 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,10 +1,11 @@
 AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
+AUX siril-1.0-execinfo.patch 567 BLAKE2B 852e3491139a6ab38d0490c57b5c90f553fba76319048cf2c3dd395bc403c10bff15ebc302904b4275b5956e38eb10dbc598dfba24bea656777540db12755d51 SHA512 2e2cc76a2a95f5d3e9bad8c710900344cd10534b70f9c36a5c1232b69adda937efac2eb7f8e0c3f86314ca11a95196e734ae114c18c47d8aaae7707968f412f8
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c SHA512 ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa
 DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041 SHA512 bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530
 EBUILD siril-1.0.3.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365
-EBUILD siril-1.0.5.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365
+EBUILD siril-1.0.5.ebuild 2014 BLAKE2B a5099b8cc32bebe5067f3b1fdd3b976408f10edbf504220dd4c44958a6119af8e15a1c3758b01e6957db4299464fd4310ae6b3a8c539257d97dfe3307c86258a SHA512 f8cc91935475a76bd999a24a115cd443758bce26c877a2d69b157c335951799ebf3542b527bc98349e28b6b4b11356bf32ab0b726fb26c1c1b8ea94a45900ad1
 EBUILD siril-9999.ebuild 1958 BLAKE2B b9c561e60100361d7686e5c7ed34e3836d540d8292b46e38f5c31820ca766e9056d4b8c7f5c51f77c8620b3d3a417e17b95b96984f7f23796c7218e95b63f7cc SHA512 0c56714a1277ec80bbd0cfe807e36f47a263837786d0992cb08b3e39e3a58561dd442639a58792e5189fd4a1a28b6aaf4b2272b84efd413658594e022ddc7432
 MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
new file mode 100644
index 000000000000..c9c7cd81c19f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
@@ -0,0 +1,22 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date:   Thu Aug 4 00:27:08 2022 +0200
+
+    Include execinfo.h only if available
+
+Bug: https://bugs.gentoo.org/873016
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 74100b3a..0eefd460 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -25,7 +25,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <dbghelp.h>
+-#else
++#elif HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+ 
diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild b/sci-astronomy/siril/siril-1.0.5.ebuild
index d354aede9fea..816f638fd2f1 100644
--- a/sci-astronomy/siril/siril-1.0.5.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index ab140cdda8b7..2db448dd52de 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 8bd289d18109..cbc714766ee5 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -8,5 +8,5 @@ AUX treeviewx-0.5.1-wx30.patch 1722 BLAKE2B bc7d24b8b3953316ea4f8cb9eb26ab78fb7a
 AUX treeviewx-0.5.1-wxstring-maxlen.patch 1438 BLAKE2B a2dc6fe39c0312559628b61d86975a21db846e4c7cc3a0bb5739dd971417abd3ab9187ea56ef44d37c0394b28d4017981073eb4d890622d0d929f7a4d428950f SHA512 6e02ac59e8a28da8e94d5d6fdea71b3db9bc4501d9becf2d7aa6472d3f9f9b571fe68730390fd4cf6e1e422d618c21c40d86442d6b710e8395db107fc3445392
 AUX treeviewx-wxt.patch 1716 BLAKE2B f869d1d90dd23a7f0e242d9c1d0b0b97e0e053b5b2f00b283073f6e7f2d714cd2bf23656e65af1f3496bef0bf681ebb0618024f259b7f4d6dea777b048a438e4 SHA512 97d074e9501000099d0c5b3e3f56a796b1526499d4ccb44ef6f0b851bde1c27fc78bbc64f439ba5ecd3afa531b752c69148d7cd3b1e5a08a01566ad6155ce25c
 DIST tv-0.5.1.tar.gz 426745 BLAKE2B 080c4e09f441fd83da3406990bbe97f9e29fa531f47a65533ca887580f8a3ec561bb4766e66e2ef4764f68eee86fdabf48481cece56ddda90f9ffdc3c80b3a1a SHA512 45a7ac6dff5b22771e4428d6b1ee528c0039956a462658d28d4f588b6df32620d8f69b3bcf5ca23643e2bdd5361da00625fcb1495bcf4f74d44ee22022c63143
-EBUILD treeviewx-0.5.1-r3.ebuild 945 BLAKE2B bdfd7f287e29287d8679657583ed738d2806e5dd175055a7c54058e14e4aba477509ae2a1a0677acdac3afad8030739f0511e1193059298cadb9e112ab75a36a SHA512 bb7bee425669dada45f106f0afdc5f7a6d2d17ea1fe56015c57a63402a6a0afcc777bffc06ac4cbc422dc03367cc4ef5633973260a845aaf78324f114a3182e1
+EBUILD treeviewx-0.5.1-r3.ebuild 956 BLAKE2B cd915d4350fb7e88aab942abe68916c8d1e284a8d75f28b0d356c59e1b39737ff6b5e7ed0767ae5876ecd70ff504ee2051e985be09bbdfdcf7b06bc1a6c33160 SHA512 78a6be94e42efcdc3dff4e54b3b775976f53a40482e4d0a62b9b024d981fc228228ad7bbfb49ca28d1307904fd13c6ff0742872fca9b6c976ffdfd60cd1f7283
 MISC metadata.xml 531 BLAKE2B f64e8c2245f0f7e72ffae3ba9f3b7c4aa0a33b769fe3ccea91c3584c8812fefaa96ad6a7745ca2afe18b1f8692e4dbf67c71009a43a2bb00be3643f2822f2b02 SHA512 66338bf8a4993325ed69bac97d1ffba8421aeaf6ceaafd6351f583fb8ab4528c0a0d70ea28b967babce004f5f3510a04a18e2d8bf549526939a7c8295d395b97
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
index 05e25ec750e9..359aa98a784f 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools wxwidgets
 
 DESCRIPTION="A phylogenetic tree viewer"
 HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
-SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz"
+SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/$(ver_cut 1-2)/tv-${PV}.tar.gz"
 S="${WORKDIR}/tv-${PV}"
 
 LICENSE="GPL-2"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f0d4d1efb95e..d45299dfa093 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 04e81b810b74..a60181721c6e 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,15 +1,15 @@
 AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a
 AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7
-AUX p4est-2.8.0-fix_build_system.patch 714 BLAKE2B 0807f4f896be0790fbeac3ab349abcbdf5c75f7eb57bc694f9c050772d9defe7e397c58a6b7d1da2e8c107dbd57489d971cd4ad7fa9dfedb4ee16509c5536cf3 SHA512 e2207974fc2df548a4f60e4233278641c6567aa909463de6ca61c5dc65b621b16d057735a404b73f39e0001233c800e27fae2c655a0a3c81d72d534ad04d8c0f
-AUX p4est-2.8.0-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e379d155f7961f5733adab1e142f6669c1d53686963d349fc9da7dc4d46fd27097c9beb223c1ab7266a4c18854aabe4a SHA512 17d128884d05999a51c28a966c66eb5fbe89512d812baa732afe372bfaf8a7bc8edf5edf1b46f5ad60353d7ee76be112dc3a7b06b8fd8fd729f5c7fbc9ac50af
+AUX p4est-2.8-fix_build_system.patch 714 BLAKE2B 0807f4f896be0790fbeac3ab349abcbdf5c75f7eb57bc694f9c050772d9defe7e397c58a6b7d1da2e8c107dbd57489d971cd4ad7fa9dfedb4ee16509c5536cf3 SHA512 e2207974fc2df548a4f60e4233278641c6567aa909463de6ca61c5dc65b621b16d057735a404b73f39e0001233c800e27fae2c655a0a3c81d72d534ad04d8c0f
+AUX p4est-2.8-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e379d155f7961f5733adab1e142f6669c1d53686963d349fc9da7dc4d46fd27097c9beb223c1ab7266a4c18854aabe4a SHA512 17d128884d05999a51c28a966c66eb5fbe89512d812baa732afe372bfaf8a7bc8edf5edf1b46f5ad60353d7ee76be112dc3a7b06b8fd8fd729f5c7fbc9ac50af
 AUX p4est-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
 DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
 DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
 DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd
-DIST p4est-2.8.0.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
+DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
 EBUILD p4est-2.3.1-r1.ebuild 2919 BLAKE2B 030e3710c3d47c201763fd6e393bc3a2508f7bceab1db077afd5b1f11401703bae2ec4d06422b3d9e6af4644c599bb085453fbe0d9f9571255f7db6245f0ce16 SHA512 7cda5e11963275d9daf0d8d276ef7f31620e62be6dd4d31741dc751c0d26dc869de652fbd2e7d577362088d518440da6984d4e37d83c335dc6b97f3b305ca589
 EBUILD p4est-2.3.3.ebuild 2919 BLAKE2B 030e3710c3d47c201763fd6e393bc3a2508f7bceab1db077afd5b1f11401703bae2ec4d06422b3d9e6af4644c599bb085453fbe0d9f9571255f7db6245f0ce16 SHA512 7cda5e11963275d9daf0d8d276ef7f31620e62be6dd4d31741dc751c0d26dc869de652fbd2e7d577362088d518440da6984d4e37d83c335dc6b97f3b305ca589
-EBUILD p4est-2.8.0-r1.ebuild 1551 BLAKE2B 831a5c37bb0997a530c3b72f54358699fbf2288b4cda79026ea26ecd94181138e5b875b6502339c03c80265aa6ff54f41021f98f938eb91695bd866096dff066 SHA512 6540a34f7026bee590b9302eb68a55375f0843f3ce37ce2a1a34b0d2ea42e4a8bbc2a28f2691ad6084d57ad944fa39eecda540fd4a5dd5075a9bf0a05dd30141
+EBUILD p4est-2.8-r1.ebuild 1553 BLAKE2B 3878fef2d5366b4885f034e85cfc8102f8e8a6b510b5d58b3d078b789f15ab65561793030a652df60221a57a62eb1916b0ddc7c611ee5721c0aa659df48a68fe SHA512 7d53c94f06ded82962c371f348f40029dfea12208a47020cf1d88b2d1682d8ba2888d11899a51e8024b08da7fc53d5a2c8275f42541d085994842a8158f9cfa4
 EBUILD p4est-9999.ebuild 1495 BLAKE2B cff45eb0a7951254a026c82c186f7eaea825779bdba372bea524a9913d070c281f0c88b55243ec5c4a883169f209a52d8055ea151e1a4b0f7feb5b6f0beaf810 SHA512 c60b7aa0d13389c30ad4c10ef9127f6c8ce6fdde10a00ddf2cf287070aef6a53d21feacecdebc353d123ec6de8f48b9f29111b281734b2898d5b823ce7b9b1d0
 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5
diff --git a/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch
index e1f86165d5f9..e1f86165d5f9 100644
--- a/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch
+++ b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch
diff --git a/sci-libs/p4est/files/p4est-2.8.0-set_version.patch b/sci-libs/p4est/files/p4est-2.8-set_version.patch
index b24f265f496b..b24f265f496b 100644
--- a/sci-libs/p4est/files/p4est-2.8.0-set_version.patch
+++ b/sci-libs/p4est/files/p4est-2.8-set_version.patch
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8-r1.ebuild
index 177d7985ea02..10b3de8b3e22 100644
--- a/sci-libs/p4est/p4est-2.8.0-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.8-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/cburstedde/${PN}/archive/v2.8.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 575af8796ba1..5cccc279364c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/geogebra-bin/Manifest b/sci-mathematics/geogebra-bin/Manifest
index babc764fe91a..a557b22d806c 100644
--- a/sci-mathematics/geogebra-bin/Manifest
+++ b/sci-mathematics/geogebra-bin/Manifest
@@ -2,6 +2,6 @@ AUX geogebra.sh 954 BLAKE2B 6345f6f0103f326a3d0acc56d9c794c0f269613916b221e690bb
 DIST GeoGebra-Linux-Portable-5-0-604-0.tar.bz2 138245005 BLAKE2B 589b12a60161ca07e6da82953aeda69a2ed7302634df9078cb997000e2b77486aa1f4dfcbc1daddfddf0b425574ad927c97e0a08d70d708a209eaf0af86d9756 SHA512 ccf190f436504727dc9c6fa10adbd2d0a72a87b641e5b7ce2c7bc8ffe8c1baa00d97b3d2b619f32f1c50b28d5c72b0e0b15619e9c8be74ad8c8fb5afbe66c9a3
 DIST GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 131095393 BLAKE2B bef756bec904e40e06823de7121deb9755bd3523040018a826dcd78e5e8563095f7e4b16a90cad34e14d04628706c1d5a56856d389bd8d599d5588d875ff9b11 SHA512 a55e05bbb7acb6f4512ae3163312fd19095f32b9a3beed09ff12e8af2389dae2bb916af816aa50ee6645f4eb4b78936f3bc497312dc9446d8e1464830cd7b717
 DIST Geogebra.svg 522 BLAKE2B 8c11d037bd8af7af571abc2bba0a8610f0ed5c1cea46fdc47a40d0176e5ea3b7ad4700601a3094b1aa15012f769883c7f5cb60a70f4ed400df57e3b0610271e9 SHA512 a54fedd530d1c803e14d6f44ab7341d9f1ae17fb6b6496bd21788ad1b88b0977d574db6de199e9168543a03dff73ab19e3c50793ec91750ff5fff4a4b7af408d
-EBUILD geogebra-bin-5.0.604.0-r2.ebuild 1182 BLAKE2B 8a693a3bdde6c8b5cc1b22f3d4f25e84d824704d1c5dcdb18c1d37472b126b9ef3fdddc1a81de31daf24992363a11a34862f7c7a9fa390fc0bc8f3d9e1bb651e SHA512 f2fd807d3c41787f4ff2d9eea33154240b4b240031e862c9eeb8766420106c0a090166b4714014b344873aee9cf30c9385af22b3183539ca74308c5acf3173e5
-EBUILD geogebra-bin-5.0.683.0.ebuild 1182 BLAKE2B 3fadbfe0b1b57e1aeb279b20daf194623d459aa2dc8e11252c69109c5712ce011c37340e9ced43da3407cfa5ce892b83e4a53427c8946c656637d6fe67ab097e SHA512 9c74947fc90c2145d2596c0586db931adc351442f1365a6ce319f3a8a5025c7ed88b71a7a98924f2a7ab60734614ea80cb868e81d0040525101500c48218b806
+EBUILD geogebra-bin-5.0.604.0-r2.ebuild 1198 BLAKE2B 4f388c070fae572cfe18c2ac7fc5f65449aac3a9a9e7096502bd2bf6054f09a6fdd99429dd5ab21dd2eb97538c9fc6b881179ae7c5bf3b2f8beb8b86e0cd7674 SHA512 8d116f1249f9ea6d79d756399699fa0185fe5165d9881b80d0a8e1a027928ba7927e766e07d96433414166c3cccdccad37418b85aef10b04482d9eaff30513f3
+EBUILD geogebra-bin-5.0.683.0.ebuild 1193 BLAKE2B 87a68d4d73c8fd6153ed9524b8e064bce707ea555993c314a86edfc4d115f2b79cdcdc757db5e7b4f3b5041eea178b45135e3ac2ea64f7a434e35ed12efd7bc3 SHA512 eb6989f97ee0743c4801c487650bfc7cf5b6fd9b588145af15e69c3f8b6a2dd81b08ffd9f6901456088a3512880861619125e376478f7514270819161126098c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
index f2e494821062..5f4924c68569 100644
--- a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
+++ b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PV="${PV//./-}"
 
 DESCRIPTION="Mathematics software for geometry"
 HOMEPAGE="https://www.geogebra.org"
-SRC_URI="https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
+SRC_URI="https://download.geogebra.org/installers/$(ver_cut 1-2)/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
 	https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
 
 LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
index 3749e86ddc99..5b2e1ae220d4 100644
--- a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
+++ b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
@@ -9,7 +9,7 @@ MY_PV="${PV//./-}"
 
 DESCRIPTION="Mathematics software for geometry"
 HOMEPAGE="https://www.geogebra.org"
-SRC_URI="https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
+SRC_URI="https://download.geogebra.org/installers/$(ver_cut 1-2)/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
 	https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
 
 LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c969dba69898..cc34775e8414 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index aa8022d11510..8ed4627a765c 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,10 +2,13 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
 AUX etckeeper-1.18.17-egrep-deprecated.patch 3246 BLAKE2B 24d09c53fb52f1cb6115097a7a66f47b87b739190d6bdcd291fffb3059f45fd1194cee51b8ef02df18f5d505f55e10cf5011b3d0678dbfb7bc516fdac9cfcd30 SHA512 aaf9525f413d7f09139fc1c441a15f193f9625ac6428eabf10ee0e51d92ed1975839c5907e6291d062c51234de968497a33b58ca815651b51f3fe2fbee14651d
+AUX etckeeper-1.18.18-gentoo.patch 2413 BLAKE2B 91bbb0196c3038a62cfaed56aee7f8c7a4e4853cdb283a5541e60634882fa6e252aaca629d0588284638f15d36ee520bed2b73c375d7dfcbb683662833c2d8a4 SHA512 34ef7d24e738ea0bb49f97d88045e2963283577cfc1f807a41825ca97ee92cc915ed9b96a258bf2d44f8882472e920087ce0670cc82a0a86b78c314268b9895f
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
 DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00
+DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
 EBUILD etckeeper-1.18.16-r1.ebuild 2204 BLAKE2B 7a8bbbd23ca0abdf6c78f1ec44c888dfeff7307bbc000ebe0a06e16f4e3ed329eabd9c602697a343ec7dfb461afb98f0ac41a1b79c28745cbb6c5cb16ddae68e SHA512 9a46883c094c997623f8ae7a316c9ed526eee01dbc3b51c260b3ea3ba4b81b0fbf91e60e4c430e0a9186e3688fe305fc85df7e1318d5a40df1543e0669170ff4
 EBUILD etckeeper-1.18.17.ebuild 2271 BLAKE2B a55f09701c013ed97bf537345f08009665384bb1bdd1e15c369cf64ee239edd3446bc5acbe7769cb648e051a36b04a0a7fad940d25e810d8cb4973113cd8697e SHA512 fc794397bcd16c3927a875c6a301abda95caae227f6540163bddf50432e509c399d9c669feee0d3eda0a7ac2b436a12c4b6803a61cdbd64925a6373f9e47d3da
+EBUILD etckeeper-1.18.18.ebuild 2235 BLAKE2B 151ab85349eeb7c6bc5049d14d7df04cf89cb6e14f6b8a503c09e236c4458f10fba0554d3d411228a431c70d3dcda9d94c34568ed838ef7633a12b85959b0c93 SHA512 3f1bfcc0f85e4822d7a727d67c45b795029353724f766d0f497f2f79971109a85b51c217691b8cbb80a53448ed6d6d70b04c88447979467b08025a0fd26c0743
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
new file mode 100644
index 000000000000..b63426712a0e
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 prefix systemd tmpfiles
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="cron test"
+
+BDEPEND="test? (
+	dev-util/bats
+	dev-vcs/git
+)"
+
+RDEPEND="app-portage/portage-utils
+	cron? ( virtual/cron )
+	|| (
+		dev-vcs/git
+		dev-vcs/mercurial
+		dev-vcs/darcs
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# TODO: submit upstream
+	"${FILESDIR}"/${PN}-1.18.18-gentoo.patch
+)
+
+src_prepare() {
+	default
+	hprefixify *.d/* etckeeper
+	local systemdunitdir="$(systemd_get_systemunitdir)"
+	systemdunitdir="${systemdunitdir#${EPREFIX}}"
+	sed -i \
+		-e s'@zsh/vendor-completions@zsh/site-functions@' \
+		-e s"@/lib/systemd/system@"${systemdunitdir}"@" \
+		Makefile || die
+	rm -v init.d/60darcs-deleted-symlinks || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	rm -rv "${ED}/var/cache" || die
+	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe - etckeeper <<'_EOF_'
+#!/bin/sh
+set -e
+if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+	. /etc/etckeeper/etckeeper.conf
+	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
+		/etc/etckeeper/daily
+	fi
+fi
+_EOF_
+	fi
+
+	local conf_update_dir="/etc/portage/conf-update.d"
+	insinto "${conf_update_dir}"
+	newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
+	fperms 755 "${conf_update_dir}/${PN}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	elog "${PN} supports git, mercurial and darcs"
+	elog "This ebuild just ensures at least one is installed!"
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
new file mode 100644
index 000000000000..298671c90004
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
@@ -0,0 +1,70 @@
+From 5ac7b1861a7e23935bc09cacfa6675d8a086877e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 26 Jan 2020 23:24:54 -0800
+Subject: [PATCH] 1.18.18-gentoo
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
+ 	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+ endif
+-	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
+ 	echo "** installation successful"
+ 
+ clean: etckeeper.spec etckeeper.version
+--- a/etckeeper.conf
++++ b/etckeeper.conf
+@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a"
+ 
+ # The high-level package manager that's being used.
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
+-HIGHLEVEL_PACKAGE_MANAGER=apt
++#HIGHLEVEL_PACKAGE_MANAGER=apt
++
++# Gentoo specific:
++# For portage this is emerge
++# For paludis this is cave
++HIGHLEVEL_PACKAGE_MANAGER=emerge
+ 
+ # The low-level package manager that's being used.
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
+-LOWLEVEL_PACKAGE_MANAGER=dpkg
++#LOWLEVEL_PACKAGE_MANAGER=dpkg
++
++# Gentoo specific:
++# For portage this is qlist
++# For paludis this is cave
++LOWLEVEL_PACKAGE_MANAGER=qlist
+ 
+ # To push each commit to a remote, put the name of the remote here.
+ # (eg, "origin" for git). Space-separated lists of multiple remotes
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -30,5 +30,9 @@ else
+ 		apk info -v | sort
+ 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = xbps ]; then
+ 		xbps-query -l | awk '{print $2}' | sed -r 's/-([^-]+)$/ \1/g;'
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
++		qlist -ICv
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
++		cave print-packages -r installed
+ 	fi
+ fi
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -107,8 +107,12 @@ writefile () {
+ 		comment "new versions of conffiles, stored by xbps"
+ 		ignore "*.new-*_[0-9]*"
+ 		nl
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
++		comment "new and old versions of conffiles, stored by emerge"
++		ignore "._cfg*"
++		nl
+ 	fi
+-	
++
+ 	comment "old versions of files"
+ 	ignore "*.old"
+ 	# Not currently ignored as admins tend to rely on these files.
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index f8904951983b..663bce2d05f7 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,4 +2,4 @@ AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f70
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-1.2-r3.ebuild 3883 BLAKE2B 0c6a79622f8631f41debe934a520317506f4f6d0cf230c44405d40073959ae33f8b2d46afe19f47cf83f0af2e275ae06289edb60565b71bd6182a8a001cdfdf0 SHA512 eb52483d6375b339e27c95403cbf6632e1e6342ba6231ff161aafd9eaa1aea2b3fad589bc5deb3930ea8ab5b045422df626f69c813e172404f0cc3947de24adf
-MISC metadata.xml 4515 BLAKE2B ed7a5069b47796b2464794d904412b2ad6ed27e2ce82e8bca3336626006ae0e575f7cb48d6ad002f9758ea7fff177c810bd2eaa1f27a13f3401abbeadd3500c4 SHA512 743b3c2f4f345771241a4d326559658b89d1a5881099a6f468fff32f6ae8b38fcc883e798d0e429fdbae08449e5285926891e9b9b7e9c4ab9b7db9eb77bf7b20
+MISC metadata.xml 4597 BLAKE2B bfc45d706d56846d4c3dc8a4073d11f6c52aac1282c14b5c4578f3c5687560c47a98832afd303981e79e68b78de842eaf2ac2aee60f2ceb5bd6c663c93db0c7e SHA512 9b341cbe55799cc095496ef6bcd9632951105db1ffeb472ebed5cd48d2919ac02f8461ccd3fc62afbc66182cb1448faab98ba9ef5081f995986841245b8d5388
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index efb5ba4405d1..5d3f570f6a38 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -56,4 +56,7 @@
 		Speed. flashrom is often much faster than most vendor flash tools.
 		Portability. Supports DOS, Linux, FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (no internal programmer support at the moment, hence no "BIOS flashing").
 	</longdescription>
+	<upstream>
+		<remote-id type="github">flashrom/flashrom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index b7cf29c0a532..2b60fb3123dd 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,4 +1,6 @@
 AUX reader.conf 246 BLAKE2B 9d8f4b1066d8b30577de625966f40455e4de7773c3387417da454d0a513604c4205b93cab32bd7443c3527fb921082aeb3b1bade369a93f630c3e8f3a084965e SHA512 57ae0939bb88fa67224583fcce555eeb4d088c5c0667a4ddd02323a45554f391a1d9b6d5a124b7e3e9dc933806b0067deb7f159611a9df89e922d8a3f23e737c
 DIST ifd-gempc-1.0.7.tar.gz 76712 BLAKE2B 5ae734ff97865a66d993fc67a2ee5537875773b8275a2125c8853ddf0006cea61f20cd38571be44126cb2cfeb16a6778d6917fd056616e24997a3aed85226e76 SHA512 dde143bd2ca46cca91f979ddbb300f0b5fea37ecfa0c67058d887fcd56edf58adecce85dd05c7af25329fdfcfdf5bf7a52d4dc24061231a234180aad3df44a93
+DIST ifd-gempc-1.0.8.tar.gz 75298 BLAKE2B 6a371a554751819bbd971dc9273fee0bfce4ef8d6fa0a8c261c6944f4689d032102630b3f103c557156de64bb3cf8f5035bdf6a141dcd1e8dd271c60a249de53 SHA512 e3410877120482c80695af832d27ea2fa6697106c3264c57c32fb46b556573a381a699b8a11307c4597e5cfb97f7bbdfc5662acd87a129d44e8adc979d507f4a
 EBUILD ifd-gempc-1.0.7.ebuild 1542 BLAKE2B 704037969eecbddd3139dac305b0631ea8fb006560197733d34df99d097895fbc758be0416030a9da178233969f8f12333cb5f8a0fbd638ae7a115c951edf713 SHA512 1fc4b3d5cfceb56287fd8f620eb77f1e0aecb87e839c60cfe240f9d99287afd6a553a990eefffefc42ba50994694fb4a9c9f13c902f9d24144934d0d1185baa2
+EBUILD ifd-gempc-1.0.8.ebuild 1507 BLAKE2B de86de3af9c146e26b47c47d9ce3cdc545f847cb28c4f40d81b51d6c5ddebcd42ddc0135c2a052eca4ace2cc17549f0ba4bb3740eb436c5a9d6ca2fe9a4b2d08 SHA512 a0ae53e7e8d0eaefb6ea50e84404fa49a430c74e8d123daf2c6823ca1cdc30f2fc75404312ba61ff6580c1141bb71e1340dfc432913242077d779597ff15a728
 MISC metadata.xml 324 BLAKE2B 71d67fe70fe27a4ea7ddddd13b4ee796656bd93983d3af1676d1a3e37dce601a05245b08e7f58f94b032823372e424e382e6794bfc3c1fe1d0d9b085c31802af SHA512 a67a567fb1b6a164e8812455af90563d2369ddbc52e4a405c2e9e07216f0ffc9279511b902ad3d702517d11ee20b466d0b485fab2867732603b5a6b9a9e69135
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild
new file mode 100644
index 000000000000..a9870055183d
--- /dev/null
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GemCore based PC/SC reader drivers for pcsc-lite"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=sys-apps/pcsc-lite-1.2.9_beta7
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README README.410 README.430 )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake CC="$(tc-getCC)" DESTDIR="${D}" install
+	einstalldocs
+
+	local pcscdir="$($(tc-getPKG_CONFIG) --variable=usbdropdir libpcsclite)"
+	local conf="/etc/reader.conf.d/${PN}.conf"
+
+	insinto "$(dirname "${conf}")"
+	newins "${FILESDIR}/reader.conf" "$(basename "${conf}")"
+	sed -e "s:%PCSC_DRIVERS_DIR%:${pcscdir}:g" -e "s:%libGemPC410%:libGemPC410.so.${PV}:g" -i "${D}${conf}"
+}
+
+pkg_postinst() {
+	elog "NOTICE:"
+	elog "1. If you are using GemPC410, modify ${conf}"
+	elog "2. Run update-reader.conf, yes this is a command..."
+	elog "3. Restart pcscd"
+}
+
+pkg_postrm() {
+	#
+	# Without this, pcscd will not start next time.
+	#
+	local conf="/etc/reader.conf.d/${PN}.conf"
+	if ! [[ -f "${conf}" && -f "$(grep LIBPATH "${conf}" | sed 's/LIBPATH *//' | sed 's/ *$//g' | head -n 1)" ]]; then
+		[[ -f "${conf}" ]] && rm "${conf}"
+		update-reader.conf
+		elog "NOTICE:"
+		elog "You need to restart pcscd"
+	fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0dab891a1dd5..e506c08726b6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,9 +7,11 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
 DIST portage-3.0.36.tar.bz2 1114026 BLAKE2B a8a535ae309c32955eae6a491cbc97f809fb67111688087aa98ac28df4bc97fcb3d9a4ce7c5dbdfbb7f21891a7524f671ff3e3ccbed425503c66bde591266957 SHA512 94b39718871e895c1170271ad072eaa72c995a7e7a06bda9ee76cde2e3949682da7a996780a83cc33c4647915f942fe9d4a7b9b6dfd9319143eb1453cee3b3de
 DIST portage-3.0.37.tar.bz2 1113712 BLAKE2B 531ff47c3a5cd45b4b33c83d96cedfd91750ad693755361d41632d2bb4352268a849accc5b452ad77106ff1ec625b3b4fea12da816f2c9675288148856b5ce09 SHA512 2eab8486d4a580ba0d91833b5306a4b8e11a1b120f44adbb81b8dc3a2aa1e6e5dd21e280471f3a74d5ac52ee00a3019c1d0b5621f5c9d523366ff29920400624
+DIST portage-3.0.38.tar.bz2 1116481 BLAKE2B c86995766e2c3b1e74a8baa45dc9f80f3e5a59cecc75b2ab88e44df06f5a48eafbfe758b4838c51bd91c25fd0d5d3f47693150baabc9ea860160c74499760758 SHA512 fe3fa352224de88a127c051229ac942d4b1b82000e2ff2f64726d2f373fb47b7026006cb2db4bd1985c6f22cfc88adafed60b079eadff4345d0885e2a0ac4861
 EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
 EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
 EBUILD portage-3.0.36.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
 EBUILD portage-3.0.37.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
+EBUILD portage-3.0.38.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.38.ebuild b/sys-apps/portage/portage-3.0.38.ebuild
new file mode 100644
index 000000000000..26815216586a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.38.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1e8d8ba4f59d..f9eb05f580d8 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index e1b72f8e6100..29ba0e054430 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -14,5 +14,5 @@ AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32
 DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d
-EBUILD torque-6.0.4-r2.ebuild 5927 BLAKE2B 4709feb28e8eac229b993fb3a41d351562ec8960510a053f04373db385594653befe4134f74456b9f05fa4b8bc606aa914ff31f50ff6fc19421ce828b2124bee SHA512 205d467e963823523299357be8248c312ee3bbd3a62843faeee6f7c3a551a5d42c5863086a12c72ccc059d23f03002b4645ffe1216de4bf520458f8527e81ab3
+EBUILD torque-6.0.4-r2.ebuild 5952 BLAKE2B 8ab710b71a0f7911949a0560aa263675e6e7820bdf23b046646bcbe692a3f26c03f67671ae5e742db0a093f2564ce5beaabe094849534f785e0a11ece9a4114d SHA512 609c0ef88c19549f3b60f7cdb3c3963ac78d48aa814dfe00155bfd75d71f0f735fe32ea8a898338343a120a32c2e804e12d3e097a11c528b51764afcdec7dd5b
 MISC metadata.xml 787 BLAKE2B 9bc7fb21c260237df6dcb50fe453f4113be2927bbe7b9ebf3816cb734e0d5a52f9acac84834c3e38fd268823137f5ec0b7a971b0eb2f28e6c44fc3c8213d648b SHA512 8ba369e5064bb9b15cb8ef4c6265723e5cacf5ebb5efda56949b5e69b824d6b366adb0ab6a3f1d4ccd316999b13b6bdf98936af3f5528451a864a1f9b6314cb3
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 9019fab049ec..b3886f93053d 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
+MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
 inherit autotools flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
 	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index eec022854ef5..bfefdc8dfe14 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/yaffs2utils/Manifest b/sys-fs/yaffs2utils/Manifest
index 871977982169..b6db9dda4f55 100644
--- a/sys-fs/yaffs2utils/Manifest
+++ b/sys-fs/yaffs2utils/Manifest
@@ -1,5 +1,5 @@
 AUX yaffs2utils-0.2.9-build.patch 1243 BLAKE2B 0993ccf4e232a315eaa7f1cd9cb77bd662890151db5ea535e1bef8c5e42912b782e5a6ed6141a550d0574fca972091437e71ca59e505b786c5efa4f91e7ecf3e SHA512 dba1262ecefa3c890e1eeb29eac637a35a3b4d7a081c0e41937955712d7b6d85a246e2f86b8faa474553e0676a30e1b8f0f6945658e5f410298d406b794fc14c
 AUX yaffs2utils-0.2.9-unyaffs2-pointer.patch 381 BLAKE2B c326241d309e81273a7a1ac70fb037c3ed1bd6b6fa0dd3144d5ab8eff5fecca5819c6d16d597cf157cab397c83346c962bf59eabc75f522963caaa7c5a31252b SHA512 85b2fb83c9765996d06a7c3f578f1a0ed1db9296bd39fc149a3cb22ead2b3f39f0e6b6720ea6a60a060c404cf43529234b6f584c788dae2b9d90b76c67ad1776
 DIST yaffs2utils-0.2.9.tar.gz 39689 BLAKE2B 9ba0557c8978ad3170e8364d8efd3f6e8403097c398c0f7d76c91bba78dd8f72bd2dca3b24c57f9972d4b74361240cce36f31e2b27f11c91c527cfce89bbb2ee SHA512 001a2452515f750bdb2251feebfe20c4f1b716b3c850e13646ee054f8e607c18ecfc2781a2f3e1f288b8b32661b11fec8a87e88d8bd4a44c98cad4dbbffd489b
-EBUILD yaffs2utils-0.2.9.ebuild 622 BLAKE2B 14b338748bb820303316952e79e5202ab8d078e34208dfddc22aac8563ec880582f522e9713e363b43486d4b9322e826263d625f1ed44c7bb7ccb28a029c32fd SHA512 7f06edeca66a0106d97611f6236f909b6db14763514859d73ba2b04c821cb80bab7693621a373c2a3a2c544888c205180761fbce71af3f72adea3a0be878ca9b
+EBUILD yaffs2utils-0.2.9.ebuild 622 BLAKE2B 840ca685eeac014518eb845ed3894c32a3a38f2cb170268c79486b844eeaf475ef52fb582cacd3c7f055ca5c4747df5970ef3780c1f7efee7ae9d951a51a66b6 SHA512 13c4d08853e17702d57530cee790379ffb2f64053e0020ff50b1cbf94510268dcd7dd3fe865d070d821e413159358cd6695f1e9274995037aab1adfe1caedc49
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild b/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
index d9691a18fa89..a8d220c9a2d4 100644
--- a/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
+++ b/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="tools for generating YAFFS images"
 HOMEPAGE="https://code.google.com/p/yaffs2utils/"
-SRC_URI="https://yaffs2utils.googlecode.com/files/0.2.9.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://yaffs2utils.googlecode.com/files/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 02e4d244676c..91e99710f7a9 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index 2431ac09b3cf..b3ed142035ee 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -5,7 +5,7 @@ AUX numad.confd 157 BLAKE2B c2b2c983c2192f63a8212bfbf05f51bebe5854e7bcee6df15ccb
 AUX numad.initd 315 BLAKE2B 6cc341364e6766a2376773f453973bb72353eda8fa95c1a768f119b3202c347e9807afb51659a323dc66fdd547b964595975c61b69222efc38909bdefd36ca2f SHA512 80b7f006f2f8a934413ec435ee1a48019e2dfeac16585f794102c47cc9011c3db0b290a9ce0b6df01b1ba8dda85e56932ae1f52eac7023e5658edf7d828d14de
 AUX numad.logrotated 60 BLAKE2B 384bada94db096e9c02555d5342fc998482012bfedb3a6c71af95ff41655a5ce17cddef19e589cfa0d4162f38228a7602ba24ba0ff5d791201593f7096776784 SHA512 6ffdc65b85fd44866b18318b3259e72188547b600e53ef2407ce8f7f1db41582ff9250bdfe4fd360e81816d533f93170cf46e3e8d89cfe57640a07a6bb101d81
 DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c4b086220f6eee1cd6e421b32f0efe2be11e66ce749142315f8207e19e635a718a41e5a8dd3ecfda02a96dfbd62798 SHA512 1b4a577f0713bae1386f2064fcb2dcbfb9453e23e7617f40cfff4e56d02a8c26a48c8d03f1ac7aa36e4ba168824572377f84bc669d1dabdc1820c2cdc4c57911
-EBUILD numad-0.5-r3.ebuild 1133 BLAKE2B f1be961f616dcd59488ffaca62ebfac54954d98101935053bfbf41ddaffffd416d0a9b88810bec439f4ffc3d1fc5632ce90d594da52359a034a0b1797524e191 SHA512 ea3eb7e4d9f4cc358b8a3098c66987040c7a70db7d9a8cf79afa7861d913cef895fb3f7c0332afa5e3d974387ce3b7f0f595a26ec88b9d9c2ed8a036b692637e
-EBUILD numad-0.5-r4.ebuild 1174 BLAKE2B aa3b9aec1be672489cbe511be56e4a46642bb2c535e3ee1301a4d3cf479b0fdddf9b0981ff1e8015133b4fbcedc834f9fffd20f1df86cb28ba75f97b01cd1168 SHA512 89977a8b23ad153c6190f65a5487b19f1441d8c775e7111b31e94ed0ad0dd287886e680ddae1969a9771b8e4e78d7bb2879128b0d9bf0be24c63ae721882053e
-EBUILD numad-9999.ebuild 1017 BLAKE2B e8e232110a892b8cfeadb2e432dca620f88ca9b5b81c2305992fa4de47e2feaccab6555780b282fc7548c947316956639e644bcf768a911e1a996e4d7ae53899 SHA512 ad2b79c664d80f019f4a9f0ee3345741fbe76e6846b2e3911cf767a589974394e8a7c23683a16e7c37005374f935373fb511553d351eaed88df0dfa34ec0665e
+EBUILD numad-0.5-r3.ebuild 1135 BLAKE2B 84339d76f976cbe544f05194adebecad561c7a85886f9367d4487140b15e19ce5f1307bb8ab7a6d744f5784fb93a66bd01bdbab0b5d5fdbb348bad43920dbd94 SHA512 4d7827a7c3c051748d527a7e03576f243719ecdf3cd291ca5b1343bdb36c74a5dcd7524a986cf4cff1213277ebb2f1e19132429d9ece41d581d18f3f1b01197c
+EBUILD numad-0.5-r4.ebuild 1176 BLAKE2B 945aed6353b8fcb0b4c0e146295c8ae7fca184159accce1ee421c71b3870c58af3bea59dafa99172ac2dd6ad3e44e75af1200dcde6a492f911ae428e82723f68 SHA512 e865c8dde6b328540b7f2d4ae10ae7897abf5193b57faea37a3afeac188b9f7c360d495ae1fba21f1435316b7312c2bc0871841dfc7c48903cf48a235f7cd42d
+EBUILD numad-9999.ebuild 1019 BLAKE2B 2e7177ec9d80dfaa3ce1c08a28a3c21aeef159cfcab830010eccbc0d6528c602ee3bc3d641fdc03530d8c61dae21311a49ec50a183b7ec46752b6183856a5a40 SHA512 1f9fb46f90a8436dcbe80e9a4e9c760488130caae51ab7a65db8de948ed8510ab72a3e530c7ab1fa91243e28067246026477c8566bf5abdd4d88d3884a843154
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild
index e90c00f370ed..73daa2a98079 100644
--- a/sys-process/numad/numad-0.5-r3.ebuild
+++ b/sys-process/numad/numad-0.5-r3.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
-	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+	SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
 	KEYWORDS="amd64 -arm arm64 ~ppc64 ~s390 x86"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
diff --git a/sys-process/numad/numad-0.5-r4.ebuild b/sys-process/numad/numad-0.5-r4.ebuild
index 33f98562b754..3c2d952864ec 100644
--- a/sys-process/numad/numad-0.5-r4.ebuild
+++ b/sys-process/numad/numad-0.5-r4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
-	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+	SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
 	KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index 61b74b22ad42..07607707eb3c 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
-	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+	SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
 	KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 11cc79c57e62..2ad1e7ae8932 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk-mac-integration/Manifest b/x11-libs/gtk-mac-integration/Manifest
index ce3739038644..a0059dcca772 100644
--- a/x11-libs/gtk-mac-integration/Manifest
+++ b/x11-libs/gtk-mac-integration/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-mac-integration-2.0.5.tar.xz 305656 BLAKE2B 10790251abc68498d486242fb168d673f2ecf01bc7a772f5634459bcd05c2029d91af81c02f006135f2c7548e7f94be0506d9271c76298786ade790607c431da SHA512 c26c9ceadb4b8c4410636e38fcd57f76a5b04b6dd14be44e62217973fe9ad1b1107a9771ddcc66e8e8fa078fa3b521df834b9928ba9371ef08cc5a55953426cd
-EBUILD gtk-mac-integration-2.0.5-r1.ebuild 511 BLAKE2B e1c5ab48907f9d3a2c8fb871ffdb7e96e57e5ef38f0adc9635ca99fddddaeb43fc5708e85c73bb91a14844c42c2df118db083737a6d965815d9ddd0ece555756 SHA512 8caceb9757ebafbcb4a78c727c4d8adeb1d8de641128fecf313ae292bb222a51126cdf092139ce3f616ee9bbd5da728c9d4f0911b8572a7e8bc8aefb4967ef25
+EBUILD gtk-mac-integration-2.0.5-r1.ebuild 522 BLAKE2B 4e6eae9b11af807601e08e797db30e835e78bfb72b50f2983274545312cc657bbbb524a563f81c67824afa35be5daa1df0829b73f0f53d5a0586c5d745861f42 SHA512 c6cf0d3b1bfe41ed094eeaae0b59bf19cd3d77e7d086c637de09f3feb44c076497a0e864bd9e5944046702ff3797811df2b8ee310a924dbcdb22e93ebdc89c51
 MISC metadata.xml 248 BLAKE2B 92ffbf5df7cedae395e3af770765075073d9dd2ddcc887b34b1eca1997d449a5dc827cb3513863a21f26efebf75700fc87e1228c8614a47e951da4b270f264d4 SHA512 5dca2496f2ab8cbdb810fd11c488d84ab9822448794d7e6e3edbb1f71a9f1865248685e25d3e54524b43d781b8e073082773606f8e91943a71fd2bafe63f7b73
diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
index 545945eeb9bd..5b3e0ecb73b5 100644
--- a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
+++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Menubar, doc and app bundle integration for GTK+"
 HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration"
-SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz"
+SRC_URI="https://download.gnome.org/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
author	V3n3RiX <venerix@koprulu.sector>	2022-10-01 07:10:13 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-01 07:10:13 +0100
commit	42ff81a7480d9bba317b42fcca03b46da2a622ce (patch)
tree	5a0ccbe2b71a4ec6c160b568160999a6afe316de
parent	290844d409ace33d948956aec3c542ea6f4a7b13 (diff)