gentoo auto-resync : 07:08:2024 - 12:37:20

author: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-08-07 12:37:21 +0100
commit: b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree: f6caa14689bd00a5760eadaa381ff41e50ef3c1b /net-misc
parent: 8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)
107 files changed, 1259 insertions, 5065 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e8633608b34d..26aa4f88df06 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index bed47c455be7..ec8209feea79 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,41 +1,19 @@
-AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624
 AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
 AUX asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch 1447 BLAKE2B 2785ea3e923d048f83bb2e25d7a645fe27e69051d43c5c4577e98218b6044cf79661d69076737d55dff8bd5be19f87dcfa24bd54003cbea3f36a736234941dc8 SHA512 05eb7e0ca1eee4f6ebae8fd3be67c34cf0d27ac90393c0c9f21f2c4fda5e69f91fbd63d7ebedbcd26f5e2498c1fd4ff9a4079fdfaf5741819892cda6f5753623
 AUX asterisk-16.30.1-r1-iax2_jitterbuffer.patch 2464 BLAKE2B f2f7d109e4876a1ec58d4af4b96415d58250ffb4ea5caa6d75873b8f853b0773747e9e8d4baba09c55ded62fa206444bd6eaef312bfb891f84044be7088a1595 SHA512 ae0649de6ffbc8b0aa35f38ae8600366f7cbf9f3342686d04705b13e6f3085bdd40bd3fb73a001cd727063db86e0bbc6a31f7691bdde2034ddd67ba6af959cdf
-AUX asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch 3303 BLAKE2B 262d7a632c170f1b1a19a32271aaaae6bb4b09613fba87567c7678740926850dee5246ea1a99118976790a7b583b09f452fb71cbbab09c0059bfaa17184d5665 SHA512 9a3976e43fa42c2e6eba4c2ff525529e784c68795cd2a5aea9838e8b14668a3a1796a6dfa517f8370ea3f873ac53073368ad6612c033652b40463aca451caa13
-AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
-AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
-AUX asterisk.tmpfiles-16.22.0-18.8.0.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d4626d3791e3cb664b03ff51260892167a22c3cfca2caa02d162e7476070ec1374a92ef24ec799dc SHA512 680a4478d3a501c26fa19e29fad18389e7e02f04c8b9a676ae0f192fa6afbed95a826b74696c6c5459aba5aba6a16c57df8a9c5ff486e9dc8f1cbd01185e9320
-AUX asterisk_wrapper-16.26.1-18.12.1 6673 BLAKE2B 3f760e26135ca1e1992205d4183ea56082765b502152b3d87d1cb276c5e84e84abcc612cb16bc13eeb585b6a4d0daf2134032207d8a7016dae59ddeb72aa7996 SHA512 1bcf747ce20cf3aeca36f9375a06ad0a031099ad50951e2049b57abf82eef673ebed499de9e81944fee6167498886e47732b4102e79f65b2c99c059ab756c166
-AUX asterisk_wrapper-18.17.1-20.2.1 7221 BLAKE2B c4c696e6e79329903e5e33cec03cd11db752e2915c247cd4d503cfc00bbafab56a560dc37c8045604b4c793b2289e03096f7b0e66535df53a375e1d74b617dbd SHA512 472ee92546dbf725e9f1fca19e258e0d6c4005923edb27bf0b6bc08a18a86913a54f85edd610c114cd867c601fc029928d49f55afec4387b54566ed3835fca7d
-AUX confd-16.26.1-18.12.1 4050 BLAKE2B cda2632a9b951f2061d4d7e25b221d0473c623860aa96eeb2bf0b8a8354606cc6b22e98ac3450d160e13507c21174d086ebecce3a4b6a470a3e19dc6a6a98784 SHA512 922c59f08f75f9c18955d7337caa8e1b12a0037909903f6afee707ffca8b784011ba35188b8a921ea8b9c6238556dc70bdd1b5716af7894c09821c03b4808340
-AUX initd-16.26.1-18.12.1 8869 BLAKE2B ac5d389e3af994453f258b23a1cd5c5630d19b7a1c9af78804517eab219a71d6c7bb901048ea052ed1ba89f4f553d1bf4d40252bc7838f0169e9561855574a90 SHA512 ceb6b484c97800e4e1ddfed9f1e6a8d91788f41b4abd3214882d716ea4eb01c39a2fb828351b2aa33bd1f053dee1af8f2a1c416fdf98df43860996463bf1c13c
-AUX initd-18.17.1-20.2.1 8882 BLAKE2B 0dd7507254955ccc21688068107211380289ff468ad74140f135097d2babdb1b31db161bf2d91fa237a883a94c4d1af84c31856cee88f07cee52a17f212ad720 SHA512 2dd51d8342e212df4d98576de8b1017d6e7fdd257a70b49d2baf78bc1640911e351ec89b14fe4c55d905d738e277f2b65d4e627535eecc5eb195e7678b3d9759
-DIST asterisk-16.30.0.tar.gz 28131110 BLAKE2B f230155a6347e891b531e54fe2821f1d477ed83699dd4a90c67b3307965430dbcdd04bd0ced49803776d349e29846492a6ef96e19ad3665dc610623be8de25cc SHA512 59cfbc1463dbad6ae7c6307d96b1a220fb02b3e398f96708654e58db788d57f2ca7aac8d4a290ed04f333b5c82c514ec9b95681125e3bdddc237e6c778fd2aec
 DIST asterisk-16.30.1.tar.gz 28234979 BLAKE2B a9cd732feb00408876f90328d7f14dbfe426829e607f9b8e812ff25823c8dc1facab1ecd423e1d4f33c1623f3769197fa3b1fe3181efad0b231c96c0afb1dd16 SHA512 1624d207e80351f976c084344d09d67fe37b526a42970da007f5407be006d107e951093209415a68c891e2bd9cb142421e7acd1ac9fba2c1b1c064aee2224cb6
-DIST asterisk-18.17.0.tar.gz 28293243 BLAKE2B 8a162d7cac92df2b6dd430fedc1446a302b1b9c1061ddd4a236fd5797e8be17d53d7179d23a7c8bd4260c73d34dea2db2b9ebffd4eebb2ed714a286838bc5ddf SHA512 1a5dd9715811a8b699d49b057ef42f68ddc88cc22a568836a6a778f6ff22d3923f81840aef425819bb59f28bb27e321154ef9e1d3deba5ed7d39c7eca562e40e
-DIST asterisk-18.18.0.tar.gz 28407407 BLAKE2B 2e49da8b93651268e2aa2f7f5e2b8ffb2f74c39eb74a4514593be39826912774584c4c33f3839a951ec068218e8db43153fee0a543a9adb94a90cc9338ad40c3 SHA512 bf3d73ef5b6a196d599771c913ae95596b0bfae8fc35cdf66181d7b56ffb4bd78078e25627e271c62988ed6342e69162a1f120cae6049dda6f1596d0759bee59
-DIST asterisk-18.18.1.tar.gz 28407009 BLAKE2B b3c3325a8958fa25364c735508357e35e4ad3ea2390b4f83d7b132c4263b2b0b56a65abab60f337e55cbc3edd4df580f3904164ba76abd4198ce1be112c93d38 SHA512 d5058399beffd2f74a17b0fdcc97720e08540383facb2f3691376cb2086e3d2f8df5b0c9110699d09cffe1ed6b2fbdfe9926d0698af0fce39c6c0a9bb4643d30
-DIST asterisk-18.20.2.tar.gz 28448635 BLAKE2B 9949033f93d770673e80a86cd48a084da853d0cbb51aa50159e813653bb39efd062772331aeb5d127f0c1c58724d9c6d748d45a2e0803f276e83bc804b942c2c SHA512 3ee44047a2d9823550b031933b709e8fd7d6a2a0a4cfb2221187da0983f8d22e411b93fde22934753ae9a7272390c7feebc8addabf7e0943eb57ae7f2fa71b3c
 DIST asterisk-18.21.0.tar.gz 28446501 BLAKE2B 15a0f928f9c20eb676ffa25af8ac771494a417744758e6e9304451502ee2981c09e1c89c7012ec11edfb9a6bfd15599d462922a373a8f8d7d5074ea0b8c7e7cf SHA512 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f
-DIST asterisk-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730
-DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613
-DIST asterisk-20.5.2.tar.gz 28215394 BLAKE2B d9baddc5b2134fd8d7c23dc1407abc37ee937f4dc3ac6dacca43126e0f3ee45b5eca1b8a66834e267d8bb02eb35c8b2e73d854b0a234a85f2dc4048b9d1c4a99 SHA512 ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84
+DIST asterisk-18.24.1.tar.gz 28528798 BLAKE2B f5f26475efb431ebfb9b16d4b5efb726dfd3c3ccb1e6fc32a30f4d67d0a31b7ba1867de83c48e090d9093208e9b46c97d5608ef2410636995d0864165d5e2a54 SHA512 d1612f1842dcb181e163aaced253bf474b5cc09c94e0dac306ccee896498d7891ba9525fbe92be6fc238003733b7b6626b1eb03c403af8423654b6417bea1c04
 DIST asterisk-20.6.0.tar.gz 28208707 BLAKE2B 7eaebcec7dd58912bc4ef6eccf46c0f10b328997889febaa0bf03e2a60197c9d2db97a0ccfd2870085c87eb97ca3b45286138857504199f09ba2071b9a0c50a2 SHA512 31af71a325cdcb9eb5c6b8bb72f523e7da8dcb1b2d33eaa04a493a922421f90c2019bbed01ff5bc8aa46cd02fa72b80a48074ecb146f5399d62bc504a0e4c053
-DIST asterisk-21.0.2.tar.gz 26280477 BLAKE2B 4bcf2f42bf75b869e2279780c4bb3999786d844e57d48eb5fd8570e0f4ecea0de73d71077e5a5fe6ce64c1c36ef694c987872281fd30e9434bc67d91a3ce1249 SHA512 419d8c2abfa680bb1a812fcbea939f2505dc9f95f860c263c303731fb4e0870060e433787b344136832ccf9d0e34dc64da25240ab3651fb499f416ec3098a711
+DIST asterisk-20.9.1.tar.gz 28292603 BLAKE2B d90bceace1f34d0e03b4b3dc53443bc9276d1dfffaa16a277aa555134475a3c965d4a7e2fd6fcf5f5c37517110e078adc9f13d07aad77403a04a53f278bb849f SHA512 3de70aec7da7047d42d26fb30603d28568ae63e69fb351ed1238ff3e3d434110823518fd2e9f9c80e27460ce9706842172234f51b158de41153bb5ba5c0a03a4
 DIST asterisk-21.1.0.tar.gz 26268701 BLAKE2B eae9bab916198ab6fba39142d96c6391ffa711c4ac5a4dd7926c0494dabcd1606bab0525e24477f453ff419329efb0a3abf5e9a012abd2a39f6f818505dd196a SHA512 1d4aea4f02950becb492af49e2d434df725676185651b4c1e5dc502f21c8380ce1368f75726bca124d41128ea01a8210d1e229883c442a42bbdb03530fc981c8
-EBUILD asterisk-16.30.0.ebuild 11876 BLAKE2B f26e339dab2fd90cecafe8b0c075dcef4ae75a3602a1c7adb22ec9792166cbb3c3639349f718a7a895b5071876af76982163896bde31245b1e614d830461cb0a SHA512 57624034782f857b181fda0c92ffcbe502ec1ef94a45e1f2f5c27b2863000fee46661d47acd79658450a37dc331b90f8439e9a5bb66999216abda86fbd48b852
+DIST asterisk-21.4.1.tar.gz 26346292 BLAKE2B 074a749799de8586983055ab47282c86b8ed50d9259c526edddee72a6decd5ef033b0d6abfde751865dd2631dd5b0eb59d054a0113334846f9237c493f4c4f8d SHA512 0d1ec0bd3ea0ba0f6a7aeeb17953abd87ab5cfd88b3779813f7b3c29a6ddbd0d7d89943bdc332753ed0d5b6f24f75bf77802d9e17e5ccbaa5b22bb30ed887db3
 EBUILD asterisk-16.30.1-r1.ebuild 11416 BLAKE2B d159192dd4b7e5807046b85e0c8237c0d555bc7a95ebc71d802f3e664f5617d845399d0b9383c739066c9403f7896475a1310c89a56b76fe2322023b4d75ef1e SHA512 258f1d1878fd9ced49fe4e9b12c01bb1803896e2a614a2b3c4518a4aab1d54b50a92c8ccf73dde0664a092c492fabad912f81c1cc327feed7b15cd792a124d99
-EBUILD asterisk-16.30.1.ebuild 11357 BLAKE2B 6e983a41609ccc98942edb6807c733fcec1afddbdd70a4eeb06e16fe0b8696b33857bd5dd41df8a65e8f98a56dab3b45e2d2ce524c414fd6e4b50025ad5fb546 SHA512 2052282ab24303ccba66f4160bccfaedbeb6bcac0b7be6213e2a2b9d1f5bc4d04e83ecb9444d06896ba3ee9cfaffcd71b3f4440258d8eb19fa7247c0bed6973b
-EBUILD asterisk-18.17.0.ebuild 11772 BLAKE2B 516b9c98aa80a7dfaed5f7ba375110cfa39c288d9c22dbb754b46f8ddf62f6ef75198fd1ea8a76e71e319a26e7e34111bca0a9768b40a37b081affed53368981 SHA512 56af8b4d9ede9c4c9a2edd94b9ffaaeffeb07c94c24a633e150ded3423141867dcd83f1ba2072f97431f3a6c0411d9bdaa81c82500c691b9ecd6da2ec7208f76
-EBUILD asterisk-18.18.0.ebuild 11893 BLAKE2B e279eb21e2093e64b4f5169d05de382abb3d408cd07c5d4c4a65b58241cf15b8fd87af8e09624cc1e3dc2aac260cd68ae0a8cf0a6ece035161ef5d7ff9ae6f15 SHA512 cff623204429a910877a18217f9e166adcbf9175991dd006e44b994b6ed140d91ce984489776f50fe6b9efdeeec2e5eeefde205f25013f10bf8d560d321d397d
-EBUILD asterisk-18.18.1.ebuild 11374 BLAKE2B bb29f1a7e36c060658cc94d3f9f6b36c7f06f03ae561b13d8d628b7b6220ffbccd22370e5158c6cf769f06685c73b50e3889138e273e2be0f13e7bfe4ceb32db SHA512 1408d7b81c53ce77897bb846c6d0b39245514e5016fbb8db379ac162ffc63d476dae2ae7f514db6460fa9e435377d4ab1a4d39e30f1c988fa836577e36639e98
-EBUILD asterisk-18.20.2.ebuild 11278 BLAKE2B 64e1b08570ff3df53d961f9cece7fcde636c3fd695f60a92fc7bb0879e530e409a6281c58de8a1f4f1d42d84c93e49dbfe1b6fc3f20d90d41babecd629aab82f SHA512 8512b2953cfa8bcac176603c4579064cded7d8af6acdc3e2faba33f8889ff29f9618777742b1d4911ddcc553111a83602917350eb27adeaf77e7e95c8feb2ce6
+EBUILD asterisk-16.30.1-r2.ebuild 11268 BLAKE2B bc730a8130fa484d1d0ff90e9a75b584569daa86e811be6b43ef086e2b149a4f32e1bef43f76e5985799368f7cebb5476f3037f171b42fe5ee4b8ab4eea01dfe SHA512 072955f38dbd5101dbff614dd3d762300d1a192d71f369b1a04c9c3bfa256c3ef5ed0ca839248b4aa3f1131ac26b75995aca1a28ce1f2ad41a40a5f51a44dbe0
 EBUILD asterisk-18.21.0.ebuild 11294 BLAKE2B 30b1c60fd758f8c3bd063cb377ac5d623628c3c1a87edbce363bf4d5177b6b44e2a2f0623280506dda05e137ef2c2eed68dc947ecf86ce51bfee5da31538e8e1 SHA512 5c57817da45196cf9bd5834c2267abb9809a638ed8d702ff817c2c04995fb2242719b62acce052c57636fb072c0562d04a4f813526fcadfc7aad79be532c43b4
-EBUILD asterisk-20.3.0.ebuild 11716 BLAKE2B e36fa8e3fc140dbc04838127a792b6693c662feee0111b09e5753563ae099789266e5d70239e234b2ec4d8b9d1ed33d11de21dc3e24592ae4a75aacac92ef49d SHA512 458434726c5a5418c99a9c8b6bfee6067e38ef4053b78593dc6eed5807801e1080c559d55e644c0ec3f78ed0181489a639588cda154f050826e276bf3a0ddf3c
-EBUILD asterisk-20.3.1.ebuild 11199 BLAKE2B 4a50600903a51d2b079ed0cbf88b9a526fa47dd6bef3f92cb94d6cc95825a508b031c9714c771cc9f0cb89c4a185280b74ab5511bfb26ccb435b52ec2e829309 SHA512 a7b948d4defe650fb0c52c979cf866f1775cd9eaa9b6eb4d5b0b90ecda6af3554d65869649e6ea853bae92d4b05df2880fcaf994a276f7feeb27b0210fdf2da7
-EBUILD asterisk-20.5.2.ebuild 11101 BLAKE2B a0dcabcf10a436065df31de075844ab2ff75c8e8546a6e5ce036d189090038ca9b402121856b2fd6190c2bcd93885bb1f5286ddaa788770d2a80d0c141326b86 SHA512 66616bcfaad2ead989e4bc9d7ea4a0e491d66821f1c025e9920d6366296dd818cb0ac000f5bb590eb33cc24b285100db240199fbcd1c5aa05238072cee95978b
+EBUILD asterisk-18.24.1.ebuild 11163 BLAKE2B 3c5f7f87ae4ff062b2c48ffdedf0a4907e077c09183a28ffa4c5b51a0016edcc888d90ea0e0155a722fc274b3bba120ed6216bd68fa88169696b482dd89d92d5 SHA512 29fafe19c4fe54be2db06f442a8733fd478f6e797130a92ff02b20a7ca9cd41393e4ab55acf7a480836f0e7083d1e595ac8acee1092e7a3a116cc63235f8d313
 EBUILD asterisk-20.6.0.ebuild 11082 BLAKE2B cf574465c0dfb99c87d27c204e10b0d4dd42f97a429f0429d5fb568b0f02e1ce4228e9b8614bd0489ff2481a1ed4d6d3709f324fdac256a7ac9c354df9403d69 SHA512 f9efc3632e0db69bae7918fc8de5e1d56d3783c4b27bd5e553e2fd9e29f05b67322f0e86e0be2cefca2d1446650d6ca089419f350d99d48541a2a411a308f52e
-EBUILD asterisk-21.0.2.ebuild 10554 BLAKE2B c17caa0cab0f60e23570f242c5036b50800212117d4a187451c56eedd2d01ebc5c83560fb513ba99e71014eec2748b29caf8fadd87c9972eae9e4a8d684db0e7 SHA512 7fb0a033937eaf018c2bf0081b2476ef0b1fdc518679f102dfd794a01040626b99ee75e7410c0fdbd70c591870ea60b3c7274ff8a4b1e9659488adaa94b2ebf9
+EBUILD asterisk-20.9.1.ebuild 11012 BLAKE2B 35ee0e408bbd1cac76d105cd2101ccb5644b9e6e7fc77a8b51f56c8780c81b45343646aea1844b07bd6047f047dc21bb0ac3968da81358ede02e2573031f86dc SHA512 7e66a49985edc5ae120f2e39e36890e0f875ca23c3d3fb2d9b71127852f9fd8485229222f5b5bcf5083e3ff1787d2172edf6739f342c9e1ce985a84b168ac7c6
 EBUILD asterisk-21.1.0.ebuild 10535 BLAKE2B 2805b89dc61ea82708e67cd79892a54b862167c51a33050a1bf0123932d4c5fdfc0080227337f2466466476bf9886890ebfb93fec5ed2f0991cb74084c847463 SHA512 b330cfec744fde6d20ad9a8509e48140da6ef56ba9d385f89a06b009683f880d583f2edbc3e82a3a9cd3097a6c0087f013f024a2793f0bb445359648ac1507d4
+EBUILD asterisk-21.4.1.ebuild 10501 BLAKE2B a36865f478fecb1f5a0a0e6207023705b62e5dcdd18cc8b2b56d6e6fda35a4488759664607574402452a40299fbcde0b36100cf7db06fe5ad0205d9ccd12dbc5 SHA512 af0d41bfab3c3cd14521da9d2d3bea63cb2e59fde7c6a28214456fcaca2e3b058f04477fccaaf5bb689529b2dfcfe10c964ae31752b2ef5721801d4808752794
 MISC metadata.xml 1565 BLAKE2B c41d24677c65e3006de867263e723e2530cae9185e260235576df5245e64c49244db82bb2febeb30935b38b5ec1eb5d26f3756f2559868248e766084fe6abcd8 SHA512 465a0a71dbafc0144a2bef2d3cdfe35dbc8e070a8bdd8cfed75c53971a6d9334ca81b4dc575d676cbb43a77f7004a92f992cf9eab3c8bfdd5c8c976dee0d210e
diff --git a/net-misc/asterisk/asterisk-16.30.0.ebuild b/net-misc/asterisk/asterisk-16.30.0.ebuild
deleted file mode 100644
index a684412a9be4..000000000000
--- a/net-misc/asterisk/asterisk-16.30.0.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		SED=sed \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
-	newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
-	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.30.1.ebuild b/net-misc/asterisk/asterisk-16.30.1-r2.ebuild
index b2a0d086ac1e..5caed3bb4430 100644
--- a/net-misc/asterisk/asterisk-16.30.1.ebuild
+++ b/net-misc/asterisk/asterisk-16.30.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,14 +12,14 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -30,6 +30,7 @@ REQUIRED_USE="gtalk? ( xmpp )
 PATCHES=(
 	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
 	"${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch"
+	"${FILESDIR}/asterisk-16.30.1-r1-iax2_jitterbuffer.patch"
 )
 
 DEPEND="acct-user/asterisk
@@ -55,10 +56,6 @@ DEPEND="acct-user/asterisk
 	cluster? ( sys-cluster/corosync )
 	codec2? ( media-libs/codec2:= )
 	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
 	http? ( dev-libs/gmime:2.6 )
@@ -239,7 +236,6 @@ src_configure() {
 	_use_select cluster      res_corosync
 	_use_select codec2       codec_codec2
 	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	_use_select deprecated   app_macro
 	_use_select freetds      {cdr,cel}_tds
 	_use_select gtalk        chan_motif
diff --git a/net-misc/asterisk/asterisk-18.17.0.ebuild b/net-misc/asterisk/asterisk-18.17.0.ebuild
deleted file mode 100644
index 015737c8a097..000000000000
--- a/net-misc/asterisk/asterisk-18.17.0.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.12:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
-	newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
-	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.18.0.ebuild b/net-misc/asterisk/asterisk-18.18.0.ebuild
deleted file mode 100644
index b2e2fa41bd6b..000000000000
--- a/net-misc/asterisk/asterisk-18.18.0.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.12:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newsbin "${FILESDIR}/asterisk_wrapper-18.17.1-20.2.1" asterisk_wrapper
-	newinitd "${FILESDIR}"/initd-18.17.1-20.2.1 asterisk
-	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.18.1.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild
deleted file mode 100644
index 3f4247463485..000000000000
--- a/net-misc/asterisk/asterisk-18.18.1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single toolchain-funcs
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.12:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-PDEPEND="net-misc/asterisk-base"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.20.2.ebuild b/net-misc/asterisk/asterisk-18.24.1.ebuild
index a16cf2d20212..369526ee8599 100644
--- a/net-misc/asterisk/asterisk-18.20.2.ebuild
+++ b/net-misc/asterisk/asterisk-18.24.1.ebuild
@@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -52,10 +52,6 @@ DEPEND="acct-user/asterisk
 	cluster? ( sys-cluster/corosync )
 	codec2? ( media-libs/codec2:= )
 	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
 	http? ( dev-libs/gmime:2.6 )
@@ -105,18 +101,21 @@ BDEPEND="dev-libs/libxml2:2
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
+ast_make() {
+	local make_args=(
+		"NOISY_BUILD=yes"
+		"ASTDBDIR=\$(ASTDATADIR)/astdb"
+		"ASTVARRUNDIR=/run/asterisk"
+		"ASTCACHEDIR=/var/cache/asterisk"
+		"OPTIMIZE="
+		"DEBUG="
+		"CONFIG_SRC=configs/samples"
+		"CONFIG_EXTEN=.sample"
+		"AST_FORTIFY_SOURCE="
+	)
+
+	emake "${make_args[@]}" "$@"
+}
 
 pkg_pretend() {
 	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
@@ -140,94 +139,94 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
 		AC_CONFIG_SUBDIRS=menuselect eautoreconf
 }
 
 src_configure() {
 	local vmst
 	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
+	local myconf=(
+		LUA_VERSION="${ELUA#lua}"
+		--localstatedir="/var"
+		--with-crypto
+		--with-gsm=internal
+		--with-popt
+		--with-z
+		--with-libedit
+		--without-jansson-bundled
+		--without-pjproject-bundled
+		$(use_with caps cap)
+		$(use_with codec2)
+		$(use_with lua lua)
+		$(use_with http gmime)
+		$(use_with newt)
+		$(use_with pjproject)
+		$(use_with portaudio)
+		$(use_with ssl)
 		$(use_with unbound)
+	)
+	econf "${myconf[@]}"
 
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
+	ast_menuselect() {
+		menuselect/menuselect "$@" menuselect.makeopts || die "menuselect $* failed."
 	}
 
 	_use_select() {
 		local state=$(use "$1" && echo enable || echo disable)
+		local x
 		shift # remove use from parameters
 
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
+		for x; do
+			ast_menuselect --${state} "$x"
 		done
 	}
 
 	# Blank out sounds/sounds.xml file to prevent
 	# asterisk from installing sounds files (we pull them in via
 	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
+	>sounds/sounds.xml || die "Unable to blank out sounds/sounds.xml"
 
 	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+	sed -i 's/NATIVE_ARCH=/&0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
 
 	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
+	ast_make menuselect.makeopts
 
 	# Disable astdb2* tools.  We've been on sqlite long enough
 	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2sqlite3
+	ast_menuselect --disable astdb2bdb
 
 	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
+	ast_menuselect --disable build_native
 
 	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
+	ast_menuselect --disable chan_misdn
+	ast_menuselect --disable chan_ooh323
 
 	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
+	ast_menuselect --enable smsq
+	ast_menuselect --enable streamplayer
+	ast_menuselect --enable aelparse
+	ast_menuselect --enable astman
 
 	# this is connected, otherwise it would not find
 	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
+	ast_menuselect --enable chan_mgcp
+	ast_menuselect --enable res_pktccops
 
 	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
+	ast_menuselect --enable pbx_dundi
+	ast_menuselect --enable func_aes
+	ast_menuselect --enable chan_iax2
 
 	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+	ast_menuselect --enable cdr_sqlite3_custom
+	ast_menuselect --enable cel_sqlite3_custom
 
 	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2bdb
 
 	# The others are based on USE-flag settings
 	_use_select alsa         chan_alsa
@@ -236,7 +235,6 @@ src_configure() {
 	_use_select cluster      res_corosync
 	_use_select codec2       codec_codec2
 	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	_use_select deprecated   app_macro
 	_use_select freetds      {cdr,cel}_tds
 	_use_select gtalk        chan_motif
@@ -261,16 +259,16 @@ src_configure() {
 	_use_select xmpp         res_xmpp
 
 	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
+	ast_menuselect --enable app_voicemail
 	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
 		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+			ast_menuselect --enable "app_voicemail_${vmst##*_}"
 		fi
 	done
 
 	if use debug; then
 		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
+			ast_menuselect --enable "${o}"
 		done
 	fi
 
@@ -279,14 +277,14 @@ src_configure() {
 			cstate=--enable
 			[[ "${copt}" == -* ]] && cstate=--disable
 			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
+			ast_menuselect ${cstate} "${copt#[-+]}"
 			eend $?
 		done
 	fi
 }
 
 src_compile() {
-	emake "${_make_args[@]}"
+	ast_make
 }
 
 src_install() {
@@ -297,7 +295,7 @@ src_install() {
 	diropts -m 0750 -o root -g asterisk
 	dodir /etc/asterisk
 
-	emake "${_make_args[@]}" install install-headers install-configs
+	ast_make install install-headers install-configs "DESTDIR=${D}"
 
 	fowners asterisk: /var/lib/asterisk/astdb
 
@@ -316,7 +314,7 @@ src_install() {
 	diropts -m0755
 
 	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
+	dodoc README* BUGS CREDITS
 
 	# install extra documentation
 	use doc && dodoc doc/*.{txt,pdf}
@@ -330,13 +328,24 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	else
+		local my_replacing=() x
+		for x in ${REPLACING_VERSIONS}; do
+			[[ $(ver_cut 1 ${x}) != $(ver_cut 1) ]] &&
+				my_replacing+=( $(ver_cut 1 ${x}) )
+		done
+		if [[ "${#my_replacing}" -gt 0 ]]; then
+			my_replacing="${my_replacing[*]}"
+			my_replacing="${my_replacing// /, }"
+			[[ "${my_replacing}" = *", "* ]] &&
+				my_replacing="${my_replacing%, *} or ${my_replacing##*, }"
+			elog "You are updating from Asterisk ${my_replacing}, you should reference the upgrade document:"
+			elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+			elog "Assistance also available on Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+		fi
 	fi
 
 	if use deprecated; then
diff --git a/net-misc/asterisk/asterisk-20.3.0.ebuild b/net-misc/asterisk/asterisk-20.3.0.ebuild
deleted file mode 100644
index e4e12e12fba8..000000000000
--- a/net-misc/asterisk/asterisk-20.3.0.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.12:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro chan_sip res_monitor
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newsbin "${FILESDIR}/asterisk_wrapper-18.17.1-20.2.1" asterisk_wrapper
-	newinitd "${FILESDIR}"/initd-18.17.1-20.2.1 asterisk
-	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-20.3.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild
deleted file mode 100644
index 080afa1dc8ea..000000000000
--- a/net-misc/asterisk/asterisk-20.3.1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single toolchain-funcs
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.12:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )"
-PDEPEND="net-misc/asterisk-base"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
-		AC_CONFIG_SUBDIRS=menuselect eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable astdb2* tools.  We've been on sqlite long enough
-	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro chan_sip res_monitor
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-20.5.2.ebuild b/net-misc/asterisk/asterisk-20.9.1.ebuild
index 53593c91aac6..531c805dedc2 100644
--- a/net-misc/asterisk/asterisk-20.5.2.ebuild
+++ b/net-misc/asterisk/asterisk-20.9.1.ebuild
@@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -52,10 +52,6 @@ DEPEND="acct-user/asterisk
 	cluster? ( sys-cluster/corosync )
 	codec2? ( media-libs/codec2:= )
 	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
 	http? ( dev-libs/gmime:2.6 )
@@ -104,18 +100,22 @@ BDEPEND="dev-libs/libxml2:2
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
+ast_make() {
+	local make_args=(
+		"NOISY_BUILD=yes"
+		"ASTDBDIR=\$(ASTDATADIR)/astdb"
+		"ASTVARRUNDIR=/run/asterisk"
+		"ASTCACHEDIR=/var/cache/asterisk"
+		"OPTIMIZE="
+		"DEBUG="
+		"DESTDIR=${D}"
+		"CONFIG_SRC=configs/samples"
+		"CONFIG_EXTEN=.sample"
+		"AST_FORTIFY_SOURCE="
+	)
+
+	emake "${make_args[@]}" "$@"
+}
 
 pkg_pretend() {
 	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
@@ -139,93 +139,93 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
 		AC_CONFIG_SUBDIRS=menuselect eautoreconf
 }
 
 src_configure() {
 	local vmst
 	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
+	local myconf=(
+		LUA_VERSION="${ELUA#lua}"
+		--localstatedir="/var"
+		--with-crypto
+		--with-gsm=internal
+		--with-popt
+		--with-z
+		--with-libedit
+		--without-jansson-bundled
+		--without-pjproject-bundled
+		$(use_with caps cap)
+		$(use_with codec2)
+		$(use_with lua lua)
+		$(use_with http gmime)
+		$(use_with newt)
+		$(use_with pjproject)
+		$(use_with portaudio)
+		$(use_with ssl)
 		$(use_with unbound)
+	)
+	econf "${myconf[@]}"
 
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
+	ast_menuselect() {
+		menuselect/menuselect "$@" menuselect.makeopts || die "menuselect $* failed."
 	}
 
 	_use_select() {
 		local state=$(use "$1" && echo enable || echo disable)
+		local x
 		shift # remove use from parameters
 
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
+		for x; do
+			ast_menuselect --${state} "$x"
 		done
 	}
 
 	# Blank out sounds/sounds.xml file to prevent
 	# asterisk from installing sounds files (we pull them in via
 	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
+	>sounds/sounds.xml || die "Unable to blank out sounds/sounds.xml"
 
 	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+	sed -i 's/NATIVE_ARCH=/&0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
 
 	# Compile menuselect binary for optional components
 	emake "${_make_args[@]}" menuselect.makeopts
 
 	# Disable astdb2* tools.  We've been on sqlite long enough
 	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2sqlite3
+	ast_menuselect --disable astdb2bdb
 
 	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
+	ast_menuselect --disable build_native
 
 	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_ooh323 menuselect.makeopts
+	ast_menuselect --disable chan_ooh323
 
 	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
+	ast_menuselect --enable smsq
+	ast_menuselect --enable streamplayer
+	ast_menuselect --enable aelparse
+	ast_menuselect --enable astman
 
 	# this is connected, otherwise it would not find
 	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
+	ast_menuselect --enable chan_mgcp
+	ast_menuselect --enable res_pktccops
 
 	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
+	ast_menuselect --enable pbx_dundi
+	ast_menuselect --enable func_aes
+	ast_menuselect --enable chan_iax2
 
 	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+	ast_menuselect --enable cdr_sqlite3_custom
+	ast_menuselect --enable cel_sqlite3_custom
 
 	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2bdb
 
 	# The others are based on USE-flag settings
 	_use_select alsa         chan_alsa
@@ -234,7 +234,6 @@ src_configure() {
 	_use_select cluster      res_corosync
 	_use_select codec2       codec_codec2
 	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	_use_select deprecated   app_macro chan_sip res_monitor
 	_use_select freetds      {cdr,cel}_tds
 	_use_select gtalk        chan_motif
@@ -257,16 +256,16 @@ src_configure() {
 	_use_select xmpp         res_xmpp
 
 	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
+	ast_menuselect --enable app_voicemail
 	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
 		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+			ast_menuselect --enable "app_voicemail_${vmst##*_}"
 		fi
 	done
 
 	if use debug; then
 		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
+			ast_menuselect --enable "${o}"
 		done
 	fi
 
@@ -275,14 +274,14 @@ src_configure() {
 			cstate=--enable
 			[[ "${copt}" == -* ]] && cstate=--disable
 			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
+			ast_menuselect ${cstate} "${copt#[-+]}"
 			eend $?
 		done
 	fi
 }
 
 src_compile() {
-	emake "${_make_args[@]}"
+	ast_make
 }
 
 src_install() {
@@ -293,7 +292,7 @@ src_install() {
 	diropts -m 0750 -o root -g asterisk
 	dodir /etc/asterisk
 
-	emake "${_make_args[@]}" install install-headers install-configs
+	ast_make install install-headers install-configs "DESTDIR=${D}"
 
 	fowners asterisk: /var/lib/asterisk/astdb
 
@@ -311,8 +310,7 @@ src_install() {
 	# Reset diropts else dodoc uses it for doc installations.
 	diropts -m0755
 
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
+	dodoc README* BUGS CREDITS
 
 	# install extra documentation
 	use doc && dodoc doc/*.{txt,pdf}
@@ -326,13 +324,24 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	else
+		local my_replacing=() x
+		for x in ${REPLACING_VERSIONS}; do
+			[[ $(ver_cut 1 ${x}) != $(ver_cut 1) ]] &&
+				my_replacing+=( $(ver_cut 1 ${x}) )
+		done
+		if [[ "${#my_replacing}" -gt 0 ]]; then
+			my_replacing="${my_replacing[*]}"
+			my_replacing="${my_replacing// /, }"
+			[[ "${my_replacing}" = *", "* ]] &&
+				my_replacing="${my_replacing%, *} or ${my_replacing##*, }"
+			elog "You are updating from Asterisk ${my_replacing}, you should reference the upgrade document:"
+			elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+			elog "Assistance also available on Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+		fi
 	fi
 
 	if use deprecated; then
diff --git a/net-misc/asterisk/asterisk-21.0.2.ebuild b/net-misc/asterisk/asterisk-21.4.1.ebuild
index b4ed5f80b54c..923c0b29641a 100644
--- a/net-misc/asterisk/asterisk-21.0.2.ebuild
+++ b/net-misc/asterisk/asterisk-21.4.1.ebuild
@@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -51,10 +51,6 @@ DEPEND="acct-user/asterisk
 	cluster? ( sys-cluster/corosync )
 	codec2? ( media-libs/codec2:= )
 	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
 	freetds? ( dev-db/freetds )
 	gtalk? ( dev-libs/iksemel )
 	http? ( dev-libs/gmime:2.6 )
@@ -103,18 +99,21 @@ BDEPEND="dev-libs/libxml2:2
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTVARRUNDIR=/run/asterisk"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-	"AST_FORTIFY_SOURCE="
-)
+ast_make() {
+	local make_args=(
+		"NOISY_BUILD=yes"
+		"ASTDBDIR=\$(ASTDATADIR)/astdb"
+		"ASTVARRUNDIR=/run/asterisk"
+		"ASTCACHEDIR=/var/cache/asterisk"
+		"OPTIMIZE="
+		"DEBUG="
+		"CONFIG_SRC=configs/samples"
+		"CONFIG_EXTEN=.sample"
+		"AST_FORTIFY_SOURCE="
+	)
+
+	emake "${make_args[@]}" "$@"
+}
 
 pkg_pretend() {
 	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
@@ -138,17 +137,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \
 		AC_CONFIG_SUBDIRS=menuselect eautoreconf
 }
 
 src_configure() {
 	local vmst
 	local copt cstate
-
-	econf \
+	local myconf=(
 		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
 		--localstatedir="/var" \
 		--with-crypto \
 		--with-gsm=internal \
@@ -166,60 +163,63 @@ src_configure() {
 		$(use_with portaudio) \
 		$(use_with ssl) \
 		$(use_with unbound)
+	)
+
+	econf "${myconf[@]}"
 
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
+	ast_menuselect() {
+		menuselect/menuselect "$@" menuselect.makeopts || die "menuselect $* failed."
 	}
 
 	_use_select() {
 		local state=$(use "$1" && echo enable || echo disable)
+		local x
 		shift # remove use from parameters
 
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
+		for x; do
+			ast_menuselect --${state} "$x"
 		done
 	}
 
 	# Blank out sounds/sounds.xml file to prevent
 	# asterisk from installing sounds files (we pull them in via
 	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
+	>sounds/sounds.xml || die "Unable to blank out sounds/sounds.xml"
 
 	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+	sed -i 's/NATIVE_ARCH=/&0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
 
 	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
+	ast_make menuselect.makeopts
 
 	# Disable astdb2* tools.  We've been on sqlite long enough
 	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
-	_menuselect --disable astdb2sqlite3 menuselect.makeopts
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2sqlite3
+	ast_menuselect --disable astdb2bdb
 
 	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
+	ast_menuselect --disable build_native
 
 	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_ooh323 menuselect.makeopts
+	ast_menuselect --disable chan_ooh323
 
 	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
+	ast_menuselect --enable smsq
+	ast_menuselect --enable streamplayer
+	ast_menuselect --enable aelparse
+	ast_menuselect --enable astman
 
 	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
+	ast_menuselect --enable pbx_dundi
+	ast_menuselect --enable func_aes
+	ast_menuselect --enable chan_iax2
 
 	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+	ast_menuselect --enable cdr_sqlite3_custom
+	ast_menuselect --enable cel_sqlite3_custom
 
 	# Disable conversion tools (which fails to compile in some cases).
-	_menuselect --disable astdb2bdb menuselect.makeopts
+	ast_menuselect --disable astdb2bdb
 
 	# The others are based on USE-flag settings
 	_use_select bluetooth    chan_mobile
@@ -227,7 +227,6 @@ src_configure() {
 	_use_select cluster      res_corosync
 	_use_select codec2       codec_codec2
 	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_meetme chan_dahdi codec_dahdi res_timing_dahdi
 	_use_select freetds      {cdr,cel}_tds
 	_use_select gtalk        chan_motif
 	_use_select http         res_http_post
@@ -249,16 +248,16 @@ src_configure() {
 	_use_select xmpp         res_xmpp
 
 	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
+	ast_menuselect --enable app_voicemail
 	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
 		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+			ast_menuselect --enable "app_voicemail_${vmst##*_}"
 		fi
 	done
 
 	if use debug; then
 		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
+			ast_menuselect --enable "${o}"
 		done
 	fi
 
@@ -267,14 +266,14 @@ src_configure() {
 			cstate=--enable
 			[[ "${copt}" == -* ]] && cstate=--disable
 			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
+			ast_menuselect ${cstate} "${copt#[-+]}"
 			eend $?
 		done
 	fi
 }
 
 src_compile() {
-	emake "${_make_args[@]}"
+	ast_make
 }
 
 src_install() {
@@ -285,7 +284,7 @@ src_install() {
 	diropts -m 0750 -o root -g asterisk
 	dodir /etc/asterisk
 
-	emake "${_make_args[@]}" install install-headers install-configs
+	ast_make install install-headers install-configs "DESTDIR=${D}"
 
 	fowners asterisk: /var/lib/asterisk/astdb
 
@@ -303,8 +302,7 @@ src_install() {
 	# Reset diropts else dodoc uses it for doc installations.
 	diropts -m0755
 
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
+	dodoc README* BUGS CREDITS
 
 	# install extra documentation
 	use doc && dodoc doc/*.{txt,pdf}
@@ -318,13 +316,24 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	else
+		local my_replacing=() x
+		for x in ${REPLACING_VERSIONS}; do
+			[[ $(ver_cut 1 ${x}) != $(ver_cut 1) ]] &&
+				my_replacing+=( $(ver_cut 1 ${x}) )
+		done
+		if [[ "${#my_replacing}" -gt 0 ]]; then
+			my_replacing="${my_replacing[*]}"
+			my_replacing="${my_replacing// /, }"
+			[[ "${my_replacing}" = *", "* ]] &&
+				my_replacing="${my_replacing%, *} or ${my_replacing##*, }"
+			elog "You are updating from Asterisk ${my_replacing}, you should reference the upgrade document:"
+			elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+			elog "Assistance also available on Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+		fi
 	fi
 
 	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate4 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
deleted file mode 100644
index 29e78eb16064..000000000000
--- a/net-misc/asterisk/files/1.6.2/asterisk.logrotate4
+++ /dev/null
@@ -1,27 +0,0 @@
-/var/log/asterisk/messages /var/log/asterisk/queue_log {
-	missingok
-	notifempty
-
-	postrotate
-		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
-		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
-	endscript
-}
-
-/var/log/asterisk/debug /var/log/asterisk/full {
-	missingok
-	notifempty
-	daily
-
-	postrotate
-		test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
-		test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true
-	endscript
-}
-
-/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv {
-	missingok
-	notifempty
-	weekly
-	rotate 52
-}
diff --git a/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch b/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch
deleted file mode 100644
index 540888368223..000000000000
--- a/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 79468a12c3533720c938731a8b7728ba4ff5a326 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Wed, 10 May 2023 23:13:17 +0200
-Subject: [PATCH] configure: fix test code to match gethostbyname_r prototype.
-
-This enables the test to work with CC=clang.
-
-Without this the test for 6 args would fail with:
-
-utils.c:99:12: error: static declaration of 'gethostbyname_r' follows non-static declaration
-static int gethostbyname_r (const char *name, struct hostent *ret, char *buf,
-           ^
-/usr/include/netdb.h:177:12: note: previous declaration is here
-extern int gethostbyname_r (const char *__restrict __name,
-           ^
-
-Fixing the expected return type to int sorts this out.
-
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
----
- configure    | 4 ++--
- configure.ac | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index bf78e2aade..b046dfc755 100755
---- a/configure
-+++ b/configure
-@@ -17537,7 +17537,7 @@ $as_echo_n "checking for gethostbyname_r with 6 arguments... " >&6; }
- int
- main ()
- {
--struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);
-+int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);
-   ;
-   return 0;
- }
-@@ -17565,7 +17565,7 @@ $as_echo_n "checking for gethostbyname_r with 5 arguments... " >&6; }
- int
- main ()
- {
--struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);
-+int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);
-   ;
-   return 0;
- }
-diff --git a/configure.ac b/configure.ac
-index ab6632beac..aeec352054 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -962,7 +962,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then
-         AC_LINK_IFELSE(
-                 [AC_LANG_PROGRAM([#include <stdlib.h>
-                                  #include <netdb.h>],
--                                [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])],
-+                                [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])],
-                 AC_MSG_RESULT(yes)
-                 AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if your system has gethostbyname_r with 6 arguments.]),
-                 AC_MSG_RESULT(no)
-@@ -972,7 +972,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then
-         AC_LINK_IFELSE(
-                 [AC_LANG_PROGRAM([#include <stdlib.h>
- 	                         #include <netdb.h>],
--                                [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])],
-+                                [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])],
-                 AC_MSG_RESULT(yes)
-                 AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if your system has gethostbyname_r with 5 arguments.]),
-                 AC_MSG_RESULT(no)
--- 
-2.39.3
-
diff --git a/net-misc/asterisk/files/asterisk.service b/net-misc/asterisk/files/asterisk.service
deleted file mode 100644
index 08245d9fe87f..000000000000
--- a/net-misc/asterisk/files/asterisk.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Asterisk PBX and telephony daemon.
-After=network.target
-
-[Service]
-Type=simple
-WorkingDirectory=/var/lib/asterisk
-User=asterisk
-Group=asterisk
-ExecStart=/usr/sbin/asterisk -f -C /etc/asterisk/asterisk.conf
-ExecStop=/usr/sbin/asterisk -rx 'core stop now'
-ExecReload=/usr/sbin/asterisk -rx 'core reload'
-
-LimitNOFILE=4096
-ProtectSystem=full
-ProtectHome=yes
-PrivateTmp=yes
-
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/asterisk/files/asterisk.service.conf b/net-misc/asterisk/files/asterisk.service.conf
deleted file mode 100644
index b7f83b71c5b0..000000000000
--- a/net-misc/asterisk/files/asterisk.service.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Uncomment the following 7 lines to start asterisk with a console on tty7
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# [Service]
-# ExecStart=
-# ExecStart=/usr/sbin/asterisk -f -c -C /etc/asterisk/asterisk.conf
-# TTYPath=/dev/tty7
-# StandardInput=tty
-# StandardOutput=tty
-# StandardError=tty
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf b/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf
deleted file mode 100644
index 224d060a3c92..000000000000
--- a/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/asterisk 0750 asterisk asterisk
-d /var/cache/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
deleted file mode 100644
index 8624bfa3383e..000000000000
--- a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
+++ /dev/null
@@ -1,202 +0,0 @@
-#! /bin/bash
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-progname="$(basename "$0")"
-
-T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")"
-eval set -- "${T}"
-
-rundir=/run/asterisk
-restartdelay=5
-nicelevel=0
-maxfd=4096
-dumpcore=0
-unset tty instance syslog corecompress corerename crashemail
-
-function usage() {
-	cat <<USAGE
-USAGE: $progname [options] -- asterisk options"
-OPTIONS:
-	-h|--help
-		Output this text and exit.
-	--corecompress[=tool]
-		asterisk's address space can get quite large, compressing the core dumps can
-		save significant space, especially if asterisk core dumps frequently.
-	--corerename pattern
-		It's assumed core files (if enabled) will go into PWD, this specifies a
-		rename pattern.  The following % codes are recognised:
-			%h - hostname
-			%D - date in format YYYYMMDD
-			%T - time in format HHMMSS
-		It must be mentioned that if kernel.core_pattern (sysctl) is modified
-		from the default 'core' value this option is unlikely to work.
-	--crashemail email@address
-		This will send an email whenver asterisk crashes (does not terminate
-		cleanly with a zero exit code).  You need a working sendmail binary.
-	--dumpcore sizelimit
-		Maximum size of core limit, or the word unlimited.  Default is disabled
-		(sizelimit of 0).
-	--instance name
-		Updated label for sylog logger.
-	--maxfd maxfd
-		Sets the maximum number of file descriptors (default 4096).
-	--nicelevel nicelevel
-		Will set the asterisk nice level to the specified value.
-	--restartdelay delay_in_seconds
-		Number of seconds to wait before attempting to restart asterisk.  This helps
-		to avoid tight-loop crashes.  Defaults to 5s. Minimum 1.
-	--rundir path
-		Where to store the asterisk asterisk_wrapper.pid file.  In order to terminate the
-		wrapper (when asterisk next terminates), remove this file.
-	--syslog
-		Pass to redirect output to syslog rather than using stdout and stderr.
-	--tty tty
-		If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8.
-		Use of this is not recommended in general.
-
-NOTE:  There are some quirks with bash getopt shunting non-options prior to --
-	to asterisk options, so be careful of this.  Typically stuff will break.
-USAGE
-}
-
-while [ "$1" != "--" ]; do
-	case "$1" in
-			--corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty)
-			eval "${1:2}=\"\${2}\""
-			shift 2
-			;;
-		--syslog)
-			eval "${1:2}=1"
-			shift
-			;;
-		--help|-h)
-			usage
-			exit 0
-			;;
-		*)
-			echo "BUG: Don't know how to process option $1." >&2
-			usage >&2
-			exit 1
-			;;
-	esac
-done
-shift # --
-
-ast_opts=("$@")
-
-if ! [[ "${restartdelay}" =~ ^[1-9][0-9]*$ ]]; then
-	echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2
-	restartdelay=5
-fi
-
-if [[ -n "${corecompress}" && ! -x "${corecompress}" ]]; then
-	corecompress=$(which "${corecompress}" 2>/dev/null)
-	[[ -z "${corecompress}" ]] && echo "Error locating core compression tool, disabling core compression." >&2
-fi
-
-# Before here will still be output (potentially munged, to the terminal).
-if [[ -n "${syslog}" ]]; then
-	exec 1> >(logger -t "asterisk_wrapper${instance:+:}${instance}" &>/dev/null)
-	exec 2>&1
-fi
-
-echo "Initializing ${progname}"
-
-function cleanup(){
-	# There is a tiny race here, if this gets replaced inbetween the read and the rm.
-	# To fix this is quite complex in that we need to keep an fd, compare inode numbers
-	# and manage flock's.
-	[[ -r "${rundir}/${progname}.pid" ]] && \
-		[[ "$(<"${rundir}/${progname}.pid")" = $$ ]] && \
-		rm "${rundir}/${progname}.pid"
-}
-trap cleanup EXIT
-
-# We could be clobbering an old version's pid, in which case it'll just terminate on
-# it's next iteration.  Towards this end, if asterisk.pid exists, attempt to find it's
-# config file and request a core stop when convenient so that we can take over.
-echo $$ > "${rundir}/${progname}.pid"
-if [[ -r "${rundir}/asterisk.pid" ]]; then
-	ast_pid="$(<"${rundir}/asterisk.pid")"
-	[[ -r "/proc/${ast_pid}/cmdline" ]] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient"
-	# We may hit a few (depending on how busy the server is a great many number) loop failures still ...
-fi
-
-ulimit -c "${dumpcore}"
-ulimit -n "${maxfd}"
-
-ast_cmd=()
-if [ -n "${nicelevel}" ]; then
-	ast_cmd+=(nice -n "${nicelevel}")
-fi
-ast_cmd+=(/usr/sbin/asterisk "${ast_opts[@]}")
-
-while [[ -r "${rundir}/${progname}.pid" ]]; do
-	# Another instance is looking to replace us, so terminate.
-	if [[ "$(<"${rundir}/${progname}.pid")" != $$ ]]; then
-		break
-	fi
-
-	echo "Starting asterisk with ${ast_opts[*]}"
-	if [ -n "${tty+yes}" ]; then
-		/bin/stty -F "${tty}" sane
-		"${ast_cmd[@]}" >"${tty}" 2>&1 <"${tty}"
-		result=$?
-	else
-		# Purposefully leave stderr alone, this will under certain odd cases (like exceptions,
-		# and other odd cases logged from glibc) result in those logs at least being captured
-		# in syslog.
-		"${ast_cmd[@]}" </dev/null >/dev/null
-		result=$?
-	fi
-
-	if [ "$result" -eq 0 ]; then
-		echo "Asterisk terminated normally."
-		break
-	fi
-		
-	if [ "$result" -gt 128 ]; then
-		signal="$(( result - 128 ))"
-		signame="$(kill -l $signal 2>/dev/null)"
-		MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})"
-
-		# TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using
-		# that, chances are they're already dealing with what we want here.
-		if [[ -r core ]]; then
-			if [[ -n "${corerename+yes}" ]]; then
-				core_target="${core_pattern}"
-				core_target="${core_target//%h/"$(hostname)"}"
-				core_target="${core_target//%D/"$(date +%Y%m%d)"}"
-				core_target="${core_target//%T/"$(date +%H%M%S)"}"
-				mv core "${core_target}"
-				core_target=$(readlink -f "${core_target}")
-			else
-				core_target=$(readlink -f core)
-			fi
-
-			if [[ -n "${corecompress}" && -x "${corecompress}" ]]; then
-				"${corecompress}" "${core_target}"
-				# TODO: Figure out a way to tag the extension onto core_target.
-			fi
-			
-			MSG="${MSG}\r\nCore dumped: ${core_target}"
-		fi
-	else
-		MSG="Asterisk terminated with return code: $result"
-	fi
-
-	[ -n "${tty+yes}" ] \
-		&& echo "${MSG}" >"${tty}" \
-		|| echo "${MSG}"
-
-	if [[ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]]; then
-		echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-			 /usr/sbin/sendmail "${crashemail}"
-	fi
-	echo "Restarting asterisk after ${restartdelay}s ..."
-	sleep "${restartdelay}"
-done
-
-echo "Terminating $progname."
-exit 0
diff --git a/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 b/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1
deleted file mode 100644
index 1a85eccf9b25..000000000000
--- a/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1
+++ /dev/null
@@ -1,227 +0,0 @@
-#! /bin/sh
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-progname="$(basename "$0")"
-
-T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")"
-eval set -- "${T}"
-
-# bash builtins are special ...
-echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)"
-
-rundir=/run/asterisk
-restartdelay=5
-nicelevel=0
-maxfd=4096
-dumpcore=0
-unset tty instance syslog corecompress corerename crashemail
-
-usage() {
-	cat <<USAGE
-USAGE: $progname [options] -- asterisk options"
-OPTIONS:
-	-h|--help
-		Output this text and exit.
-	--corecompress[=tool]
-		asterisk's address space can get quite large, compressing the core dumps can
-		save significant space, especially if asterisk core dumps frequently.
-	--corerename pattern
-		It's assumed core files (if enabled) will go into PWD, this specifies a
-		rename pattern.  The following % codes are recognised:
-			%h - hostname
-			%D - date in format YYYYMMDD
-			%T - time in format HHMMSS
-		It must be mentioned that if kernel.core_pattern (sysctl) is modified
-		from the default 'core' value this option is unlikely to work.
-	--crashemail email@address
-		This will send an email whenver asterisk crashes (does not terminate
-		cleanly with a zero exit code).  You need a working sendmail binary.
-	--dumpcore sizelimit
-		Maximum size of core limit, or the word unlimited.  Default is disabled
-		(sizelimit of 0).
-	--instance name
-		Updated label for sylog logger.
-	--maxfd maxfd
-		Sets the maximum number of file descriptors (default 4096).
-	--nicelevel nicelevel
-		Will set the asterisk nice level to the specified value.
-	--restartdelay delay_in_seconds
-		Number of seconds to wait before attempting to restart asterisk.  This helps
-		to avoid tight-loop crashes.  Defaults to 5s. Minimum 1.
-	--rundir path
-		Where to store the asterisk asterisk_wrapper.pid file.  In order to terminate the
-		wrapper (when asterisk next terminates), remove this file.
-	--syslog
-		Pass to redirect output to syslog rather than using stdout and stderr.
-	--tty tty
-		If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8.
-		Use of this is not recommended in general.
-
-NOTE:  There are some quirks with bash getopt shunting non-options prior to --
-	to asterisk options, so be careful of this.  Typically stuff will break.
-USAGE
-}
-
-matchreg() {
-	local v=$1
-	shift
-	echo "$v" | grep -q "$@"
-}
-
-while [ "$1" != "--" ]; do
-	case "$1" in
-			--corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty)
-			eval "${1#--}=\"\${2}\""
-			shift 2
-			;;
-		--syslog)
-			eval "${1#--}=1"
-			shift
-			;;
-		--help|-h)
-			usage
-			exit 0
-			;;
-		*)
-			echo "BUG: Don't know how to process option $1." >&2
-			usage >&2
-			exit 1
-			;;
-	esac
-done
-shift # --
-
-if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then
-	echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2
-	restartdelay=5
-fi
-
-if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then
-	echo "Invalid --maxfd value, resetting to 4096." >&2
-	maxfd=4096
-fi
-
-if [ $maxfd -lt 1024 ]; then
-	echo "maxfd is guaranteed too low, bumping to at least 1024" >&2
-	maxfd=1024
-fi
-
-if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then
-	echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)."
-	exit 1
-fi
-
-if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then
-	corecompress=$(which "${corecompress}" 2>/dev/null)
-	[ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2
-fi
-
-# Before here will still be output (potentially munged, to the terminal).
-if [ -n "${syslog}" ]; then
-	tdir="$(mktemp -d)"
-	tfifo="${tdir}/asterisk_wrapper.logger.fifo"
-	mkfifo "${tfifo}"
-	logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" &
-	exec 1>"${tfifo}"
-	exec 2>&1
-
-	rm "${tfifo}"
-	rmdir "${tdir}"
-fi
-
-echo "Initializing ${progname}"
-
-cleanup(){
-	# There is a tiny race here, if this gets replaced inbetween the read and the rm.
-	# To fix this is quite complex in that we need to keep an fd, compare inode numbers
-	# and manage flock's.
-	[ -r "${rundir}/${progname}.pid" ] && \
-		[ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \
-		rm "${rundir}/${progname}.pid"
-}
-trap cleanup EXIT
-
-# We could be clobbering an old version's pid, in which case it'll just terminate on
-# it's next iteration.  Towards this end, if asterisk.pid exists, attempt to find it's
-# config file and request a core stop when convenient so that we can take over.
-echo $$ > "${rundir}/${progname}.pid"
-if [ -r "${rundir}/asterisk.pid" ]; then
-	ast_pid="$(cat "${rundir}/asterisk.pid")"
-	[ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient"
-	# We may hit a few (depending on how busy the server is a great many number) loop failures still ...
-fi
-
-prlimit --core=${dumpcore} --pid=$$
-prlimit --nofile=${maxfd} --pid=$$
-
-ast_cmd=/usr/sbin/asterisk
-if [ -n "${nicelevel}" ]; then
-	ast_cmd="nice -n ${nicelevel} ${ast_cmd}"
-fi
-
-while [ -r "${rundir}/${progname}.pid" ]; do
-	# Another instance is looking to replace us, so terminate.
-	if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then
-		break
-	fi
-
-	echo "Starting asterisk with ${ast_cmd} $*"
-	if [ -n "${tty+yes}" ]; then
-		/bin/stty -F "${tty}" sane
-		${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}"
-		result=$?
-	else
-		# Purposefully leave stderr alone, this will under certain odd cases (like exceptions,
-		# and other odd cases logged from glibc) result in those logs at least being captured
-		# in syslog.
-		${ast_cmd} "$@" </dev/null >/dev/null
-		result=$?
-	fi
-
-	if [ "$result" -eq 0 ]; then
-		echo "Asterisk terminated normally."
-		break
-	fi
-
-	if [ "$result" -gt 128 ]; then
-		signal="$(( result - 128 ))"
-		signame="$(kill -l $signal 2>/dev/null)"
-		MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})"
-
-		# TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using
-		# that, chances are they're already dealing with what we want here.
-		if [ -r core ]; then
-			if [ -n "${corerename+yes}" ]; then
-				core_target="$(echo "${core_pattern}" | sed -e "s/%h/$(hostname)/" \
-					-e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")"
-				mv core "${core_target}"
-				core_target=$(readlink -f "${core_target}")
-			else
-				core_target=$(readlink -f core)
-			fi
-
-			if [ -n "${corecompress}" && -x "${corecompress}" ]; then
-				"${corecompress}" "${core_target}"
-			fi
-
-			MSG="${MSG}\r\nCore dumped: ${core_target}"
-		fi
-	else
-		MSG="Asterisk terminated with return code: $result"
-	fi
-
-	[ -n "${tty+yes}" ] \
-		&& echo "${MSG}" >"${tty}" \
-		|| echo "${MSG}"
-
-	if [ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]; then
-		$echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-			 /usr/sbin/sendmail "${crashemail}"
-	fi
-	echo "Restarting asterisk after ${restartdelay}s ..."
-	sleep "${restartdelay}"
-done
-
-echo "Terminating $progname."
-exit 0
diff --git a/net-misc/asterisk/files/confd-16.26.1-18.12.1 b/net-misc/asterisk/files/confd-16.26.1-18.12.1
deleted file mode 100644
index c350b7e9161d..000000000000
--- a/net-misc/asterisk/files/confd-16.26.1-18.12.1
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# Additional options for asterisk
-#
-# see "asterisk -h" for a list of options
-#
-# No default.
-#
-#ASTERISK_OPTS=""
-
-#
-# User and group to run asterisk as
-#
-# Value: double-colon separated list of user and group, or empty to run as root:
-#
-#
-# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
-# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
-# ":asterisk" to run as user "root" and group "asterisk"
-#
-# Default: asterisk
-#
-#ASTERISK_USER="asterisk"
-
-#
-# Nicelevel
-#
-# Set the priority of the asterisk process
-#
-# Value: (highest) -20..19 (lowest)
-#
-# No default (leave scheduling to be system default).
-#
-#ASTERISK_NICE="19"
-
-# Send crash notifications emails to this address
-# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
-#
-# Value: Email address or empty to disable
-#
-# No default.
-#
-#ASTERISK_NOTIFY_EMAIL="root"
-
-#
-# Send asterisk's output to this terminal
-#
-# Value: Full path to device node or a number
-#
-# No default.
-#
-#ASTERISK_TTY="/dev/tty9"
-
-#
-# Start an asterisk console on the terminal specified by ASTERISK_TTY
-#
-# Warning! Use only for debugging, this is a potential security issue!
-#
-# Value: yes/no
-#
-# Default: no
-#
-#ASTERISK_CONSOLE="no"
-
-#
-# Maximum size of core files.
-#
-# Value: Size in bytes, unlimited for no limit or empty to disable.
-#
-# Default:  do not generate core dumps
-#
-#ASTERISK_CORE_SIZE="unlimited"
-
-#
-# ASTERISK_CORE_DIR
-#
-# Value: Directory (will be created if non-existant).
-#
-# Default: /tmp
-#
-#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
-
-#
-# Max number of filedescriptors.  asterisk can trivially run out of
-# descriptors.  In most (SIP) cases it uses at least four descriptors per call,
-# and this is a conservative value.
-#
-# Value: Number of descriptors
-#
-# Default: leave system default in place.
-#
-ASTERISK_MAX_FD="4096"
-
-#
-# Delay time before restarting asterisk after a crash.
-#
-# Value: Number of seconds to sleep after a crash before restarting.
-#
-# Default: 5
-#
-#ASTERISK_RESTART_DELAY=5
-
-#
-# The stop mechanism to use.  Asterisk can do gracefully, when convenient or now.
-# By default we expect you to want to stop as soon as possible, so we default
-#
-# Default: gracefully
-#
-#ASTERISK_STOP_METHOD="when convenient"
-
-#
-# By default the init script waits two minutes for asterisk to stop.  This allows
-# you to change that, or even completely disable and go into wait for ever mode (-1).
-# The value here is in seconds.
-#
-# Default: 120
-#
-#ASTERISK_STOP_TIMEOUT=-1
-
-#
-# ASTERISK_CONFDIR
-#
-# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
-# (typically /etc/asterisk) to be used for configuration.
-#
-# Default: /etc/${RC_SVCNAME}
-#
-#ASTERISK_CONFDIR="/etc/foo/bar"
-
-# ASTERISK_CACHEDIR
-#
-# Value: Directory to which astcachedir in asterisk.conf is set.
-#
-# Default: /var/cache/asterisk
-#
-#ASTERISK_CACHEDIR="/var/cache/asterisk"
-
-
-#
-# Normally the init script will not wait for asterisk to fully boot.  With this
-# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
-# after starting asterisk, and wait for asterisk to start up completely.  This
-# is useful in certain conditions where other software requires asterisk to be
-# properly started before they themselves can be started.
-#
-# Default:  no
-#
-#ASTERISK_WAITBOOTED=yes
-
-#
-# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
-# In certain highly unusual configurations it's helpful to also get the
-# hostname into this filename.  By enabling this option the wrapper loop will
-# adjust the core file to be named core-$(hostname)-$(date ...).
-#
-# Default: no
-#
-#ASTERISK_CORE_USEHOSTNAME=yes
-
-#
-# When core-dumping, the default is to not compress these files.  However, as it turns
-# out, compressing these core files can save significant amount of space, so if you
-# want them compressed, specify the tool to use here.
-#
-# Default: do not compress
-#
-#ASTERISK_CORE_COMPRESS=bzip2
diff --git a/net-misc/asterisk/files/initd-16.26.1-18.12.1 b/net-misc/asterisk/files/initd-16.26.1-18.12.1
deleted file mode 100644
index cc6a3dee575b..000000000000
--- a/net-misc/asterisk/files/initd-16.26.1-18.12.1
+++ /dev/null
@@ -1,309 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME}
-	ast_cachedir=/var/cache/asterisk
-	ast_stop_timeout=120
-	ast_stop_method="gracefully"
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename="${ast_instancename}(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
-	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
-	case "${ASTERISK_STOP_METHOD}" in
-		gracefully|when\ convenient|now)
-			ast_stop_method="${ASTERISK_STOP_METHOD}"
-		;;
-	esac
-	ast_group=
-	if [ -n "${ASTERISK_USER}" ]; then
-		ast_user="${ASTERISK_USER%%:*}"
-		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
-			ast_group="${ASTERISK_USER#*:}"
-			ast_group="${ast_group%%:*}"
-		fi
-	fi
-
-	[ -z "${ast_user}" ] && ast_user=asterisk
-
-	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
-
-	return 0
-}
-
-start() {
-	local OPTS PID
-	local tmp x
-
-	local OPTS ARGS WRAPPER_OPTS
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f"  # don't fork / detach breaks wrapper script...
-
-	WRAPPER_OPTS="--syslog"
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}"
-	fi
-	WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}"
-	
-	# ensure that ASTERISK_RESTART_DELAY is integer.
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-	WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}"
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}"	
-		OPTS="${OPTS} -g"
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then
-			einfo "Core compression tool     : ${ASTERISK_CORE_COMPRESS}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}"
-		fi
-
-		if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T"
-		else
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T"
-		fi
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}"
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in "${ASTERISK_TTY}" \
-			 "/dev/tty${ASTERISK_TTY}" \
-			 "/dev/vc/${ASTERISK_TTY}"
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		if [ -n "${TTY}" ]; then
-			einfo "Messages are sent to      : ${TTY}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}"
-		else
-			ewarn "ASTERISK_TTY=${TTY} ignored, not valid."
-		fi
-	fi
-
-	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : Yes"
-		OPTS="${OPTS} -c"
-	fi
-
-	if ! getent passwd "${ast_user}" >/dev/null 2>&1; then
-		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
-		return 1
-	fi
-	OPTS="${OPTS} -U ${ast_user}"
-
-	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then
-		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
-		return 1
-	fi
-	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
-
-	if [ "${ast_user}" = root ]; then
-		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	elif [ "${ast_group}" = root ]; then
-		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	fi
-
-	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
-	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
-
-	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
-	einfo "Wrapper options           : ${WRAPPER_OPTS}"
-	einfo "Asterisk options          : ${OPTS}"
-
-	/usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
-		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
-			# asterisk can crash during startup ...
-			ebegin "Waiting for ctl file to appear"
-			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
-				sleep 1
-			done
-			is_running
-			result=$?
-			eend $result
-		fi
-		if [ $result -eq 0 ]; then
-			ebegin "Waiting for ${ast_instancename} to fully boot"
-			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1
-			eend $?
-		fi
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Older path.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/asterisk_wrapper.pid"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "${ast_instancename} is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for ${ast_instancename} to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 2)"
-			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
-				echo
-				eend 1 "Failed waiting for ${ast_instancename} to stop."
-				return 1
-			fi
-			sleep 2
-			printf "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Requesting ${ast_instancename} to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1
-		eend $?
-	else
-		eerror "${ast_instancename} is not running!"
-	fi
-}
diff --git a/net-misc/asterisk/files/initd-18.17.1-20.2.1 b/net-misc/asterisk/files/initd-18.17.1-20.2.1
deleted file mode 100644
index 7d48b36456bf..000000000000
--- a/net-misc/asterisk/files/initd-18.17.1-20.2.1
+++ /dev/null
@@ -1,311 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="forcestop reload"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME}
-	ast_cachedir=/var/cache/asterisk
-	ast_stop_timeout=120
-	ast_stop_method="gracefully"
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename="${ast_instancename}(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
-	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
-	case "${ASTERISK_STOP_METHOD}" in
-		gracefully|when\ convenient|now)
-			ast_stop_method="${ASTERISK_STOP_METHOD}"
-		;;
-	esac
-	ast_group=
-	if [ -n "${ASTERISK_USER}" ]; then
-		ast_user="${ASTERISK_USER%%:*}"
-		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
-			ast_group="${ASTERISK_USER#*:}"
-			ast_group="${ast_group%%:*}"
-		fi
-	fi
-
-	[ -z "${ast_user}" ] && ast_user=asterisk
-
-	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
-
-	return 0
-}
-
-start() {
-	local OPTS PID
-	local tmp x
-
-	local OPTS ARGS WRAPPER_OPTS
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f"  # don't fork / detach breaks wrapper script...
-
-	WRAPPER_OPTS="--syslog"
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}"
-	fi
-	WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}"
-	
-	# ensure that ASTERISK_RESTART_DELAY is integer.
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-	WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}"
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}"	
-		OPTS="${OPTS} -g"
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then
-			einfo "Core compression tool     : ${ASTERISK_CORE_COMPRESS}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}"
-		fi
-
-		if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T"
-		else
-			WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T"
-		fi
-	else
-		cd /
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}"
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in "${ASTERISK_TTY}" \
-			 "/dev/tty${ASTERISK_TTY}" \
-			 "/dev/vc/${ASTERISK_TTY}"
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		if [ -n "${TTY}" ]; then
-			einfo "Messages are sent to      : ${TTY}"
-			WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}"
-		else
-			ewarn "ASTERISK_TTY=${TTY} ignored, not valid."
-		fi
-	fi
-
-	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : Yes"
-		OPTS="${OPTS} -c"
-	fi
-
-	if ! getent passwd "${ast_user}" >/dev/null 2>&1; then
-		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
-		return 1
-	fi
-	OPTS="${OPTS} -U ${ast_user}"
-
-	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then
-		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
-		return 1
-	fi
-	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
-
-	if [ "${ast_user}" = root ]; then
-		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	elif [ "${ast_group}" = root ]; then
-		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	fi
-
-	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
-	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
-
-	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
-	einfo "Wrapper options           : ${WRAPPER_OPTS}"
-	einfo "Asterisk options          : ${OPTS}"
-
-	/usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
-		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
-			# asterisk can crash during startup ...
-			ebegin "Waiting for ctl file to appear"
-			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
-				sleep 1
-			done
-			is_running
-			result=$?
-			eend $result
-		fi
-		if [ $result -eq 0 ]; then
-			ebegin "Waiting for ${ast_instancename} to fully boot"
-			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1
-			eend $?
-		fi
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Older path.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/asterisk_wrapper.pid"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "${ast_instancename} is not running!"
-		return 0
-	fi
-
-	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for ${ast_instancename} to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 2)"
-			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
-				echo
-				eend 1 "Failed waiting for ${ast_instancename} to stop."
-				return 1
-			fi
-			sleep 2
-			printf "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Requesting ${ast_instancename} to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1
-		eend $?
-	else
-		eerror "${ast_instancename} is not running!"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index b7dc02f978a0..52ebf3385c64 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -2,5 +2,5 @@ AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a48694
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
 DIST chrome-remote-desktop_118.0.5993.9_amd64.deb 17677480 BLAKE2B 1f29d8a8d90f12515afbea857e5f4b7ec0ca56a3051e14e7f67c38c906d743c74ca274a00342a8a9745effeb0023a7e88615c886dcbdcbe68bbcafe317b8902d SHA512 ffa0fb28cb7842a13df3228b5ca6e83c2e9d3967c5013b3613cefec7f86f56e6df069f33e65c3a979ce15d971906cb4488b90a4dffc4b95cd5d65346b4a08f87
-EBUILD chrome-remote-desktop-118.0.5993.9.ebuild 4852 BLAKE2B 274fbb64e75b175009e4f53e48e0099ef58aac45dd0403593eac20606826fb25b8e4939292b33a05864970ccf420577681497f62e10f65d93a9259aaad07ab5e SHA512 a00c349f715feffac0704d9382a86957fad47f15aaddd59fafa5f9bcf0895ea129d4cd730ecf942161385869aa4f0b327cc571a7d5acaf417eca7fad87a16513
+EBUILD chrome-remote-desktop-118.0.5993.9.ebuild 4851 BLAKE2B 28ed485754ad4c4d0d5f4f6e375795efcf518cb4292f71f7fcca26fc8d35777c0399a27446729689ab4dd35deef5157cc29807d5bef539bcc2e125942f0167c9 SHA512 9ee1fc2155e10c29093b9aa0a5e7881f4c0a68593175c35f9189e1ef5563bdd7927c9db29ce24d1851b8e0703f7b03197e8f7498e2ea67a0f385fa1f6a715718
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
index 98867942b1eb..54242e0bf2cd 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
@@ -13,9 +13,9 @@
 # Use curl to find the answer:
 #  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
 
 inherit unpacker python-single-r1 optfeature plocale
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 082b48cf2e31..81522c589ecd 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,7 +1,10 @@
+DIST croc-10.0.11-deps.tar.xz 41579476 BLAKE2B 2323f1886cb8c4c6f11d406f97ff420c38af185e65572e2c9e37d3095eee1909253c73aec1bcc9015c87b06648e9a1f5ea5818492c3f1c96962944175c5f89db SHA512 5fe825a66ce745eff41c77643c594ad3406d25e8079405b34110d96dc33ac015dd68528071d8354bb44fdf68247915365f530ccc10743d014e4d6bf96d1803b9
+DIST croc-10.0.11.tar.gz 575860 BLAKE2B cd0c43adcf509edb009a28ba7bfc871a6280e8ce4d4f529502ee2ff1547e957e551ea8184ff24c1097050cc7fd449f399b2849c4803b27d82b5b1e72bde5c9f1 SHA512 1cdfc5823e29406ec92ad4b24526e30032b89787d77382a0179c558cb2f0dd99556d93c7523ebfbb1dd4cac15ec596b3ddd0ce58ac5b9491f34b94436a20fbef
 DIST croc-9.6.15-deps.tar.xz 30217856 BLAKE2B 87c34fa60f0bda194ca022648be2ce11da7b4b9a3f3a5f5b16a5127d5b25197ec99bdba1ef388c38b9e632ed4ef0f89a68e3b58368d9df7b07a1f3129b2b9145 SHA512 caa944dc9e8fb0d4883f4447c979282826e2364fe8b196e412861189953c23a09b6de38306aa00eabfeeb12fb4d3ab9e9794494da8ece10c3ee5a0cd72161d17
 DIST croc-9.6.15.tar.gz 512614 BLAKE2B 2a87593b5d944c2b5ea970d30f0b64b2a8325cca672421aaa58e6fd07e440aad88de6acad564fcb9963256a9f499421dd9343f51395babd724deeffe875cc6f7 SHA512 8ae76dc5029e7adc809b0083e147c57c7249e9fbb07f263a0b10d21539ebfc69c5d9d8e60811cca06bbb313ec9a3a143baaef73f77ca599dc102626dc9fccf29
 DIST croc-9.6.17-deps.tar.xz 29935608 BLAKE2B 1bdcd2e86f09f3a112faa9f671705a5cabb3f6d9037ba71f0947ee2ce3863d840a8e6847167017c7e02de422900bfbfc8ca285933dd23b95a4232e67c0e30c50 SHA512 0787600d6ca9d46da1e66b27e5f3cc2c88020fa8bb9119c1455209680eb886245f05a7650727759f7624ec59e4b4cec7910f58e83b79d0f87b26375de17b13b2
 DIST croc-9.6.17.tar.gz 514013 BLAKE2B ac0819791329085d91a57a170981d5b42739c098bba7c6ba523d6f02dee06868d9ac45fc4b264a7dff670550d38aa90be10a9be99d07417fb5754529022583d4 SHA512 a9bc1b4325ae8066874f40cad1ff63e8f69cd7d36189f553e6865efb456fed319384710d86ad81cdfebdd3d70cfa82f7ce84d458898d1016ccc652b6b692d120
+EBUILD croc-10.0.11.ebuild 1052 BLAKE2B 87b1350f1a1fb7eadc728316e7760fe55c6fef6894c0e91a15de0cf905b0bc723e8a09f0771edb8ac5f7b45820c176c08b62a569dad2b9fe988c99dc101dc64e SHA512 59883a43fc51c7193250118a076711acc22b30537492810525c7cfef29bf12b429c8a772249e45e3d45e2aa031258995bf0b56fd26d791f8a90b1aec63564b75
 EBUILD croc-9.6.15.ebuild 1051 BLAKE2B b7ead5c41dc52f153018f479298252b3b6f73a712bfe85aa4976a92f9b599832fde63cc43c8d17d5270c79b752a171fbea016ac9c6c3692bc9ac29c88a30bc1a SHA512 463d400fcf88dd58db8bfbc1af746bfadd03bc0a6f818277edc7832f3e447e52b014bc57e7b571f72c59f75d7dc302a11c05f1a15afdafaa59287eab31c6f247
 EBUILD croc-9.6.17.ebuild 1052 BLAKE2B 87b1350f1a1fb7eadc728316e7760fe55c6fef6894c0e91a15de0cf905b0bc723e8a09f0771edb8ac5f7b45820c176c08b62a569dad2b9fe988c99dc101dc64e SHA512 59883a43fc51c7193250118a076711acc22b30537492810525c7cfef29bf12b429c8a772249e45e3d45e2aa031258995bf0b56fd26d791f8a90b1aec63564b75
 MISC metadata.xml 638 BLAKE2B a54a82285c77fbdbc963e002898a8fa079849f298831f0d88fbe1861c2c14742151933b4acae38a3b2219b9bd042dadd3472d09afe3e7f94fd39b63a5e7bc646 SHA512 40b095b3e9a84d4d91a6584adf27d3e3b2c30dae159e86f32ecec5637bf384af40117fa9a59faebae07adeee734bb560a537b835add456350516441482f61a08
diff --git a/net-misc/croc/croc-10.0.11.ebuild b/net-misc/croc/croc-10.0.11.ebuild
new file mode 100644
index 000000000000..edfe827fbac5
--- /dev/null
+++ b/net-misc/croc/croc-10.0.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
+src_compile() {
+	ego build
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
+	einstalldocs
+}
+
+src_test() {
+	ego test -skip "Test(Comm|Send|PublicIP|LocalIP)" -work ./...
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 76bf21221e02..ee7f848b6c04 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,6 +5,7 @@ AUX curl-8.7.1-rustls-fixes.patch 1526 BLAKE2B c1ce730bc1d78d9655378a174b32706bc
 AUX curl-8.8.0-install-manpage.patch 659 BLAKE2B 44a303863fb826d0fca139c8a9091ce1e9ed461f3ee1545b4c3fb9a03dae2f707622b61d4f34345bafcccab751f989972eead676de5a784b5af138a1cc0e467c SHA512 0d5acfb2cf32b3855a29e01cacc5b3f06014832ca0adfa554938b3b06658dd63a4bac75932b4476b856f4c9adb096217bbb549b1a81a4a012f8b668cb9420079
 AUX curl-8.8.0-mbedtls.patch 1686 BLAKE2B 6bafbfcf8c418e0507dc910aafe8667c3a71c535fa13f329ef67087edb4f6dcbe70113f752baf8a9ac6c72424045a3111b4e21992c84c7d2cd66684cfaa0ad0f SHA512 07ae1a42da92a200bbc72d911ecbf83b93df2a2be6022605842fc08bc870e466b19b6dc78298039027266155a5c9fcc81f05107fdbdfba4cfac4ddaad4d2a586
 AUX curl-8.8.0-multi_wait-timeout.patch 2732 BLAKE2B ae2f40f6dcec16761d959fe5eeaff531ff3ac2c2cd26d676261ecac406653c3d560941455f6d46dd1552f20429582173e45f05865cbdd009c28f21de6a98a458 SHA512 1fbb5506ce1b87c90ea2d029adb9eaccb9930203c8aa0c119666cbee6fc1fc190423f02592bb2620ca3fa1b60822fc704bbc6f671152e877b2383173260acb04
+AUX curl-8.9.1-sigpipe.patch 773 BLAKE2B 7ef3bbd4ca9558621b4f1ea5cb9847705cd6331b7f3d5d2a950642d090c789b802c0ff4f96ff2805b9e1dfe807b14daaee223dbcb2ff1426458dadb3e71d1e79 SHA512 55e55da046425e9a60064ff79ec3f8ab37a10275210f46cfb10ad29e9a29cb137a28ba6a0effa90bfc46d687aab929565b97bfa7549ac8a202746e332d1fa6ed
 AUX curl-prefix-2.patch 1075 BLAKE2B 657ac450c9d50a08f62be72dc9d1bc68c494dcc0c8153f1a89d5cb50d240aa6bcd56b48242ed3ea1352da5cd5d98b8c6daaff6fdcc672a95a0233db1f8d27bdd SHA512 91a531291426477a68108dcc40656e6a56caabfda26f351d4b7cdb39e66f500ffd532f2417a81c5a789ea624b4f6325aa8006155292910612e54ab3d9daa3620
 AUX curl-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
@@ -12,9 +13,11 @@ DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe
 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a
 DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
-EBUILD curl-8.7.1-r3.ebuild 11043 BLAKE2B 3d468dea6498e583f32d9ab2d1f46d318ff1be54f618eb6d675aa62600cdd54e8fa8456ffd625554453ff3892ada172f8180cba3b6a764e8b3c873edb700575e SHA512 ecb08a53bf882c4c8ab6b659f8cbe30f595f336c830c239be35abe13bf80eabf41513719a4c13193110ef20dc19edd5d9653aa484a3abbc1a3ada3abe3a9e29c
+DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
+DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
 EBUILD curl-8.7.1-r4.ebuild 11267 BLAKE2B 50dba5d100c3fee6b1721a63c059e365a27e02924c514164f13b082f7afabb4afc5aa47a14eb48283701828c834906bcde012530cd60697167a09d615da7df1d SHA512 aa5b768414133e81cdafb774f44c33f14de19c607013f64d83f5e2460285215e1792e738746d8665f2b98ff85ab0d50c03d96d65145ae72967193a34be3aae13
 EBUILD curl-8.8.0-r1.ebuild 11494 BLAKE2B 6086d91363a1724a62f45062899114d4f96af8ca28ce67bfe843b2c8d435b65e543e4860be4619c4628a7e66425edc19c90de3d22a54eaba2ac118075d2d44a2 SHA512 1f18433acec5d1ba5631b7e6ecd1c9cf7c3039decdb5e001333ed709f86487808d92afee96e31a9ce5c2c1ed79b5189be205397378bc2f0583efd7acb286c54b
-EBUILD curl-8.8.0.ebuild 11117 BLAKE2B d088f434876adfaee0e4b4983c2b9cd047460496260b2a2678581bec7a63bf2e93272159b3e82fbd472df17f062f1b3fe6f81e75a5e2dd1ab588b208a6f6909f SHA512 8419bcac5a90e96a0ae896787ab632d85c29c373365c4084bfa14e414f2e9494f01ad0c812e2fb1b8596ee96f682cc76da2818f3b5cc992801c0a1660f61ac9a
-EBUILD curl-9999.ebuild 11092 BLAKE2B 366122c9c5c9ff592959d8932b0adb04b73fce5b3155a5e47bd2246ae3922546c4e39a4b0f9a556e0f6163953398ac8270f49ab4af34d05c88f815e40e807d53 SHA512 0551db5807a5d02e096548d3b9116ce6563bff1c6be661a04da6ccdae077cee1cd9936d1f61c8ee38dd4442e4b519dcab7c04c5034f207ce1c002f0ab2bf0808
+EBUILD curl-8.9.1-r1.ebuild 11448 BLAKE2B 6e321535bc9e79401b923e4b4464b99facb1b87c1079dd9ed0686c8e373f6431bb463ff0dea237710f50d4ca8d8fdb86b9c32a12eb841f7d7789438c1c8764e4 SHA512 fe112d9cb2c0984fb58754255c14978fb1f1bdef677e867b1725cb1497b5325ec1e71bcec9da481c9869e7d5689a2c01b415faa0002314b78e986f31851442c4
+EBUILD curl-8.9.1.ebuild 11401 BLAKE2B 5b90711bcc0fc5058ca59799482356b0bd35025259b722862bbdf5352dbfbdce0aed6294b11e6e8f71cb0ffa72d340a28311e8333e5fce935a44b04a0385647b SHA512 b00508d74545a380e8327cf8f4bf9c7e3c255e49a8310c1d18ba8678a06218ef741bc6e715f115ebbef8f3dacc9b07cbe55fa1c24566c680a91b1edca50d27d6
+EBUILD curl-9999.ebuild 11399 BLAKE2B 171c5b00a9b4be26e79efe04efa464adaa6c7962700557f3a3b6734190b2d522d602eb304303cda0c750bf723ee3ff5cf17e75cb1e4623b0f33ccfd845a228b4 SHA512 c3b3d5d96006d0f2ebcb6c24f8d27be3f820e92577098522f5fcb6697ab85c0a275fcff130bbc23dbf9284594fa070881c523450d20d061cd5b6a7fb7912a833
 MISC metadata.xml 2215 BLAKE2B aa0851849ffda831aeec7a6315d23892c35680ab42c0bc9a5662238e7b8289d5f48d5f2a60ab0bacba06f71271bf60d14958bfec029a048f732d22fdc60faded SHA512 7da9247a1bbb533ae0bdc919f5bd2ad7ed298a7f9e986dce6d2471cedeee9f1542a8ef79b1fdbca5a1a0d33194b99ff3d3f5c27054ac01a3f1e40a1e94d6c1b2
diff --git a/net-misc/curl/curl-8.7.1-r3.ebuild b/net-misc/curl/curl-8.9.1-r1.ebuild
index 7877669d822a..68501e82986b 100644
--- a/net-misc/curl/curl-8.7.1-r3.ebuild
+++ b/net-misc/curl/curl-8.9.1-r1.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=8
 
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
 inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
 
@@ -17,21 +21,30 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
 SLOT="0"
-IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
 RESTRICT="!test? ( test )"
 
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
 REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
 	ssl? (
 		^^ (
 			curl_ssl_gnutls
@@ -40,13 +53,25 @@ REQUIRED_USE="
 			curl_ssl_rustls
 		)
 	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
 	curl_ssl_gnutls? ( gnutls )
 	curl_ssl_mbedtls? ( mbedtls )
 	curl_ssl_openssl? ( openssl )
 	curl_ssl_rustls? ( rustls )
-	nghttp3? (
-		!openssl
-		alt-svc )
+	http3? ( alt-svc quic )
 "
 
 # cURL's docs and CI/CD are great resources for confirming supported versions
@@ -56,20 +81,21 @@ REQUIRED_USE="
 # - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
 # However 'supported' vs 'works' are two entirely different things; be sane but
 # don't be afraid to require a later version.
-
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
 RDEPEND="
 	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
-	adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
 	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
 	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
 	ssl? (
@@ -85,8 +111,8 @@ RDEPEND="
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
 		)
-		rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}]
-			<net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
+		rustls? (
+			>=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
 		)
 	)
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -100,7 +126,7 @@ BDEPEND="
 	test? (
 		sys-apps/diffutils
 		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
 	)
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
 "
@@ -130,11 +156,9 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-prefix.patch
+	"${FILESDIR}"/${PN}-prefix-2.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch
-	"${FILESDIR}"/${P}-chunked-post.patch
-	"${FILESDIR}"/${P}-fix-compress-option.patch
+	"${FILESDIR}"/${PN}-8.9.1-sigpipe.patch
 )
 
 src_prepare() {
@@ -221,7 +245,6 @@ multilib_src_configure() {
 		$(use_enable ldap)
 		$(use_enable ldap ldaps)
 		--enable-ntlm
-		--disable-ntlm-wb
 		$(use_enable pop3)
 		--enable-rt
 		--enable-rtsp
@@ -262,8 +285,9 @@ multilib_src_configure() {
 		--without-libgsasl
 		$(use_with psl libpsl)
 		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
 		--without-quiche
 		$(use_with rtmp librtmp)
 		--without-schannel
@@ -279,7 +303,13 @@ multilib_src_configure() {
 		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
 	)
 
-	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
 		myconf+=(
 			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
 		)
@@ -299,30 +329,6 @@ multilib_src_configure() {
 		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
 	fi
 
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
 }
 
 multilib_src_compile() {
@@ -368,3 +374,11 @@ multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 	rm -rf "${ED}"/etc/ || die
 }
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-8.8.0.ebuild b/net-misc/curl/curl-8.9.1.ebuild
index db51f02670f5..29fe1924e39a 100644
--- a/net-misc/curl/curl-8.8.0.ebuild
+++ b/net-misc/curl/curl-8.9.1.ebuild
@@ -26,16 +26,24 @@ fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
 SLOT="0"
-IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
 RESTRICT="!test? ( test )"
 
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
 REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+	)
 	ssl? (
 		^^ (
 			curl_ssl_gnutls
@@ -44,13 +52,25 @@ REQUIRED_USE="
 			curl_ssl_rustls
 		)
 	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
 	curl_ssl_gnutls? ( gnutls )
 	curl_ssl_mbedtls? ( mbedtls )
 	curl_ssl_openssl? ( openssl )
 	curl_ssl_rustls? ( rustls )
-	nghttp3? (
-		!openssl
-		alt-svc )
+	http3? ( alt-svc quic )
 "
 
 # cURL's docs and CI/CD are great resources for confirming supported versions
@@ -60,20 +80,21 @@ REQUIRED_USE="
 # - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
 # However 'supported' vs 'works' are two entirely different things; be sane but
 # don't be afraid to require a later version.
-
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
 RDEPEND="
 	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
 	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
 	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
 	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
 	ssl? (
@@ -104,7 +125,7 @@ BDEPEND="
 	test? (
 		sys-apps/diffutils
 		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
 	)
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
 "
@@ -136,8 +157,6 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-prefix-2.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${P}-install-manpage.patch
-	"${FILESDIR}"/${P}-mbedtls.patch
 )
 
 src_prepare() {
@@ -264,8 +283,9 @@ multilib_src_configure() {
 		--without-libgsasl
 		$(use_with psl libpsl)
 		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
 		--without-quiche
 		$(use_with rtmp librtmp)
 		--without-schannel
@@ -281,7 +301,13 @@ multilib_src_configure() {
 		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
 	)
 
-	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
 		myconf+=(
 			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
 		)
@@ -301,30 +327,6 @@ multilib_src_configure() {
 		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
 	fi
 
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
 }
 
 multilib_src_compile() {
@@ -370,3 +372,11 @@ multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
 	rm -rf "${ED}"/etc/ || die
 }
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index b42cca9c5152..94d88b092468 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -26,14 +26,16 @@ fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
 SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
-IUSE+=" +psl +progress-meter quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
 # These select the default tls implementation / which quic impl to use
-IUSE+=" curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
 RESTRICT="!test? ( test )"
 
 # Only one default ssl / quic provider can be enabled
 # The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
 REQUIRED_USE="
 	quic? (
 		^^ (
@@ -41,6 +43,7 @@ REQUIRED_USE="
 			curl_quic_ngtcp2
 		)
 		http3
+		ssl
 	)
 	ssl? (
 		^^ (
@@ -50,8 +53,20 @@ REQUIRED_USE="
 			curl_ssl_rustls
 		)
 	)
-	curl_quic_openssl? ( openssl )
-	curl_quic_ngtcp2? ( gnutls )
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
 	curl_ssl_gnutls? ( gnutls )
 	curl_ssl_mbedtls? ( mbedtls )
 	curl_ssl_openssl? ( openssl )
@@ -71,9 +86,9 @@ RDEPEND="
 	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
 	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
 	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
 	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
@@ -116,7 +131,7 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
 "
 
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/curl/curlbuild.h
@@ -330,7 +345,7 @@ multilib_src_test() {
 	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
 	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
 	# -v: verbose
-	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
 	# -k: keep test files after completion
 	# -am: automake style TAP output
 	# -p: print logs if test fails
diff --git a/net-misc/curl/files/curl-8.9.1-sigpipe.patch b/net-misc/curl/files/curl-8.9.1-sigpipe.patch
new file mode 100644
index 000000000000..d308fc4420e1
--- /dev/null
+++ b/net-misc/curl/files/curl-8.9.1-sigpipe.patch
@@ -0,0 +1,26 @@
+https://github.com/curl/curl/commit/3eec5afbd0b6377eca893c392569b2faf094d970
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 5 Aug 2024 00:17:17 +0200
+Subject: [PATCH] sigpipe: init the struct so that first apply ignores
+
+Initializes 'no_signal' to TRUE, so that a call to sigpipe_apply() after
+init ignores the signal (unless CURLOPT_NOSIGNAL) is set.
+
+I have read the existing code multiple times now and I think it gets the
+initial state reversed this missing to ignore.
+
+Regression from 17e6f06ea37136c36d27
+
+Reported-by: Rasmus Thomsen
+Fixes #14344
+Closes #14390
+--- a/lib/sigpipe.h
++++ b/lib/sigpipe.h
+@@ -39,6 +39,7 @@ struct sigpipe_ignore {
+ static void sigpipe_init(struct sigpipe_ignore *ig)
+ {
+   memset(ig, 0, sizeof(*ig));
++  ig->no_signal = TRUE;
+ }
+ 
+ /*
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 765f8ac2bd9d..4309c49bad92 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,8 +4,11 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
 DIST dropbox-lnx.x86-202.4.5551.tar.gz 113668681 BLAKE2B 2590c89af767803b77ff7bd57e4978c90a90be6f6394f7058393045fa4f3c68ae97ab365a460eccf38ab1e0b0a58b0e33aa482348a0bdf040dbe71d0bf683eeb SHA512 d5176c6c4b8f178fced661ef6df73fb767c3e7ff7f111df4829ab258d218586e128acb4187de6d840a0faca5a8766ea97b77c4d5c915fbd944be458ff07b8765
 DIST dropbox-lnx.x86-203.4.4857.tar.gz 113474071 BLAKE2B 109111bca49d7c59d9f7c28b9c012953b8cb01a116cdfe757b0c37b9a168e12ed61501cf313c5b5264fbbafa1528d5e2c884de51c3e3a18318dfd195b14ff7d1 SHA512 54945ecb11094d1a73a96f0469415eee8c2b936a22f8a9410ea5cac75e5eda4b3db72def487eef6f113e6bac7eb656403587fbaab4503bb331032648225660a3
+DIST dropbox-lnx.x86-204.4.5420.tar.gz 113538291 BLAKE2B bd8bb5a2ff327627d9664f93a9c68cc01b6a745b69fa1d312e3f64da7edc9ef62da45807d5fdfcdcad194a5eebf6562b67e22abce241c435c37c9d46d485cae9 SHA512 868350b68e77a91d4a1e74ede5cf4b219b998089956c1827c96f36fd6401a8bf058d573d31485e1ca94e7d2c72a6c20f34563d5c04ed2833971d8f2bc41de08e
 DIST dropbox-lnx.x86_64-202.4.5551.tar.gz 116236652 BLAKE2B f8a7c45ed45ce70580cb0c2f23e83c06098b8792e4a47b01f8ea9d2b1674b6d6470450edc25d58917630106b9f3ba49c20e87829b2f594d9e3a458d2586276fe SHA512 2d33f9f6d7a8b59f381ed43033c7638a54ae0a84f68845127505f6eb7ef00fbae490d7ba8d4f5e31790a39348612db665591e2785870acf816d60ca6d20097c3
 DIST dropbox-lnx.x86_64-203.4.4857.tar.gz 116080942 BLAKE2B 44b039a1478bc48a01c2a6c81250417c753dacbac0c7b393e2bf5b1ed1fdcb06855432c6f48bdc3d734d036f5f6e769eee6fdc9ac1685d003db711c9a6646112 SHA512 372ebe6a621f9df7143a4f685d9a6c305d3b124813b13514dd56a409ec473240115000bbedad624efc40c36660811e4a347f0847a9c9a1e0e526f20559f3390d
+DIST dropbox-lnx.x86_64-204.4.5420.tar.gz 116062581 BLAKE2B a9740c2c7d1c36fa1b263c65c3bce119e0974409451af0e17038184de4986a6a5349b7b687c4f484fadd8d3698ddeb030358cd22a4a0e28a9d46eb88b64f9544 SHA512 850804590b7fc1932ef421451355e47b55ecf40c1090382317b4dad168f6dad67448ec9df59296da010a50f39dce1e62621177f7e0b3c250bcb1be33daf62ceb
 EBUILD dropbox-202.4.5551.ebuild 2854 BLAKE2B 83fb409fd9c6af41a884408f2258e3563a2d146f1fba8edfcc7e5fee674b8396cc1a674207533091721a2709118cdf655f24c5871ecdda663eb96da9b05b3861 SHA512 17f3737762fbaf48508b911b9605b629a876f3a503367298250ced4e81d599b6d496ef7f8b2742c0ccb9df89d8f8002ee732bd66f67148d474ae79fc96336ba8
 EBUILD dropbox-203.4.4857.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785
+EBUILD dropbox-204.4.5420.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-204.4.5420.ebuild b/net-misc/dropbox/dropbox-204.4.5420.ebuild
new file mode 100644
index 000000000000..7d9715a71882
--- /dev/null
+++ b/net-misc/dropbox/dropbox-204.4.5420.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+	fi
+
+	make_desktop_entry "${PN}" "Dropbox" "dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 165fa9a44087..eb890a75fb76 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,7 @@ AUX freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch 10363
 AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23f4dafe90c6b145b2bfe13d1cc6ec3c0729b6b6d3394da3a090fb73903b775b9d51711416ba0a56786e141d7a2bad SHA512 f45a38b36b5caee74be8b590b80e56adb91b42f41ad8149a97ef2ed0f5c10a32e4024149d75e4eb0b0242f086e71d9367ffd4c9dd307f113f1d25f1cc2c0793e
 AUX freerdp-2.11.7-type-mismatch.patch 758 BLAKE2B 3841272554c8b5e3bbd6a94fe00c8a9d429a3ef82f1723ff27a15c23d1be91bc3ec5bc1a9cc7a87911e3d690f2e53a6b46f65a77a5c3f738a585544b512e5743 SHA512 49e5b67904cb84b658c28cf98845b152c4421d506440e8efe04a388aa72d22dee5e41350f2acfeebd0bfc859ff8bc6a2aa654fabecadede3d8fc9166420de2e7
 AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada3bf2165d6b271f259f4a49b40d4ca2c2de75e5321156cbedcca77240663e143986073d5a49e74b2b6caf456a6136d83673becf6c35e SHA512 c44165fc843742d1cb5859f24c6eaa78cda13837315ca3fde48092835992998701a670a66cf351c406153a65166050b5523e432789b5b6e2151227ea43ef034d
+AUX freerdp-3.6.3-backports.patch 9269 BLAKE2B 24f9c976c5406b967a207179a2fb86f1f1ffec73ff46d7f049f628817aac7ccf1a71e6f76c5fbd5e569a599e01880ee5d27ad3f328a27c836972984ce6d53e4a SHA512 febce83fe7006b4e3112dcd385d3c2911290f7aa9cdc702bbd2d2163ef153a86dd2ba57afac75c491505bbc947e02db74c185d86abad832a38c6f091c2602c80
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e
 DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76
@@ -12,6 +13,6 @@ EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc299
 EBUILD freerdp-2.11.7.ebuild 4059 BLAKE2B f104ca6d06a417cc3e5930fe85eadbf9fa10c61bb52e544daeaaf3316c216ba6363b0b1d3d1a0b79455fe9613831748901f0edce28f5d2df9cca8abffdd349a3 SHA512 fe9ebbcacf18cb59d16458c5cfe47cf15fe89150ebfeca176b6d288b96112ef0965e517171f87c16e62590eee8b3a6a106fe2ba87062061e98dd36f33671b18a
 EBUILD freerdp-2.9999.ebuild 4014 BLAKE2B 8e16a4c7dc35301402fbae5da1ba9da5673f0b5c4d8da811e5671f91816265a7dad92b5ae69533f44c084cec371962eac4499a0bb7ce98665336abf3ddaa730e SHA512 7ca53326d24353a2e1bc2d5c006c6a0866c98363d11ab231ff1c086119545979019ad9e13d9e40d4903bb020f4b891a041c0c93edfd566def19296b870e968fc
 EBUILD freerdp-3.4.0-r12.ebuild 4202 BLAKE2B 5f55807ba41422d61497b7ee08a0b150ad41a92ea50a83c9d1aaac06700b1b7b99927c651a9e861860935bb0643174be983e09e2b9f07e5cf99bb3c75016d2b1 SHA512 6a3029a833773ae2e30da1510d4a7d0b185cc300d1c53c164ae8da5f63b3fd63d2a0bc90616546b0ce45f162eda34b907230392267facb948123ea3ef60d21a2
-EBUILD freerdp-3.6.3.ebuild 4283 BLAKE2B 20357f723d89b13d6b4338a14bb783b8615be3b8b47248b2c8c1fb5961e3a1006aa1322ab7a55bec8d745fb61a8e0738ace694d8168c66bf7425318b0504b963 SHA512 dd71a8c9b37d32df03afb619f0bdfb261cc8b31e59d869fcc97f3d7ba6d09df8caff0b6bb5d427d6b6cd58a020de3f3412c5fdd3b29562b1b9180451036247b5
+EBUILD freerdp-3.6.3.ebuild 4341 BLAKE2B 6cae4f931a469fc450bbc6c9a91c96593d5c5ac72f494b6a5698c64f7b27cdf8631660e7b4ef9ea08cec3f3f7c10739aaf77ac10ddb99393a96fa256bc8055c1 SHA512 bd0521d9f012ace258461ad1d7b840b262b04bc735b19700adffb2eb229889bbe9f08a29eae164438e5bae2a7ee6c459e3be408eb00b261092d889a6454e2f25
 EBUILD freerdp-9999.ebuild 4288 BLAKE2B 46b1483dc049b9a791bc35d29a8c411a5d9a3c9efb0768ccfa51b9f95fb050815611fc25339f55797ca605a0bf0f9cdea27bac61ee532c6e88932068b8a8c237 SHA512 284f977053213df5d2ca5f7e1e778a513a38e0c37e853133ec3f7a1520940f742ab9112d8383190cb2fd17d5f3cc7a08b88cd9efb199746db069a8a54c7eb517
 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae
diff --git a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
new file mode 100644
index 000000000000..473b27cbab02
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
@@ -0,0 +1,224 @@
+https://bugs.gentoo.org/936406
+https://github.com/FreeRDP/FreeRDP/pull/10410
+
+From 776083234b61224f8e3412c31be406b11509b7db Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Tue, 23 Jul 2024 09:14:04 +0200
+Subject: [PATCH 1/2] [warnings] fix unused-but-set-variable
+
+---
+ channels/parallel/client/parallel_main.c | 4 ++++
+ channels/printer/client/printer_main.c   | 2 ++
+ channels/serial/client/serial_main.c     | 4 ++++
+ channels/tsmf/client/tsmf_media.c        | 2 +-
+ channels/urbdrc/client/data_transfer.c   | 3 +--
+ libfreerdp/core/gateway/tsg.c            | 3 +--
+ libfreerdp/core/heartbeat.c              | 3 +--
+ libfreerdp/gdi/gfx.c                     | 7 ++-----
+ winpr/libwinpr/ncrypt/ncrypt_pkcs11.c    | 3 ---
+ 9 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c
+index ce574b87b084..4be078693870 100644
+--- a/channels/parallel/client/parallel_main.c
++++ b/channels/parallel/client/parallel_main.c
+@@ -160,6 +160,8 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp)
+ 		return ERROR_INVALID_DATA;
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+ 	if (!buffer)
+@@ -220,6 +222,8 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.5 Processing a Server Write Request Message
++	               * ignore offset */
+ 	if (!Stream_SafeSeek(irp->input, 20)) /* Padding */
+ 		return ERROR_INVALID_DATA;
+ 	const void* ptr = Stream_ConstPointer(irp->input);
+diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c
+index 8d11f9b5ccd3..c458c0fdcfca 100644
+--- a/channels/printer/client/printer_main.c
++++ b/channels/printer/client/printer_main.c
+@@ -515,6 +515,8 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp)
+ 		return ERROR_INVALID_DATA;
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPEPC] 2.2.2.9 Server Printer Write Request (DR_PRN_WRITE_REQ)
++	               * reserved for future use, ignore */
+ 	Stream_Seek(irp->input, 20); /* Padding */
+ 	const void* ptr = Stream_ConstPointer(irp->input);
+ 	if (!Stream_SafeSeek(irp->input, Length))
+diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c
+index 22f799a16ba6..c98a27ea9040 100644
+--- a/channels/serial/client/serial_main.c
++++ b/channels/serial/client/serial_main.c
+@@ -241,6 +241,8 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+ 	Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	Stream_Seek(irp->input, 20);            /* Padding (20 bytes) */
+ 	buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+@@ -301,6 +303,8 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+ 	Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	if (!Stream_SafeSeek(irp->input, 20))   /* Padding (20 bytes) */
+ 		return ERROR_INVALID_DATA;
+ 
+diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c
+index 5f47090ae37b..b20db415944d 100644
+--- a/channels/tsmf/client/tsmf_media.c
++++ b/channels/tsmf/client/tsmf_media.c
+@@ -1161,7 +1161,7 @@ BOOL tsmf_stream_flush(TSMF_STREAM* stream)
+ 		stream->presentation->audio_end_time = 0;
+ 	}
+ 
+-	return TRUE;
++	return ret;
+ }
+ 
+ void _tsmf_presentation_free(void* obj)
+diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c
+index 56f3267ccc35..5f9a6e0e479e 100644
+--- a/channels/urbdrc/client/data_transfer.c
++++ b/channels/urbdrc/client/data_transfer.c
+@@ -1038,7 +1038,6 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_
+ 	BYTE bmRequestType = 0;
+ 	UINT16 Value = 0;
+ 	UINT16 Index = 0;
+-	UINT16 Padding = 0;
+ 	wStream* out = NULL;
+ 	URBDRC_PLUGIN* urbdrc = NULL;
+ 	const BOOL noAck = (RequestField & 0x80000000U) != 0;
+@@ -1061,7 +1060,7 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_
+ 	Stream_Read_UINT8(s, Request);             /** Request */
+ 	Stream_Read_UINT16(s, Value);              /** value */
+ 	Stream_Read_UINT16(s, Index);              /** index */
+-	Stream_Read_UINT16(s, Padding);            /** Padding */
++	Stream_Seek_UINT16(s);                     /** Padding */
+ 	Stream_Read_UINT32(s, OutputBufferSize);
+ 	if (OutputBufferSize > UINT32_MAX - 36)
+ 		return ERROR_INVALID_DATA;
+diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c
+index fdd01089810a..60ccdc5a63c6 100644
+--- a/libfreerdp/core/gateway/tsg.c
++++ b/libfreerdp/core/gateway/tsg.c
+@@ -693,14 +693,13 @@ static BOOL tsg_ndr_read_packet_response(wLog* log, wStream* s, UINT32* index,
+ 	UINT32 MaxSizeValue = 0;
+ 	UINT32 MaxOffsetValue = 0;
+ 	UINT32 idleTimeout = 0;
+-	UINT32 reserved = 0;
+ 
+ 	WINPR_ASSERT(response);
+ 
+ 	if (!Stream_CheckAndLogRequiredLengthOfSizeWLog(log, s, 2, sizeof(UINT32)))
+ 		return FALSE;
+ 	Stream_Read_UINT32(s, response->flags); /* Flags (4 bytes) */
+-	Stream_Read_UINT32(s, reserved);        /* Reserved (4 bytes) */
++	Stream_Seek_UINT32(s);                  /* Reserved (4 bytes) */
+ 
+ 	if (response->flags != TSG_PACKET_TYPE_QUARREQUEST)
+ 	{
+diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c
+index 1fb608962f0a..6a77bd562ceb 100644
+--- a/libfreerdp/core/heartbeat.c
++++ b/libfreerdp/core/heartbeat.c
+@@ -25,7 +25,6 @@
+ 
+ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s)
+ {
+-	BYTE reserved = 0;
+ 	BYTE period = 0;
+ 	BYTE count1 = 0;
+ 	BYTE count2 = 0;
+@@ -38,7 +37,7 @@ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s)
+ 	if (!Stream_CheckAndLogRequiredLength(AUTODETECT_TAG, s, 4))
+ 		return STATE_RUN_FAILED;
+ 
+-	Stream_Read_UINT8(s, reserved); /* reserved (1 byte) */
++	Stream_Seek_UINT8(s);           /* reserved (1 byte) */
+ 	Stream_Read_UINT8(s, period);   /* period (1 byte) */
+ 	Stream_Read_UINT8(s, count1);   /* count1 (1 byte) */
+ 	Stream_Read_UINT8(s, count2);   /* count2 (1 byte) */
+diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c
+index c9016a995e6b..59c7a377f8db 100644
+--- a/libfreerdp/gdi/gfx.c
++++ b/libfreerdp/gdi/gfx.c
+@@ -1855,14 +1855,11 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx,
+                                    pcRdpgfxUnmapWindowForSurface unmap,
+                                    pcRdpgfxUpdateSurfaceArea update)
+ {
+-	rdpContext* context = NULL;
+-	const rdpSettings* settings = NULL;
+-
+ 	if (!gdi || !gfx || !gdi->context || !gdi->context->settings)
+ 		return FALSE;
+ 
+-	context = gdi->context;
+-	settings = gdi->context->settings;
++	rdpContext* context = gdi->context;
++	rdpSettings* settings = context->settings;
+ 
+ 	gdi->gfx = gfx;
+ 	gfx->custom = (void*)gdi;
+diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
+index 5f0a80262a30..74ee99ec3a2c 100644
+--- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
++++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
+@@ -356,7 +356,6 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_
+ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state)
+ {
+ 	CK_OBJECT_HANDLE slotObjects[MAX_KEYS_PER_SLOT] = { 0 };
+-	const char* step = NULL;
+ 
+ 	WINPR_ASSERT(provider);
+ 
+@@ -418,7 +417,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
+ 		{
+ 			// TODO: shall it be fatal ?
+ 			loge(TAG, "unable to initiate search", rv, i, state->slots[i]);
+-			step = "C_FindObjectsInit";
+ 			goto cleanup_FindObjectsInit;
+ 		}
+ 
+@@ -428,7 +426,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
+ 		if (rv != CKR_OK)
+ 		{
+ 			loge(TAG, "unable to findObjects", rv, i, state->slots[i]);
+-			step = "C_FindObjects";
+ 			goto cleanup_FindObjects;
+ 		}
+ 
+
+From f22974a95a6b2d647174f4195f2ba4789105afaa Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Tue, 23 Jul 2024 09:15:00 +0200
+Subject: [PATCH 2/2] [winpr,utils] include current source dir
+
+---
+ winpr/libwinpr/utils/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt
+index 2c5efb3295a5..6bf40e77b1a6 100644
+--- a/winpr/libwinpr/utils/CMakeLists.txt
++++ b/winpr/libwinpr/utils/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ include(CheckFunctionExists)
+ include(CMakeDependentOption)
+ 
+-set(CMAKE_INCLUDE_CURRENT_DIR ON)
++winpr_include_directory_add(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ option(WITH_LODEPNG "build WinPR with PNG support" OFF)
+ if (WITH_LODEPNG)
diff --git a/net-misc/freerdp/freerdp-3.6.3.ebuild b/net-misc/freerdp/freerdp-3.6.3.ebuild
index 54782cebb998..2603e73e7407 100644
--- a/net-misc/freerdp/freerdp-3.6.3.ebuild
+++ b/net-misc/freerdp/freerdp-3.6.3.ebuild
@@ -108,6 +108,10 @@ RDEPEND="${COMMON_DEPEND}
 	smartcard? ( app-crypt/p11-kit )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-3.6.3-backports.patch"
+)
+
 option() {
 	usex "$1" ON OFF
 }
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index b4aa614390d2..efe285049da1 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,9 +1,4 @@
-DIST gallery-dl-1.26.9-5227bb6.patch 3415 BLAKE2B 864d6877ba9f6ee6449465ebce9b6648325c176f2ae4062c27e7059852b05983a99f203aabc9e3c361214b14d489bdb450920879171385474ddec50d83f1b937 SHA512 6931eeb00f6fcd6b9005672aa23ed2b0270846758a762a8a86ef51ca860bea2563673b02881abd5a1a224b7518a89e66de46da5cc0a7994d58078886aa090c64
-DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb
-DIST gallery-dl-1.27.0.gh.tar.gz 682957 BLAKE2B 7a376c22d970533ac3668d9893fed74551100463d7d24c93940971238c568b70c644cd78df1edb506c9a5ef0d7154d3566f61fb9bcc047c47f0868900936b5d5 SHA512 129df83eafecf3ce680318ff9360fd99feb2136e236f377eb7921406e3f4ea93bb2479265dcec18cae77b83f013223612c0cae7ffd7ac2e122e0395de7beb92a
 DIST gallery-dl-1.27.1.gh.tar.gz 686087 BLAKE2B c80f37d314671637f435957abf9d79d01d421e48c89e90a3290e6fbf6e32f89d4b7495deeaf2ce0528750b65d4b404108fe78bc42f0e39dda4bcfd4267aa9dff SHA512 d3243bd23e7a743d98b9745d78b653546a49a97dd8468b60014fa6ba74071de8057c8b479dc3d74854b4c194034b027fe15bc530a60dea34dcc6221b105c285c
-EBUILD gallery-dl-1.26.9.ebuild 1297 BLAKE2B 4887d8139f44daa0a8ce4ad56ac50107165e2ca4f9f50e71076531770ad8d17cb67c6485581cca5f03f16476f9042523aed9cd1c6a59a27a38215a53d45f2d16 SHA512 d2304f95acc119c0229e104d5343de465d60246af78a4c73c15da25ad8fd57cbaba540d9bc4a4ec70502304b2ff138475712a005757047864396237fa38e3fc5
-EBUILD gallery-dl-1.27.0.ebuild 1135 BLAKE2B 6e723f8f07315caca81761ee50766967dddb9de138ed0abdbedb1478b1f2185546b8d9b5eeb2a57fde4f039c901291227a700d18a605b101e44d782b33239ac2 SHA512 204d46d1265b23c1674de3bd1e234d98e705c9a156ca85d775f916def176ac4371b868c94e4d76d9b26c3aa0fb26bf6200259ec934b62687f9c329e335de46cf
-EBUILD gallery-dl-1.27.1.ebuild 1142 BLAKE2B e0b7b410c71ec272bf5c02ba6489c84f7bc9251c64e35774f599a130b356ce2c7bd2e51c345defa812664d0c7e2381ebed78edb5b087c741ef7d42fcc11afa58 SHA512 357e03c77c606d5c98b98b1a97226180c752efe086800c95c9e5d89e442985c8875add96714443960005b969ddab640ef84ef6383cf169e46f1940f418ee0ee4
+EBUILD gallery-dl-1.27.1.ebuild 1135 BLAKE2B 6e723f8f07315caca81761ee50766967dddb9de138ed0abdbedb1478b1f2185546b8d9b5eeb2a57fde4f039c901291227a700d18a605b101e44d782b33239ac2 SHA512 204d46d1265b23c1674de3bd1e234d98e705c9a156ca85d775f916def176ac4371b868c94e4d76d9b26c3aa0fb26bf6200259ec934b62687f9c329e335de46cf
 EBUILD gallery-dl-9999.ebuild 1142 BLAKE2B e0b7b410c71ec272bf5c02ba6489c84f7bc9251c64e35774f599a130b356ce2c7bd2e51c345defa812664d0c7e2381ebed78edb5b087c741ef7d42fcc11afa58 SHA512 357e03c77c606d5c98b98b1a97226180c752efe086800c95c9e5d89e442985c8875add96714443960005b969ddab640ef84ef6383cf169e46f1940f418ee0ee4
 MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae
diff --git a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
deleted file mode 100644
index 74f78f4c094c..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="
-		https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-		https://github.com/mikf/${PN}/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch
-			-> ${P}-5227bb6.patch
-	"
-
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${DISTDIR}/${P}-5227bb6.patch" )
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Tests against real servers, some tests always fail and some are subject to change.
-	rm test/test_results.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild
deleted file mode 100644
index 64a17799c780..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.27.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Tests against real servers, some tests always fail and some are subject to change.
-	rm test/test_results.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild
index fea34fbde450..64a17799c780 100644
--- a/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.27.1.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 17ba2d175a63..cacbe0032a84 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.46.tar.gz 5058596 BLAKE2B 1b3b84d3677c815bfe950f0fe2bf618bca12d1c854bf9d6328611feb41344b952a8579716db936a6010bbe4db772e9d3cc2e57b365b2e66264b9fd4dee576c4b SHA512 25ca6a9bf626182ae16662bc7d9f571c14b107c4036ccba0b4c2d562aa4f26fd7af23765de53e4159f67e48632548d3148dbb9c9ae19bffbef50c48a10f85a01
 DIST gns3-gui-2.2.47.tar.gz 5064818 BLAKE2B 8d8fea47e6ed0256e8e22659a8eed24dc18183b44d4ca3c1a863b0c8f5e45471b5ffc82c267ad18f4e97f5587f0a615586364ed26a340e409f11b74375916c3f SHA512 e9637d0789c7ee656a8fd366be150e70d9045240fff962b30b9beff5b11dd22a3ede9565c18b02f934ad610bf05687fce7a7dbd6c8f5cea6cf22db2c1871781e
-EBUILD gns3-gui-2.2.46.ebuild 1073 BLAKE2B 051752911b728153fcfaba792ff1055c04612ac0fa312209cf6eb2b41cea8052ec3e923e193b4068e9349e6c0ee925a40513e987ca2f220a34c289bc5c7fee9c SHA512 c5f1d73edc8c5afb4862787ca86d08b09751d0fce35fd26a42dab0abee76555f05c6a108e7f54127063d731266b22fe166242ca051e94811541f830b673a87f5
+DIST gns3-gui-2.2.48.1.tar.gz 5065473 BLAKE2B 4536997b9bdfad93544582f1c8ef57953b4a83ca0300bdfdc2ebc6dc70db66a779cb924bbae71589ac0971107bcd70ecb9f095346cceef026761d546c7fce7ce SHA512 74c4b9b79a1bda42e7f4bea4439c30ef53f5d3a792295a9395e6a27c5bb7a9bdee9278aafc19f1c283621cff2f79844f0b97ac1ecde48bf7bf897f97fa798479
 EBUILD gns3-gui-2.2.47.ebuild 1072 BLAKE2B a42adcf445a86b8597e90534cebc39bf6fb3348f9acfc7d3fedb0bba6dd08c9bf502974f35723a63fea08821e49fd7bf786aac26f083920df145ccf9d8b5e581 SHA512 c80e9bfb265a527ea6da439b87d0c30f76afc727e84758712ea75659c7365f7e233c2f888f45c62de61bf6878328540900997ef96e7a7bb2621c49e2dd204c7b
+EBUILD gns3-gui-2.2.48.1.ebuild 1072 BLAKE2B 3bced1ebf9fd944c3600a26b68ac728f84583f190731000649f8e9b146ad42f9e5dd39b972077bd556e18606a66add8e51162419c0c26beb60837aaf8aaeb220 SHA512 249414318c4e1bbfad875a0dd6ddc005f1ce2ac94307ee9b5aad30c97c5eff9abe0ebe4ce501bd57270c3b2d12838c952582f8e01f02a5b60af065fc890c8a09
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.48.1.ebuild
index 9ced99155546..031b643becd8 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.48.1.ebuild
@@ -19,10 +19,10 @@ KEYWORDS="~amd64"
 #net-misc/gns3-server version should always match gns3-gui version
 RDEPEND="
 	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.8[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 1197581b06aa..ba0df8b1d680 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.46.tar.gz 10745825 BLAKE2B 280c16e76a73b638ea66c1c8a674a0e11eab3f0dee612b40c480d604244bf6e78d32c79f6a4587a95b88ce601ba3911672b6402831fce8c7a721465dcdd2da9d SHA512 6f7e52c0f1fcdbb0af7963cfaf1cd17c7d6af36e1ac89b4b2e725c14ff17d1560a50d286ea351ab2649560c09dcac62b35add9492f06c5068010129751b0848e
 DIST gns3-server-2.2.47.tar.gz 10850105 BLAKE2B c83cdf6495ddc4997347ff41416a684b6c6a516eefa6d1811e8855a4954edbace53aefb817ddce8cb08526c798b02fad11b5bb3b70a076be97a4a1ab92dd48b7 SHA512 1634e813feaaef9b7d44256a34c58fc1e339fce2d57dc41d7ff8ba86c2ed3999f19063754d5bc928d99319f3d2e8949a72ebbe087f82a8dc56dfbd6ba06f8bd4
-EBUILD gns3-server-2.2.46.ebuild 1887 BLAKE2B 161d290ff8157d99b6f7692699622ef0c735e49a1ccfdf84feb7e1c43eb7e8738c476594d1476366b9a21c0d22269164f6f340bcb4d3edd5c4051e48db2c4af1 SHA512 f0bf75787a0e0c4ae2c71a8da90d517177b4d7bbfc191561dfacb5553959a69f5f7030ed31da917c526e94e8e8ba2c0de903c0bc6ac3e560166849f0c50ee775
+DIST gns3-server-2.2.48.1.tar.gz 10851841 BLAKE2B 021ace62b3d3ef379014948df1808ecfecd9f8a15a6f225a0219433e74ee811ec67b8caeb507ca7b99244f34e9ff4f9f95d4f80a7b472413ae064a86347821f2 SHA512 f367d812393d90895243fb29b580989fe2927e796492427c5d962a67e97d5e11d5e3fb861d5cdf196f6d7e7f70f6db083f8fc0d2c359bf0535e7b86cecbb0ab3
 EBUILD gns3-server-2.2.47.ebuild 1981 BLAKE2B 5e529ff7809a2781ef2621ab78d36645f0c78118a987dc1ac6feea4fa847ba07cf7980afaa1221a7340c014ce1e7fefc7fdd701bb559eb8d0e270a819cf84ad6 SHA512 185044c457890849520f22230876c605384be598cd1514bc27fd5fac60cde522446440f6546e7d259da150c70d0b0b4b9e721805a227c5f4389cdafc1700abae
+EBUILD gns3-server-2.2.48.1.ebuild 1981 BLAKE2B cd0cffb54a1925e1c2010dcff628acc6318a1a3834ece6bb99f6d6b389d318d33022fd79ee2565f396a13d9d41360498aeadafb9d1afd98ff0d5abdf00db1df6 SHA512 39ed390450d6b5f48d7eb9cf00c33d07fd0a934df0f074e5cb124bdc1e9a202df3124ef0130d50c2f8cb8d2fd76f6ad9151b6b329709257713b28fd363157091
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.46.ebuild b/net-misc/gns3-server/gns3-server-2.2.48.1.ebuild
index 3a083dab53e0..f4f3abba999d 100644
--- a/net-misc/gns3-server/gns3-server-2.2.46.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.48.1.ebuild
@@ -14,22 +14,24 @@ SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	acct-group/gns3
 	acct-user/gns3
 	app-emulation/dynamips
-	>=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-24.1.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.9.5[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.8[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox[static]
 "
diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest
index c2b4d4427f89..74b0defbb91c 100644
--- a/net-misc/haeredes/Manifest
+++ b/net-misc/haeredes/Manifest
@@ -1,5 +1,3 @@
-DIST haeredes-0.5.3.tar.gz 20357 BLAKE2B 54be7f0a4bd09cd85c0cf7b2baed589258749bb2b05764ca61d4656e6c19832dfbd249d425e6a9ede30fc8f5711392491adca4c025014dc6e05c6009108c98dd SHA512 3bf0a14b45f9c3c929cc97559ca03a3df1c542196daf574917171dacd3c47117a908ed0c849b3527bd2dcf8f99a15228845d3a8ae97e051f707162d62cfccc13
 DIST haeredes-0.5.4.tar.gz 20360 BLAKE2B b3dae1cf300fc871d9a3b49431000e9e6100142d55d7a7ea06be069ef58353a59622b7b40dabf48e1bde2e9fcab20825b5e00d9d8c8856ab81a4c713c0f33475 SHA512 6ed9b4d69a42c661a771746a584d76602988626064b239e90405e8a7930dc7495075e20b51560556b4d10ddf2df422a0e7d56fab5e424242ec3792743701a5ce
-EBUILD haeredes-0.5.3.ebuild 851 BLAKE2B 53c592fada6475cac53d02fb3bd17918d8e2e3226ab0dc15f41052310e1b2f24cf2593619c671a0fa5e140bbfd541be37818c4138b2358327576f9a0034f2e88 SHA512 80ec55c9f32410ab7066fdbd2cda3e1b84c215a9a4841093b67f52934bad3bc94dc43571f93110d67f3f712a637116c60e22d1bb7b0fab44f4fb6579eff444bf
-EBUILD haeredes-0.5.4.ebuild 847 BLAKE2B 7cca81c134151350b4fc50f480ecdd552d69288db869415622ce456b61dd3344645e77a0ae873490b254181ce9f8496d695f19527b8bddfbc89eb96e7636a3b6 SHA512 1b8877fa4f85d2fb46f10a0c4b36dd62fc4d5d08e481f204e2ef1cf56bb13e058318f97daed1c8e1618ce91d1d9c3ce5a9e5aad7975237cedd31d0c53fc9cf65
+EBUILD haeredes-0.5.4.ebuild 846 BLAKE2B a35e37520a601af4a9dc236139594c8f7598fede15eec3ec2aac926dbcc0c673bb09650c235240204a2dd6d1f7159b0a1f22a6903e9f288cb2d4fc5db79fcb9b SHA512 e7fb9674af1245a6577e29e67218d3f449c1f22eb4830da68a943b680b500eb91062b27c42528b508a119dbc8f21f3211bbb6fa5abda0db559b135f882e3d86f
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-misc/haeredes/haeredes-0.5.3.ebuild b/net-misc/haeredes/haeredes-0.5.3.ebuild
deleted file mode 100644
index 15a105ba5401..000000000000
--- a/net-misc/haeredes/haeredes-0.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Confirm delegation of NS and MX records"
-HOMEPAGE="https://michael.orlitzky.com/code/haeredes.xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# The test suite requires network access.
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/cmdargs-0.10:=
-	>=dev-haskell/dns-1.4:=
-	>=dev-haskell/iproute-1.2:=
-	>=dev-haskell/parallel-io-0.3:=
-	>=dev-lang/ghc-9.0.0:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.0.0
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/filemanip-0.3.6
-		dev-util/shelltestrunner )
-"
-
-src_install() {
-	haskell-cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-misc/haeredes/haeredes-0.5.4.ebuild b/net-misc/haeredes/haeredes-0.5.4.ebuild
index e9ac2f7ab731..f2cad8509cd2 100644
--- a/net-misc/haeredes/haeredes-0.5.4.ebuild
+++ b/net-misc/haeredes/haeredes-0.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 # The test suite requires network access.
 RESTRICT="test"
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
index 044b7fc12fef..566055ca56ab 100644
--- a/net-misc/hath/Manifest
+++ b/net-misc/hath/Manifest
@@ -1,5 +1,3 @@
-DIST hath-0.5.7.tar.gz 31087 BLAKE2B 2449872bae187dfd67ab94da7df55bec7a9735bcd85a9dbd96ef7ce1afdd3f83ed666eb02b6de54719ba32b96de75ff168136f07760023ea2db7bb55bf51f70e SHA512 daa1ae22e8a01f63db6849c7c9e90917051644c681848c66bbd5cb7178326a125868c9f52d506bb5561595fd1bb8b16ae922b91e1be44ccb86e346fc1730a6dd
 DIST hath-0.5.8.tar.gz 31116 BLAKE2B 3d6f91b1e286bbb88feab5f30a9164f19ae0bb886d39dd8c945b4c2b61106b6d9a233511b704b96c15176e9152f63d891f72a3ad11b64c8043e03c20ff705365 SHA512 c5a50e8c976f92f5d8fa3750098850f50198a3a07342e6fa3a2fa2faeb5e850780aef17d648781379a419671011f24749a0f24ca5c9d98cd48c94b0e5c871017
-EBUILD hath-0.5.7.ebuild 807 BLAKE2B b3f2983b9b4483e6036ec2ee91421214b506de6e597542f9aca80c05f3b8879c17db8c520c20d48dcfcb201ccff554d06ccca0e07a26c8740580cb79a22d8e55 SHA512 ad3e01802774138646503ac82b0e8438af50ffc52b8e338321414f3ba919d6f4d2fdf708258810064e506e81ed486c3d9f2137e44abc5816e2375e4bdcf63455
-EBUILD hath-0.5.8.ebuild 786 BLAKE2B c2b4e9d18b315820b22ddc7dab510b41bdfb3105171f42cc102d1cde3341d4dc41e0b345bb4f9c995eae5188527a7990204dea1f05d78166c7879e5fd0720f87 SHA512 7cf9b3d7453424583a8c0a2b4bb1036183c83a2d2e7b3daa3f2b54b73aa35a641100c437ac647e16f3a9856b8470382982cd0e7672cbaf625df7f55a0ab5d1bf
+EBUILD hath-0.5.8.ebuild 785 BLAKE2B a9f8722080c942a0d3dd91f9d53311cec1fb057f9f7646ab881084b030d3014ba9dc96dcd104a347b02666df4cb70814c9b8d59505ba774ac47c9e158f6fe464 SHA512 f83d6b2a0807c4996397b5595005ede04490b17a110cd6518b219964ba2505bff26a38447ae917dfc06e19ec66296a1f6a3b7ee5c8196f0e34be568725c66e63
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/net-misc/hath/hath-0.5.7.ebuild b/net-misc/hath/hath-0.5.7.ebuild
deleted file mode 100644
index fca6453aa95e..000000000000
--- a/net-misc/hath/hath-0.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hath manipulates network blocks in CIDR notation"
-HOMEPAGE="https://michael.orlitzky.com/code/hath.xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.10:=
-	>=dev-haskell/split-0.2:=
-	>=dev-haskell/tasty-0.8:=
-	>=dev-haskell/tasty-hunit-0.8:=
-	>=dev-haskell/tasty-quickcheck-0.8.1:=
-	>=dev-lang/ghc-9.0.0:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.0.0.0
-	test? ( dev-util/shelltestrunner )
-"
-
-src_install() {
-	cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-misc/hath/hath-0.5.8.ebuild b/net-misc/hath/hath-0.5.8.ebuild
index 80c9fd8405e9..e489a78d18a3 100644
--- a/net-misc/hath/hath-0.5.8.ebuild
+++ b/net-misc/hath/hath-0.5.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/cmdargs-0.10:=
 	>=dev-haskell/split-0.2:=
diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest
index e539ab3bbb4f..10f05bef72c3 100644
--- a/net-misc/inetutils/Manifest
+++ b/net-misc/inetutils/Manifest
@@ -1,3 +1,3 @@
 DIST inetutils-2.5.tar.xz 1670424 BLAKE2B 80ab4f4287328ceb75c33b8794ec21209ea95206a205ea60fbd8f1d7e7fa01eec228ea50d61c8bb37a88cd3144b58ecfecd0af440ba85d43d5ea19565d88a6d4 SHA512 dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c
-EBUILD inetutils-2.5.ebuild 2073 BLAKE2B b085e67a4f1817e67286523bf3c4841cee792876351b83fd6abe707aad21f006fc83342ed71969b6d40bf43c5f4f44f34844b5ecc6b1c0f87a864cda69cfe35a SHA512 2c6cea69b4f6abb9084bdefc4a5abccca661123117d79382deeaf00e271c4a63f25a7493de032bf42d5e0194e19ff273490653c2c6c58fed2f3eade0a720d5e6
+EBUILD inetutils-2.5-r1.ebuild 2133 BLAKE2B fc957717cb4a706623b2d304dbee90d283adc54d12ebaecb9abda244c589d51a058f29e9d452231655b248e8a8dc42993f3ec3e42e7e179862107d254b4fd3ae SHA512 3965c47234aea7ebf41f9ee2e4825bf7611db73b828fb3f3e4a11950aa8297c8aaac703f1d6b1cf3c25a50cfe121cf719dfc3b88357fb7531012e05c833a0257
 MISC metadata.xml 1421 BLAKE2B 71e33b4a980f4a4c3819cecfe8a2421970b4d0120cd06c515553b629ba55151a4d8e4be437adbfae147f62ba35cf548ad8861871709242eea1582855c4250d49 SHA512 55906bb8ca4dbb54d2cfe7253e10c977d3a8b8fd46d10be3ad36d78a60d9ebc7be31e0b5169f0f5eac5dab1b375605d3c4276091599fe6784c6ed01d43246e48
diff --git a/net-misc/inetutils/inetutils-2.5.ebuild b/net-misc/inetutils/inetutils-2.5-r1.ebuild
index adc14e092684..3ebcf02e40ee 100644
--- a/net-misc/inetutils/inetutils-2.5.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${DEPEND}
 	rsh? ( !net-misc/netkit-rsh )
 	logger? ( !sys-apps/util-linux[logger(+)] )
 	telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
+	telnetd? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
 	tftp? ( !net-ftp/tftp-hpa )
 	whois? ( !net-misc/whois )
 	ifconfig? ( !sys-apps/net-tools )
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 546149149832..1ae8ea0acd61 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -2,14 +2,17 @@ AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54
 AUX iperf-3.12-Unbundle-cJSON.patch 2894 BLAKE2B 74981580ed628224fbbbf19f35c5a7972b066029d45ba8a86b437f7aafda80a6f1bba5696b5a35f210993bd9af0406de1ff168f41ec36f8bfbe2674dd626b34f SHA512 c9f7d8f0286135043e1d686e2936f4765d8b344b57ea3c7b887c94665201904e10119f6f7fed028fef898ae75a25aa9157b26def007515921ec249503fa9d66a
+AUX iperf-3.17.1-Unbundle-cJSON.patch 2784 BLAKE2B 67fa2a15bb0970844f062423d4a3448f32cd6644ba92a02d06fcb76dc60a9e62d0948006765de80458b420344b4f380dde4dbf90f296449664c4fbfdd72ad99a SHA512 dfd2ac4cc3d6666887bff8515399ec79a10f350484c340c615f2a1dc22547c3ac64800499b831caf647a50f7eccb4ceb381942a5f7cacd859333c3afbe2661ae
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2
 DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c
+DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974
 EBUILD iperf-2.0.14a.ebuild 876 BLAKE2B cd791db9fa5b74ff692cba8cb61caf649aec855a3f80c01d7ce9e3179f95f85ced11a23e81cb43891803c0767d2bd10236bda4d09bbe91368863888f9937f278 SHA512 10d04995d8046b6c0fca3f7b6985909fb54baffc299c0c4f8351b34b89a3534e8e2a482562f00b1cb40ba5e4666d6233f8a982ac4bf57ed1fc65d9e947d88e80
 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
 EBUILD iperf-3.15.ebuild 1141 BLAKE2B 20133db4023bc0efcfd458572e2dc543a4e6db5d3116361f4375e84123a83b492288ed27c3c51f3784be81976f0c4c2db594477c0cbeaa02b4ad514823ee3b64 SHA512 1015cfb39c2a16747561a758d7c7ac7c42c4157902d96f986b9b50344d47fe625a2fa8605a6016780675daaa0aa053c530dac4b478560383e6b21f3dc431e12d
 EBUILD iperf-3.16.ebuild 1141 BLAKE2B 46f404667f6f2681bcde647201b69c85e72e7decbc01e8d6b50044af007f337dcf9385abfd93ac03b5ce0c0cb7a381191b3389a15979324442876b22d4877058 SHA512 a4be321fb7545c18a03cc0574ce0274a02da891f915669e558e95249d78a4f62e44216ae4cbe509bf0795267b33a4495ac4af30689d7052f2f148c6a3d8ca1de
+EBUILD iperf-3.17.1.ebuild 1136 BLAKE2B 3b86b8365fa97418a976449cb76cc117a7c63d94b076245c73e17b14b624520af512f0d2dadb2ea07f9060634045a29ba98539a63824ef85ec0cb31a792b01cc SHA512 4ab38234e09786e5dbc5ce6b43c5bc811ce3801b0683c4bc3cd788b22e60b0f3d0dd952350b3c417bfe705681e56358d1963f72b8a5408f90ddd6749b5293824
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch
new file mode 100644
index 000000000000..856403ca6b65
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch
@@ -0,0 +1,110 @@
+Date: Tue, 30 Jul 2024 21:11:48 +0300
+Subject: [PATCH] Unbundle cJSON
+
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,6 +61,8 @@ AC_ARG_ENABLE([profiling],
+     AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
+ AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
+ 
++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
++
+ # Check for the math library (needed by cjson on some platforms)
+ AC_SEARCH_LIBS(floor, [m], [], [
+ echo "floor()"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,8 +10,6 @@ include_HEADERS         = iperf_api.h                                   # Define
+ 
+ # Specify the source files and flags for the iperf library
+ libiperf_la_SOURCES     = \
+-                        cjson.c \
+-                        cjson.h \
+                         flowlabel.h \
+                         iperf.h \
+                         iperf_api.c \
+@@ -46,10 +44,13 @@ libiperf_la_SOURCES     = \
+                         units.c \
+                         units.h \
+                         version.h
++libiperf_la_CPPFLAGS    = $(CPPFLAGS) @libcjson_CFLAGS@
++libiperf_la_LIBADD      = @libcjson_LIBS@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_LDADD            = libiperf.la
++iperf3_CPPFLAGS         = $(CPPFLAGS) @libcjson_CFLAGS@
++iperf3_LDADD            = libiperf.la @libcjson_LIBS@
+ 
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+--- a/src/iperf.h
++++ b/src/iperf.h
+@@ -52,7 +52,7 @@
+ 
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+ #include "portable_endian.h"
+ 
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -79,7 +79,7 @@
+ #endif /* HAVE_SCTP_H */
+ #include "timer.h"
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "units.h"
+ #include "iperf_util.h"
+ #include "iperf_locale.h"
+--- a/src/iperf_tcp.c
++++ b/src/iperf_tcp.c
+@@ -42,7 +42,7 @@
+ #include "iperf_api.h"
+ #include "iperf_tcp.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ #if defined(HAVE_FLOWLABEL)
+ #include "flowlabel.h"
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -45,7 +45,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ /* iperf_udp_recv
+  *
+--- a/src/iperf_util.c
++++ b/src/iperf_util.c
+@@ -46,7 +46,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf.h"
+ #include "iperf_api.h"
+ 
+--- a/src/iperf_util.h
++++ b/src/iperf_util.h
+@@ -28,7 +28,7 @@
+ #define __IPERF_UTIL_H
+ 
+ #include "iperf_config.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include <sys/select.h>
+ #include <stddef.h>
+ 
+-- 
+2.45.2
+
diff --git a/net-misc/iperf/iperf-3.17.1.ebuild b/net-misc/iperf/iperf-3.17.1.ebuild
new file mode 100644
index 000000000000..999cff75ed27
--- /dev/null
+++ b/net-misc/iperf/iperf-3.17.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.17.1-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index e6fc57775655..07c787586837 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -3,10 +3,10 @@ AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238
 AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d
 DIST kafka_2.13-3.5.2.tgz 110420856 BLAKE2B fd59e7fcb22a944f6fdee4ecda7d418f3818c42b23a0b8a02ef629781ed8a34c95e4ad75560f9e3fb9bbc32933f7960f086c39d2294c336b8ab520c887aa8a22 SHA512 229ccc5e3e6b3b9845f59f6e829d70711c5a5a2293f32b6bcabc37350666f874bc7d8f08130f712a1b32915205c10f2847f04908c20d5f7fdb4b62d058c9defe
 DIST kafka_2.13-3.6.1.tgz 113466638 BLAKE2B 1142459c2810cf4df8785afc9fab57440357000a97b23cfec8b6c59d886706d4fd13120388e9473917106c1cb237f65671bb1258de1343ef7818b3b97617f0b4 SHA512 1f063cd67463dd3bb5a5e06e7a1c2278db84bfc836a634fac7c9a005de66a42ac00b32f5e9bbdd22086605f73659efd4ce5bd1185196b02a743be0898daac55d
-DIST kafka_2.13-3.7.0.tgz 119028138 BLAKE2B 5d366f5d9456668f4914da30fa32f7104816ec721379f88c5e77946f01256e02a7a6465e6865cb957af5bdf6a77e3ae16cf9e715f3b13ce00e1debd0ce34d4f3 SHA512 b8679283a2d8dab86e7c636b2c688fe9d9e64ac437241f65ef7a1733f4d26a2bd415eefa04f09f1911373bcd2a5dbc3838c76347f68656425c09202cd290ce91
 DIST kafka_2.13-3.7.1.tgz 120235344 BLAKE2B ae78e77b52eae9099f700a7644120b307cb2e8f84fb76b313b4fe208988d7010856a36253eb3ce4196a3bb8ac1c791e9d83969913f67553dea702f4b55675446 SHA512 78e985235d245ba9e2951a82e723a62b8aba8b74a2c8376f7271906af715a36de9142c446096f13fd4bff3a4c10f1d080eb924e91e2256ec2db779906fd6737d
+DIST kafka_2.13-3.8.0.tgz 120735482 BLAKE2B 3ea97f26b650b7f2f3741d40b95e9e247fc8bade4bc4a767b7cd61338618d23dbca016da24bbb6dd07ddfee1ac239b89de441e46720fe490d2e6693e4f5b810e SHA512 0a33b7be7b6fa53249ba80f9d02cda71ed81927c160aa6ee9be1e3d3c1c4b50466ffc905293143fd88ceac7f5e7d8f5bec28ef972addd3c459cc8b1291e738aa
 EBUILD kafka-bin-3.5.2.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
 EBUILD kafka-bin-3.6.1.ebuild 2065 BLAKE2B 8405b16c621951140f30bde027b26337dfc11bdc8b1800b65c5fc7c3e1ac52075a7479a6303df60ed27d42af6e266825de090dcd66bfe9156d3af78ce55b4da9 SHA512 70ff29218e9409d07a33275b287ce86d42835e79a1bdf3ab86791ffc764c749f473bf0d86fecffbdfdcf011facad187a4ea47158ef49354fe0ff716cc8f0bb36
-EBUILD kafka-bin-3.7.0.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
 EBUILD kafka-bin-3.7.1.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
+EBUILD kafka-bin-3.8.0.ebuild 2065 BLAKE2B febaff84d4f1afb9ea3d00fbe13721a45baed92fc8c4e5bf02af582fb87381a610236131990c13162a185f1e9adfb2ed5eb773f5f19533b761024ec11177e76e SHA512 343afb2eba8c8e75f2609701091997176e8560bc4d6fee64f862e38b935a79ba0323c6e28e8c1c152d2c3603b8dbf7c109de9fb610030567f21987b8e413b64f
 MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e
diff --git a/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.8.0.ebuild
index 750555119b44..750555119b44 100644
--- a/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-3.8.0.ebuild
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index 8c280cc0b70c..1b8fbf26df6f 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,5 +1,5 @@
 DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
 EBUILD kio-zeroconf-23.08.5.ebuild 900 BLAKE2B 31511b68fc1fde36743d4eda7530feaa77d6a11e79dd48c920d61aee84216f910ce8c1254182d41d630343a8c288df9e9c33ab8643312c981ef72131c7d19c27 SHA512 81299817a158568a5d1f8f053d7cd57b14d5bebe207b997991b3efaff8fdd75d99c86c8f9a321b8efa35527864a11631a9c5c99c5f33f7538f5fc960972363ea
-EBUILD kio-zeroconf-24.05.2.ebuild 597 BLAKE2B b6bff2387595619f9c1d59e6ca639a7ea905e876afdab253c4e36c21dd674fa203c99571acedca5a8212fde9d677f3fdc2f76994a88cd6a9e104f623afe2ea22 SHA512 76dea3ad4b6d66b900d292eed410afb97224f66ef22fba33b89f3933ab940c265b28a853ee54dacb66846b84b8b0d6e03047cfec84e1c7a8ac682f61cf70e148
+EBUILD kio-zeroconf-24.05.2.ebuild 602 BLAKE2B 5957767596b375bb95653779872ae33f999248f97599f5c573a0b27c955b1a73f0d8304302014bacd8b1b55677060800691fda4b223b339aba0d5836589af7a0 SHA512 bfd0ffe8417130209d082cb7c9ad04357bf204ca755390e78f2b4ab768b3ea2e200bbc084024e9e191fa8735d26d8c68e6f10c9499812b34b1f3133113cc73a1
 MISC metadata.xml 501 BLAKE2B 467c829559f7cb706ba27fe6400ac8282b9270faadb574fa78ea977c35075a29e8d4c98267f3c4bfdb83d2c39dc8abd3b5db3e94acc3ffaf5cd5c1c52bd9c3bf SHA512 dba3e3de6cb07e240e7664806b196c748df3604e22e84a265b01bbdc2a56192ed1906b30a76c79d6d8c98763c8651c3a3dcff30a0fc942c22a65901234ad2740
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild
index 22ed48f20d40..ca28c0731856 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discover
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 1537455ae812..f58444e8c72f 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -3,5 +3,5 @@ AUX netkit-telnetd-0.17-r13-gentooification.patch 880 BLAKE2B 2727806eb103efa78d
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
-EBUILD netkit-telnetd-0.17-r13.ebuild 1647 BLAKE2B 89857940a0aa9b08d1549fcc7c5056a27465b840cbb4487f01a9e6f58949c4ed45b109141b57883dd85b9067b3fef3b6ed027d133a366702aa38d28820910c4b SHA512 eae79057f871940f4d4fa749c8f909ba59a29cbeaef527588ea786db9ae739cc65e86327577fa2147469a7b50a46823cc6fa92428a73e4ed0694496c7460ee47
+EBUILD netkit-telnetd-0.17-r14.ebuild 1712 BLAKE2B c62acde2ffdd54957454cfe2c59c912f82d0e0bf17251d274238763e00fd3e0aa091117b31e1545b6bb1da1e7018c4fa03057c1bf14a7b61ffedae4bd9e69e03 SHA512 8c4f8953f7bc5b71601a4f4344a731516463946e7313e871598aff38d9fd72f079ba85364d1ef6bab77eac85e6feb5ecade10acbf266d759e30f166eaa9544ab
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r14.ebuild
index 1cdb22da14b8..e4c30a44260e 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -21,6 +21,8 @@ IUSE="selinux"
 DEPEND="
 	>=sys-libs/ncurses-5.2:=
 	!net-misc/telnet-bsd
+	!net-misc/inetutils[telnet(-)]
+	!net-misc/inetutils[telnetd(-)]
 "
 RDEPEND="
 	${DEPEND}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index bb9ad7409d07..14ab6d762246 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,4 +1,4 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
-EBUILD omniORB-4.3.0.ebuild 2376 BLAKE2B a8fd586ff7d8ead01e52b5edc580891e66622fa805b1bba3d617ec9df0a2c678dafa5f9766a2c6a9f164906ace031145dcfc7680b74ac92401fe2421bf1779c7 SHA512 5f1b99fdfe7fcf18ec54b979aa185174b598eb90b6fd804ac60028d81ac19f2987769956c53b5ffbe4bfe8543c71fd7cd7d2b4d8d00f15dec9474fc3b1b75f2a
+EBUILD omniORB-4.3.0.ebuild 2376 BLAKE2B 09203748d3d56278e205b1cd622ba0eb8e426d4156c5a5f8e6fb1f9761fcb1ce2a020bdc183cd3dc483f0d28d91aaea54c4e851747c7217c0425f4d0080b666e SHA512 9ad1dc822f81806d1a13411baa0dfb1cdf4c582df11e057fe9c69cc3a79344a8eba0a9ca06290cc54d40a9a38cc584665e67b39fe99fb588e32c6d32b5160e94
 MISC metadata.xml 480 BLAKE2B 18c6b730f8a61f23ca0141f021af7106bcb9d47d66b9bebccf2caecb242b01e9256458da34b2a76d6451ef5f19e926c4c0362ade9a0bfff0dc5384c2f2949de2 SHA512 ee60840029f943440643b41e21daf17edb0c74e56210ce753ffcd0628aa5fc3191101f4c1b53a9b275df78cb8afddcca9c82795ea632cc1e2946fd0e371b33d7
diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild
index 49ee886822a3..7e108749c512 100644
--- a/net-misc/omniORB/omniORB-4.3.0.ebuild
+++ b/net-misc/omniORB/omniORB-4.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1
 
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index b8539fbd4da1..694d4ec1853a 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -4,5 +4,5 @@ DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c
 DIST ownCloud-4.2.0.11670.tar.xz 4126004 BLAKE2B 60a5855239b32bfb6769d38de3eced3dcb6c642d702fa33439dfebdc97947dfaed1f0081d2ec8913edc7ab8688872115abd739e21eae7d06e96cbcd92abb5565 SHA512 277d18581155f663c0c18b44a6c0fb9b31c84695e0980da486028b91c1d1c9f5a7ba956afbc11fb2e7fc4679e46a30c2d737667208f5c0599a39bf91a109ce99
 DIST ownCloud-5.2.1.13040.tar.xz 3989152 BLAKE2B f1bdee88acaa83e2adf66f37ac52070f5f92ba63584b66463a2378439756ed78f8dbecb088a909668cb8ee0c52c58e520906ffd1783feb2ddce7f4d433d39257 SHA512 182768b385e9ef8c841045617e6b2d5c47a1b621d2898ca8d7a6ed153ef2d1ca67072f620d6f380189f239db13a6a50fe178d1c00bd669c81a7df86a52e2a5c5
 EBUILD owncloud-client-4.2.0.11670.ebuild 1850 BLAKE2B 28efde1665f92fb0da508f39cb1988de0290f3cca6f2b82f52e205ea60f0fec94a98ee29fa49dbc94a128ba535b2a54b5fbc529d0f9594be601dca7e263683dd SHA512 4b761e88ac8762cf2728dd45b9459ad6fba8797a86b6853ce6896474c6f0d99a88c3fed32b6d8d28f86604bed6dbd18d27eb8ba94e5d4b3514b1bae0e23809bf
-EBUILD owncloud-client-5.2.1.13040.ebuild 1225 BLAKE2B ca65590feb834b11bfa42ce8badb4b5afdf7c1e03eb8ba5cc04949b948883f4a3e853cb0c730247206a9762f478fcaae62e7a781ffb23ac3c1f0ec62dc5a3297 SHA512 8232225d3c8a6324a907d799f3b3988f64e6b35dc8eee91ee0c8079f44722f1765b8e8bbc1196b8865f01d2cb815ec9e663b00b7fded68c6a949548d94cc01e9
+EBUILD owncloud-client-5.2.1.13040-r1.ebuild 1230 BLAKE2B 8587ac59db86fe433722dd10a8141490c1949c6abfcc76e8e6572bc2396400479ea9e6d032bf40f9ea3f0f6ac2595a66726c16d7276fa13baf87cb144b891c64 SHA512 81ef62362c72775a7cfbc0b0d21bffaf864e1c2db4d8ca404079bd7dfcdd3294858f346180af81a519ba40a8610579b91f914557f04590964666c1d8a99ba140
 MISC metadata.xml 512 BLAKE2B 51b61a62b5fc3f067270f74c70149e42bb5d5456b73eed7e8f605189d496a4279474031594e8978ac7b3d9d3709b0cc3b6d7536a13bd97b1b1fcea46ee48e149 SHA512 f770affb3fce04e89444e75a80166c822c4c124f4e0a8bb3a38227a5ac2d7edac79fa11783dd3150369ef562b87d5e9bad26e20c3c38f5330c8466a12a40605f
diff --git a/net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild b/net-misc/owncloud-client/owncloud-client-5.2.1.13040-r1.ebuild
index b9f26661351c..17ed5c205d07 100644
--- a/net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-5.2.1.13040-r1.ebuild
@@ -18,8 +18,8 @@ IUSE="keyring test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/kdsingleapplication[qt6(+)]
 	dev-libs/qtkeychain[keyring?,qt6(+)]
-	dev-qt/kdsingleapplication[qt6]
 	dev-qt/qtbase:6[concurrent,gui,network,ssl,widgets]
 	net-libs/libre-graph-api-cpp-qt-client
 	sys-fs/inotify-tools"
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index 6c67736bf442..52971ab83657 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,5 @@
 DIST pssh-2.3.4.tar.gz 51859 BLAKE2B 788f5239cd35e240cc1961e73b532c60e5221ede9de48878f9636339b18235dc67109948eeb4f64871985bb24e1a7f823b1718da3dbe2ea893af58fd45495c61 SHA512 7abf327ca53dda2402465254e447eb837babdd2b4d865abb5b52a1135bd234694b84c1148cb3e4ed0198271ed29333fc1b5d0d01dc653fcf6d3e5b9f170b9d4e
+DIST pssh-2.3.5.tar.gz 52364 BLAKE2B 1ab05fe39b4d510fa5dcd9cec52b4e7200bfce54445e0b345299af00be564dd20e7267f6aab3ad0c2517cfadbf6106393e8718c8ed680cfbf1ad7b6f48812d32 SHA512 47515b05c9ee2bb302e25d5404736184ad04e22afdeb77bea799d80adadd977af2744e124bd06b751bb06ad05baed6b577cc636b808f32db83edda669598e3ee
 EBUILD pssh-2.3.4-r3.ebuild 724 BLAKE2B f1ce371ccb35bde605fbbffd6c8138680e7818c5d0ce6244c7c49e82b9596ab86e8e8df25a437f3ae33ea6d8302fecc82465128b3cf108e7dcc6b7d72051d674 SHA512 2157c7cfb6cc1a7c1607374b2607855b27ac810e9c01ddf679b72a5c8a30aa9ea0f241f4e5f44fb3025a6ae85064b0d3e9549bfa7fc0189188ebdcaae2016884
+EBUILD pssh-2.3.5.ebuild 615 BLAKE2B 3226ff50736560aa1fcf70a1558162b2db04f970fecf96718983623155e23ebd1da9eb4ab9a21bf542caa24b4581c9b65d3ab68b76f7ba2330e571df5c8ab07d SHA512 c06728b02af458467de9910caf2a7e74675c97ed487c66bfc58e687d330c1660286d29ac9f1582b6a3ad6c456855639805d5e2253319464e9f5146a73095e50e
 MISC metadata.xml 415 BLAKE2B 86f4588a2dc1da92bbe426b844de02c18a87ff1b8f4566c63f48854e8b38ed014530e4d63b96a44feb6d1f41477ff9317a1b434eb74c83dc995f24ef2d7cfab3 SHA512 113cc042c12d46038f0a9f441cb9fd40f91d3c7b668bc9949786eb755754a45f17fcb478948fb21e7f669617a393939566c187ca06342e10017718384873bb04
diff --git a/net-misc/pssh/pssh-2.3.5.ebuild b/net-misc/pssh/pssh-2.3.5.ebuild
new file mode 100644
index 000000000000..555c7d2e8648
--- /dev/null
+++ b/net-misc/pssh/pssh-2.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
+HOMEPAGE="https://github.com/lilydjwg/pssh"
+SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!net-misc/putty
+	virtual/openssh
+"
+DEPEND="${RDEPEND}"
+
+# Requires ssh access to run.
+RESTRICT="test"
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 18533acd05b6..6bdeffc559a4 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,4 +1,4 @@
 DIST putty-0.81.tar.gz 2844616 BLAKE2B f4f687555ae6d043f9eb868eccb1086227a0fa3ec1a5eff68ab7ccd96c877fd87afad9c9639930e899e0fc16058ea0f4553a3035ab477761038d6257332d64af SHA512 d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.81.ebuild 1757 BLAKE2B 12fdc0ce4f55cbfe74d8b9b0fd332bfa10d2b94554f96b39e4484b23ceeed41fb2f34b8037769b0a7ef9609b2ff5dc319316b3a74f307066734fa88bc9ffb6a7 SHA512 fa2f57698e0e0164b5c3e198434cbb8b710869aae8de33125e2787d12c109247740e07b5515f674e0dd402f5427c98f785c0c3040fc1c774966460fe906bfffb
-MISC metadata.xml 887 BLAKE2B c51675758674360519d21f8722a4ea0815bfc56591a28e9026e4aa02b0046006ab87bfcd68f945184f1d82710d912a0f3557c34f4d43fc5fadd7ad7c38b5c3d3 SHA512 be79490eb1313d5f9d4b80dacc6e7727d44c1106da668869e58f106235ff6b074d17ad3fe41aa09c176bf713e17dddda6a73df728bfdfe752db6ccbf9690befa
+MISC metadata.xml 807 BLAKE2B c06f09a4e78ea91040befe42cf633eecca900e7d0834ef467e72cb63ce2110bef3e4f3a2f4ac5dff261843d4aeb9888a135a4b26941099318ab3e92fabf86b85 SHA512 9d1433b175722a65450b2dc19c9b9d2831b5d1a90456b73291a2a1e93e9a198a495aa458ec23908d48d8463847b7b6666b90135d076a17fec2170027be0bf942
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 6d9cc6eb57e8..12325b7e5962 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>matthew@gentoo.org</email>
-		<name>Matthew Smith</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 		platforms, along with an xterm terminal emulator. It supports flexible terminal
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 8b9877c18972..88874e404e02 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,10 +1,4 @@
-DIST rclone-1.63.1-deps.tar.xz 298002884 BLAKE2B e9dc1dcd3240d4a649b26606109f4ceb9e4e03448da8d27a11c19ed0dc6df39569c3f4714194c3a62e3d80c7a22591ac392d4187df464a4cf203c6135438ec5b SHA512 fff9e6d8ec7721abfd6c95220163478cf1bb3c8fd551a4310641b1213c072ed853e3ca40fd4109ff642d621cc441434f93608af590bb1b07ac2854ddd1d54147
-DIST rclone-1.63.1.tar.gz 16294505 BLAKE2B ccb83d5c748f8b68ba7eb7f5910f9b3e8e503407855b4bdd10d5feafaaa96bbf113305cb90952d05922a0ccae6e8efe88737271f4a193cf7a38f79820439c007 SHA512 fff03146ae7de4b47b883576b67852f9ff0558137ecb966300bd357c706d4b71c20ad0f87d0028c90b570d9351024f4ae8ddcce13333df1cabd0e76e08b29063
-DIST rclone-1.66.0-deps.tar.xz 367625224 BLAKE2B 244dc6c77315d1e1038b5e784deb55ca597ce728df34b0619a62ebd40524547a8e12c90f85385bf8515eb69f5cb07d5db6dbcb0de2c7a259edb1d934ce1eb747 SHA512 b238069636da506826deb99ddab869789bf7bda58d4eb47e47101c5011dd35dfd9a39f481f1c874d57a3330fa8b969fed2b98bb1d13ec8e79495f55403cf6001
-DIST rclone-1.66.0.tar.gz 17066102 BLAKE2B 587208635c2154782a9f3285c7972a567625120140d1b43096b572d19ab74ae9c7e12b485d6a74d88f1ef4bbce9656bea8f21c67c641227756dd48856a4da9a7 SHA512 955ed1457ebe7e6ac2288484109ba263601e147f767ce71b70e14ddcf3f97659d90704de094e4e83c0820267e0f41b1950fc3db534bb3577bcf27f0a2401eb84
 DIST rclone-1.67.0-deps.tar.xz 367523832 BLAKE2B 45e33614658aa619f0abe4cb48ae8eb82d39cf3f56ef9c9f0fcfbc14c2ba2868ff237ae0ab1f308bab31352e176209029604c18c22d180d68c0605a6a671a3c2 SHA512 2e4aba47f37ca67c7ba827d9c70bae858cb9633861c546e9cf19205a11109c52ea8e3e7b13f3073be5ab6405770b7c58bb00124393b712bd59fa25da6930987e
 DIST rclone-1.67.0.tar.gz 17232236 BLAKE2B 8241234a970335bb67a5f51b11fdc79afe4a3894c1df2409d141cc8662fec669c1d273e7e67383291703cf66a4168a0ff3c3f8e28d569b0df340c0e7b4a4c324 SHA512 9d336c6a03ba7711f88fbd6ff019b4ce02825467b9656bba8811e9c27fe857ba5d64d863e1f5f3129cbcc89509891615d911794376c90775901a7de1b0741448
-EBUILD rclone-1.63.1.ebuild 1104 BLAKE2B b44f954688b4aea211812e31f62edb83eb501746167d9656a48394a35d4f31cd871f936a0fc086c393854011b299fb5d5ceb0785504439174da994639edc4d92 SHA512 b6e55378818f3527421d1720a84f723a6b67af45ced19c4f205bb6b80bbadfcbd15b57ecc962199871263e9340e1ffd5088b45785c7bf9bb1d7913b4f2681c8b
-EBUILD rclone-1.66.0-r1.ebuild 1481 BLAKE2B 5ef10483275adc5c1528f671142d9d7ed5815af544850052c57343057ba965c001967e11a8cad63eb5704e187643c6a7a1e5fcdeae756fcc17273f72e35db9dd SHA512 06356bb6db628ab899b3946795c4b5687f7d32ffb1ae85c5f718828502659257b050861e720f084cc4221c6cfb7e95023ea08dc64750866a3617109a50579e33
-EBUILD rclone-1.67.0.ebuild 1483 BLAKE2B 635fbf54022fa9243854913d12f696431ca6dc93f75cc223cc687dbd6ee40dd6d27de8bde28a478abff82244954fc6d25794ff9e4a86e5311876c64f07df6a5d SHA512 56a80fee745ba534f32b1bb6f0306ff01406c977f8eaf2c7acc5eb4b4df6e07a16aed8cf3cc20341283c2313216da182b27328c27351c496ca5011b547787dd4
+EBUILD rclone-1.67.0.ebuild 1481 BLAKE2B 5ef10483275adc5c1528f671142d9d7ed5815af544850052c57343057ba965c001967e11a8cad63eb5704e187643c6a7a1e5fcdeae756fcc17273f72e35db9dd SHA512 06356bb6db628ab899b3946795c4b5687f7d32ffb1ae85c5f718828502659257b050861e720f084cc4221c6cfb7e95023ea08dc64750866a3617109a50579e33
 MISC metadata.xml 494 BLAKE2B 8c55f5c9c23f1f0d91a1c617b15839850edf6a1e1da2ce9f3c474c69770175a102be95500b37e384ad9d68b1931363d35d2e499ed38a918bbd13528116528c10 SHA512 7df01f2ac9a0fe8a048726c327ada07cdf3b332c202144e31dec4be9558c75819cb871425a70406e1b84df7a13cb7c8470cc6522b343a3efb4dc8b529687eb27
diff --git a/net-misc/rclone/rclone-1.63.1.ebuild b/net-misc/rclone/rclone-1.63.1.ebuild
deleted file mode 100644
index 9087a250f9f2..000000000000
--- a/net-misc/rclone/rclone-1.63.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-SRC_URI="
-	https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz
-"
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sys-fs/fuse:3"
-
-src_compile() {
-	go build -mod=readonly . || die "compile failed"
-}
-
-src_test() {
-	# Setting CI skips unreliable tests, see fstest/testy/testy.go
-	# TestAddPlugin and TestRemovePlugin fail
-	RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.66.0-r1.ebuild b/net-misc/rclone/rclone-1.66.0-r1.ebuild
deleted file mode 100644
index aea77db97b4b..000000000000
--- a/net-misc/rclone/rclone-1.66.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 check-reqs edo go-module
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/
-	https://github.com/rclone/rclone/"
-SRC_URI="
-	https://github.com/rclone/rclone/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	sys-fs/fuse:3
-"
-
-CHECKREQS_DISK_BUILD="2500M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_compile() {
-	local go_ldflags="
-		-X github.com/rclone/rclone/fs.Version=${PV}
-	"
-	local -a go_buildargs=(
-		-ldflags "${go_ldflags}"
-		-mod=readonly
-		-o ./
-	)
-	ego build "${go_buildargs[@]}" .
-
-	edob ./rclone genautocomplete bash "${PN}.bash"
-	edob ./rclone genautocomplete zsh "${PN}.zsh"
-}
-
-src_test() {
-	# Setting CI skips unreliable tests, see "fstest/testy/testy.go"
-	# "TestAddPlugin" and "TestRemovePlugin" fail.
-	local -x CI="true"
-	local -x RCLONE_CONFIG="/not_found"
-
-	edob go test -mod=readonly -v -run "!Test.*Plugin" ./...
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe "${PN}"
-	dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone
-	dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs
-
-	newbashcomp "${PN}.bash" "${PN}"
-	insinto /usr/share/zsh/site-functions
-	newins "${PN}.zsh" "_${PN}"
-
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/net-misc/rclone/rclone-1.67.0.ebuild b/net-misc/rclone/rclone-1.67.0.ebuild
index b59ebe324c66..aea77db97b4b 100644
--- a/net-misc/rclone/rclone-1.67.0.ebuild
+++ b/net-misc/rclone/rclone-1.67.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	sys-fs/fuse:3
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index babb0dc0fcd8..e702890c737b 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -2,10 +2,6 @@ AUX rdate-1.10.2-fix-musl-compat-stdint.patch 4574 BLAKE2B 8228b520bc94c1fce7041
 AUX rdate-1.10.2-respect-AR.patch 1117 BLAKE2B ad992ef817847c39c779eb1a251df905b3a9c0c70487433dcb22014717c4b10486d06237bc2b12b6827c7016321a88950ff8d40a5072b81d5e9bf8a2a0f834cf SHA512 66912901b7b052203af8c39de81aab08f9c512d46c8eaf2174fc936c7bdeb7a045ad56cbfb81b65dca7cb8790c95174b4021ce227289f4e4edb63d21020e9409
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
-DIST rdate-1.10.2.tar.gz 19839 BLAKE2B d51ff68303a05abd8049abebafd76a01d8dedff6a294057640989989f851f1b381d75f2ad7ab94a850de76c485340770e06cf086225d641a2fee6d43112b473f SHA512 6e3759e73c05532b54f004592989572f78a0cfef7a2af1ae33708c9d239b63203702466664d39701afbc0012ff53fbf0bc3917ad8bb3df3322c4b613fd2e8aba
-DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.11.tar.gz 20210 BLAKE2B 0ff4abebe08f33b45c753dd2912c36e3895c1745b2d78340c7574116f50cd4d05364c5bee97e883b7ad587fcd5261931d928689cd583aa86b43aac408d2a4a6d SHA512 916952c26cdd51c8666bf62cdd823cf8a07fd4487fbf73213d529525b31a90f056120ea2ff16e6d37ea7c662853ba3c15789fef90724b2dbf17c21a6ff3f415d
-EBUILD rdate-1.10.2.ebuild 857 BLAKE2B 8970e5d2d8a0e6b77addb0b09d25ac975a8c10e34e1615a6780eae75d2fa1761434b81810c3c9524c3c78df854852548925457e7d713e935d03877266b4b58cd SHA512 a0fc238d98e0217ff2a79faf32570d1018dbe3e2c3339e3da8f5151dc55ffa4619f9e3bc295f5dddbf0f8a4dbfe768118d092344e0afc2cde6e3a072c1e6968d
-EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480
 EBUILD rdate-1.11.ebuild 756 BLAKE2B 421f24142db47f4b21c9cbca4abe6c7be5a9a56fe6cb6d0ce3f6e38cb9fbacddd7f8f5adf9ad36d7fa28e6bba5b9e6ea1f50f75c15844a1b0d54ac30501a6acb SHA512 62857422a33433fac31936a5081c80a014485eb5ff28d869f62e981f5441b9a79ae36bcb6bc4b1babbe1fbc590daa8ca1129c1c00fce9269f135eac5addb4ee2
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/rdate/rdate-1.10.2.ebuild b/net-misc/rdate/rdate-1.10.2.ebuild
deleted file mode 100644
index f64d1f48a116..000000000000
--- a/net-misc/rdate/rdate-1.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="openrdate"
-
-inherit autotools
-
-DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}-${PV}"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND="dev-libs/libbsd"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.2-fix-musl-compat-stdint.patch
-	"${FILESDIR}"/${PN}-1.10.2-respect-AR.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
-	newconfd "${FILESDIR}"/rdate-confd rdate
-}
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
deleted file mode 100644
index 6287c785348b..000000000000
--- a/net-misc/rdate/rdate-1.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=openrdate
-
-DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libbsd"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
-	newconfd "${FILESDIR}"/rdate-confd rdate
-}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 0d1652292a08..163659966264 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,7 +1,5 @@
-DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845
 DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a
 DIST s3cmd-2.4.0.tar.gz 144976 BLAKE2B d854281a029b9865dc40d6bebd0994840a201ad573dfc628916daec00a6b38022f3f3c80aa745870c0b594443da747b1967d24976701e4d97167cfc087ae6dd8 SHA512 78a7fb193ef94759e6b59c8bccc2e736f4195f7de781f6a5d11a5685a3cf93ca9ef946bdefbfe0b0dafd0ea0612c8944283c3177f280d14edfca6553e62e0b49
-EBUILD s3cmd-2.2.0.ebuild 687 BLAKE2B 0ac58660ed0b156a6ef1ea5e6b34c2df519e36464c8dc43cc38a0cafbfa92248739979347c23ef38232e7365efe216191330f53c8e110801b487078be4f9d6e3 SHA512 0d9e1d60f80c521b9c933dbe51a72ef8a5d34e39c4127753b60629da6262473ea62bd7ef8849c12e474a8ef91cbc23b80f5bf9962cfa0587a14f1f5e294e25be
 EBUILD s3cmd-2.3.0.ebuild 700 BLAKE2B 901fb46db5d4834c90ba1e13fda5bf44cab9ecf5f5f5516aecc3c5ee5d6c880104942336c25e6308be2cc8c67c3381602c4efa53574fe12d7adb4f2125325eec SHA512 b90e6ee33e140e7ce05709bbd3a117b7a9c1b611d28a4379613882dbfd3a48faf74ca8ce24d88812c5ce9c44f0bb41eb810561673b7fe1535bbac3328a05418c
-EBUILD s3cmd-2.4.0.ebuild 734 BLAKE2B 315cd4848fbc812bb4484a22b78ab3eacb7a69edd2b69dcd8237555dfccce2fea825e2cdcc2628a6550237956da11268b4788b3438fe6092304730194e5f0b50 SHA512 62418e219ced5bd5ef6536bc17d4950adece32998ef8bfe5a1fed49278fcbce98f69f47c4e7395fd88166940e91cabd7682e8b1039ac0e07d33e1c310b239fb6
+EBUILD s3cmd-2.4.0.ebuild 732 BLAKE2B 30a79dc26a7c0775f394b2593e429100de55ecebf9af7aee31669c5a420cfd4aae5211d8d39222922fd814388e6b11850ad85f0a1199ab65f4d116928c8e2721 SHA512 008db7c6d0a7580e8685b9d1da1e42b048bdb5d4e54b01dfd6f61fb002f18b0cb8e76ecc3675212e853a5af2cc643f4440d7862f4e8428fc695db55cff943b63
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
deleted file mode 100644
index ff60617f838c..000000000000
--- a/net-misc/s3cmd/s3cmd-2.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Amazon S3"
-HOMEPAGE="https://s3tools.org/s3cmd"
-SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	"
-
-src_install() {
-	distutils-r1_src_install
-	rm -r "${ED}/usr/share/doc/packages" || die
-}
diff --git a/net-misc/s3cmd/s3cmd-2.4.0.ebuild b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
index a3e56368e7f9..b481b6abe13d 100644
--- a/net-misc/s3cmd/s3cmd-2.4.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~loong ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 ~loong x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index d38009710c48..c2f68eaa1a43 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,6 +1,6 @@
 DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f56888ff29da7bbe9f94b74838d628052520b3c5f97e52d4f3b3dd20c0207d1e706e398b24a54c7a03cc3b9c5693c70e18f4418bfd9c83d8e3ce48cd19fe9 SHA512 004ebf52194a2801c01429990b00ada1b7e2850d1087d3efacf29542cac6a9bb351181ff8ef6713550279d9c5c2f415dcdfba847ef5c848a564b2454e6c05e81
 DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28
-DIST smb4k-3.2.72.tar.xz 4341620 BLAKE2B 8fe3a2f6e30c9565197882aed92f27db862e0e6c9df35dda1b9187d7279618cae6359c1282ba474ae5b4fe39b8446e133aa95e0f10d0d4087580813944b49ba2 SHA512 0140bca46d21f0355e0cf06ec3cc140b84bd3f334c291c7f2f7dcf379c5520c35d8e77fe7eade5b156462c3a366730405fff8f9678cc5e0e061b3ca837b9de6d
+DIST smb4k-3.2.80.tar.xz 4345084 BLAKE2B 117074e852c6393ba07f71ab0561c61a41d0a45128aad402a5baa3a41efefb8e2b2e984d69f04e44a1940678ea404003685fe83c2cd36bddc1cbe756e78e6833 SHA512 46acd2adad4b7e8278d6fdf4ee31691a75b88222188271975adf5391d7767af8e7617695a51c2536e621f57db97627e4ab3db1953cdc6cc475dd462b5da2836a
 EBUILD smb4k-3.2.5-r2.ebuild 2331 BLAKE2B af60be9eb3e4e56f163b794f7560d59d1781574b6379c1472f9b959d9ea8c6862d3c09a17784b054c82a9970f4e0794a9ef91b21a2fe0a07ef7ee4238998b12c SHA512 e5d598f4157f8ae0b0e436385f8859178a9b01a253dc916d1a1f0172974425619886641ca0890ac2df17823b278923a5e22913e754fd3bf1267c3be7183a9c0e
-EBUILD smb4k-3.2.72.ebuild 2082 BLAKE2B a472fea6c0377fbff7eed5471caed5ff7c663b9831654e2f7beadc58f7f9bf98d6942bbcfe9b3c831aef914134fbb82e7a9796ddae3ff2a0a85af1366aaba263 SHA512 889647f51710c881272b1205f016733f39c7cbb19513a62f72e74ecee0430bf9dea2f68e7e9d090b7c678b464cf49f4ba507ec1232bb598b784ce359a36e237b
+EBUILD smb4k-3.2.80.ebuild 2087 BLAKE2B 54895545362a36ac5933d05aa322c470fc2742b32b9f9a4fbe28de8fe4d25d4f082e20453109f836cdb34c49c8745efb0358e33737d4f4f2cc38771d9560d97e SHA512 dd04c366167921c9219d9b35556e6687b1b6fa70e77bc5702b0300f4a9fcb58548e413fa6ed8622754843a15d37f7cc7ea614cddfd5ed9d9df172441aa8bd20d
 MISC metadata.xml 593 BLAKE2B 087dedf151163d8d8f02f41a9aa08117219c50556e3e60c97bf3bf3175fbe41fe9cdc1f0ada27aacc660095b41edfcb9502d02568bcd9eea26e8cecdbceaebe9 SHA512 f090b6f9b968087c912cc88187089a0eb891e77713fd5aabed03931b9da6f2f6673e48b37edf57de5da3a421f25d82371f9568db302e9e35e64f5f8200a2418e
diff --git a/net-misc/smb4k/smb4k-3.2.72.ebuild b/net-misc/smb4k/smb4k-3.2.80.ebuild
index 11ee460efd82..9e0ab7802da4 100644
--- a/net-misc/smb4k/smb4k-3.2.72.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.80.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/snarf/Manifest b/net-misc/snarf/Manifest
index b28b1a5af4f9..ece7fbc4f4d9 100644
--- a/net-misc/snarf/Manifest
+++ b/net-misc/snarf/Manifest
@@ -3,6 +3,5 @@ AUX snarf-fix-build-for-clang16.patch 674 BLAKE2B 9c04d8bd7c140773bc512f6cef34d7
 AUX snarf-fix-off-by-ones.diff 1592 BLAKE2B 5d6e72b792ceb95c40185211d3e1221afec730013ae8ae58f2406f2c71a230e34df282ed4323e5d27eecf7f16c1ea63d59d605e80b00e88db9fadfd9f05d4b8c SHA512 0e42437031fbfacbfaaeb76432b19ff65cd979cfebb0b17adef230fae75bc69cafccc386f95f656c1d40f01a849f0e4daa0d027fb78d97932ac5881c22e0cfb6
 AUX snarf-unlink-empty.diff 1581 BLAKE2B 09cd54db80c7b427cf84f413ac9253eb1aab44d3c4999e5c005c4fc9cfe45dfc280c2a7cf855545ab3f41896a1a5196662d628264f7384730450d7f0b6e7619f SHA512 bb33a2b5c4d929d8a35fce94812c8231f76b54914c9dc57d07dee7bf311e4fd034a97a343c588eba5479cbacd406cb82acc1835e15c911cd04100eff2dd3d398
 DIST snarf-7.0.tar.gz 64495 BLAKE2B d91930e0578a4a89b200a76aa69834d5f7c974a280c56d3c5f4a6f6b4e127145c90a397c410cb339d0865468a53aa433c7387dc2cb205ef8decd2f7a794168d0 SHA512 311c3e4a1b32fd024da8a5c8167888f254608d538695e30b3c632c606f67d1e3d94d8c88deb7850f782f38412f1bfd9022b0ee780c8644655f0648ccf0a0354e
-EBUILD snarf-7.0-r4.ebuild 874 BLAKE2B e5b522d1082a482f0d5ed1554059003cd01247c3c688feec6445ad51ba9d2b8cb977ddf54a415f066b9b57e8ef7934e6d83b474ebb4f5cdb305ea09452346c03 SHA512 34abbd5a85a0f08e60ea90f0380a061ec4720f75df2bf03768baf242c2c62f941820168d63aaf2f4696f65fbb971badb2a5cc589d89e01c8b71757687476bbd0
 EBUILD snarf-7.0-r5.ebuild 984 BLAKE2B 994e67d0b5bf794530461568f546c7be99fb732d4c2d29347b0d8699787a518e0ed10801697ce3fbafb8bc0766f8d4d1733c731cdc4e807fc777217660c0c7f6 SHA512 6d2af04905d1695cbbd876cd16bd0a5a5551d535db819228ed92b6a496d5004aafcfaad78c1db6cd475edbb16fa9f7f98badf11f911e2e1b6ef93426cc3c8096
 MISC metadata.xml 387 BLAKE2B a4f66d319d05707c587a47b85198eea2d4004db907659d10f8e7532828e338f5250d72fee6378bafc91119314fa2c26921eb0d13232a46e13f1ef5647175004a SHA512 bb55fed6a7e232743e6fd4a35ed5a38f3002ea6fca327bb1f58ac4c4d37da08fefa5bf7eda53fa156a808a22f158a70ca2754917f86796693b32213a5ec17b1d
diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild b/net-misc/snarf/snarf-7.0-r4.ebuild
deleted file mode 100644
index a5e2107fea38..000000000000
--- a/net-misc/snarf/snarf-7.0-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
-HOMEPAGE="https://www.xach.com/snarf/"
-SRC_URI="https://www.xach.com/snarf/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/snarf-basename-patch.diff
-	"${FILESDIR}"/snarf-unlink-empty.diff
-	"${FILESDIR}"/snarf-fix-off-by-ones.diff
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin snarf
-	doman snarf.1
-	dodoc ChangeLog README TODO
-}
-
-pkg_postinst() {
-	elog 'To use snarf with portage, try these settings in your make.conf'
-	elog
-	elog '	FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
-	elog '	RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
-}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index d398808a2d16..5d8f9fb5f404 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,7 +1,8 @@
 AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c996e55f059ffde68aa6fbd52828dcbe252331b9e56b8b701a1a3500b1a8e0b804e612e317d69f1bde9fd8cfc872 SHA512 15082f7c3c71b6f0860061d5c8b32dabcd54e7956919c328870c3cbb32fb96dd59c06931216e43beaa39a8c056088b6a73737ae8f7973136ba08f0c67aed2939
 AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081
 AUX telnet-bsd-1.2-musl.patch 1097 BLAKE2B 3b2d7424a04abd910cc6dcb94b8ca740ed7a2294f768fa23e6559569a25032f1c29e8f8ca8c01195486c6d5354b050996d4aad4af58b33919770f51c22ad6aca SHA512 71d4450eb3a55483d93029fbe5f4fccee30fb63d170dd6b5d0f3f2ae4007a827920b7adfb53858ae048054f5d23ca8492c1f36e5f36ca8513f54bdb0800133d8
+AUX telnet-bsd-1.2-openpty-util.patch 868 BLAKE2B 7065e1bfdf2d69619beeba400648e25945e9d382d5c816c615cb012b800dfb4cb01ed76ed38c8b1c37563bd39f6f05d888df948582ed619b6fd8513e1cdf8494 SHA512 71d6b7cdd08dec944a200f3cdf1e54dbc24891fb1665afca2da9f74e28b43bec233124dc11e97588d85296dfecc34380b38c84440ec1d5302c6c99ae68b0d09a
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
-EBUILD telnet-bsd-1.2-r4.ebuild 1085 BLAKE2B c5f7ef9126843d42de7736e10afdafe7d170576df3726013949bbe65ede863516dae553a2aca0f70be81cc1c9cb9aec40cace4ecaeb83ea4bd5534f023e3bbee SHA512 9b925720ec41b75834c0ad38db56876a955de1def20afa741e5731d50498e5175ca4eb63a805cd5668823cf8148bb03961b3d63a4fab239bfaa34a2b5854b873
+EBUILD telnet-bsd-1.2-r5.ebuild 1189 BLAKE2B b492fdf14178917712f223480c8b6cb416da89385b593cd69d6d6001b45a90341667e9d248a09d26728620027abb280b019ff97258947129f3f8717b1f0a9379 SHA512 761f2d6f4c241120623cfc2031d17b5536079316df55114e922a8c335a62c04a97ea4a15476d31fe32c0599e96b4b87be3c6f06b5fa4227eed894ac09cf29f81
 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch
new file mode 100644
index 000000000000..332e7951ea53
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch
@@ -0,0 +1,31 @@
+build: openpty is declared in different headers on some systems
+
+Check for util.h next to pty.h for openpty is declared in it on at least
+Darwin systems.  Solaris needs termios.h
+
+--- telnet-bsd-1.2/configure.in	2024-07-26 10:13:46.814937718 +0200
++++ telnet-bsd-1.2/configure.in	2024-07-26 10:19:15.734016104 +0200
+@@ -12,7 +12,7 @@
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
+-AC_CHECK_HEADERS([pty.h utmp.h])
++AC_CHECK_HEADERS([pty.h util.h termios.h utmp.h])
+ 
+ if test x"$ac_default_prefix" = x"/usr"
+ then
+--- telnet-bsd-1.2/telnetd/sys_term.c	2024-07-26 10:13:46.859137256 +0200
++++ telnet-bsd-1.2/telnetd/sys_term.c	2024-07-26 10:19:54.700983107 +0200
+@@ -36,6 +36,12 @@
+ #ifdef HAVE_PTY_H
+ #include <pty.h>
+ #endif
++#ifdef HAVE_UTIL_H
++#include <util.h>
++#endif
++#ifdef HAVE_TERMIOS_H
++#include <termios.h>
++#endif
+ 
+ #include "telnetd.h"
+ #include "pathnames.h"
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
index 8ba189abbfd1..1a89db5b5c43 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,8 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-telnet )
 	xinetd? ( sys-apps/xinetd )
 	!net-misc/netkit-telnetd
+	!net-misc/inetutils[telnet(-)]
+	!net-misc/inetutils[telnetd(-)]
 "
 BDEPEND="virtual/pkgconfig"
 
@@ -30,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fbsd.patch
 	"${FILESDIR}"/${PN}-1.2-format-security.patch
 	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-openpty-util.patch
 )
 
 src_prepare() {
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index 2aae89e0f3a5..82b7165837e9 100644
--- a/net-misc/throttle/Manifest
+++ b/net-misc/throttle/Manifest
@@ -1,3 +1,4 @@
 DIST throttle-1.2.tar.gz 72501 BLAKE2B 8374d09f12f37f60a2dd52c5e3e08ef53af0862fdb51d530883f291b1d0ab2a1127dcc70a08d4179e3052788a84e9a8183db3dbb53ae8181e62fc3728005c7a3 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f
 EBUILD throttle-1.2-r1.ebuild 485 BLAKE2B 551e81e251cf661d6ac5aedb58ee6d7d94784de8caacd40e3b48e31400ae2f4db55e0005fa9ecedba754de96ee54db5304ff66d91086d7f6cc9e8108f48eb8e0 SHA512 6f6b8ae23331995bede3fdd685f87e4822353ca2e197e3b2da6b41d873048511ff0277d3812f6533639b5faad142693bf311f2ae935b2c66413887081fd67087
+EBUILD throttle-1.2-r2.ebuild 478 BLAKE2B 46afc6fa252cb5f5d9a6578d8f63101bf026d1604b782145ee7c263ccf3268bc506d96f1ac0984a1af9a01efa3f6d9452e7cb534afe709cd8664b035c39e0840 SHA512 cf93ab046cc981b205ac0661839a949e85978aba22e3b0de8b0ccd59ae9c6fae667bf9b6a3db46ca8a6b320e2543d4e1cf501129e3a09039f1b04a8fe28f6808
 MISC metadata.xml 371 BLAKE2B 2dcccf05f086ebc0ae46a028e4392c35fdaa9835816e91eeeef91b86f614a5186706e12743e8439b1a81a0ffc52a8b41faf81f867e07972c206666b7beef1fb5 SHA512 0b5fc342b26420cf3dbae362664eef65aa522f395b7567aa90abaf3128930d602db3b17eb5f033f1307a641eb59d553c0e5e0b8863726adb9f278d5e2d38a83f
diff --git a/net-misc/throttle/throttle-1.2-r2.ebuild b/net-misc/throttle/throttle-1.2-r2.ebuild
new file mode 100644
index 000000000000..83e57c3d15db
--- /dev/null
+++ b/net-misc/throttle/throttle-1.2-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+# orphaned package, we keep its sources, but upstream is long gone, and
+# disappeared
+
+DESCRIPTION="Bandwidth limiting pipe"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index 2fe38b0f0158..a298c9c06154 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,3 @@
 EBUILD tigervnc-xorg-module-1.13.1.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
-EBUILD tigervnc-xorg-module-1.13.90.ebuild 458 BLAKE2B dddc7a3fabe0b412abea968dc134087325b1c70855c2c246d6fe411167883133da4d99f57fcc786103f818b2dfcceda9beb1e1499042861e5c5cdad45eca95ba SHA512 38e45e112970dc866a6f40edec73bd0bf266355f6c3a8be4d9351afa5798ceab443a157a33961db708725f1a1a458ea17c034947d3260bbbfc062e79a82366b8
+EBUILD tigervnc-xorg-module-1.14.0.ebuild 458 BLAKE2B dddc7a3fabe0b412abea968dc134087325b1c70855c2c246d6fe411167883133da4d99f57fcc786103f818b2dfcceda9beb1e1499042861e5c5cdad45eca95ba SHA512 38e45e112970dc866a6f40edec73bd0bf266355f6c3a8be4d9351afa5798ceab443a157a33961db708725f1a1a458ea17c034947d3260bbbfc062e79a82366b8
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.0.ebuild
index 65b3a6997f9c..65b3a6997f9c 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.90.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.0.ebuild
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index c274981e9cbb..58ab8c718202 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,12 +3,14 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59
 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673
-AUX tigervnc-1.13.90.initd 2927 BLAKE2B 9a6a13cbe80471151896a617be7c2ad6c57ed4d3913ee6fff7cc7845e93966c6fab2852b1561ac3b26c001518ddbdd25428501cb48f8dd3e7a8a59ca8940c3ec SHA512 45ee8723ed38c1821b6e60a034b20c95f11cd1db21a3270c6c2655516d5e2114cd872f163d2e7d649057156db0702a44bb0a8f8cbf05a9be7c04fdb62b6678de
+AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6
+AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4
+AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
-DIST tigervnc-1.13.90.tar.gz 2082778 BLAKE2B 204f2bdc503f4f13ead2cb641c78390763ebc590822d5759fdb3f1c1e052c761ffa443bdbb8f380d5b6b9f45215506bbd1c20d4bae336ee14d9e3621161a182a SHA512 8787d8b18e491df841947b42492e6ac09ed57c72a2b3a1aa901676b7b73bd8dfab5ce45177333913cf66d604804c55357d15eefe5747c31e97b91ce2b9f44093
+DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
 EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a
-EBUILD tigervnc-1.13.90-r1.ebuild 5451 BLAKE2B 969ff59f69636c982e7c4bbf6fae54941b1d0f71950135d62700b31d28166e84708de6a4d5b0f3f3e0e3e3b05f37a3e5b7c15a3ad9154a1c8709f7428071b1bf SHA512 7fbb6c3eaaafb0284816e6a0c93524991f3b4d506cf93d3e3563b5f4da5264b8541e27a5420fcc8716a252b78694ecffc1b2eae0834d5f4b1057b58971db08a0
+EBUILD tigervnc-1.14.0.ebuild 5606 BLAKE2B bcaaa94235e07852da83c4e511517c56b0258c5e9b7a1f7520f47e3b77ad2258b87f5f0ca5f8181d23de9c3f7c2262001e90c8b0544e50ea0faf363fa80ca438 SHA512 d0e34507861494b11ab610f76f0ed062ecca79fb27418bd76890cfc23e53a7697a2bf655c9a0af99fd5936cb93a3949d0aee3c9c8cb632f496d1959582f822cc
 EBUILD tigervnc-9999.ebuild 5451 BLAKE2B 969ff59f69636c982e7c4bbf6fae54941b1d0f71950135d62700b31d28166e84708de6a4d5b0f3f3e0e3e3b05f37a3e5b7c15a3ad9154a1c8709f7428071b1bf SHA512 7fbb6c3eaaafb0284816e6a0c93524991f3b4d506cf93d3e3563b5f4da5264b8541e27a5420fcc8716a252b78694ecffc1b2eae0834d5f4b1057b58971db08a0
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch
new file mode 100644
index 000000000000..898bd2122eaf
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch
@@ -0,0 +1,28 @@
+Add more possible paths for Xsession, depending on which display manager is
+installed.  We need an Xsession that executes its command line parameters, so
+leave xinit last.
+
+See also https://bugs.gentoo.org/746227 and https://bugs.gentoo.org/936475
+
+--- a/unix/vncserver/vncserver.in
++++ b/unix/vncserver/vncserver.in
+@@ -437,11 +437,14 @@
+ 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+     }
+ 
+-    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
+-        if (-x "$cmd") {
+-            $Xsession = $cmd;
+-            last;
+-        }
++    $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
++    if (not defined $Xsession) {
++	foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++	    if (-r "$cmd") {
++		$Xsession = $cmd;
++		last;
++	    }
++	}
+     }
+     if (not defined $Xsession) {
+         die "$prog: Couldn't find suitable Xsession.\n";
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0.confd b/net-misc/tigervnc/files/tigervnc-1.14.0.confd
new file mode 100644
index 000000000000..9cadc6ab8ae5
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0.confd
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/tigervnc
+
+# Add the user(s) Xvnc(1) should be run for to /etc/tigervnc/vncserver.users
+# DISPLAYS is no loger used.
+
+# Optionally override the default Xsession file
+# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
+
+# vncsession no longer supports VNC_OPTS
+# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.config/tigervnc/config instead
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.90.initd b/net-misc/tigervnc/files/tigervnc-1.14.0.initd
index bf9eee12787b..fa9e4248b304 100644
--- a/net-misc/tigervnc/files/tigervnc-1.13.90.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0.initd
@@ -25,16 +25,9 @@ checkconfig() {
 			for display in $DISPLAYS; do
 				user="$(grep "^:${display}" /etc/tigervnc/vncserver.users)"
 				user=${user#*=}
-				# bug #690046
 				if [ -z "${user}" ]; then
 					eerror "User is not defined for display :${display} in /etc/tigervnc/vncserver.users"
 					return 1
-				# 1.13.90 changed the default config directory to ~/.config/tigervnc
-				# but still supports ~/.vnc if not found
-				elif ! runuser -l "${user}" -s /bin/bash -c \
-					"[[ ( -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ${XDG_CONFIG_HOME:-~/.config}/tigervnc/passwd ) || ( ! -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ~/.vnc/passwd ) ]]"; then
-					eerror "There are no passwords defined for user ${user}."
-					return 1
 				elif [ -e "/tmp/.X11-unix/X${display}" ]; then
 					eerror "Display :${display} appears to be already in use because of /tmp/.X11-unix/X${display}"
 					eerror "Remove this file if there is no X server for :${display}"
@@ -43,6 +36,12 @@ checkconfig() {
 					eerror "Display :${display} appears to be already in use because of /tmp/.X${display}-lock"
 					eerror "Remove this file if there is no X server for :${display}"
 					return 1
+				# bug #690046
+				# The default config directory is now ~/.config/tigervnc, but still supports ~/.vnc if not found
+				# Only warn if password is missing, do not error out.  See bug #936442
+				elif ! runuser -l "${user}" -s /bin/bash -c \
+					"[[ ( -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ${XDG_CONFIG_HOME:-~/.config}/tigervnc/passwd ) || ( ! -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ~/.vnc/passwd ) ]]"; then
+					ewarn "There are no passwords defined for user ${user}. The server may not start."
 				fi
 				FREEDISPLAYS="${FREEDISPLAYS} ${display}"
 			done
diff --git a/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild b/net-misc/tigervnc/tigervnc-1.14.0.ebuild
index 24dd8515063c..dfc8ef4f5e0b 100644
--- a/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.14.0.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
-		dev-libs/libbsd
 		dev-libs/openssl:0=
 		sys-libs/pam
 		x11-libs/libXau
@@ -97,7 +96,7 @@ BDEPEND="
 PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
 
@@ -198,8 +197,8 @@ src_install() {
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
 		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 
-		newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
 
 		systemd_douserunit unix/vncserver/vncserver@.service
 
@@ -221,6 +220,13 @@ pkg_postinst() {
 		elog
 	}
 
+	use server && {
+		elog 'PLEASE NOTE:'
+		elog '	The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+		elog '	~/.config/tigervnc instead of ~/.vnc'
+		elog
+	}
+
 	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
 		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 7e3eab8316ce..ab8bdd169854 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,5 @@
 DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
 DIST unison-2.53.5.tar.gz 1408926 BLAKE2B e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470 SHA512 eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c
 EBUILD unison-2.53.3-r1.ebuild 2640 BLAKE2B d59f6ff05b4f082f64bf3593379fae8fe9945847c0ac3fb1c23f70f249811fe66cb4791008886378c26291beda5be749aebb54d58c105c61ef3b67462d95764b SHA512 b074f6cd44fed516800ee19f1e65878dcae9afb0d2afae553ab3955f6499a7b81780680cac89d032d3dd8e9128e982387bb9bd01f5b8a85185bdac2de1ded109
-EBUILD unison-2.53.5-r1.ebuild 2620 BLAKE2B 457684b3e93a0a7505d317d16a15dbf545b74e583ba93b6976a8819d8b63194625dc9d1a67e5ba927d7a762c5c8327b992600889486413c2960619b876fa4a75 SHA512 5a7ccc44fb156ddd2c3d39c1a5834de7f4e7a3ed96b9e935e56178ad33b98599878be571f233fad90f48178f7f19f958bb0b3fdddd9875d91ced604b7f774a47
+EBUILD unison-2.53.5-r1.ebuild 2737 BLAKE2B 126a4538f6d4d97b053c2209d5c823c7b33bcfb7a006db1d488beebbd7cc62f63e56d64dacd788f9affce1a2d61739e4b0c82cfedef5fc1d4e4fe93a9cca2ad7 SHA512 e60d8be9a00cbff6a17c60b39afe90d390b7ecf1cc6218620e1a7ad1f0044cf5cb1118cc1999e70addc38ced6b5e9018973ecf9d6a25eb54e6be7c8b8552deab
 MISC metadata.xml 533 BLAKE2B b8ab17513b1bfdb3467fd5f728caa0e782c8092737577c7ba9fd38c064842cc06136a1e84fc76d90c9c52785d54cce6916f4930c4e582a0138ecc8bbf623bd70 SHA512 6fb4be0ee5c3750f73c080aef8724535a470607966c3b8086ae95e7e962666dabbffb2536f6859e4cfe4018c985903a78b759d3cde498b0f97ad060af3b6eead
diff --git a/net-misc/unison/unison-2.53.5-r1.ebuild b/net-misc/unison/unison-2.53.5-r1.ebuild
index d1619282f060..2c3522204b35 100644
--- a/net-misc/unison/unison-2.53.5-r1.ebuild
+++ b/net-misc/unison/unison-2.53.5-r1.ebuild
@@ -86,6 +86,11 @@ src_test() {
 }
 
 src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
+
 	# install manually, since it's just too much
 	# work to force the Makefile to do the right thing.
 	cd "${S}/src" || die
diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest
index c2681da227b0..72bccfd00da9 100644
--- a/net-misc/websocat/Manifest
+++ b/net-misc/websocat/Manifest
@@ -1,214 +1,7 @@
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aead-0.4.3.crate 14717 BLAKE2B 304e37cb58ebbd8a0ff8f38eb178afad7860cfeb3f1c719f061f4e15282e3cb133089270a1a2dd9299c4007e1963d373578c7fe4139cb222f05a2d15b2313485 SHA512 c1f700a35c5933acc38ca6aa2cb945c4676a4765802d6021c35631de5ace35390a9dc877c1669cfd8789716a73b0397dfe551c32f50774683b0b8573b54fbd77
-DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
-DIST argon2-0.4.1.crate 28834 BLAKE2B ce5aea2b60a5417b51c02eba16cedf1c0b8e5da8ea06c9ecdff6135f60b63fff56350d77c5b7503b1ea2483e53558f44a535f80ea71876cf816e00ca6a18ff3d SHA512 32dc18c92e73d85baccec4c7650f558574280b85e173bcde639c1a91bef1320bc19a77d6f716f1e3237ad0156a773009c0f0d004c092579c7f82fa3827ba81b4
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.8.crate 6621 BLAKE2B 15afc4b27028f542b6977bcf19cc75f7e47df1f4e241e43d858bf451a659a2e937e0a3c1c8918d4fba6d1f66e47ba2f2e329023f3dcaff182e048e9e4f783825 SHA512 d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
-DIST base64ct-1.5.2.crate 28206 BLAKE2B 1059855de932f0d17c39c05f0b38a01e314284d16bf5fcf7b3627a51ab0aef210fb1c6f6f5b84aac7492769b51de8c235139de77e3f92a6b4a792669d8943236 SHA512 29d704441942d65bb0ce4c6940bab9c803cb79cbdd4118e0cecbe23aea9597b5770271c83ad7d5d9ef6608162807de2711f9f12aba8757f0d93638849de21b10
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blake2-0.10.4.crate 46804 BLAKE2B 694e81198aa92d610a189056558b77765f8231a2dbde4e861396edb57398af30e10c6bfd8bb0b62c2013d4874b5442d3df8857499d0f5fff640649224ac4663a SHA512 ea6fde4969d66de70e0689da8c76efd37c8f70b9f1d1894d5c1e497a980b011cac75ac650170b7f0face9f85f0c35d05e136dcf823e1cbe7df3db58b72c6fa4b
-DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f
-DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
-DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
-DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
-DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chacha20-0.8.2.crate 30716 BLAKE2B ddf2d375d46b3a6d0ae2bb1215d1de1af04e29e6deeef08b71886ab8060f047cbb973ef5b2e7f11cfd7c692fe601efc0087b29a18b0101b8cfcf6b34f91be2c0 SHA512 2718dfc786b3d4fe1cb6817f09c5f174fd3649e7a2eeb8218e2355b3ee59f08b6e81e8f6830e683f9ddabd8ac55628d470b5f5159045106e8a597e39f359139b
-DIST chacha20poly1305-0.9.1.crate 68379 BLAKE2B 47580ca5562b50a8785cf33c5bf58600e7bb795aad1b6985f7c7cefc63f8be40032cb71711c22a1c2d97a2126041b51f17289c98801ef39b40b2593b9a115569 SHA512 d41c347ada6ff99c5fc7f389ea422a5fd7059679d35d4728df360e90a59e66254f6fae2611edae3c012316fea5570166b7db6c3fd88a52d0500a5222bbdc238a
-DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f
-DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
-DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
-DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
-DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
-DIST crossbeam-deque-0.7.4.crate 19868 BLAKE2B a9cb1bba32df38980da7a4042610e514ede6f6ba15abd08629aa28b4a70e8c96030eacddf438df0701c4aea8c07cbdb088ad88b1fef24880a50d234160f44123 SHA512 ebc8bb09a46cb9cd999d8abc034b21016510a086282436aa73416b456ec7893b1c70339e05dab45cdb93bef4435939b0d95826f74bdcbb077e5ff31d15377da2
-DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
-DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
-DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
-DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST derivative-1.0.4.crate 42508 BLAKE2B 9996bf596e7646a242acac394c9ec2f5be20b49ce3cc257c26d51fd676740c46114005b05d270e31235f59916ad90238cfc5d30728b5e114b908c74974254f55 SHA512 b6dd82e4ebacc5df58302d2baa8d47eb12aa6d87bb3fb9ef125bce17e163e5a6d921e99e88d9ac91fed402a912e80ff92067a9d6236a8e52f6f8e8435f790623
-DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951
-DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
-DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
-DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
-DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
-DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
-DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST futures-0.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341
-DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
-DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
-DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
-DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
-DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab
-DIST http-bytes-0.1.0.crate 11513 BLAKE2B 50ac2039bbecdd17ee3057850dfcedd3999bc628053338935cadd7dc4f2d8d85cbc1ac4d4bdb7caceb64e2c113746691d18b3144cd0573b2224cfa774001c257 SHA512 c800062d0a12710c6101f2d4cb6363b999613a4d092baed5ebbfcfcf0d51ee042be9b48967ac61fb4624e95fea2b4acd4b4b5fb67461fe5c06e3e388051fdbeb
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
-DIST hyper-0.10.16.crate 113115 BLAKE2B 9276328c07d6bee7fc172d8104b6e8f30f0b0fd441937d2f4cb94e54c076a47e32db6a7c90827995c6c5c63e535d2cc6e597d52bca2bede17d117f038d971435 SHA512 22a9c31c490b002c8daf085536abec24cb01c0d63a16e6d153eb3cb165a7338d2109d6f88fa8d343942e2c6d7928d3c5ba62575a404b0dd7811f57e423eca4d9
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
-DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.133.crate 603256 BLAKE2B 00139eb8ec3921b961c20e9334e7b2fefe87d03df22c77b213491c07d93be193d991a814efa20c91cd5eab93fe392ef511ae4cec497bd5c41372d5aad1c31dde SHA512 526561652d77d5f61fa52dd9fe02a46a5f66289ec0aff5b2464311c3a90972c3ced0a84dbc901fa99a0fe35ef36af890bb7de40b9c6b7b7dce7fe8a1a738ed7b
-DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8
-DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
-DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
-DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
-DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
-DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
-DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90
-DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73
-DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
-DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
-DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
-DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
-DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
-DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
-DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
-DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST openssl-0.10.41.crate 219460 BLAKE2B 363832d3d358514d6d5c97d6e7f7d56b84b33655c3df318b38e0ebaa3e19b84f94aa600347a8cd8f1682accf24a6de342c585e3449f8f8889fe5ac40cc4a5441 SHA512 2ac24fb9b29f8ec3f54944277df924925a0b9a9e4f8a604f8efb0039794520e99520bc28d53355ba4224e69484dfd93265cd174c6463159837f316aae5a9789d
-DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
-DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b
-DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
-DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
-DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
-DIST password-hash-0.4.2.crate 26099 BLAKE2B 3f211d467d43960c1d767111c679d2ee7ca004a14946409e37b4e8ea46848100095bd43ac5d4e4ab31828e6fc09e67eb0b40e677dffb086f711668c4918c8bcb SHA512 f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
-DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
-DIST poly1305-0.7.2.crate 31868 BLAKE2B afbc7d84f3f67276d1da7d2b1b00d23de35b6b46205e8a4309aa9f1a2abc582cb09b63b28773daffe45074bd250ec77b54923ef8fd422918625179c99b7d410d SHA512 4fff82358985b564b7ee76626854d67221740b6f8540754939899ad3c773809182eaf3e4a2fb697ab382c4a6643116cfbc4756a5a2662eda240625e879e10cdd
-DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
-DIST prometheus-0.13.2.crate 81623 BLAKE2B dd1411ba2521e3f0bd705bf8e164acb93e809d0850f2c7001ea0f40e24269050f5fc5107fa8b5c0613b0304f2c64a4782b2392eb3833865d0497e056d6411fa8 SHA512 9c0282fce8b053a1ee8f2253b885a843b37982a7f261f4533ec0dddd006b9439ef55c3cda1efdb3433abf9ed9d1d7584b3aaf98f67a2706730c459de214002ae
-DIST prometheus-metric-storage-0.5.0.crate 7129 BLAKE2B 366653e1306c0a32fbb68aefb3ee30099d700e0b92f2795b01ea4bab49e8cf60055765363124386e48597aae20138b25e15967b90e80bbd4cfec6584ece39426 SHA512 08f2479de155acf03c8f8a7e4fba7035a7652cb906aa504b56bfea168dfe70f8f3c398c489d9e92f9dc7a48c8a320b9f2ac5372019b4f32341e9b2a4b778bb87
-DIST prometheus-metric-storage-derive-0.5.0.crate 3719 BLAKE2B 4ed22782a0e09ad68935a4b1bf9df82b1c151766f02a0372cbff0028c2ef747152d20ada17d3bc693b8dd0cd5db3ee8030a4c73d6f50b1c0ab8f276eefb6f540 SHA512 35d3af8a68c65c435f94f3173ad1b2d117b87df7b889fac20c49c0137120c898c6f9bfc066efa73fa8fc8f13ab6cc8e604b1d36a4ce55d984a8fdbc2c8574e2a
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
-DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
-DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
-DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
-DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
-DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
-DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
-DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
-DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST readwrite-0.1.2.crate 6872 BLAKE2B e1626076fa42000faa6e12cf32e76f9feac00aba6f88024a786945ed0549819bf402dab1cebfab5fb325f901885d39e58a942f00331a7da47ce36f893dde46fa SHA512 f043f8176e202075dbecda73782fecf644d7246b7df9ba194d6caaf42a25f93941ca3a6bca4d2870357314e2a19c7f837de682763e167756247e1a96a0e8c22f
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
-DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST security-framework-2.7.0.crate 72601 BLAKE2B 593b08ee9c393d49e7ba9264705d91f969f006a944a855995761c7e00d0c97b3653350f9165649b774bc3c9f9f564307298951cc1b03ff47aa4d0fae501eb513 SHA512 7bbc52a951b328ac25a65dd5d69d173b566f18ee62158a98e2d2d4fb8c51c8dc9930bd78f9cc2ad4eb2fffa1bbb4eda3941a37ef1b545b78f3a39bc480056307
-DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
-DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
-DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
-DIST slab_typesafe-0.1.3.crate 5980 BLAKE2B 8ac675c6c313c13d2f8fc88b44c41314578c0c990335dae8f216daafc3cb0b122042cb54b65b4ca8264c0c6bdb3b6d07edac479f615f23fafc3417d7d6f4115a SHA512 f2dbece513c795f7fac857dfc060034bf61d0d51bb1891566d9c36be97308562033251c11e422020f67bc04bcd9111148f434b55051f69b9ea0d79b072cc410e
-DIST smallvec-0.6.14.crate 22855 BLAKE2B 5f96c825c57ee6ab80bc13469793dc7ee780cd856e614c6cc0c747e1cd43fd5e27b589652610198e7757252bb6fb25905f616ea82fb9d8a9ffd5c8cd394b4f49 SHA512 4ba563b542922523566efbe0aac9df499c694bea9ba8ba14a74026d516e02f1fa8f542774b8044150a8e27f01a4b1c71c5280b5a82f61d5b45f022ed223f3977
-DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
-DIST smart-default-0.3.0.crate 6297 BLAKE2B b2e782a64802595b94c6e36b7365b4353ee0a16c5f9477d0222c9862991ebc6841d0f0ceb1dc671da139afe190fc15f3b1c0ece2fc62c897b4a351fee5523072 SHA512 022bfb5321d01cbcca95eb30bfe75bb80bc0f48538cd6434c5ae89252289e3f1daff0a7cd46532ad936f8714544451ac3138a0c3507e9de689dafbe396afd34d
-DIST structopt-0.2.16.crate 26165 BLAKE2B 3609dffe30adc12dd30b3acf6bc1722841ad0823f3199569c616b6cf9502a3b89def471571bdeddff4dbe1722e3b595de3c5b18408b4f4f2015a2db0b51bb517 SHA512 3154f168dabdb6476989970e75d43c8d730f73b567171c0d3bedaa1549ffa13dc543c28b25174efdbb90637b972e9e857dbf2422b95fb55ed9dabbde069e191e
-DIST structopt-derive-0.2.16.crate 12951 BLAKE2B 7b7eddb8854a5bc47b8d91103b2bceaab9057b553c72c4ee6c995dd4392cc9594124cc00562115bc0250b87499f8b8480fb34d8be1434bc55a668a79cfda6c75 SHA512 7ede89d104af3e57e9a78eae16cc8644622b1e83f8ea852ed3cad2e03d3ccb50e5fbd0f3f73cdc32b51bab6607b9b65266012fc7294d48ca0a234875c816a301
-DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
-DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
-DIST syn-1.0.100.crate 236691 BLAKE2B 0e604e48b2e9498f2de290ea0c7249d03a2e7c388f920c5f671a861770c96a5d72958fb5efde45490c0fad0f5ba34a25927e5ae1a538062feee509b0d8629ebd SHA512 20fbac3fa505bb2bafebdb35e3581434240629d8554433ccdfa1ef8cc4b74e31ca0355d47abf7081e983d222b14e08c5a806922e5490a7c19d5a6bdc2ffcffde
-DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912
-DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc
-DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
-DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
-DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tk-listen-0.2.1.crate 14268 BLAKE2B c8381e66ad43a7649da2f84170ae45a4d04ddd7a9f10e085fd537edafc3a7ab5c3697f092e8fddabd92307c6757c8b8ddf1fd33c2479c375b812d99aba9517dd SHA512 134240c0cb3255c77aceed3e88ad95d63df8a0c2df1436925579dcc78c2ae9efeb1045a5f295c09e87d5c8e8aa8a5961fda411ff345ae74b8292f58884bf7344
-DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
-DIST tokio-codec-0.1.2.crate 7850 BLAKE2B 68e196f0cfe2742f5bd6a4074eafb7cc83d80622f51743e9cda367c8fb26bcf3a6a10772963e75f86c3ef054270f22a13e58a3455ee316145b111a2d6ad00053 SHA512 69bb3a0ea81fc8437fd57c2ee533f0674770182207576e463c8a5859956175a4619500b832863cae9ba9d0d09d76c33441c7b3e929896a61304b25c9d2dd6c94
-DIST tokio-current-thread-0.1.7.crate 19690 BLAKE2B 1a6ccb40e59095df2e4ece5be501027a9975297c8606cbf107e8a365529d175415d1738e6770c31b586685fa0e573b6c4eade68fc83b1e01d89c2e22a3741e28 SHA512 4458eecddf552cc63dfb877976cdaa2060f8fd82a9cb6667f8fb3507aeffef4f3db38d649de55bd784f98828a12bc066d35e96c60ca07a42cf8f16a5fd7d58ea
-DIST tokio-executor-0.1.10.crate 12191 BLAKE2B 9efed875a669cc842d298d2ea5ec310a008707f5ec4b796d68fbcaa3ff47c3484630306116d6d36c71f4461869e63a11dd498cb680013f5a3c2a9a46fff9763f SHA512 e2101de6130d09c1a0cf750ea49f605db2933ee4d96943e111d550816ba6a67e4d662e0ba5fb548ae62d582b665239b27b8478f2364b6c46d038dbde8cc41754
-DIST tokio-file-unix-0.5.1.crate 11181 BLAKE2B 42feb87903ce66953b7ff70c73ada3131342727046d0eeaaacdc46e47e2d27f59e2ec8443123e7fadef0461221cf0d922adfac10e17eeb402f235041adc5656c SHA512 7f40a8a90b26185058f13127d4361d50c9e78c78854821be79a899d45df0fa2a42f889623f9e0dee1824ea917086b42f90b84ac761f414e110413cfe65e7d766
-DIST tokio-fs-0.1.7.crate 20881 BLAKE2B 08d22887c990149cd3aeefc3a9aef949124a2c3cb9edb5ec2b76a01b90f85a22226417f75319f92514d812b752ff7090854188e64d2c1af8cf8c773b7a97a8e5 SHA512 3a1023dd9537164c61ba07b4759d05136165274efed6cbb7bf868ccabc311353b0e221137d2be643970f4d710bff20251104344a7542a08ac3d60ef502624d2f
-DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef
-DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604
-DIST tokio-process-0.2.5.crate 23688 BLAKE2B 555f3ffee5ccc574ea19a07c558af0ab735447695ed654cd94476387658c065ee8749883e716f07e11b75231aadbd28fc14ef1ec93d09b18086e9bb6398a2789 SHA512 aa22040bb26d23abab955903a7973020c596b07744d1d53c6b5ab425314dc96a03ccd0128ed5f531f0cb3202e64ab00976523b359c5bd8a863ba947f64b21d87
-DIST tokio-reactor-0.1.12.crate 21058 BLAKE2B c1a1842aeccc0d3f74dc4e588c485d326f74b652b8f504bf20cdd69c42dcf937c49bbd0c149f8da428dd12f5d8a1715bd39ad76d3b71f1e414c663093a437d26 SHA512 2db454c63f8965345997685baa9e4f1e7d2fad1c0087e7d79bcbdc5bf0176703de49c50180689db5f797aff6794748e01a28877d46f58cf453d7a4fe17d3f791
-DIST tokio-signal-0.2.9.crate 19789 BLAKE2B b5fa30d457327031871150bc251cc1850b43b716ce650803d3a58ec130e885ed2e8ad901d955ea95af6a9dacada13321feae845374552f7ce504f09f2f7e5ffe SHA512 afdd91454c2da8f0b2fce65ffcf35dbb2f73cb5552f63fbb6e8bf1e125d9026840cf1ec895a91a4c69997ada17ab6abfa8aa43217c07d18591ab375aa49da180
-DIST tokio-stdin-stdout-0.1.5.crate 6661 BLAKE2B 1279776134a9e46de5a45c0561b95154fd55b0c965e00f5422000bf7a2fff94447aa504b57318e2a80dccdacfc6f0bed3582208278384e0808e2f8454712ef37 SHA512 f37d52b667243220fd44400bfd659721559d673bfe934a717abf59da35478192732127e0fbd33863754211a45777b548e90e32d18fbb9f84b147181d39251bd2
-DIST tokio-sync-0.1.8.crate 41830 BLAKE2B 20e61e5e5360f54446ad60de050a4156d3e975f4e246f51b308ea1def48c51f8f1b28fcfd81362b00e0f6f9c40382abb71a4c9e799e81cfd7b0c7b085c42cc27 SHA512 b3665476629ecc8d513d53169beebe090818c6b76ca99f0a508c730bde0ca3c49b828942fc3b9d76fa9cad1b6766237e18a329607ca2314c7ad4b343dd785371
-DIST tokio-tcp-0.1.4.crate 12745 BLAKE2B b11b76b94ac5fee26c83537d9c169fa775539c90703fd9ae2c5565c99bbb56305c474710a3b90ed2e8cc2010ac00de77023ecc04e5cb4a653d7b5e0f0e21e23d SHA512 e33168e12ab9cf448f75ccc1662f54b287db0961dd472da3a86f400d6b80159cce290b9a4b948d216b86284e5bd61c14db8750fc2d0ac16d3937418c1260d2f4
-DIST tokio-threadpool-0.1.18.crate 54825 BLAKE2B b1c202bb8aa453f3af56d82713c175dbe0b3b2c1a8efd8ba849b0afb243f48a4f76b994095e4c490b37710d6a1c33eab2f1a2dddcfe15bd9887ad8bfa9c76f8b SHA512 163aea96e536f670e5536c728b159da52585805a721a18ee42e9324320df4e93a9baa5b31072e5a12af7cfe3968bb57f0a5864e17a758f66e71e31f7f02d7b27
-DIST tokio-timer-0.2.13.crate 37873 BLAKE2B 0a1c1e07b941919dc5d1c1a425ba84d6d954b52932933e521fe5e8c76f36c9c2bef9b93eb710e79490c3082519f385f7737454ed884fc7d11ca92ca44b4fe5ca SHA512 9813e5e74cf210eb3fc29268483da32272852c79b23d4b09ad7ee012687c910848b9b8fa5638d4d71cf62d2722f29093f2324ccd4f2e65db5c111ed6f9142d04
-DIST tokio-tls-0.2.1.crate 16354 BLAKE2B 120f2839ba7e4666dbd75db26b52eb5fe6498ced7f7b46708699ec0cd42624b0b504b2503a72b5ba0c75c64c1062967813c13d964ac79e7cd94f3e1cff2cf6d0 SHA512 d657d331ac14b98738fd828acfe543fc2ead7f57a6c35380de55863369a8302b55b7356b75db67baf894749a26956e05abd4499bb453708aebaba6456712ae12
-DIST tokio-udp-0.1.6.crate 11677 BLAKE2B 6a2e871f385be1fb7bc597fc00a20f0086e7fbdb0b5fd2785e3bb3c01d5c41f0b1c46b29d9735f5a0176e1560225346a4ae394b7552d4d5668277ca7053b82b3 SHA512 404d2418c2e78c5e693514b181a782cd41d313f62b29186b9f30796d5fa48d7d223156d665dab39fded5b7ff5c2a47c0d08ae320b003063aa22112bc8857f62a
-DIST tokio-uds-0.2.7.crate 11942 BLAKE2B 5c74cf32de1c047f75175fbff9af0cadda1a74673f5b2e3b2e652ef5724f0d428b9caade0c474411c5308559103972e19344adc97822f930d1dd31edb048d1db SHA512 c06818507ebbfc53c34b7afffe5b16c682749371a9dd7db9fffb3800b5d63fdd1d7e646bdb0c84c3b86228f86c54d2b95f61942cdcf087c9f5a1491fcb764102
-DIST traitobject-0.1.0.crate 1957 BLAKE2B 0ce6e870f29a7a67e8e8db7516dba85ba4a15fbeabca4c44b655778f9a012a525c671cb3d6841477642f7ec4157cf5c8ed754169b44cef708da988000549e9fc SHA512 aa23140652ecb3397ea989da0c2c58da88d22a816a2bb9fbd90db4299b773275d20a68411d8d300d2fefb2b508f561978c12b95f88d178f9401fe2230f9f795f
-DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9
-DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
-DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
-DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
-DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89
-DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
-DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c
-DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST universal-hash-0.4.1.crate 8503 BLAKE2B 2cb981f8c1b9337f69e4b6672c69c01515009e8bbfaf5236f7db6cea4f3467938be75b4a1aac69433d18ce09361c52bbe99face153417f5105c4ffd050bb2c39 SHA512 fa582c789b462d8b9cf069fe82de47bad5e3a4d88d83d58c82a54fcfe56f44c24a6a63374e050d89162700510e8c87eb74430be30e1da9dbe4a4b6bb80a684e1
-DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
-DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
-DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST websocat-1.11.0.crate 102374 BLAKE2B 29399053a7c5cf398bd83dd9b52604819d9cddf5138483362e6fc39dabc03b39f56191975ffb147e6cd5433070cbb3c98644396d34565c41b3d173e3b84355f3 SHA512 867faf0645a81c8a8924147865507485efaf7cc2ceb850a4b1e93cfbff06b4318324e1ac37b7316c52444a70f32de529bb8584626cca94411a31c4794d1cea7a
 DIST websocat-1.12.0-crates.tar.xz 24777476 BLAKE2B 39d3162438d4941db1de46f0a904ea0d7557c5da377679c1310215e5d6a05f062b601512f56acc9161fc6cdd306c9e41d16bd7c7db14c9da2c73fcc6fb0fd377 SHA512 c3e471b92ef7a2cd30e8627c53436c8e49ef061c7e939be1583c5fc66718580798328f9d453676e79807284309873f5c82dcc6d8b3f263f71596c57de38cb9a2
 DIST websocat-1.12.0.tar.gz 165961 BLAKE2B e83675c1bd421add00a3a2409b51e98edacb52c018b3f617cc78808e14d8a2af0a7ce9d6db1a6ebc740a6c620213e70fb3dda91c2f8a9bcd9e93d05c8043b313 SHA512 043e175d557fee92d381ed1f1aa510056e1d59d0bd25c8f1cc9bf78c3ef59e9e76c5ac283f6bf4e8c9563365cd57deaf5e6f3b0040e6d680a9e8dc80ad931610
-DIST websocket-0.26.5.crate 61982 BLAKE2B 5bad2852a59a606f1202ecff500cbadd141982fb66eb51f87b91dd832335b5cf088af5608e0ec4cdea2425c53c58871532106a5d8c8a22e9702524278239fda3 SHA512 6489f639430a7c496e2b3502a110777cf275fce29b9ef1a67f083042846b767c7c1b74cd112ee604ca5e17de23033a28f3d79d56fd27ba9c1a103d2d307ce584
-DIST websocket-base-0.26.5.crate 19281 BLAKE2B 73ce88556b3d13a02829b97a578844545efe74cc5fabec1ad71ad9ec4f42ab2dab19117961e9354915f3ef33aebfc60d32a1c6174aa73444bd191835132d9322 SHA512 dc1ba64b54427a81debbf64bb171fca718951f3449159828c142d55d4564201b290dac83979fde530a02d274e309fcf14659b62e63dfae013ddfb37bbb3539e8
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
-DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
-DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
-DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
-DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
-DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
-EBUILD websocat-1.11.0.ebuild 4721 BLAKE2B b39630639f827b6a6aa787358f71b6e07f0c6e4163af82dd2fadc2611788fcfae28b4088d95ca989c28a7e15e967f1f9fd43a4674917f96fa78946c9826cee21 SHA512 25f66eab5cbf6052e1993433604c9c7798b9c629b700a9280f6c2ea0ebd0fd9339bc671d588d22acca84c60084f54daaa292bcdf2729e7f5ea641a174c48b606
+DIST websocat-1.13.0-crates.tar.xz 26849464 BLAKE2B d7be9a8db3c1774d7ed607d5ec5cdf6435fa9f2ac4dca7c23d7dc5c858f0301b103794707fec036318ef1287faa9ecdc795385439a71d7bbce28f2e746841ddd SHA512 2fc155c69c0c115e8c8298e9756bb92b905982b5212bd51ce82032babf145cef79451ca981c2378caf1b54980ef12b491c6d324bc6915bca63cfd23ef9fa1152
+DIST websocat-1.13.0.tar.gz 175990 BLAKE2B 287e869538246d9d5c62080aeb1627b0e8155585553800c0d639e2a8bebf9b4d65e3df35ff424c48076cdccbe79b54a15119793ae22cf68d1ce1774c0e795236 SHA512 119cb6d0c226ed4f1df86a42a26903ba8465db30e5d0908d4a28601a58636e9a906fbb44d2d811ec9b25103a8c48b4ccea8b31f2f61854d062bc436ac6afac78
 EBUILD websocat-1.12.0.ebuild 979 BLAKE2B d32942e205e08a4b3620be07e7ddcd819a424f2146685aafb039b9e3642d939b0e0e3c17b5d3961be4ad93621dcdbac620a763d5d55608e628045c711ca2b28a SHA512 462b25987011f984f423106bac4c3ca9f5725f8ac5f8e56e8eee50cbda518efb6c95d2cd009944f4a23884754107e849905cd03b191eae3d091b2ae862e8f218
+EBUILD websocat-1.13.0.ebuild 968 BLAKE2B 336ab58550f55c999844696538d951bf9f2eccc179812181ba768d459f86e2781742f020e37db39909f4165c50af0205500774905cabf28d674e5e0efe07b47e SHA512 3b7e52ad1260227c78334f8499ec5eeec82d5c1e10b4292c532df1517fc07f7cde2cf0466c954856d37c0049cfdb6e5c2322237ff76b79007c1dff53eb54922d
 MISC metadata.xml 451 BLAKE2B 833d2a6d39da6dd42db69c6428e70ba2cad341bce3643b90be6046f98f12675a7e5d76bfbc63006a74bc5232e95366544ac73f66c3ea38a78c6a7df56d82b88c SHA512 19793a68342f93c6e2ac264a25c5a6499c30593686b2b27c0359861380dc7de974cdae54bacae5461c6a856f14860d05b858f6b4a9aa20260b67e4ebe0f925ec
diff --git a/net-misc/websocat/websocat-1.11.0.ebuild b/net-misc/websocat/websocat-1.11.0.ebuild
deleted file mode 100644
index fe290f266303..000000000000
--- a/net-misc/websocat/websocat-1.11.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	aead-0.4.3
-	anymap-0.12.1
-	argon2-0.4.1
-	atty-0.2.14
-	autocfg-0.1.8
-	autocfg-1.1.0
-	base64-0.9.3
-	base64-0.10.1
-	base64ct-1.5.2
-	bitflags-1.3.2
-	blake2-0.10.4
-	block-buffer-0.7.3
-	block-buffer-0.10.3
-	block-padding-0.1.5
-	byte-tools-0.3.1
-	byteorder-1.4.3
-	bytes-0.4.12
-	cc-1.0.73
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	chacha20-0.8.2
-	chacha20poly1305-0.9.1
-	cipher-0.3.0
-	clap-2.34.0
-	cloudabi-0.0.3
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-deque-0.7.4
-	crossbeam-epoch-0.8.2
-	crossbeam-queue-0.1.2
-	crossbeam-queue-0.2.3
-	crossbeam-utils-0.6.6
-	crossbeam-utils-0.7.2
-	crypto-common-0.1.6
-	derivative-1.0.4
-	digest-0.8.1
-	digest-0.10.5
-	env_logger-0.6.2
-	fake-simd-0.1.2
-	fastrand-1.8.0
-	flate2-1.0.24
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	fuchsia-cprng-0.1.1
-	fuchsia-zircon-0.3.3
-	fuchsia-zircon-sys-0.3.3
-	futures-0.1.31
-	generic-array-0.12.4
-	generic-array-0.14.6
-	getrandom-0.2.7
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hex-0.4.3
-	http-0.1.21
-	http-bytes-0.1.0
-	httparse-1.8.0
-	hyper-0.10.16
-	idna-0.1.5
-	instant-0.1.12
-	iovec-0.1.4
-	itoa-0.4.8
-	kernel32-sys-0.2.2
-	language-tags-0.2.2
-	lazy_static-1.4.0
-	libc-0.2.133
-	lock_api-0.3.4
-	lock_api-0.4.9
-	log-0.3.9
-	log-0.4.17
-	matches-0.1.9
-	maybe-uninit-2.0.0
-	memchr-2.5.0
-	memoffset-0.5.6
-	mime-0.2.6
-	miniz_oxide-0.5.4
-	mio-0.6.23
-	mio-named-pipes-0.1.7
-	mio-uds-0.6.8
-	miow-0.2.2
-	miow-0.3.7
-	native-tls-0.2.10
-	net2-0.2.37
-	num_cpus-1.13.1
-	once_cell-1.15.0
-	opaque-debug-0.2.3
-	opaque-debug-0.3.0
-	openssl-0.10.41
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.22.0+1.1.1q
-	openssl-sys-0.9.75
-	parking_lot-0.9.0
-	parking_lot-0.12.1
-	parking_lot_core-0.6.2
-	parking_lot_core-0.9.3
-	password-hash-0.4.2
-	percent-encoding-1.0.1
-	pkg-config-0.3.25
-	poly1305-0.7.2
-	ppv-lite86-0.2.16
-	proc-macro2-0.4.30
-	proc-macro2-1.0.43
-	prometheus-0.13.2
-	prometheus-metric-storage-0.5.0
-	prometheus-metric-storage-derive-0.5.0
-	quote-0.6.13
-	quote-1.0.21
-	rand-0.6.5
-	rand-0.8.5
-	rand_chacha-0.1.1
-	rand_chacha-0.3.1
-	rand_core-0.3.1
-	rand_core-0.4.2
-	rand_core-0.6.4
-	rand_hc-0.1.0
-	rand_isaac-0.1.1
-	rand_jitter-0.1.4
-	rand_os-0.1.3
-	rand_pcg-0.1.2
-	rand_xorshift-0.1.1
-	rdrand-0.4.0
-	readwrite-0.1.2
-	redox_syscall-0.1.57
-	redox_syscall-0.2.16
-	remove_dir_all-0.5.3
-	rustc_version-0.2.3
-	safemem-0.3.3
-	schannel-0.1.20
-	scopeguard-1.1.0
-	security-framework-2.7.0
-	security-framework-sys-2.6.1
-	semver-0.9.0
-	semver-parser-0.7.0
-	sha-1-0.8.2
-	signal-hook-registry-1.4.0
-	slab-0.4.7
-	slab_typesafe-0.1.3
-	smallvec-0.6.14
-	smallvec-1.9.0
-	smart-default-0.3.0
-	structopt-0.2.16
-	structopt-derive-0.2.16
-	subtle-2.4.1
-	syn-0.15.44
-	syn-1.0.100
-	tempfile-3.3.0
-	textwrap-0.11.0
-	thiserror-1.0.35
-	thiserror-impl-1.0.35
-	time-0.1.44
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	tk-listen-0.2.1
-	tokio-0.1.22
-	tokio-codec-0.1.2
-	tokio-current-thread-0.1.7
-	tokio-executor-0.1.10
-	tokio-file-unix-0.5.1
-	tokio-fs-0.1.7
-	tokio-io-0.1.13
-	tokio-named-pipes-0.1.0
-	tokio-process-0.2.5
-	tokio-reactor-0.1.12
-	tokio-signal-0.2.9
-	tokio-stdin-stdout-0.1.5
-	tokio-sync-0.1.8
-	tokio-tcp-0.1.4
-	tokio-threadpool-0.1.18
-	tokio-timer-0.2.13
-	tokio-tls-0.2.1
-	tokio-udp-0.1.6
-	tokio-uds-0.2.7
-	traitobject-0.1.0
-	typeable-0.1.2
-	typenum-1.15.0
-	unicase-1.4.2
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.4
-	unicode-normalization-0.1.22
-	unicode-segmentation-1.10.0
-	unicode-width-0.1.10
-	unicode-xid-0.1.0
-	universal-hash-0.4.1
-	url-1.7.2
-	vcpkg-0.2.15
-	version_check-0.1.5
-	version_check-0.9.4
-	wasi-0.10.0+wasi-snapshot-preview1
-	wasi-0.11.0+wasi-snapshot-preview1
-	websocat-1.11.0
-	websocket-0.26.5
-	websocket-base-0.26.5
-	winapi-0.2.8
-	winapi-0.3.9
-	winapi-build-0.1.1
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-	ws2_32-sys-0.2.1
-	zeroize-1.5.7
-"
-
-inherit cargo
-
-DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
-HOMEPAGE="https://github.com/vi/websocat"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl"
-RESTRICT+=" test"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="
-	${RUST_DEPEND}
-	${RDEPEND}
-"
-QA_FLAGS_IGNORED="/usr/bin/websocat"
-
-src_configure() {
-	local myfeatures=(
-		$(usex ssl ssl '')
-		seqpacket
-		signal_handler
-		tokio-process
-		unix_stdio
-	)
-	cargo_src_configure --no-default-features
-}
-
-src_install() {
-	cargo_src_install
-	dodoc *.md
-}
diff --git a/net-misc/websocat/websocat-1.13.0.ebuild b/net-misc/websocat/websocat-1.13.0.ebuild
new file mode 100644
index 000000000000..e42ad159e087
--- /dev/null
+++ b/net-misc/websocat/websocat-1.13.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+
+inherit cargo
+
+DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
+HOMEPAGE="https://github.com/vi/websocat"
+SRC_URI="https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ssl"
+RESTRICT+=" test"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="
+	${RUST_DEPEND}
+	${RDEPEND}
+"
+QA_FLAGS_IGNORED="/usr/bin/websocat"
+
+src_configure() {
+	local myfeatures=(
+		$(usex ssl ssl '')
+		seqpacket
+		signal_handler
+		tokio-process
+		unix_stdio
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+	dodoc *.md
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 15a779d0f999..c235914357e2 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,8 +1,6 @@
-DIST yt-dlp-2024.07.07.tar.gz 5687365 BLAKE2B 877b8bd15d7650b0afa928f44bac587843d1e37b8f26b82a64af9171525a26f89930b40f5f24e8c81833220bf78da4669bea0e4a660211a673e6209e9e062f07 SHA512 f6cb892db1364ccce2c2f99c5b0cb859475cd7757c93f03e1059c8222aadf2fd2220c6ea3509334a16439858274bbeb889dce52d7a9158043d6de473d5346598
-DIST yt-dlp-2024.07.09.tar.gz 5689089 BLAKE2B c5f6c17b68ad1816af5c1ae480afd9ba6300a7b588d44a86d780433f147dbf12a1598c4940907277d9fcbd3d924616460c1ea98b8b84ebe06c09ec5703b8b158 SHA512 8abfe3a70ae0758a001274b07523647cdf0f4e760eb98867577b1ac6306bbebd0f8ddee93de2782da2a19b9476e120e571b4638c07b93ffbfc060822d4ff126f
-DIST yt-dlp-2024.07.16.tar.gz 5688157 BLAKE2B a1e4cd8ff7b73246aed2239298d548945c99fe8d76d41b9e3293767b7b680028f4d23f2fc116516e853be163b267a600f99525784d9b3cc16280f1b8b2d5a90a SHA512 17f5aa71ae01b6a009e5b0a4380d9329530563ee01ac268a2a6acff01732ce0c9d14181790a15b182b0de09a35b6db2f3e814acc50934d5f3e361245027926e9
-EBUILD yt-dlp-2024.07.07.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
-EBUILD yt-dlp-2024.07.09.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
-EBUILD yt-dlp-2024.07.16.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
+DIST yt-dlp-2024.08.01.tar.gz 5708569 BLAKE2B 83659efb7de95792e28edd8f43103c73141ffb9e3492baaf3533759329e36f8fc84da5a45a281ca394664a67c0723019de89f43362c24ff026c4cdd6158f04b5 SHA512 e454969e641f2e36cf1deae142a0eddfb54eb9dc19601066e129d597304cb28550b08b2a5923e7ebf7133e7793fcd6b3006d7b19040f37d40450854f4fe06247
+DIST yt-dlp-2024.08.06.tar.gz 5710396 BLAKE2B ba657ddd054fc814adfc9644378ab51e50f980a8ce9d9589d0e69d4242fc68a22314a230135c54737a1b453d853d811a48d1737b05c2e04d3494ca580a6937b0 SHA512 5db3ceeb217148755e31492d490bfeb69879400873274dec4320ce58b49dce9ce93d1e32714d6b7433364780e269087fc55acb94ef4fca0d998c504f2efac41f
+EBUILD yt-dlp-2024.08.01.ebuild 2418 BLAKE2B 0fc0a872e48610461af592f3534a56329da3356e6731e17e405dc75812b8e7378a38b92fc8fe11a7e383082f87fd8bf40c7d3185affe47f65b60b85ba5bda84b SHA512 58cc1944fc4e45b37b81d268db6bee98a0fcfc13d70c5e3d443a8baba60a5364e1c3752da2ae97e14abce000b4152409b992f1f4577b00593928aca2776cfe9f
+EBUILD yt-dlp-2024.08.06.ebuild 2418 BLAKE2B 0fc0a872e48610461af592f3534a56329da3356e6731e17e405dc75812b8e7378a38b92fc8fe11a7e383082f87fd8bf40c7d3185affe47f65b60b85ba5bda84b SHA512 58cc1944fc4e45b37b81d268db6bee98a0fcfc13d70c5e3d443a8baba60a5364e1c3752da2ae97e14abce000b4152409b992f1f4577b00593928aca2776cfe9f
 EBUILD yt-dlp-9999.ebuild 2436 BLAKE2B 3be5da21d8b1ffef30cb8c204121d7c7ce59ca12d0e369ce6c232dba59a1cf8c057c7f6b09b6bca4289533f04db6075c72843d5154221b0c8f18dd6cea809d4f SHA512 c83a141c85ac1fb1091525f6f3b7600d3fc9132b2a4cff39f5460fb2c20c5d9094e2176450cdcde24b05877c2306462045929ea6e3690d9d48012e234a8381ca
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild
deleted file mode 100644
index 68214ba4c2eb..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2024.07.16.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 distutils-r1 optfeature wrapper
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
-SRC_URI="
-	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust pycryptodome and drop optional dependencies (bug #828466)
-	sed -Ei pyproject.toml \
-		-e 's/("pycryptodome)x/\1/' \
-		-e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with FEATURES=network-sandbox
-		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
-		# fails with FEATURES=distcc, bug #915614
-		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-	)
-
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.07.ebuild b/net-misc/yt-dlp/yt-dlp-2024.08.01.ebuild
index 68214ba4c2eb..a4bd878780a8 100644
--- a/net-misc/yt-dlp/yt-dlp-2024.07.07.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2024.08.01.ebuild
@@ -17,6 +17,8 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="Unlicense"
 SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.09.ebuild b/net-misc/yt-dlp/yt-dlp-2024.08.06.ebuild
index 68214ba4c2eb..a4bd878780a8 100644
--- a/net-misc/yt-dlp/yt-dlp-2024.07.09.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2024.08.06.ebuild
@@ -17,6 +17,8 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="Unlicense"
 SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index 3b011de16d9f..8eab4949b8b8 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,6 +1,4 @@
 AUX ytmdl-2023.11.26-data_files.patch 208 BLAKE2B 51cb77162812f798ce73d3d71d7a1ad113c047b3ed1e75747d09017b400353dc1fd7bd13ab180ad2e33f4d5c52c65330ff841240677b89da45c85e57a4328993 SHA512 66e6b4177c64232878c5ff04d09a931e0d3a51d0f797f5e2186d3c2870f606c6ac54a367abf90fb3805018f01f6ddb79065aa3a543171f1d1cbcc06e813f910c
-DIST ytmdl-2023.11.26.gh.tar.gz 1120208 BLAKE2B 145f8e24305f4978f1ed0655e5511c6b17b94ea23301309c31bbafaec60b2184216ef0866aed478eda95763ab4ec0cd43eac176acf849871e58c3505b09ea231 SHA512 df8ed294f0092d4078fba8b64abcd2524e0d8331a42dfee6e1869e3a418cf2d54f95d7c300d83e4392295ea4116ec989d418b0292b0895ef474bf93338a980e7
 DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760
-EBUILD ytmdl-2023.11.26-r1.ebuild 1645 BLAKE2B 32762cca3ee9918b8f206f10353242c41b22ab82ad6226c1e7f2038c2bf6773578c008dd5ecc26b48677f706354ff64ce073da8173e481d7592136625595f34b SHA512 b2b3b90c78bf4b6b07e38e1e625dd6e67ece37e64bc8e9bda10fc797651f2bf88a6b06841b1e0dd817185d0262bf41e88d93a1704c199904bab416c5ea25df1b
-EBUILD ytmdl-2024.04.14.ebuild 1644 BLAKE2B c1e84e395c0b1a1945987eeb4c3bda96c16aa45fbed1d32369e99eb6398d1cdf418f2c8c11a63eb513c22ab34791da0f259c039e94c94a6499fe52d8675debfe SHA512 d1f7a0134e07d90f2dd071447eaffe2fff6bf0833e4cfa6cf62c3fc8652bec1b0bc69f5e237c93cf68c5d3ec0492c1f789163b2bc98c52b8df7f0ec6e82f18ae
+EBUILD ytmdl-2024.04.14.ebuild 1644 BLAKE2B 9215f8dad81938cbbbdd85e1c358f53fcf69fa5267211f78064a063c2c0eb77e2113db2f488e4a638e1de314244664637a411122c5871b8c7225fe6172073227 SHA512 324cb8deb393dac2e1142541b48a3ea59914f4bd6a9621074db01b9104b1c1044604f72fe3e1384115e7087765334912029c9421d1025dbea2ec6f3d560e6196
 MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild b/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild
deleted file mode 100644
index 0ec4e506c4fb..000000000000
--- a/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 edo
-
-DESCRIPTION="Simple app to get songs from youtube in mp3 format"
-HOMEPAGE="https://ytmdl.deepjyoti30.dev/
-	https://github.com/deepjyoti30/ytmdl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git"
-else
-	SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
-	dev-python/itunespy[${PYTHON_USEDEP}]
-	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
-	dev-python/pyDes[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/simber[${PYTHON_USEDEP}]
-	dev-python/spotipy[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/youtube-search-python[${PYTHON_USEDEP}]
-	dev-python/ytmusicapi[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	net-misc/downloader-cli[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch"  )
-
-python_compile() {
-	distutils-r1_python_compile
-
-	edo "${EPYTHON}" ./utils/completion.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	newbashcomp "${PN}.bash" "${PN}"
-}
diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
index 0d06867b5465..f73f070585ef 100644
--- a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
+++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit bash-completion-r1 distutils-r1 edo
author	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-08-07 12:37:21 +0100
commit	b8c7370a682e4e29cda623222d17a790c01c3642 (patch)
tree	f6caa14689bd00a5760eadaa381ff41e50ef3c1b /net-misc
parent	8a4997a7e2d1e36c089d4d76935b5a902d98d3d0 (diff)