gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /net-misc
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
128 files changed, 2078 insertions, 1016 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5b6498606fda..6c17f888b000 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index dfa0d0998842..e30fe1ffc210 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,7 +1,7 @@
 DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
 DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
-EBUILD axel-2.17.10.ebuild 974 BLAKE2B 20f71b59b2fba73a6eae3cdcbe9863177be7c32edf7b24186673c514a71034789ea98c03d3589ec931723a45281e2d1b47053284b336db12929f660fd90929cd SHA512 bc806cd0ed64d74cb654a4c5d9a01a040d65dc35dcbaa31367d4e81871b9995a332aaf413ad1e8cda1ddf1e30b48f65edcf575077de0e6437a9666cf15358654
+EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
 EBUILD axel-2.17.8.ebuild 974 BLAKE2B 20f71b59b2fba73a6eae3cdcbe9863177be7c32edf7b24186673c514a71034789ea98c03d3589ec931723a45281e2d1b47053284b336db12929f660fd90929cd SHA512 bc806cd0ed64d74cb654a4c5d9a01a040d65dc35dcbaa31367d4e81871b9995a332aaf413ad1e8cda1ddf1e30b48f65edcf575077de0e6437a9666cf15358654
 EBUILD axel-2.17.9.ebuild 979 BLAKE2B 2674e0f45621ac1dda8b5139aa49f7cbad1cbffa159510b7800c7951208e687a139a86ff1f837ee53bcbbe2a67756d8251a12cf98d44e3ece019983b88865982 SHA512 0d00c387b1f13db45a6bcf37d040395e58b98aa1c2a19d203da06de2fbc85e19d02d444bf3064bb85add4cdc4952fc54d415a3abd094e0148e050305bb203381
 MISC metadata.xml 335 BLAKE2B 8de02303ead90809cd34dcc7fed0a845e137b3ae3338ca44c10a9339da0ee5391ac183f17f0b59fbc9515eefa8daa0030bc009feef7f1400b0a76d4f2f6d5900 SHA512 41e63e21afcb123fbe05f43fe1958e4883d37eb2a1df38b013f95d6eb6cce6cba9819d4843b5a267f123bc145325bc09bb4f2f8ceac1000b750812fb367398ac
diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild
index c2b94b904b2b..9ec3f17398db 100644
--- a/net-misc/axel/axel-2.17.10.ebuild
+++ b/net-misc/axel/axel-2.17.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug nls ssl"
 
 CDEPEND="
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 14df16214e86..9bafd2ebbb7e 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -5,4 +5,4 @@ DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c167
 DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B 4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb SHA512 71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65
 EBUILD chrome-remote-desktop-96.0.4664.9.ebuild 4808 BLAKE2B 26d9e5c83ac126f414f3dab199f50972965fe777c2bf55db298c2ed82f8fd5cb14cfacb12c249544c2fc7cc24ceb181759e3be0b10dd8df1e943b6f8a51cad39 SHA512 db708de2928e175d476f127a60c5c878cce3db19c6a0298a4a04447c1fb4671ee383a0307b5267c743e4b32630069c4ce49bc5dea56b07e77e9e37efb9867368
 EBUILD chrome-remote-desktop-99.0.4844.11.ebuild 4808 BLAKE2B 1ff119f4d33e81f69d5b34ee743ccd645b7d5cc391012adf63a30d169fe5603264ff061da06377b575a453b31045fa9cbb73cb5cec58637ba284f97200898fe1 SHA512 fa1df0c86ff168a328e086da5903b3c1dfd470ca8b3da173b47ae8303e10a5077370528d95316137b78799cbcd02b2a0c8c0b9e1e2622cbe0d4a0757ba754a19
-MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
+MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
index 8041df927597..7517f8d97dd7 100644
--- a/net-misc/chrome-remote-desktop/metadata.xml
+++ b/net-misc/chrome-remote-desktop/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<name>Mike Frysinger</name>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 2f4ea8d894de..be30cb32a721 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -12,7 +12,7 @@ DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e7325
 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
 DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
 EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028
-EBUILD chrony-4.2-r1.ebuild 6721 BLAKE2B 3e582b40a5f48953d41e847d5f2c8b39d1322806b6c00031ca37febe3eb88a22bf2233d8303ae5b6fc5112cf8ecb4d3c3e536ea525efa5720b8884c993615803 SHA512 a6d7fd5287fc71c974d9f4b9f68d1885b8bb00734ad97a493f0698100107f1b837234e129cb144850c84b6b9d820708dc27aa4ab143b82d1f675f8b3204b7434
+EBUILD chrony-4.2-r1.ebuild 6720 BLAKE2B 7ceb4f2b1d9bb4894f7e5a3a4b5e893e082e5e341e3027eb281a5546e019c10c4b91cf789f6161c3236a4f9d5d9338f3fa9c578529fedca4e877da3eb30e5d23 SHA512 dfe2087b8fc58a5b4289c1766f3e14800360a5bce333b61932ad0d2b244e1210533cfc09a1098c05ed2beb45256ebeb904d3ba04e2128878008d55a42fbd9f8a
 EBUILD chrony-4.2.ebuild 6643 BLAKE2B 42de896b755ab3992c620c440adcfbf088e6b325085fdaa7bf1d2798c5219781b5741052d605541054536925524f78734f8c4cb0ad04d5b4d279422212ecd2a5 SHA512 7843e59659e2c1fdc381c0e2995e198e21e180abbe11faa7425c13348950c2f997d2caef1ee899d3f7e38666f21224e969493a2167e967c6d6ce8445215e8499
 EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.2-r1.ebuild b/net-misc/chrony/chrony-4.2-r1.ebuild
index 815d78a0b5fb..8f97331ddd90 100644
--- a/net-misc/chrony/chrony-4.2-r1.ebuild
+++ b/net-misc/chrony/chrony-4.2-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest
new file mode 100644
index 000000000000..8e36239b4fac
--- /dev/null
+++ b/net-misc/downloader-cli/Manifest
@@ -0,0 +1,3 @@
+DIST downloader_cli-0.3.3.tar.gz 10881 BLAKE2B 489e49d679be3570ee348ec73091cc3458953d4b37c552a9a417af2421e9c032624214300418ff8c93decda6bad7622e6208a08dc216f40d1195f849dc11d0d3 SHA512 4210cc3c09f4c9d07c3ea7335b6ea356393f539ef26e3a231b3278359e853165b8145c1f6186b657e2cee02b515748f7ffc87966cc30e082b0d2b282b9557c72
+EBUILD downloader-cli-0.3.3.ebuild 504 BLAKE2B e2cad4ad0b06078e0bed492ea279b206688090d75f3eec3c53c477587e22d1802bfd377c9f19b9cd595fe828c7976bd2a99b424555fe777e1895feba9534d269 SHA512 e50e84f2b5c14502eaa695830218ec281ea4162f0342b6bfae21642dfbe1ed59d149ecc7b485163ee00cc94426ef2804e7e29c629191622361b43f2add19f58d
+MISC metadata.xml 423 BLAKE2B edb59675dce904aa2808cb3986d28d5f57347937438107f608379e33a48a3432495c3f230d562345431e5cd47da045cae3f83f29a6b7ce582786df698210d0d0 SHA512 463af333a9bc72c5b0e98fe0b42703eafe565a6744ed24be935c91830285754513f0ce05ad6abe953d34c81521fabbb04f41564d78be26268c022671fdced58c
diff --git a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
new file mode 100644
index 000000000000..05a0f258d87c
--- /dev/null
+++ b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple downloader with an customizable progressbar"
+HOMEPAGE="https://github.com/deepjyoti30/downloader-cli/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}"/${P/-/_}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/net-misc/downloader-cli/metadata.xml b/net-misc/downloader-cli/metadata.xml
new file mode 100644
index 000000000000..31fd36227c7b
--- /dev/null
+++ b/net-misc/downloader-cli/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/deepjyoti30/downloader-cli/issues/</bugs-to>
+    <remote-id type="github">deepjyoti30/downloader-cli</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 6b363db9dafe..d10c2aabd755 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -2,5 +2,8 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
+DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b
+DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105
 EBUILD dropbear-2020.81-r3.ebuild 3009 BLAKE2B c85c3b010afa5aa31cad91e362385a38d7e39467d2b6b0353898eb603e3624da7b520c79512c3ae87b100445d4470eac16b762391589a2e4091de2a92767285e SHA512 bfb2f428fa98bb9accb282c18cb13378970362705f74a04711604dbe8ad9c25619f2b96d6e5df4060a9b556d04ea7fc7d695a1741481d541cc6032b131fbdfeb
+EBUILD dropbear-2022.82.ebuild 3395 BLAKE2B 0413546d02089e7477fc0844cf05ef5836ed3cc758d48a2fe99b229e2b4587cc2b51248cbf143734a56a45a40d46ce5fb4a700de46f58ec4dad565f14c9568fe SHA512 b32dc2140c1a9d14be678392c267152da849cc753ca1dfa3238c9147508b3dcd88789a6bdbe96cf7f3fb2c53e9f2fb14d04301cdfc4951c60f70f4f7e62b4778
 MISC metadata.xml 1792 BLAKE2B 11de80280a55da65d07a8a89195bd8342b34c5ac2b15b8c86aaee64dd81253bd0b3d0b6ce1b5544dbbb290a9359194981357b7e95570e52c45103c482a1828c9 SHA512 1d18e935fab0b524df060d3b4a000b9bd639f75f40328137c7bdf0b6a016307d3ddf7c60bf5e6500489d8e721fca39bc6332ace5fad97d2f0a9de91136da91dc
diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild
new file mode 100644
index 000000000000..27bbc8b51dd6
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2022.82.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dropbear.asc
+inherit savedconfig pam verify-sig
+
+DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+SRC_URI+=" verify-sig? (
+		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
+		 https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
+	)"
+
+LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="
+	virtual/libcrypt[static-libs(+)]
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? (
+		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
+		>=dev-libs/libtommath-1.2.0
+		${LIB_DEPEND//\[static-libs(+)]}
+	)
+	pam? ( sys-libs/pam )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-dropbear )"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.46-dbscp.patch
+)
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+	)
+}
+
+pkg_setup() {
+	if use static ; then
+		ewarn "Using bundled copies of libtommath and libtomcrypt"
+	fi
+}
+
+src_prepare() {
+	default
+	sed \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		default_options.h > localoptions.h || die
+	sed \
+		-e '/pam_start/s:sshd:dropbear:' \
+		-i svr-authpam.c || die
+	restore_config localoptions.h
+}
+
+src_configure() {
+	# Notes:
+	# 1) We use bundled libtom* when static build is enabled because
+	#    libtomcrypt lacks it and we don't particularly want to add it.
+	# 2) We disable the hardening flags as our compiler already enables them
+	#    by default as is appropriate for the target.
+	local myeconfargs=(
+		--disable-harden
+
+		# bug #836900
+		$(use_enable !elibc_musl lastlog)
+		$(use_enable !elibc_musl wtmp)
+
+		$(use_enable static bundled-libtom)
+		$(use_enable zlib)
+		$(use_enable pam)
+		$(use_enable !bsdpty openpty)
+		$(use_enable shadow)
+		$(use_enable static)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin || die
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}" || die
+	fi
+	save_config localoptions.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 88e0c3729771..b53705e6781b 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,16 +2,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-141.4.3299.tar.gz 101154693 BLAKE2B b95f1b1d9ba4673bb8c66129c6221f72f0bd08b86152f4a810e4d7346f52f5bab3488747d007ab6c9f15cf1c9a4df1ca68097f21122465386822a8862f3888dc SHA512 2c9277fa73a5930b2abf113b4f52f205b7dd2cc5b6eb4d46487fb3a70019b77d0fdef7afd24aa9563f527d2b48094d2da865e122523a79f30cbdf0c2c3f87205
-DIST dropbox-lnx.x86-142.4.4197.tar.gz 101203911 BLAKE2B 5f8d299372fb0e6d67eb091ebd95c0f92fc1a1ca7e89b4bbad6c00a7f8b049c9aec46cc330657e797b0125e9c090fec40cbba5475e376262ad38f94ebb9daa58 SHA512 65f77bd6b9906291246a5dd7e5e1ad2771ed4f2e1a969e0335950a88043a0799564ed0d1efa61a2495d4dfd109278edc4b3adeac9b0959cec9e0b3f3f655410f
-DIST dropbox-lnx.x86-143.4.4161.tar.gz 101332974 BLAKE2B c81417a3f100c064af4370cac698a46b7f667eb26b819dbc8420ed7bf583cc5e07ac469cb34ffbb5818314c5adb1869b8611b7c5768feb307f62fcbaf49541c9 SHA512 41ad7016feb2560d09877388e423e16364d132abb1ac4d875b19b3d1be71b9c2f313efcc09f18ebdab6fe3b36f6add50137ea36e67737320a7ec0a229643978c
 DIST dropbox-lnx.x86-144.4.4491.tar.gz 102606173 BLAKE2B e662ffac51126b1541a448a32aa4885e4a9a300a48cda79b2cd26e9edcdc53c2cf76dd1e03be4bc7d44d2a7c11e2b7f32d2b89af6ded4c650af8f05ddd865753 SHA512 ed040ddc8883877dd28966691ac068e26cc57a89d9cd9c364b005afb6057c025ec7182f341e1d8c7c2edb1d65ad7ab71a8f39c17e2dcbf73a5af6eba1275986b
-DIST dropbox-lnx.x86_64-141.4.3299.tar.gz 103354049 BLAKE2B 5f2d881d8c8422707ab42b3a4f75ca9a9c32023273f3bb0bacd6eb7a9cf89b45b3aa8442649868814ca8d4063978ddb8f34c5c1bc464274c103075ecc19ea514 SHA512 16dd3c717c7cd578b7a7af53cb3f432ce849b5ee7bd13ba86ff919e59c35b8b5ee8e70784995cdfdf49b877d0c3d9ca5638974ee3cbe863e332978c5fad905bf
-DIST dropbox-lnx.x86_64-142.4.4197.tar.gz 103610767 BLAKE2B 005a0b36b9265f6ec9e4b019ac8df1a2e83f56cf15f6f558ab167fa2972a1fad4e605e7553b819877902dbf63685c77c47468882e47c1ef9ec1965d00fe455ce SHA512 30228316033d76dd1204a909f6fb21f21bcb1e2c5752a000619c4a69859299bc441830f5ca5439ea096f2e3f493374257367c90b5d4d6f4c8268bf3010913244
-DIST dropbox-lnx.x86_64-143.4.4161.tar.gz 103726609 BLAKE2B ac611ed45d57d0ffa9f31ba5078e54fdacebc5b59cfc82d101c87db69ad1eff5709159898504c7032e680c4d26d22ccf149299ce874e8709c765fcf9ad5ff41d SHA512 fa885e6ada8000c888cca201127c3511da3e5a007b0984105eb20cb3615addb26dc1558561ab59cecf8835697fd2ed64a357ac28320960b0dbd7778dfbbedd92
+DIST dropbox-lnx.x86-145.4.4921.tar.gz 102627045 BLAKE2B a048bce81530d3874f4139e6e98e787f4e2242da830b5a5a43e6ec5f5502ad91bd90bfd25d2068895d18487b516cbd1e35c2fc2cfee9a50f15aca20ea48f8f6b SHA512 3bc7059e5387862c9ccc720f620d7aa47b594c78360f7644b5312659056cbca7cd345c0ee784b4de20c2bcd5f47958a64cc0e0eb63200bdfa8b73e6c06156f0a
 DIST dropbox-lnx.x86_64-144.4.4491.tar.gz 104875474 BLAKE2B 42dd986edcf1ae6b709f0a52872219618d771636dccd6f4d0ff0abd7302c8d9358ed0cc6f6f26fb007633a9696f6119c7aac80f631f6687203cd8ed85760f8e4 SHA512 4bef381d4ab177325cd089a854942814b8a7efd553b4f71980c17ea1312d8e9c9a64662ab6a99626254e50a195c2c66f5fc92f465f12881cbd4e89618e120d89
-EBUILD dropbox-141.4.3299.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
-EBUILD dropbox-142.4.4197.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
-EBUILD dropbox-143.4.4161.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
-EBUILD dropbox-144.4.4491.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+DIST dropbox-lnx.x86_64-145.4.4921.tar.gz 104888508 BLAKE2B 11a91e4c0da4066e4d18daaf5e066c141bb480811a54e3aab8b7c6ef3a96faaee40d5d7007c871de7cc1bd5f402a03c2586de49a13ff2ce75d5bf1dbf120d1bd SHA512 f3f8805c7f98f5bc0010545be2daa9d8713253a5391494537b5c2a8e010b605f50a32ebf1dff473ce6e8768e5350a8b62310541197de24b44a4c5c2295d43c30
+EBUILD dropbox-144.4.4491.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
+EBUILD dropbox-145.4.4921.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-141.4.3299.ebuild b/net-misc/dropbox/dropbox-141.4.3299.ebuild
deleted file mode 100644
index f43dae64fff9..000000000000
--- a/net-misc/dropbox/dropbox-141.4.3299.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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" "dropboxstatus-logo"
-
-	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/dropbox/dropbox-143.4.4161.ebuild b/net-misc/dropbox/dropbox-143.4.4161.ebuild
deleted file mode 100644
index 0c3e0f739306..000000000000
--- a/net-misc/dropbox/dropbox-143.4.4161.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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" "dropboxstatus-logo"
-
-	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/dropbox/dropbox-144.4.4491.ebuild b/net-misc/dropbox/dropbox-144.4.4491.ebuild
index 0c3e0f739306..f43dae64fff9 100644
--- a/net-misc/dropbox/dropbox-144.4.4491.ebuild
+++ b/net-misc/dropbox/dropbox-144.4.4491.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/dropbox/dropbox-142.4.4197.ebuild b/net-misc/dropbox/dropbox-145.4.4921.ebuild
index 0c3e0f739306..0c3e0f739306 100644
--- a/net-misc/dropbox/dropbox-142.4.4197.ebuild
+++ b/net-misc/dropbox/dropbox-145.4.4921.ebuild
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 615a9ec73df7..4e000518e77f 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -3,5 +3,5 @@ AUX efax-0.9a-fno-common.patch 762 BLAKE2B 57c915976dd6437a9f4e420188ae28ed44dda
 AUX efax-0.9a-strip.patch 332 BLAKE2B 12f4313f6d0c9c5b88dc39eda399afbb7e5ec0d0e5b95114197757b091a1c635e086e2e1791cfde415e950c08f4e2eb6b020bb607750441c59e1a3ef7896e2d8 SHA512 02945f51850e90e70572402fd75cdedc3a213b4329c5277066f696153b773e9911b4d48c29f295c0f7c54dc3518e08b4b8a83f882f5ed604284cbb784ae42b13
 DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc
 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
-EBUILD efax-0.9a_p19_p1.ebuild 1242 BLAKE2B 725c4d6ff515c68e3e0eb7fa821f9cbc2f670d9a8a92abb0a46a2cc37d51c752c3b74b018d6b84022d63b6e8f60ee68d072ebe7119d71cc0d99455bf93339ce3 SHA512 63f6e8e0a37ca602d22684c2a146e47422221ea66005e9c5382e2df6d7f74e45757168aa6f6818c3cff5cc9430827d848e070ebfdd426482eb74f63cb61047c0
+EBUILD efax-0.9a_p19_p1.ebuild 1244 BLAKE2B a478e3cdd52c987395929bba72b8c15fcc66e18a7698a3313643caaec53a3b3462941dbd0d547dca4f34fff55c6f337167a638807599bd7ae11eabf26d15bc56 SHA512 255204e664c2d883f724d35b1c31a660247662cf58d5e333ed5c82987e4a8ec49f923ae1ff7996fb7fb04216524dac4303f3f5189c722bdcf458edf3b55c50a8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild
index f15a6494aef2..cc28377d9026 100644
--- a/net-misc/efax/efax-0.9a_p19_p1.ebuild
+++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 1610b6b74968..2fff7f1d4fbb 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -2,5 +2,5 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36
 DIST electrum-ltc-4.0.9.1.tar.gz 4464915 BLAKE2B 2c328f9fc433f39b11aa2bfc4e397b75aadd07adc66576ae985c5b41b32d663df80bb67dafbbce210f3581f6fb43e666070d090bf189eb4907efd07d306fc945 SHA512 926ad16246d0609a787614b84cadfa893ed792ab2a54a3c0b9d707019e29874b1ae1c42dba098f34b61f915d85578809ff87dc9026c85563264a2d2b583c8823
-EBUILD electrum-ltc-4.0.9.1.ebuild 3866 BLAKE2B 781548f9512eaaa0fff4eb1762b6fe9da24842aaa550625154dabf90487dbdad08c8c402c1b20d1cfadb351f38c0e2af347d6343f38f87f0dec67789083ad9f5 SHA512 8b9547a5a3a981e10ec407d2f426cde154bc3ff37b1e3c998c4efc4c26290dd069d578a27b06cbc04c221f58ce7dfa1cae5d47451e3d13442c1008fe8fdc128f
+EBUILD electrum-ltc-4.0.9.1.ebuild 3658 BLAKE2B 6d7b478fb2140ff54e7c1243c3d28520989fede213309f7992baa579feed5205f4194c3ec9b121c1714cbcb5e291f8c21269afdd62adf4b421ee2c7d735c4717 SHA512 5bdcd1327933ccad1325f054f1781c5948cab870b8f6f7ca5587347ced1156c46f9e0eb0b2767cd3c45365d9abae98a7ae457ed185eca5f8dc3c22a54fa284f0
 MISC metadata.xml 894 BLAKE2B e281f5655d1c92356cfdd0a685192e471e265929e4ff22a0adc4d4f8578a1600ae1877a574f150afeae9c36714a015c199aa43d57eb5848f575726debdba5318 SHA512 3ed81f974efd82226d35eae7acf99a66bd397c4a64b7435f416b8e2bda3f50e94b784fc3d794d150d107dceb5fa23b484c288658453b6ebeeda8ed9a7e33de77
diff --git a/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
index 7cdd8f438e5b..89fa018a6112 100644
--- a/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg
 
 EGIT_COMMIT="${PV}"
 DESCRIPTION="Litecoin thin client"
@@ -141,17 +141,3 @@ src_install() {
 	doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png
 	distutils-r1_src_install
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 93a3731f6f72..daa759a96d80 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -2,6 +2,8 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92
 DIST electrum-4.2.0.gh.tar.gz 5065087 BLAKE2B 800667f2661ef45fae7e7f2d73229810eb490e90a9bea7ff84c04c3cf859f07ac71972658a52f802817a42de7eeb0084c6b0e1aba74733918f250228996f0641 SHA512 72c8afcd2f3fc3de2b8b6516dc82355718c7dc9a88b06ba91d8e3a3d1e2bf329c02cfc8ea9dc22aff88fbde622dd443606f14e11e0bf8050da5765cd9be75a83
+DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88
 EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
 EBUILD electrum-4.2.0.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116
+EBUILD electrum-4.2.1.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116
 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
diff --git a/net-misc/electrum/electrum-4.2.1.ebuild b/net-misc/electrum/electrum-4.2.1.ebuild
new file mode 100644
index 000000000000..02786de94c6c
--- /dev/null
+++ b/net-misc/electrum/electrum-4.2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index bfbb9ef87ec7..9bf6bd8ce7b2 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb
+DIST gnome-remote-desktop-42.0.tar.xz 158448 BLAKE2B 35c5458ec314d7e3abc60583d136e18296609af2caac658cf936685085b6f8b6725bc453336131293dadd1b548d110a4cf5cf8871fcb80d838212e60e204feb1 SHA512 3bf03fc96205df4c5efcef0e340ad85e7011ad8e4fecf2e29d9902fbb1633801da7d1094645e850267249dda9383ae0aa782f3e0207a7351d764482f2d0dc349
 EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc
+EBUILD gnome-remote-desktop-42.0.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild
new file mode 100644
index 000000000000..e0ed71da320e
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	>=dev-libs/glib-2.68:2
+	>=media-video/pipewire-0.3.0:=
+	app-crypt/libsecret
+	x11-libs/libnotify
+	media-libs/libepoxy
+	x11-libs/libdrm
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.5.0:=[server]
+		>=sys-fs/fuse-3.9.1
+		>=x11-libs/libxkbcommon-1.0.0
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index a89466b1341a..5e66e172beba 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,6 +1,5 @@
-AUX gns3-gui-2.2.28-tests.patch 504 BLAKE2B 0403dd9ccb6c7c5808ad8d1b20ea9a35da23b0731392b146cd0c638880e444c2e6973f9eae327407871d77086984921ac7b70a9aa3543f8e3e26c797e14244b2 SHA512 599a5cbdf0ddfbd68ef30c1f433f7e42c9bbf749f3ed7b2442b210c1560bc72a9102fbeff87607d9e578ec6610c379e5cd67fa04ed6cd06ac88d21f65846f485
-DIST gns3-gui-2.2.28.tar.gz 5043019 BLAKE2B 734e614d9364d7c0462621eefd62225b4c784af47ef7d1b60e76dca0f8a6baf21269ccc1a63f00bfe2992d12d2079bd822d310c4a6fbce9a0fc6e772c4d0108b SHA512 514ca1c40e1652d0941cdbc1f5adc41cd71990138a84f96ec522a50dcd39433e1312a6bf4768cd926cdc25b69a5291e8ac7028c33ef19338746a9cd25a042b45
 DIST gns3-gui-2.2.29.tar.gz 5043197 BLAKE2B 9a08f16a96448400a2826e94cf244a126527578fb6f09c6f207b106aa30c194c522f78d4803125a694bdda8bf464d8fa923bbf5e9cf4f79834028aa605ac218b SHA512 7a6ad191d772ae91739196baa64644b5fcebdd3baf8781e07ce0cbbc70b98b09930005b349b15940237798624912e466abce7eedda588fb32c43601247570ec8
-EBUILD gns3-gui-2.2.28.ebuild 1071 BLAKE2B a55cb64a9d3a01df9257b7890bda4a9c6c0bbf5cbf90313ce7b8465c9d68c2ca6cec29affbf5d0ef1f8db18a2384c28c2041f79bd20b210242d8e22d9b1b7b13 SHA512 2684e759dc124cd565fe1a712049975d13ff093a6b6021986094ff91e514cfab017711cf56bcf4a92c4b8cf67657c987695fefb59f9df338b122d631e0c172e1
+DIST gns3-gui-2.2.31.tar.gz 5043086 BLAKE2B 3b028b57406d86137fc4d0488cb588bf5821de1d79c4be80c7da6b8895fb594f90bc7018341d82d4e77db2e25510b8fdb191ce819904423ebbcc5caef612bf21 SHA512 ea894cf65b80dad985fbc2112d018750c42b3c0bd358f6f5a6a491748d12e90e2de01108658611c7ba890a55fa688853c3e98d9220c8cb28c772595fa586100e
 EBUILD gns3-gui-2.2.29.ebuild 1026 BLAKE2B aa0a46f4016ec2fbe7e04adce0833968596963c1d1d2b9cd2ee6b1b21121a81632d52e9f26625babd180386974f86beab1277383eb21d729bfae628eca4b42bb SHA512 a21c7c1814ad86299a538f6c614b49c5d3028093cdd04933651eac0d7bb22feb7ddb2ae126f3acfbd0e8befe5a5bdffc36d5c46203a103749ccccdd14b75c85d
+EBUILD gns3-gui-2.2.31.ebuild 1028 BLAKE2B 1d7b4a0b5b4b26966cc1abb49d6c0d4f0c99e42dc303b498bebeef664be57afde6f24dd545d813fe288b3df800318e36b788d4fb78b7445d380068d0f03d4371 SHA512 5c407af4148e1fa26ce7bf20c607b78d625bc648f5ea9b08768e263256ed5f4df28dfc23bbeb899c8a3efcf5b37545dca26a5d80f8476f74e8241bd61f245563
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/files/gns3-gui-2.2.28-tests.patch b/net-misc/gns3-gui/files/gns3-gui-2.2.28-tests.patch
deleted file mode 100644
index aad72138710e..000000000000
--- a/net-misc/gns3-gui/files/gns3-gui-2.2.28-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/GNS3/gns3-gui/commit/a5aa9bfb7a9996c3e07f506110d61c5a319a7468
---- a/tests/test_link.py
-+++ b/tests/test_link.py
-@@ -104,9 +104,6 @@ def test_create_link(devices, project, controller):
-     assert link._link_id is not None
-     assert not devices[0].ports()[0].isFree()
- 
--    assert link in devices[0].links()
--    assert link in devices[1].links()
--
-     assert link.getNodePort(devices[0]) == devices[0].ports()[0]
-     assert link.getNodePort(devices[1]) == devices[1].ports()[0]
- 
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.28.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.31.ebuild
index 14949a3a803a..7373084f8b44 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.28.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx xdg
@@ -20,18 +20,14 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.5.4[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index c6f7a6cd9e13..5fd69753f05a 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.28.tar.gz 10240577 BLAKE2B 760f4f534ef6c4c94a62bb89a19fa2f300ac3f613b69eb6b6d3cfd5d08a13673f8133a7fb4e66e4fd3cf79b8c2988157038855d523af444a434865f40a8a0e38 SHA512 d75a510050dcb9bdf9f6bb2336c797768c6f6451a49a87143e977a2ba1a39f5a062702bbd0fd2cd750fdc24092a3d4e3defa3d4a2411e7b6a0df3e284c6fd512
 DIST gns3-server-2.2.29.tar.gz 10241179 BLAKE2B ae9df1414d679c49f3b0da84f6b07789a0343ee74cf1c744c7b8dc55ab5395a92cc223cddc0d04516f315d5483d4cc3260c0f815c81992a12127fc6694fbaa2a SHA512 1e5eaeb127efddd6f21e167de4b56a2713c8a4dbc470e2595f807d8283f4b9208564f910dc3ac4602049ee4b1267eaffb9c5787b2d556c4d27176d153c67fc05
-EBUILD gns3-server-2.2.28.ebuild 2080 BLAKE2B 610964ac5108a4acf0fd7c75f575a3721e1e643c7bd9fc5e4d2008a66c562911461b16f5adcc952e8043a6a0fc092c0a10c0a187457ce90d0c3c95117abe7e2c SHA512 ece130239e1b43164b332e5b44cbfa87432fd57a5145a28dc428ed3d9b70c177f9acd9c2c5a6b8341b5eef167e76cb34aea9751216630d2afe83049249d8d547
+DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834
 EBUILD gns3-server-2.2.29.ebuild 2080 BLAKE2B 610964ac5108a4acf0fd7c75f575a3721e1e643c7bd9fc5e4d2008a66c562911461b16f5adcc952e8043a6a0fc092c0a10c0a187457ce90d0c3c95117abe7e2c SHA512 ece130239e1b43164b332e5b44cbfa87432fd57a5145a28dc428ed3d9b70c177f9acd9c2c5a6b8341b5eef167e76cb34aea9751216630d2afe83049249d8d547
+EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B e4bb2f8d1945076f5f736b2b07ab0c2f49c4a8e4ee3e49b0a7ef9f4f704f307922f746f6d99dc5e7cc69103880acb5f4e9c113e772fa512a395f5f7f704a1d4d SHA512 edb14145263381e914e40c88c72d5160d2085c0f8e0cd3828e935db341217b38eb6a615680002b194a644571ceca5f1029731891291a45222311d0bf8ddb02c8
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.28.ebuild b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
index af4f9ccadcd5..8b5af5922125 100644
--- a/net-misc/gns3-server/gns3-server-2.2.28.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 optfeature systemd
@@ -23,11 +23,11 @@ RDEPEND="
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.5.4[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox
 "
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 1343e2cd1ae7..5495f9ed632e 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -7,8 +7,11 @@ AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-21.8.0.40.tar.gz 150632410 BLAKE2B a63480e5c5a934a06a66e6754013e6a75a962d36b851c9a43d9dcef6e0dc99aeea1331a547386f72a1700bd1c3b31994506b8c0923656fa7bbf8bedf0bcaf032 SHA512 6673312555d1b391bfadcde72ca6d6439f477a53b1206fae403921f73aa7535e7df56eefc226372ddd7707601368e32c5393f91f8a7ffb68f7c66da88ded128a
 DIST linuxx64-21.9.0.25.tar.gz 157545077 BLAKE2B c35d5da11809d68a8618d5d07df092f0ccc1af4f32485dbf5032aa7cfc0a78311d742e34bece6791c80d2798c277a9cc1a618bb2291d63b97926cda42fcd2fb4 SHA512 f111ba048464aad1ecdd543faf6cd7db2ea45b7934f9acf06864239ff653eb0d87abe8267a7717db45b6607b20764e1c26e0901e82e6907a4a3c09d6b331449e
+DIST linuxx64-22.3.0.24.tar.gz 161513614 BLAKE2B 8e1d4756a0e25f8b03b2c17251dccedcf48107f55356fe79616935496216305b5ebea19e33741fd0d613812f6eabd920e5edbfca84871249b0552eb4be3761a1 SHA512 87ef69eb6fd25984c70a2646e0c151f162962c848d20769625854a5ff9f6364a16c04dea6145751ebb7e29c0f0bb93760500de1c631699e1c4fc6e8de131e06e
 DIST linuxx86-21.8.0.40.tar.gz 135966502 BLAKE2B a870cbe584958deeb5727a3994d6bfd93c62f2e6a100c029cd1d5514ee6a8d788ed43b51a6bd01b7ba47f12d40b0669807183717b7231b0cc9b919654279e4ac SHA512 86e82ee8d00604f75e7042989e298a87be48a81717865237e9e0ccdb6def91a4d7f52319773f0a04b31db0b6bcf90a4457355414e62cfb6595511a6679525a66
 DIST linuxx86-21.9.0.25.tar.gz 139524584 BLAKE2B e8854b2a363b7d15b490f97239d6a4af9e5bd32fa70e7884b5f23ccba9b072d74e7d4d11b39b1eb252e3d0d37ed8450f105e864f0b17f42f1ee1a47723b444e0 SHA512 326109d17142aa633a64afd1ed5972ae7fec3182e3d8bed74ce93a0fba9db3c86a6c73831d2b9c4a1424ad885f2462289786dd7a92ea23c429560c700be89416
+DIST linuxx86-22.3.0.24.tar.gz 143073253 BLAKE2B dab19b4ff0192687a33c385327d799cf5eb59cb5f75ae47246b4ddd124246e60179ab5503ff05f18c79b97194ecd6d71324834a443a92c0c7ac58d55a368bcf6 SHA512 5f79be72a626501ae857e13efcd46a8371ee8a402d3fe45b8caa2bd07e92e81240909d849969c738a262f1698c0810f4065ac7b37888df772a9042fe70d3eca7
 EBUILD icaclient-21.8.0.40.ebuild 5421 BLAKE2B a416182e9e9f4769f8b0b9dd53580c6201e9d1107e5f07deb3b7b319ac1883b55681b5c566b3fa829c1c467a74cf0406e801b719e4e675e1562ab63bd178355a SHA512 7226655750edc699a8e2b15c5db1f2495d641e2d9aaddaeb936e4ac67d7e30e6f50c365efe088314e7dcc331c72d694a3b42bea456463e52a06aa7b01fa86c7e
 EBUILD icaclient-21.9.0.25.ebuild 5423 BLAKE2B d37f73eb66df4202d38cf60479a2b0ce8cdcb594ec3f2a772d6e047ffd9ecf8b56a2d011d2cc3949eff9622502d4972f58340377912227cddcd8d0c9da4956c2 SHA512 3caa23fbbdcd778268b73a452170477c98445e98700f8ae6f23929a1a74b55bf440f9c4a9d3876b452ee5bcca70e05e468c3f6f0187dbc75561e291c50ca81c1
+EBUILD icaclient-22.3.0.24.ebuild 5423 BLAKE2B 72240f902964eac02b50d9c327d2edfa180dccbfd6ea5e5bea528a7273c406e6fee3326965d1774ba36dc0fe7c81f584de4d2feeabf1942a9ef4b2bc02af18dc SHA512 1e8a492128ab5e4a1f7be899ff18866427e459d6fd4b512d49ed9540f0b82e20173f3e6d9e510e92c85c314d6e8802463fcf33e54fb7f45def3bd1eb605ea7fc
 MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
diff --git a/net-misc/icaclient/icaclient-22.3.0.24.ebuild b/net-misc/icaclient/icaclient-22.3.0.24.ebuild
new file mode 100644
index 000000000000..c6fed4ed5d78
--- /dev/null
+++ b/net-misc/icaclient/icaclient-22.3.0.24.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/jpeg:0
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+
+	# We need to avoid module.ini file getting added to the package's
+	# content because media-plugins/hdx-realtime-media-engine modifies
+	# this file on installation. See pkg_postinst()
+	mv nls/en/module.ini "${T}" || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	if use amd64 ; then
+		rm lib/ctxjpeg_fb_8.so || die
+	fi
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	# nls/en/*.ini is being handled by pkg_postinst()
+	doins config/* config/.*
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	local util_files=(
+		configmgr
+		conncenter
+		ctx_app_bind
+		ctx_rehash
+		ctxlogd
+		ctxwebhelper
+		gst_play1.0
+		gst_read1.0
+		hdxcheck.sh
+		icalicense.sh
+		libgstflatstm1.0.so
+		lurdump
+		new_store
+		nslaunch
+		setlog
+		storebrowse
+		sunraymac.sh
+		webcontainer
+		what
+		xcapture
+	)
+
+	exeinto "${ICAROOT}"/util
+	for bin in ${util_files[@]} ; do
+		doexe util/${bin}
+	done
+
+	local other_files=(
+		icasessionmgr
+		NativeMessagingHost
+		UtilDaemon
+	)
+
+	exeinto "${ICAROOT}"
+	for bin in ${other_files[@]} ; do
+		doexe ${bin}
+	done
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	local inidest="${BROOT}${ICAROOT}/config"
+	if [[ ! -e "${inidest}"/module.ini ]] ; then
+		mv "${T}"/module.ini "${inidest}/" \
+			|| ewarn 'Failed to install plugin.ini file'
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 6f513bd1dfc7..b0d97be6bfb4 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -2,10 +2,13 @@ AUX iputils-20210722-fix-no-ipv6-ping.patch 2038 BLAKE2B ac403da299a9e407482396c
 AUX iputils-20210722-optional-tests.patch 5276 BLAKE2B c485d39b06916acdaaec6f98ffeb718afbfd630af7220c7dfb408855a8862c2b121bbf4482621f633b86f1b94df78afc54157d99f2ff28cff833ae263aae5e78 SHA512 59d7ff881c03d7c03f5f41d2015f03175456487d9802999173f4705b3cfd7819957258e68a0b932fd9901f418bca866252d4a673d66f08b9e179a07ae84e8c40
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
 DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
+DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
+DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
 EBUILD iputils-20210722-r1.ebuild 4497 BLAKE2B 141f0df921a2b3841b1d8befca29f7699b518daef3231a0d6239b10b1663478c7cf0014ce024fb10b718a7bde838f2528c6b630ceb83abdecd3af72384215454 SHA512 516a2d32faca7775076badae729bc0b49d03740b93e707f489d0dadcf417d4adca23c42a2a055a26c0de60fdf5663f72afffa687dcfd39194fb99114776ef61d
 EBUILD iputils-20210722.ebuild 4512 BLAKE2B 1db6a9919ec592900f53fe4676a31b21059a6f011418616eef131f2d57d869b5af8ee3a0d4b527adc85a65c564a9137d23f631c03376920890d4140d8ceb0435 SHA512 fad6f0ac622ed92df810b9a34c9450853af63ad7ace9707dd1855058ff47188dffa2b134bf50862ab1c52e26c8c2207ac7183115d9c7452e0e116bf1c536538c
-EBUILD iputils-99999999.ebuild 4356 BLAKE2B 105fc357e9bc8afe96e2447e7007587f2687a634f6773a2aefd1cefaa129576d6dfcb36be62e82d76b816ad8fe1aa3734762d1fa08a1918dd3a761173b29c687 SHA512 9da7290b239d223034a226d76633f3f77379f388cc3914f524fab294a23621229d7d840dc74f49dcb1c8d0bfa3471adb44863e2efe96f85c9f18cd974b8a9a22
+EBUILD iputils-20211215.ebuild 4773 BLAKE2B f65e64db9db6252eb36f21cf3221800909eb9a90f588bfbcf0b8efa0a74454a807a4ef46891e7509b8a8840e3e6424b0e8e9edb6329fdd2a7c78ac8cc290b0ce SHA512 a187a4bbc760c73bf527cea3c3229dde55914967fde59d41b78ad1a71de8317adaa7aa762219d09ed1f4fa8c85b2bbedb71099ed0080e4c55f101362661c5918
+EBUILD iputils-99999999.ebuild 4579 BLAKE2B 974cfa5b771f8bd983d2b28dc51ca8cf1bc05a9497ee733a67a187fd023e4572d6fb1955b1d66d9c7151f203b3b4cf91b486149607ade7cfe941f5f39dc6b4f8 SHA512 b4de09522b2b91954b5742d92f898e1522064f7d9345247c06c63d2ce06c54d34daa62ca1a6d5ec892d4780e28f8adabe571b99391ebc0548c423fc39a29dc3b
 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9
diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild
new file mode 100644
index 000000000000..010a74464c06
--- /dev/null
+++ b/net-misc/iputils/iputils-20211215.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces dependencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag, all USE flags enabled and
+# tar ${S}/doc folder.
+
+EAPI="7"
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tracepath"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn2:=[static-libs(+)] )
+	nls? ( virtual/libintl[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
+
+if [[ ${PV} == 99999999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	"
+fi
+
+src_prepare() {
+	default
+
+	plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local emesonargs=(
+		-DUSE_CAP=$(usex caps true false)
+		-DUSE_IDN=$(usex idn true false)
+		-DBUILD_ARPING=$(usex arping true false)
+		-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+		-DBUILD_PING=true
+		-DBUILD_RARPD=$(usex rarpd true false)
+		-DBUILD_RDISC=$(usex rdisc true false)
+		-DENABLE_RDISC_SERVER=$(usex rdisc true false)
+		-DBUILD_TRACEPATH=$(usex tracepath true false)
+		-DBUILD_NINFOD=false
+		-DNINFOD_MESSAGES=false
+		-DNO_SETCAP_OR_SUID=true
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		-DUSE_GETTEXT=$(usex nls true false)
+		$(meson_use !test SKIP_TESTS)
+	)
+
+	if [[ ${PV} == 99999999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS=$(usex doc true false)
+			-DBUILD_MANS=true
+		)
+	else
+		emesonargs+=(
+			-DBUILD_HTML_MANS=false
+			-DBUILD_MANS=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+
+	meson_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Tests require root privileges. Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	dodir /bin
+	local my_bin
+	for my_bin in $(usex arping arping '') ping ; do
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
+	done
+	dosym ping /bin/ping4
+	dosym ping /bin/ping6
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+		dosym tracepath /usr/bin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if [[ ${PV} != 99999999 ]] ; then
+		local -a man_pages
+		local -a html_man_pages
+
+		while IFS= read -r -u 3 -d $'\0' my_bin
+		do
+			my_bin=$(basename "${my_bin}")
+			[[ -z "${my_bin}" ]] && continue
+
+			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
+				man_pages+=( ${my_bin}.8 )
+			fi
+
+			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
+				html_man_pages+=( ${my_bin}.html )
+			fi
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+
+		pushd doc &>/dev/null || die
+		doman "${man_pages[@]}"
+		if use doc ; then
+			docinto html
+			dodoc "${html_man_pages[@]}"
+		fi
+		popd &>/dev/null || die
+	else
+		if use doc ; then
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 34966ccdc145..cef1837240e2 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -14,11 +14,12 @@ PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
 inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == 99999999 ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -28,39 +29,33 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn nettle nls ssl static test tracepath"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	virtual/pkgconfig
-	test? ( sys-apps/iproute2 )
-	nls? ( sys-devel/gettext )
-"
-
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
 	nls? ( virtual/libintl[static-libs(+)] )
 "
-
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="
 	${RDEPEND}
 	virtual/os-headers
 	static? ( ${LIB_DEPEND} )
 "
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == 99999999 ]] ; then
 	BDEPEND+="
 		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-ns-stylesheets
 		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
+		dev-libs/libxslt
 	"
 fi
 
@@ -74,34 +69,27 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local emesonargs=(
-		-DUSE_CAP="$(usex caps true false)"
-		-DUSE_IDN="$(usex idn true false)"
-		-DBUILD_ARPING="$(usex arping true false)"
-		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
-		-DBUILD_PING="true"
-		-DBUILD_RARPD="$(usex rarpd true false)"
-		-DBUILD_RDISC="$(usex rdisc true false)"
-		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
-		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex traceroute6 true false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
-		-DNO_SETCAP_OR_SUID="true"
-		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
-		-DUSE_GETTEXT="$(usex nls true false)"
+		-DUSE_CAP=$(usex caps true false)
+		-DUSE_IDN=$(usex idn true false)
+		-DBUILD_ARPING=$(usex arping true false)
+		-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
+		-DBUILD_PING=true
+		-DBUILD_TRACEPATH=$(usex tracepath true false)
+		-DNO_SETCAP_OR_SUID=true
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		-DUSE_GETTEXT=$(usex nls true false)
 		$(meson_use !test SKIP_TESTS)
 	)
 
-	if [[ "${PV}" == 99999999 ]] ; then
+	if [[ ${PV} == 99999999 ]] ; then
 		emesonargs+=(
-			-DBUILD_HTML_MANS="$(usex doc true false)"
-			-DBUILD_MANS="true"
+			-DBUILD_HTML_MANS=$(usex doc true false)
+			-DBUILD_MANS=true
 		)
 	else
 		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
+			-DBUILD_HTML_MANS=false
+			-DBUILD_MANS=false
 		)
 	fi
 
@@ -110,12 +98,13 @@ src_configure() {
 
 src_compile() {
 	tc-export CC
+
 	meson_src_compile
 }
 
 src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		einfo "Tests require root privileges; Skipping ..."
+	if [[ ${EUID} != 0 ]] ; then
+		einfo "Tests require root privileges. Skipping ..."
 		return
 	fi
 
@@ -139,7 +128,7 @@ src_install() {
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
-	if [[ "${PV}" != 99999999 ]] ; then
+	if [[ ${PV} != 99999999 ]] ; then
 		local -a man_pages
 		local -a html_man_pages
 
@@ -171,7 +160,21 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
+	if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
+		HAD_TFTPD_VERSION=1
+	fi
+}
+
 pkg_postinst() {
+	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
+		ewarn "This upstream version (>= 20211215) drops two tools:"
+		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
+		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
+		ewarn "Please install one of the listed alternatives if needed!"
+	fi
+
 	fcaps cap_net_raw \
 		bin/ping \
 		$(usex arping 'bin/arping' '') \
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
index 5936c1459c1c..ff565534fc75 100644
--- a/net-misc/lambdamoo/Manifest
+++ b/net-misc/lambdamoo/Manifest
@@ -2,5 +2,5 @@ AUX 1.8.1-enable-outbound.patch 451 BLAKE2B 71c9fa7921e258df1b785e7b5d92eed3b380
 AUX lambdamoo.conf 185 BLAKE2B d681b52af98a278c9ee4c4485afcd0919f952e5a5cd1740a4365af233f60c273833c3c35d9a65f4e1e48ebe99d93e9c0ee307ed8b052b97e41abdd6d8e4a3bd2 SHA512 fa96885e674b571c6eccb682cb4ab47d09a723a1dd82d6a11a42e5760c2b53ab24919627823ab9c4a2aeb5d3d2d41984df3eb9f3de382164b062e024639ba2b2
 AUX lambdamoo.rc 1145 BLAKE2B c6b5b7d25644c0a2832144a6c8b6be3af082d9bac30f5916c84a3ecac983556095018cbbbdbd138c046927873c9e52cbb02560ef1b84a553b666f0c5514534c3 SHA512 ce0d41459aac2249b2982d5bc174810e2fd5a77ad5c5f102929c350306bb799cdd9582926dda42c062d7f60b77ae59dd26d7f32d249193d13e9b9feb888ebd96
 DIST LambdaMOO-1.8.1.tar.gz 363803 BLAKE2B 0bca69eff651911d97f1de66c93aaa0ebb14e199277bb83171e0855313291501ef501272b58a0524da1e3764359f0c6b79377d021db0b45097ed29674793024e SHA512 1629375d74c67851e20ac007411261bb24c642249e4ede0415580b5c87e0df77b23e8a70b249f734ad3b5bc3b8859b5f0162dc55f69b9756ce2afa6a9553b7fc
-EBUILD lambdamoo-1.8.1-r3.ebuild 944 BLAKE2B 40bda30bc206729333d829ca746c36df07608a9bceafe0003030d4d9a1b386ef4d963b88e191eef9f8a79e5337d7cab0100a617c564e78b2c277d79f3e6d8cb8 SHA512 2fc70f883bd1824a2e7b0bfa482ac1935516d1df273bb025ab987d3dc1819b2a3a89e12b6e05348684e5a25ff66c4d488b3e1f384e6147363ce4ce9ac736c5f4
+EBUILD lambdamoo-1.8.1-r3.ebuild 942 BLAKE2B 862d16cf68acb828c3acc9faa387666201a98a43fbce0213041268a0a681be9bcbd2386e5234e81b02d2893c5a0b90421f9bbf1800bc372614dd3cf1f0e32bd8 SHA512 652e96d775d1b4861e7a4e5272208045c910362dbd8e7b2c39d14a410ff8fbf633184c31857365d27f00465daa8ffe3f581a4da3c690b28d00bddd4460111374
 MISC metadata.xml 247 BLAKE2B 26c6f1781285d6a2e474461f846bb7cf7438d7693d9ff6dd275aea80494abb0852b86b0eaab76208df608b40743d41403a2b0bfbe6d0f56daa18ef871cb52f92 SHA512 d155b4a71540ed996da9bf8aaf79560c81d07c3248bf7329c235fb501a115e8aba1b2814fdf051aa5e81816b16477b250d231b9e2e5f8c38b7116f496a4e94df
diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
index 41acc456a60d..b95483d47d8d 100644
--- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,9 +31,8 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS} \
-		-DHAVE_MKFIFO=1"
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -DHAVE_MKFIFO=1"
 }
 
 src_install() {
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e27ec89e2216..597e5748b630 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,7 +8,9 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74bbac038db329d84f2b9229e6db8204c2c0b55075ef238a5c3fa3751de5a0fb843a2ee0e71a648a194aed832d6dd36 SHA512 46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835
 DIST memcached-1.6.13.tar.gz 1031167 BLAKE2B f65871ad2a110fb4baa96dd57844cfc403bcfc905120bbf13a6be9392a78ae3dafcbb59f05b9d212a1239ede465a3688d5ca90e5d104f654e36c76739545c234 SHA512 3f3ef37f5838d8b1b8100cdb77b2226d8d29eef093bcb2c9a03f2420144aa35a5c8c1c957134eddce1fdd37a05b5ffc19058baf05dd3aad60fca12f8c81eaf1d
 DIST memcached-1.6.14.tar.gz 1034514 BLAKE2B 960da79748019cfc6b8c1e2f63e67bede8a472985e738e3998ef41e48bd1c645671cf42661280cd4d97fde8de368f9f5d74e0aa83a7447d7f19fa6eeb303a01c SHA512 607b5c0d4c721c714b6e6e3fbca4845fc24103e1dfb988a2edf818b78f918eeb71b86b211e311dc2bcbc438a9a0ffcb69a3bd6694b591720ede8b5349c804740
+DIST memcached-1.6.15.tar.gz 1051109 BLAKE2B 96e931b2a513cc6717dbc3262e3c7d30a2293c7a1380e3bd961d82e3f24bb2f3fce20950a587e0588bf11c9606af230cad6ab1e749d438e62daf171cbaaf1853 SHA512 00ee15eb7932420a25f3ce973bc7fcc5ba77a514091883f8b4e58ea861073caa91c676c0020f03c768077e20c76f34bca96616be104af3fbc8e7e78303958f3d
 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff
 EBUILD memcached-1.6.13.ebuild 2868 BLAKE2B 5f38656aec2eb9d62cc12ee437410a01d9e666e33856c9755aa3c2add6c75db2614932415933431f545e5f0b1bc90d8af11397ece9ddeddd70fe474f6082432e SHA512 b7388ee5dc5bef4597104a92d3a314207fb35bfc3a66c17b5c691fabc3bbb9bc49587acc0d432b01c1e838c032330ee23c93df4d15bd726bbe300032381deff3
 EBUILD memcached-1.6.14-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75
+EBUILD memcached-1.6.15.ebuild 2968 BLAKE2B be697710d4688ad91fb6eac4ae72bb3f76b5195a24cd93b4e5df74aa3f38244a6fb2c28d9200798ed54f3b469858db0a9afe84ffcbc806f44fe969851c5c6182 SHA512 e4881b5088fa43f10c3bfd2a310a8e5479a133e3760a0c61402509ef89b8160398b2e190b9a2945628290fa3268ca9185f75b8eda9ed7c823d3711153d6d2dfe
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.15.ebuild b/net-misc/memcached/memcached-1.6.15.ebuild
new file mode 100644
index 000000000000..510916602bb0
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.15.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index c89fedd24b80..d7db480d3ab7 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -3,4 +3,4 @@ DIST mikutter-4.1.7.tar.gz 2331574 BLAKE2B a60918f2bfe3a56087536c0b3313f454cdee6
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
 EBUILD mikutter-4.1.7.ebuild 2920 BLAKE2B 506803e931fd2df0f21b507b70155f5d1357163fd075d14e9ef64592b789350ca60fdbe0c5b510405ce5776c8abb5366871950d753a3b8c171d29b58a83cfc14 SHA512 7d59610ee5eb841dd82db78cc4aded409c4d0c2012c2fe849923952ff0635ef5ade0ca3c19405b88c9bd090d5151e11bf26b9f6fb56af56b1d9a98581d8c1e14
 EBUILD mikutter-9999.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
-MISC metadata.xml 215 BLAKE2B b8deb40f472148c0470ad5a4a39aba042d968cd059c2e8e1adf9cc530ff5c3fe45435fdd71034e2fbaf2f725fdb65367e1179e09019bacdd886f917bebfb2302 SHA512 973c3da0775f8f2ed293f7c3e548804d4ff19e04da7e6a03a30265b7365f704acaf1cd4534fb4513d81b85e6c79aa31b01c42bf716903beccf53b715331c8965
+MISC metadata.xml 245 BLAKE2B 679c2c8c096017f4eefa915d06fde493784875e685ee5078252f57a24df6fba8f9829261929f1fee146c10b30485fb81c2fa93614b8348548844658774193f61 SHA512 0d85fefe9769a0241748160f3e73644a81f68d578d392f1c443c2f56d5f05faef7458c8d1380804bbac9280626e95207de32f493be5910a9f7f678bc0fbf5cb9
diff --git a/net-misc/mikutter/metadata.xml b/net-misc/mikutter/metadata.xml
index 6ce8dfcade1b..c0c769ac2c9f 100644
--- a/net-misc/mikutter/metadata.xml
+++ b/net-misc/mikutter/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>naota@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+		<name>Naohiro Aota</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/mptcpd/Manifest b/net-misc/mptcpd/Manifest
index 95dba01578c8..616c95796f1a 100644
--- a/net-misc/mptcpd/Manifest
+++ b/net-misc/mptcpd/Manifest
@@ -1,4 +1,5 @@
+AUX mptcpd-0.9-loopback-monitoring.patch 6941 BLAKE2B f3798b5da940266cad94093e0ab16c93546ac62923b94f947ffdefea89b864776ef668d6359c6a7b7f5f675b05dd4d55f73ea55f632fb209eb12b99c8f585975 SHA512 cf3cc223d46ad568b25c5bb9c583ad388d558242956692328c9582d11c73e69d2acc58661607b9ec44b71abc5265f6171529d34b21cabf5f16c313bf05d2a7a6
 DIST mptcpd-0.9.tar.gz 654063 BLAKE2B fd9e8bf5cec517c934b9d38a736a128d087b54b5e4db90816a8cf8c242195fec8e3c4cd28d2f6e5a93326cac311a6b29048313c722004cea39e19448dc467976 SHA512 4fd292304d6270351b865e86cc401c1f5cc9043606b171e852bd37b2472c5f80061d760be68e5cd965caccb2f25c03d9ceea6232a5a587016c81f85e68ca8882
-EBUILD mptcpd-0.9.ebuild 1103 BLAKE2B 629897a77071480b8516bc646df0852838a88fe8122581ba13ff178691e3311dc9927d78502d7bb415fd506eb435887ff4b348f8a53d24b04966e9812eb381f8 SHA512 f9c005fbad040d994458e7c8cd9b64f929368de5f7d2ee7abc5f2d84deb944228d04966820c71bb01c42940001e8dc5e5110b268b9be8f9eefa9d33ed80403b0
+EBUILD mptcpd-0.9.ebuild 1161 BLAKE2B 1cbefb7a16d7bcfb267e5c40ca708fd5908e6a9e214671419950b63f2012a80617c537a4d5eb4f4d2d4c82f5b53cfaf2d5c595f4a6aadb566fad0bb11da4c736 SHA512 d7449fcd0eb50db970a7174624250c8f4b743a967c8a9f058063a01e6915d56586991228204445f630edce0743a1879576734e782ad73d971cafd7590ff0b40a
 EBUILD mptcpd-9999.ebuild 1103 BLAKE2B 629897a77071480b8516bc646df0852838a88fe8122581ba13ff178691e3311dc9927d78502d7bb415fd506eb435887ff4b348f8a53d24b04966e9812eb381f8 SHA512 f9c005fbad040d994458e7c8cd9b64f929368de5f7d2ee7abc5f2d84deb944228d04966820c71bb01c42940001e8dc5e5110b268b9be8f9eefa9d33ed80403b0
 MISC metadata.xml 326 BLAKE2B 77d6f17ab473dfbdd5d156b8c6020ba80cf49d95fc9693c88b6f6a5f2a9449cc0caa53ba000183a4fba747d7e298b77528346c680049ea28fa86b9c308da0a34 SHA512 1150bc86b2b12c042e0de7eab7701808a703bd0a42e5a38eac94e07131f3138ee6c010644fd1837ef6240e1c83cf51553f8f99fd03970a2f84252aeee7e76f06
diff --git a/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch b/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
new file mode 100644
index 000000000000..38061a754a4d
--- /dev/null
+++ b/net-misc/mptcpd/files/mptcpd-0.9-loopback-monitoring.patch
@@ -0,0 +1,197 @@
+From a200ef26e4daf0347dd8f1bd35d49dd66fba7a7e Mon Sep 17 00:00:00 2001
+From: Ossama Othman <ossama.othman@intel.com>
+Date: Thu, 17 Feb 2022 16:39:59 -0800
+Subject: [PATCH] Allow loopback network interface monitoring. (#220)
+
+* network_monitor: Allow loopback monitoring.
+
+Add a new mptcpd_nm_monitor_loopback() function that allows the user
+to enable monitoring of loopback network interfaces.  Monitoring of
+loopback network interfaces is meant primarily for testing purposes.
+Mptcpd will retain the previous behavior of only monitoring
+non-loopback network interfaces by default.
+
+* tests: Enable loopback interface monitoring.
+
+Enable loopback network interface monitoring to allow the
+test-network-monitor unit test to succeed in cases where non-loopback
+interfaces are unavailable, such as in a sandboxed environment.
+
+Fixes #208.
+
+Co-authored-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
+---
+ include/mptcpd/network_monitor.h | 21 ++++++++++++++++++
+ lib/network_monitor.c            | 38 +++++++++++++++++++++-----------
+ tests/test-network-monitor.c     | 15 +++++++++----
+ 3 files changed, 57 insertions(+), 17 deletions(-)
+
+diff --git a/include/mptcpd/network_monitor.h b/include/mptcpd/network_monitor.h
+index dc35e3d..ea1a95b 100644
+--- a/include/mptcpd/network_monitor.h
++++ b/include/mptcpd/network_monitor.h
+@@ -213,6 +213,27 @@ MPTCPD_API bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
+                                        struct mptcpd_nm_ops const *ops,
+                                        void *user_data);
+ 
++/**
++ * @brief Enable monitoring of the loopback network interface.
++ *
++ * Mptcpd normally only monitors non-loopback network interfaces.
++ * Call this function to enable monitoring of loopback network
++ * interfaces.
++ *
++ * @note Mptcpd monitoring of loopback network interfaces is meant
++ *       primarily for testing purposes.
++ *
++ * @param[in,out] nm     Pointer to the mptcpd network monitor
++ *                       object.
++ * @param[in]     enable Enable or disable monitoring of loopback
++ *                       network interfaces.
++ *
++ * @retval true  Successfully enable or disabled.
++ * @retval false Invalid @a nm argument.
++ */
++MPTCPD_API bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm,
++                                           bool enable);
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/lib/network_monitor.c b/lib/network_monitor.c
+index 2ae275b..7a3927e 100644
+--- a/lib/network_monitor.c
++++ b/lib/network_monitor.c
+@@ -4,7 +4,7 @@
+  *
+  * @brief mptcpd network device monitoring.
+  *
+- * Copyright (c) 2017-2021, Intel Corporation
++ * Copyright (c) 2017-2022, Intel Corporation
+  */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -78,6 +78,9 @@ struct mptcpd_nm
+ 
+         /// Flags controlling address notification.
+         uint32_t notify_flags;
++
++        /// Enable/disable loopback network interface monitoring.
++        bool monitor_loopback;
+ };
+ 
+ // -------------------------------------------------------------------
+@@ -525,16 +528,15 @@ static void mptcpd_interface_callback(void *data, void *user_data)
+  *
+  * @return @c true if network interface is ready, and @c false other.
+  */
+-static bool is_interface_ready(struct ifinfomsg const *ifi)
++static bool is_interface_ready(struct mptcpd_nm const *nm,
++                               struct ifinfomsg const *ifi)
+ {
+-        /*
+-          Only accept non-loopback network interfaces that are
+-          up and running.
+-        */
+-        static unsigned int const iff_ready = IFF_UP | IFF_RUNNING;
++        // Only accept network interfaces that are up and running.
++        static unsigned int iff_ready = IFF_UP | IFF_RUNNING;
+ 
+         return (ifi->ifi_flags & iff_ready) == iff_ready
+-                && (ifi->ifi_flags & IFF_LOOPBACK) == 0;
++                && ((ifi->ifi_flags & IFF_LOOPBACK) == 0
++                    || nm->monitor_loopback);
+ }
+ 
+ /**
+@@ -708,7 +710,7 @@ static void handle_link(uint16_t type,
+ 
+         switch (type) {
+         case RTM_NEWLINK:
+-                if (is_interface_ready(ifi))
++                if (is_interface_ready(nm, ifi))
+                         update_link(ifi, len, nm);
+                 else
+                         remove_link(ifi, nm);  // Interface disabled.
+@@ -1301,7 +1303,7 @@ static void handle_rtm_getlink(int error,
+         struct ifinfomsg const *const ifi = data;
+         struct mptcpd_nm *const nm        = user_data;
+ 
+-        if (is_interface_ready(ifi)) {
++        if (is_interface_ready(nm, ifi)) {
+                 (void) insert_link(ifi, len, nm);
+         }
+ }
+@@ -1442,9 +1444,10 @@ struct mptcpd_nm *mptcpd_nm_create(uint32_t flags)
+                 return NULL;
+         }
+ 
+-        nm->notify_flags = flags;
+-        nm->interfaces   = l_queue_new();
+-        nm->ops          = l_queue_new();
++        nm->notify_flags     = flags;
++        nm->interfaces       = l_queue_new();
++        nm->ops              = l_queue_new();
++        nm->monitor_loopback = false;
+ 
+         /**
+          * Get network interface information.
+@@ -1555,6 +1558,15 @@ bool mptcpd_nm_register_ops(struct mptcpd_nm *nm,
+         return registered;
+ }
+ 
++bool mptcpd_nm_monitor_loopback(struct mptcpd_nm *nm, bool enable)
++{
++        if (nm == NULL)
++                return false;
++
++        nm->monitor_loopback = enable;
++
++        return true;
++}
+ 
+ /*
+   Local Variables:
+diff --git a/tests/test-network-monitor.c b/tests/test-network-monitor.c
+index d7c6b87..d22f6be 100644
+--- a/tests/test-network-monitor.c
++++ b/tests/test-network-monitor.c
+@@ -4,7 +4,7 @@
+  *
+  * @brief mptcpd network monitor test.
+  *
+- * Copyright (c) 2018-2020, Intel Corporation
++ * Copyright (c) 2018-2020, 2022, Intel Corporation
+  */
+ 
+ #define _DEFAULT_SOURCE  // Enable IFF_... interface flags in <net/if.h>.
+@@ -115,12 +115,11 @@ static void check_interface(struct mptcpd_interface const *i, void *data)
+         l_queue_foreach(i->addrs, dump_addr, NULL);
+ 
+         /*
+-          Only non-loopback interfaces that are up and running should
+-          be monitored.
++          Only network interfaces that are up and running should be
++          monitored.
+         */
+         static unsigned int const ready = IFF_UP | IFF_RUNNING;
+         assert(ready == (i->flags & ready));
+-        assert(!(i->flags & IFF_LOOPBACK));
+ 
+         if (data) {
+                 struct foreach_data *const fdata = data;
+@@ -249,6 +248,14 @@ int main(void)
+         struct mptcpd_nm *const nm = mptcpd_nm_create(0);
+         assert(nm);
+ 
++        assert(!mptcpd_nm_monitor_loopback(NULL, true)); // Bad arg
++
++        /*
++          Enable loopback network interface monitoring for this unit
++          test in case non-loopback network interfaces are unavailable.
++        */
++        assert(mptcpd_nm_monitor_loopback(nm, true));
++
+         struct mptcpd_nm_ops const nm_events[] = {
+                 {
+                         .new_interface    = handle_new_interface,
diff --git a/net-misc/mptcpd/mptcpd-0.9.ebuild b/net-misc/mptcpd/mptcpd-0.9.ebuild
index 8f307676ab46..a35610eb41ad 100644
--- a/net-misc/mptcpd/mptcpd-0.9.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.9.ebuild
@@ -27,6 +27,9 @@ BDEPEND="
 	)
 	virtual/pkgconfig
 	"
+PATCHES=(
+	"${FILESDIR}/${P}-loopback-monitoring.patch"
+)
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest
index 12479d328c1e..77d2b415f255 100644
--- a/net-misc/netkit-talk/Manifest
+++ b/net-misc/netkit-talk/Manifest
@@ -2,5 +2,5 @@ AUX netkit-talk-0.17-ipv6.patch 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504
 AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f
 AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f
 DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5
-EBUILD netkit-talk-0.17-r7.ebuild 1166 BLAKE2B 89f48037c69b7ebf8a4cfeb38769f0f72a88c8e943a7ec081ff10c3c09de9ee31bdc73aca9d3d7efe4d7974a46712c2320e480523fc16c731e5d41a1b0652be4 SHA512 dd1ff01f80a58c12bf60b871d7d749b24b6bc397ab0bae26aabaa702a5124e37bb2c0f3fb537d8ef93c951f59aee4b737f74cd457ee3ed236ca948720d7c842e
+EBUILD netkit-talk-0.17-r7.ebuild 1168 BLAKE2B 9fc209c12a77f34b007b5857e4858fbe62ded218d26a4a75c2ac876ef463bb13fda860314788abcfcbcb541386fcec673f14242964c47fcb41b3c07de5b546a5 SHA512 3d1422424c9b80391410a990c7a8b3bebf77264493dc9412a0927c47c44c9b7ada1db5b7c6c46ebae3307037493df52562ab9ac7dc112a5ffa6835e67491beab
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
index 585a64aabeab..2afb9caf1300 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_configure() {
 	# not autotools based?
-	./configure --with-c-compiler=$(tc-getCC) || die
+	./configure --with-c-compiler="$(tc-getCC)" || die
 }
 
 src_compile() {
diff --git a/net-misc/netkit-timed/Manifest b/net-misc/netkit-timed/Manifest
index 0566f1dd641c..748b0abf93e2 100644
--- a/net-misc/netkit-timed/Manifest
+++ b/net-misc/netkit-timed/Manifest
@@ -2,5 +2,5 @@ AUX 0.17-CFLAG-DEF-fix.patch 1551 BLAKE2B c28853b653da9b19c651ce84762e8d450f94d7
 AUX 0.17-timed-opt-parsing.patch 403 BLAKE2B e0164998a4845da439b640d60b3cdac1dd8a1329aaf41f6d4cd5117bf2eb92bf555ae9739883f3da913a5ff69bc2a91c1eefd5c31e79cf7c281d770de0df99de SHA512 76631e8ebcbe3a49f8454d6f72110803de58ddd5b3b5614e8abcd82f348e3bb1d9e706b3608b9c1f0672d529806dcbd571e27ae96b8fa5c7c9a4cd1b1762ad03
 AUX timed.rc6 358 BLAKE2B 358a7b3fc14f30b0146e1269cf9327d9aaf64d8329b25c610b0405adfc91d4d21d6d14ec08c7234b53934460851db6f947117733b3d4070645503dbe1761eaa5 SHA512 cde2063563dd02b404560fa84bfa536f2f7c75e9271225e94b08630348d78639e386b8a0f59f04b389ad66f2d714c63edf2eed507b690d5ba989780b400547a4
 DIST netkit-timed-0.17.tar.gz 48655 BLAKE2B 5e076394e2605569b8a9a34d47b59234ffa0f643a13ef7ac688b40d259079ec5d2eef99a0efa35d7975e11118c1fe87bd138edd98199dde68cc4d8d9f10c3599 SHA512 781a41555953a165949dde7e7279298d4faf348575ba1214c6ce60cdbc74f6f03ab31002d57a441cbcaf674f7e2cc00afa17632bc3fcb28e2afd95d39cd70b99
-EBUILD netkit-timed-0.17-r10.ebuild 1020 BLAKE2B 5889111e342f5bfa3ec48f47d2cca1a14d9389c5b31bd600669369ce8c51cff1f33b0478ddfefe190e733bb02b75d28792ca7e906f7d8cf83ae030d9b2b5f41d SHA512 267312c5a49304fd6f449023f84bf508956ae8dab13a5901809d5b0e75b5234e08984c0bdb5d4f6195a4df59da12911b1c27aa29ebf1c45383d8f1a110087fef
+EBUILD netkit-timed-0.17-r10.ebuild 1019 BLAKE2B 77eb78510e70c457c44b337ec08aa93093d2b15546fc4983be4aa9c55426fabff6727fb5b581fcf80cfbe345e163849d11a3856f0fdfaec907ec251e61379e55 SHA512 3f20935b6c17fed7d1e06a530ffb132d9d1fe4476ac807542db8076875adaea5f63d396a54fbba72f67f3a4285d0789935cfd29ac4e377a807c7fc7ebda6e1ac
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
index bde888f10c2d..8a5bc3d4f073 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ src_prepare() {
 src_configure() {
 	# Note this is not an autoconf configure script. econf fails
 	append-flags -DCLK_TCK=CLOCKS_PER_SEC
-	./configure --prefix=/usr --with-c-compiler=$(tc-getCC) || die "bad configure"
+	./configure --prefix=/usr --with-c-compiler="$(tc-getCC)" || die "bad configure"
 }
 
 src_install() {
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index fe2547c57976..747e427e3e24 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,5 @@
 DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d
 DIST netopeer2-2.1.16.tar.gz 371327 BLAKE2B fb9022cdad297ce366c00efbb0394feaa4dcff766f35c614354ea83a31871f24e05893e418face4e14df4d677c84e254cd8058259cddbc86ab4c94903eabd0f5 SHA512 9d0f1ddd38db2e9ac9a15ca1d8929eb32f682dd47c491a475acc406849fac0bc5f61f15cfabdacdedafe572855cf31cff4294c34eda2cad61e7518b62f40f71d
-EBUILD netopeer2-2.0.35.ebuild 978 BLAKE2B d219cc8f2ae80831cb16e00047db60eebf156b0b8ec96dcf1f2c52d3400f482a2b535c5811c6f21257ba3a36268cd88d393187825ffce046603f641a1a391b1c SHA512 bb60a9b22620bdf5618f7635d56fdfe5bc481d761e1a679dd855e452b6d914583c319d20c0dae539df9c718981959547da8a370c08930ab70c61e1abeee9b4cf
+EBUILD netopeer2-2.0.35.ebuild 979 BLAKE2B 72e9500e0b0d16f9f6653fe93a16bab58429caffc1282f32699eafe3e5880cffc7f5cac6979b11a98d817bc6bb175cac36f4ef44b7f266cde70bc46aee584d7b SHA512 e62166179026286c494bdc75c009ec00fbfd9217a85b7ed94a903c62ecdb4c87ac5145d00ca6be0bbdb39cb4545bfb38ae33b6486f2c2ace14c0c2b192c1a456
 EBUILD netopeer2-2.1.16.ebuild 978 BLAKE2B bab8b7b4576f5bf2102a3e37c65050cfc5670d14d7fd710cb00a2e48cc20ec3426e4fd1a9377a2ed9cf78157ca1e10b7e1acdc95faae23031e88974170119884 SHA512 9bb6c4bcf4730405e26f099f433e83ff196acc2f37d22eec65566a2960c08b25750f2838f131d452c59aa62cca5c5576c2a27bc7bfa3eb55dfa1a9f83a05ee29
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.0.35.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
index f4ad0b6b6641..1b2774f2b27a 100644
--- a/net-misc/netopeer2/netopeer2-2.0.35.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index cf6b3f40a7b6..750a68a91d27 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,7 +2,9 @@ AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb
 DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
 DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909
 DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
+DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
 EBUILD nextcloud-client-3.3.6.ebuild 2193 BLAKE2B 50f2084e5a1882d928273fcc938ff6258fc88b0fc2c22c47bfe2ff361e6791abb5f9e7baa6c8b8aee0ed696dd90f994f7fc9ddb985ed2ea6088208ce8576a951 SHA512 55038556483e044b6f91906efc6feb9311bde74bb09dab1877af6c92e0d5c70d3e8405541d9a30ee2aa7aa1c121d5d691cbbb4b4711a0bfc2c8289dfd4c69a3d
 EBUILD nextcloud-client-3.4.2.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
-EBUILD nextcloud-client-3.4.3.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+EBUILD nextcloud-client-3.4.3.ebuild 2182 BLAKE2B 33133006cd7cba83da279d15122a00b82658967bbc3df8c2da157f9ed87582526e84b6959dd3d39dfdb909fee75eacb780a0548a9bd40564ceb38d7e61e805e9 SHA512 3b1957a1755b3dadb4d2a92d9991d97f1a17bf4f94120ea44219a46bf49b909fb8828a9f4f56e929c375d631e46645ab2cf4c084c98a26b58ebba98cf080960e
+EBUILD nextcloud-client-3.4.4.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
index df314cf64b74..a3ac54808113 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
new file mode 100644
index 000000000000..df314cf64b74
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	gnome-base/librsvg
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index b29172129f8e..e974ab0567d5 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,8 +1,6 @@
 AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704
-DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589
 DIST ofono-1.34.tar.xz 1060828 BLAKE2B be0d3787ca9226763fb2bff46f1c3cec813d702730d6231986ec5aa43e2d96e08385fa3f64ccff97cf15844e41a33d6c37d1d35c8b0c5fcf3765848e258e3372 SHA512 79ebf0bc795288f07b58eeaa1a0aa3309b4afecae3abdd26c0749e22a4c2e74b65e93cbcfdfd1738dbcb2d0cfb8c687d182d706696a7c1cd5b4ed3bcec059489
-EBUILD ofono-1.31.ebuild 1635 BLAKE2B 45b6875cd3e99ff72d5bde84c7f17f14bb74e75676afb68f006f5befce85c1221fa8249d5c3cb294ce3c2e4eb441b7d80d90af56f26973a3396f59aef6d17711 SHA512 9518abf4fa61f8812f7e5dda459565e3ee5168e3777522256301227152e3e03f6293e39ad41e6c1b7fc946b55997c937cc1193363808c54101ea01a4125a1bb8
-EBUILD ofono-1.33.ebuild 1636 BLAKE2B 6c60822a95dddc6f6e017cdfd43a875976984d2d89cad8681aabb46fc259201ed011864aea94b94100de9c27cd358af5ac923dd18e32063770760af10bd95d82 SHA512 b994465fd5043299589d09644225a4a11589ffa6d507cf41a01a686d3603dffcdedc2dfad47d3ebfcb55ae393892d18919646e537feae3831974ff93caaf4289
+EBUILD ofono-1.33.ebuild 1635 BLAKE2B 2ec579c72af17add304ccd2b4945a21c9fd5725907e93e3457d3f9504ef9d6ecd868a2b7a43c49c5ee6411de12266677d14ce51f31d9808573c453cb98211303 SHA512 bcaeb56d9a37cc0bb35d45f553b1c930c9a7d1cbca604a0ce862769dcd298ee784be9f885f59a009bf1c35baf1b79b7723208d99050b99767e07ca9e871c872d
 EBUILD ofono-1.34.ebuild 1642 BLAKE2B 4fec94e65e7f613febb35e118ef6670b3cba3dffd7961002079239ff54054a59cd71248ec6409f415abc45a1dafb9aa858ed8e3e7234c5848dad823d0cb3f160 SHA512 beb1c80eae1dcbc666c86157e8499c8f7570da72aa8456cf8a14da5353b33a47756c6df835d475287dee034ba887a19741310ffc9632a0c90eb33f7b0dd0db10
 MISC metadata.xml 952 BLAKE2B 9980756397330c03bd0f21db6d44e4af119135b9a864d4cdc97a697e7f0013051985c7db3c48d8d17bd592cfaf185a81add398d3e0a3ddc64aa61979a1603d5e SHA512 a745e9cf9a89e3c989cd950651c3d914ffe17e34f32f9623c468127011c6faa35942484d24c34c217b614b295743120a035a56aa30ae79343a72ba5cfbc462f0
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
deleted file mode 100644
index 7ae12935361e..000000000000
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://01.org/ofono"
-SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
-	>=dev-libs/glib-2.32
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-provider-name \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-1.33.ebuild
index 522dbe691596..22a7d7241f42 100644
--- a/net-misc/ofono/ofono-1.33.ebuild
+++ b/net-misc/ofono/ofono-1.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/openrdap/Manifest b/net-misc/openrdap/Manifest
index 8cfaf886c045..f1da1aefda98 100644
--- a/net-misc/openrdap/Manifest
+++ b/net-misc/openrdap/Manifest
@@ -1,28 +1,4 @@
-DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
-DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
-DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
-DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip 5447 BLAKE2B 9b79de84354305adc2019db61eaa5f84daaf0ba088b1582776b4973d85fda9055264b14218a00ddaa3c23696f5c57574eecbd48c2c7dc4df84348bf5c507d559 SHA512 eb9b80bd07a9586681ccb20b48644c404ad326e65251571531776ffb51eed20dfc79cb34dba332dea2fb4aa1a766da2cbad597b59db3c7f770b56febe1956ed4
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod 43 BLAKE2B 3d0d2a05e01b444fd374e5fb17a44bc8e5edfd9b6f3cfb4f11c5560b5cb7ff6fd6b17a71dc4f66b1b5bae36772c4f1b78f38c4d57e56781e7a8f49e20a119181 SHA512 7b584512981122677bbdb1c18358f1ecf72f7e97f61d80c9787f0887ea456e96c3f67155fc287a8cc7ce39584cf48696dd9c3a14c98e3c3f5b3a744cc6a4cd9f
-DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.zip 24559 BLAKE2B 341d9363a33f516e7f5e919d83836affa0133c7d6153b2c5aa85c748fcc4e77dc93d6c3d2e215d91beb020cd6e4fdc3cb602593ad403fbf3eec88dcd71122bbc SHA512 8f262a5f859f2cb644c9e278e492b7c0004a38d45ad41a9cb5a321a4d450fc81007ff1ddbdc34923d3da4fd1d271c11aa7192f77adeb6421d9f82a11cd942eae
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
-DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+DIST openrdap-0.9.0_p20191017-deps.tar.gz 21223841 BLAKE2B 8bc7f6d7926835a0fd1f723cf9a63a57b15c11d6bdaeeeead5da307a6053c931eba55e3a27a6c9e7c069f3421005be97e6070da657328a63e60f083566333af3 SHA512 c536daa1c3b2f3ac904d3f2e33b38351bbf50e0abc5e071958efdf364d9d59910b1108cb355e5e3c9e8a1517b5b222c8ab39a899f9dd6d7e80dda617b5ed0290
 DIST openrdap-0.9.0_p20191017.tar.gz 78085 BLAKE2B c3366aff7f12bdc8df4646c426e803834b382d02c0295eda0c97fef1ecc6ed54b6435e49bd1f67fe9884e4b8de466bb52db1494a4a531957c5c7c607eca4e5bc SHA512 494ceab714a4dc7c37c1a11a16a4d475627be59f9c56058a99ca203dece8a4963b06b0fca4091c1d3e194208427095335f9bb12043b02f27efb9b884ed43f7ef
-EBUILD openrdap-0.9.0_p20191017.ebuild 1925 BLAKE2B bdf8c6c223f5213672505f8423c4c1aecae4daf06f75c53286b0d04f3d995adbcddce0a7555ca03a79cd96c16ec17cb88b79589949de5447686338bef8786dda SHA512 78a8f7bdcad253670dfe2519e22afc3a632676dfb86244c92ad35dda28b31bf85c0a1c79b2efaa3c2236c23092444527a4004cf31069db3cc4163077d694f6ca
+EBUILD openrdap-0.9.0_p20191017-r1.ebuild 660 BLAKE2B a9449ab97784bbd158e7870a5e02093228981c9cbf3161448ee3a0b100bec1f0a2d11462ffbbb87f0bbd1be7e47dc6dbe00f9c884548a4cf7cd7407f69ed6d4c SHA512 938365beac585cea6fe0f1f8b356d1a7fca356ae0f2e5d25b4de5c82953575169d819f314b85ed84f6a48d385219232f3119972e38d30230a7247be7b6bbf4e5
 MISC metadata.xml 502 BLAKE2B 8190935c5504521111ad0a3cd92de04eb407c0b5306ed48787b6950f2507eafb2715fa9bd62d5352f74af95a78f2fcd9d8521ed02c1f4da815e66671f48c4711 SHA512 cf4dd914fb175eee0ce8fcb545d2b933c4a028790ab7df98b37b8b681e7354239a0542ce5187a185deaef6a4b621cafab410ba3e72843e8cf01c05c564a7faae
diff --git a/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild b/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild
new file mode 100644
index 000000000000..d7e9899224db
--- /dev/null
+++ b/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGIT_COMMIT="af93e7ef17b78dee3e346814731377d5ef7b89f3"
+go-module_set_globals
+
+DESCRIPTION="RDAP command line client"
+HOMEPAGE="
+	https://www.openrdap.org/
+	https://github.com/openrdap/rdap
+"
+SRC_URI="
+	https://github.com/openrdap/rdap/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~conikost/distfiles/${P}-deps.tar.gz
+"
+S="${WORKDIR}/${PN/open/}-${EGIT_COMMIT}"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	go build ./cmd/rdap || die
+}
+
+src_install() {
+	dobin rdap
+	einstalldocs
+}
diff --git a/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild b/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild
deleted file mode 100644
index 0deb042fb15f..000000000000
--- a/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-EGIT_COMMIT="af93e7ef17b78dee3e346814731377d5ef7b89f3"
-EGO_SUM=(
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/jarcoal/httpmock v1.0.4"
-	"github.com/jarcoal/httpmock v1.0.4/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="RDAP command line client"
-HOMEPAGE="
-	https://www.openrdap.org/
-	https://github.com/openrdap/rdap
-"
-SRC_URI="
-	https://github.com/openrdap/rdap/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-S="${WORKDIR}/${PN/open/}-${EGIT_COMMIT}"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() {
-	go build ./cmd/rdap || die
-}
-
-src_install() {
-	dobin rdap
-	einstalldocs
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 9b26f2a0bfbb..71f6dacc8b30 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -32,6 +32,6 @@ DIST openssh-8.9p1.tar.gz.asc 833 BLAKE2B fd44a5545bd0795ee335e480011dbe3c12011d
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-EBUILD openssh-8.8_p1-r4.ebuild 17077 BLAKE2B 7af036dcdd0bf2a7076529acd1173670f68198b68d86270a09a07f8c2562d40af861300822aefffc402f6f8d998f1843b3961e766130605a9507ee3854c04821 SHA512 74473973c14b51bf40ee5077cbd1402216f03689149db88af45e44210c48631f240db034f24a987cc0c48629770b1e2176858ab28e6662a97fd0f494be6ff684
-EBUILD openssh-8.9_p1-r2.ebuild 17262 BLAKE2B b7bac52dce42f2ea13ae502e5bc86c5b0591ebe27a2c688a196cb8af95b6d9f2e2ba1a882a9ceff878c835a5c5c6a1a3885179d0af7441c80f75e2739d23b678 SHA512 22440a0c0f9b09f19732ed249a6d9453f5833085cb626080cf1941bf764ac811e26b0218c3eacd371d01ad57f14429bb08eca1d54a344879d13c9362263f5025
+EBUILD openssh-8.8_p1-r4.ebuild 17055 BLAKE2B cee54e3781c78b8f8e150d819473c3140ee07161b3bce92ba5dbe7cbf6e81d69fa3c4cf8ceba0c8d0d2f7a1c295482a3072bb8758bb3225cf011bbb74622cf06 SHA512 65f31daf43c96d56a46c6f3238471dafffe7aab2f0811c72113feda8b670100d024e6426587e3f35cc630f72e5d6ff141ee6a13b795643d2edc484472048b125
+EBUILD openssh-8.9_p1-r2.ebuild 17240 BLAKE2B fdfb71a829a3983efaa528240ced37a7cfe4843e1f6d8c02bd6c991455ef32f7ec4bc592f157d778d1cf8944e42387fb85de251e22f32b790021a663e1630afd SHA512 1fe0d20d824716cade9075266508eaf94d9e28de9a72dc51f62841dc0a052adf8933384a6eb8d577a31e79ba3fe8db5ac0de4fd8e9afc8f422e5ba4c1eac5799
 MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
diff --git a/net-misc/openssh/openssh-8.8_p1-r4.ebuild b/net-misc/openssh/openssh-8.8_p1-r4.ebuild
index 346f1afe7e1f..561dc2dd6076 100644
--- a/net-misc/openssh/openssh-8.8_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.8_p1-r4.ebuild
@@ -303,7 +303,7 @@ src_configure() {
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with ldns)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/openssh/openssh-8.9_p1-r2.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
index d56d99980ece..64d88e4197f6 100644
--- a/net-misc/openssh/openssh-8.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild
@@ -306,7 +306,7 @@ src_configure() {
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with ldns)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 0a6b181334b0..7c193b708785 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,4 +1,4 @@
 AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7
 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3
-EBUILD pipes-1.16.1-r1.ebuild 651 BLAKE2B 11f199ac06317585b7200b5cfa5fcaa1ac8136478dbfcfb9ca79c191b7a42f7f3b682496e45528f2aae5d3e6dfe8921fc37b509d3202f00d6ede6a42a940ee00 SHA512 269d5fd9aedf979c68397ac599484584dc66ab894fa68c6fcf596bff4cbfcb0fc7f70dceb6737f4d8ade15026c1519aa8cf78913f5e5f7f0a74cd47e2f874caa
+EBUILD pipes-1.16.1-r1.ebuild 653 BLAKE2B 0940c6c100791d6ee122fc445ec47b3fd9249671188c469a892fca0b13a15f40cd7114a00eab92e9f1c2e00582165249b15f2dd68b5c340a1c1f1e5603038149 SHA512 889685503f74ced6ba2f3ccd35e3b12c68b66a285445944f7231de441134d6b5d73c91488d50028d8a6ced67327f4dc0689475e02b9d89bb92819e975e9fddef
 MISC metadata.xml 1244 BLAKE2B 87ebab2c78e1d5cd55ecf5f7ada08bca00ebd347099725ed0a50e66186401f19add0d94865b3c2baf9221c78d5f1a7ec55488d57ca289ff4fc3b7ab92ad1438c SHA512 1141579f90552bff7efe344685d3029343b18b6ed12727e5041b89f8b82493693cf87a7f9b87a654ded89cd2410c5b64223129c197002ce86b8898334939fa7d
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index 11036b37088e..7a2acfb32695 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ src_compile() {
 	# Prevent the build system from looking for dependencies
 	touch .depend || die
 
-	emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+	emake CC="$(tc-getCC)" OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 2ee93ac2364a..ed97830d7f5b 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,5 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.76.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
-EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab
+EBUILD putty-0.76.ebuild 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
+EBUILD putty-9999.ebuild 1748 BLAKE2B c19463b704de38bc5226c6f37b58aeabeb888a85f5cfcdbed00d32f525241daca1b7382a7f7f0a7c86fbbd1c2ccda92481a209e353afd6760c9b9dcc14441af1 SHA512 f18023f6866e116aae2b6cc9aa92cd3421942d6396768321bc44da8f88292ea50a38999053bb015914cc23af37d52b275cb0d7dad7c7a5ec15412ffe7f70ed23
 MISC metadata.xml 1011 BLAKE2B a759a93b5f4affdefc2ad81edd6a9c15fa31feb5b549d23a56114e7a9937bef6e60aa6b630fba223043cd0909e8052dcb3f1e848199399aa1f249b9d4dd59715 SHA512 3c48cbb3dff26aee751960ceccb5214c97adb60c68eb67fe69a2c6ffa059b2defeb66623e85da970c4fa0668fafa5c4b61404685fcc3e6d5b803944d11ea9bf9
diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild
index 62ac436ba4c6..c793525eff4f 100644
--- a/net-misc/putty/putty-0.76.ebuild
+++ b/net-misc/putty/putty-0.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ src_configure() {
 
 src_compile() {
 	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+	emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
 }
 
 src_test() {
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 68b02e9dd70b..97dbfaea150f 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,7 @@ src_configure() {
 
 src_compile() {
 	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+	emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
 }
 
 src_test() {
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index a43b302d69a0..08136e1b464e 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,4 @@
-DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
+AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900
 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
-EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750
-EBUILD r8168-8.049.02-r1.ebuild 1059 BLAKE2B 316c5dd6ec2a37d058acbd9d0e10ed1e9e08d8db789537b82c405ca099c5c0ac69b02c00e0b64e62525d757a6e99f7bbc09c0efa43b8b9987b40641babffea4a SHA512 a072ecfb47b5758e0a04f960d517c6cdc589bd001994803ca0eeb39e8e4f5955935100a5c20b462584c24bca72e50cbed8b7138e9588a898ae1d424e7237d1a8
-EBUILD r8168-8.049.02.ebuild 924 BLAKE2B f4ff3e0f5177124d6628f6c3205f62512e6c3343e0a8de91d87073c7af0f57fcab421e2834434da7a9d309e02a604e6a006294016c78621e7864f276cb8e9a88 SHA512 b82a87e40ed975c981eacc6e03410dca1b824319cf0ae7aa75bad04d30c986af62fb14f164e587a7d585b50eba216225bb8f316c089b18ba6d46b8702b27a053
+EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
new file mode 100644
index 000000000000..9e4e77615458
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch
@@ -0,0 +1,70 @@
+PDE_DATA has been replaced with pde_data
+netdev->dev_addr is now const and uses assignment helpers like eth_hw_addr_set
+
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=48eab83
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e
+
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -95,6 +95,10 @@
+ #include <linux/seq_file.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++#define PDE_DATA pde_data
++#endif
++
+ #define FIRMWARE_8168D_1    "rtl_nic/rtl8168d-1.fw"
+ #define FIRMWARE_8168D_2    "rtl_nic/rtl8168d-2.fw"
+ #define FIRMWARE_8168E_1    "rtl_nic/rtl8168e-1.fw"
+@@ -563,7 +567,7 @@
+ static void rtl8168_down(struct net_device *dev);
+ 
+ static int rtl8168_set_mac_address(struct net_device *dev, void *p);
+-void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr);
++void rtl8168_rar_set(struct rtl8168_private *tp, const uint8_t *addr);
+ static void rtl8168_desc_addr_fill(struct rtl8168_private *);
+ static void rtl8168_tx_desc_init(struct rtl8168_private *tp);
+ static void rtl8168_rx_desc_init(struct rtl8168_private *tp);
+@@ -24129,9 +24133,17 @@
+         rtl8168_rar_set(tp, mac_addr);
+ 
+         for (i = 0; i < MAC_ADDR_LEN; i++) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
+                 dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
+                 tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
++#else
++                mac_addr[i] = RTL_R8(tp, MAC0 + i);
++                tp->org_mac_addr[i] = mac_addr[i]; /* keep the original MAC address */
++#endif
+         }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++        eth_hw_addr_set(dev, mac_addr);
++#endif
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+ #endif
+@@ -24159,9 +24171,11 @@
+                 return -EADDRNOTAVAIL;
+ 
+         spin_lock_irqsave(&tp->lock, flags);
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
+         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+-
++#else
++        eth_hw_addr_set(dev, addr->sa_data);
++#endif
+         rtl8168_rar_set(tp, dev->dev_addr);
+ 
+         spin_unlock_irqrestore(&tp->lock, flags);
+@@ -24177,7 +24191,7 @@
+  *****************************************************************************/
+ void
+ rtl8168_rar_set(struct rtl8168_private *tp,
+-                uint8_t *addr)
++                const uint8_t *addr)
+ {
+         uint32_t rar_low = 0;
+         uint32_t rar_high = 0;
diff --git a/net-misc/r8168/r8168-8.048.03-r1.ebuild b/net-misc/r8168/r8168-8.048.03-r1.ebuild
deleted file mode 100644
index 49c108910168..000000000000
--- a/net-misc/r8168/r8168-8.048.03-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
-}
diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.049.02-r1.ebuild
index 2f271eb31f74..6686979b10d9 100644
--- a/net-misc/r8168/r8168-8.049.02-r1.ebuild
+++ b/net-misc/r8168/r8168-8.049.02-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info linux-mod
 
@@ -24,6 +24,9 @@ IUSE="use-firmware"
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
+PATCHES=(
+	"${FILESDIR}/r8168-8.049.02-5.17-fix.patch"
+)
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
diff --git a/net-misc/r8168/r8168-8.049.02.ebuild b/net-misc/r8168/r8168-8.049.02.ebuild
deleted file mode 100644
index 7a3513fe3b08..000000000000
--- a/net-misc/r8168/r8168-8.049.02.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
-}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 6c0b8156f31c..77536af13911 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -7,7 +7,8 @@ AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a0312
 AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
+DIST rsync-3.2.3.tar.gz.asc 195 BLAKE2B cc18dd2589c09f869e35ecaf94a610e5b605dcb10ceaf01e6c0eb2667666a9a73feb7dcb2325638686c772f91a74d6d1f15ea33fdb6a38e89640f32a8cd0e04a SHA512 b7e512d8bb0aaff7c48571b918a7b0362942c65ef2a0aa076574ec86c05822dc5df41f8796fdf62b762b12d166a671c9e979f9962357b89e3649459c4567525b
 EBUILD rsync-3.2.3-r4.ebuild 3498 BLAKE2B 7ed62167acab5e725dba71c258a9a4f770595142469ca6c3b43939c2f99669f08fadc5fa6ac0104a14b774f6e679d547065b58135f13b5f0bacfb22e3d1b03b5 SHA512 b1bcf2bc437955ff6c86a9f0dbf492b927103b05d93edbdc44823fa49496f373d11c477af5c0fd83a1894f8e12148f6eddc0767c6535ef78b5ea4394520e0fa6
-EBUILD rsync-3.2.3-r5.ebuild 3787 BLAKE2B 0269ef2e8d91da95a7789e7da7d9603fface6ac2c99d747c3f430813aca8f1ba5f1d4147df1dbab0ded354fd3a6ef6d4589c554f3fe7d9e5c29883c19dfcc866 SHA512 abf1d2c92c2414fae3a341119cf41a64d61f81f2ea854f21d5f5f64a2f601700d3d50300f21b102fa3f3217371562939e86a892657435e5e7f327f7df3d80e32
+EBUILD rsync-3.2.3-r5.ebuild 4019 BLAKE2B cfc6983ceae44e3fff86e43186fe0ffbfddac35843895586a593aa6aa97e398ccab12f696a36353a2a8e2509cd79a4795be4653c06c6bcd77872649166a4b0a2 SHA512 3f7462e646d7407e649a03c992faf10688b980cb4f42c36c6e7c1964abb0fbe64d76829f052130fe15cfcce2cc5a53e44422bc9ffcffc2cf72454e905c5cdc1f
 EBUILD rsync-9999.ebuild 3932 BLAKE2B 23cb0f29da61f0b15a52664584bcd69d9796512720a0ab3f68f5cc061a62bcae338f1113d6006c102969e988a7cc092b7d33b4ce8fa01712c43e3c0325de4d13 SHA512 0d7ffade47161a6da93fd41bcc4068c8bd5611ab45ea645c74150c39f11255d4d650bb36f6b21c3e8b3232b8004e85cf53ea4c97e80722396221b3e1fa9fed92
 MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild
index 7f996c540050..4e060aaa03bc 100644
--- a/net-misc/rsync/rsync-3.2.3-r5.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,14 +9,16 @@ if [[ ${PV} != 3.2.3 ]]; then
 fi
 
 WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
 
-inherit autotools flag-o-matic prefix systemd
+inherit autotools flag-o-matic prefix systemd verify-sig
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="https://rsync.samba.org/"
 SRC_DIR="src"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+	verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
 S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-3"
@@ -33,6 +35,7 @@ RDEPEND="acl? ( virtual/acl )
 	>=dev-libs/popt-1.5
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
 
 src_prepare() {
 	local PATCHES=(
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 728797e4a89b..e34ae3b5918f 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -2,5 +2,5 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb
 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8
 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
-EBUILD scponly-4.8-r7.ebuild 6930 BLAKE2B cc3831790f8f14c427efe8f277c9ee407df55b3143ce190c4702d42a844b0ab1223d7736b250b1308741860d5eb4f80af9164e6ae31ec83821841f3a56bc2c84 SHA512 ab9b9046df09078d5fd42acd1d8fd0991a2bc049e76de49f28b38d33a285dbc223eb51eadc3eb5627332b00f07a9c913c760aae7d482148497afbe41bd105b95
+EBUILD scponly-4.8-r7.ebuild 6932 BLAKE2B 547c40d3b53c068fd61181fb50d7282daf9bee37c4807b4db692906a5e2198094c3755d88b1fa7be4cdba60b575d12ada4279407e7899721955f531b1b62b30b SHA512 04fa9b4f54a9827b599346a57587f515af7b427d4d93ce577fb31dfb8275c991a62b26d213b6f09c39eae915aa974f2488bcc719c600350756a8eec8bfbd2068
 MISC metadata.xml 1761 BLAKE2B a2fbdcc0e9b89e85180548a97a12eeb27a5d973673451972c32184dfc932d6634950e0620fa2a1e2962d8a08508c31439f9a3e29a6e2a3e4f76d53933ac425e5 SHA512 bdfe9ab129bc9c939850756b23510c91908c21aa417529501b2ada83a30335ce4446f5bbc6dcb728df09e1b27d4cf7ba4eee4f43b96a1b92c0ea476d05ca7592
diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r7.ebuild
index 53455a9f74eb..db5e7ae99a4f 100644
--- a/net-misc/scponly/scponly-4.8-r7.ebuild
+++ b/net-misc/scponly/scponly-4.8-r7.ebuild
@@ -55,7 +55,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 298d5bb1fcda..11f86deae270 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,14 +1,8 @@
 AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
-AUX seafile-client-8.0.1-glib-2.68.0.patch 530 BLAKE2B 936c032a129a65cdfaa64779f45113996f06f7a3bc155a101f312275d70c89edf0042172adbec253c13a571e0e68cd76b1d414823ccc4b975c990e5969e660c9 SHA512 c6eb836b46a3e9aefb89c7e824420695bf44994a6c668a1378598c226b45a6e894f1fe429c3957c6a6cf7463a425a01131d2caa46595d3779cb2f387187fd733
+AUX seafile-client-8.0.6-select-qt5.patch 1092 BLAKE2B 887ea09f0fd4c21c8b1ec65444e19bbcb50675b47bcff3553e21ea39c2ba67bd574a781e84232aef6b7e23143a8b9dd8828b024234060c5ed881074353f8f752 SHA512 4bfd313bc09cd5ceefc583800f87736620e0f33fdf6a4fc4b420325c3c8e074cfc14d21586190cef208660a14c05a1e056f9fd90a9ceddd2c2c1e780461d7a0a
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
-DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923 SHA512 f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4
-DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72 SHA512 944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff
-DIST seafile-client-8.0.4.tar.gz 11701804 BLAKE2B 4d1647a4c783be634eca79ff3ca0713888c38222c1c571f11393a4cc6067073c4ac2a41256a678482c8e66c16cc88dc04883f432d81e374a06264650fe198ade SHA512 eb9afa97f02cfd6054dab34c0ce7e268b8faca49d364d0051358c3f69ae4c8b4e130025891a4c99e4d6cd5abe6b617ea23bcc0d6f2b07ea438debf9899b6d406
 DIST seafile-client-8.0.5.tar.gz 11701650 BLAKE2B c9c436f53cf7effa6c2e1cdbb09f5cffd53f7ef8fa6f6b12bb92c0d3c2e54b38858c95a3ab4c511d16774a973c8c2a7e66842825e9535d1332e8589dc201d22a SHA512 1f3eb643dce980a1aa0ff71e0ecca83b3db0848f9983bf7782adae6d181ddc28454a6cd75ebfcf439c17eb2008a5e0d4a684e5cee60fe7b83297e9fce1fcfec9
-EBUILD seafile-client-8.0.1-r3.ebuild 1150 BLAKE2B 83a6f759ec8664f219d2d121e9385e1c65f0e372f83df526261492eb32d1125c3a362694b9263a960719dd2a0cda1ef50d097c1916c9865383e135b37544db59 SHA512 0382087bc129926c08e31c45a1d503d8b49c3eebc218e3e1ec3bbd0b7a0838e35003293ceffa217d38a134763cdd3aea9a8a9fbdd3413d21d58e965fc18b6d92
-EBUILD seafile-client-8.0.2-r1.ebuild 1267 BLAKE2B 630d1bb6c899dfe153be4ae7389c2b772580de86ad237dd0a0454833b64302dbd4fc5d71fa9351ad1bf231093557ca739588bcd2dda17ec5360a581fb973f6a4 SHA512 153a47665cda4d5a52d106f70443aa31411e8de7c01d327a1ccc76173d3534058d5f36d32a29a13a292d726d968945d2812998791dbddb51ce2b1787cd1a0845
-EBUILD seafile-client-8.0.3-r1.ebuild 1164 BLAKE2B 14beea7340a9fe04b5ea753e3b00365ca56a715eb90ae0f0d12de04633128ebc1c1cd43cfcf31f3d02c1e3ac6005de9693f075400bfe67bb4449a578227828ad SHA512 8d4ad22b990aa902562eba2aa52f8a8fdbb74646957448cfbf3e6cd533eb3d9c26fde8cf17b62562ca5d49f6f1092ef9c82e1b61d88830275bda8a394db3d3ab
-EBUILD seafile-client-8.0.4.ebuild 1159 BLAKE2B c62d29d591a47b69b76e2d6d0761b0c00d3b1da650d2283ee96a860ac9d725647383e6eff6363c20a6e42d496054c945c307ca8530a0e30c619ec8d7489b0eff SHA512 7e31c983471c7bb18d48232950a45d3a8366577b07b9004839257649dbf6cbb50f428acf67e530edbfe715772c82bb346b89a83701a49886bd6220ad612ade4f
+DIST seafile-client-8.0.6.tar.gz 11702726 BLAKE2B bcba073b9ec17c33f653ae89e518f30f96ec8f9bdb780a9e06ae75d565c223c6b0505fd1ec9475b66bcd8d26f84846a99968fc006514d1eccb4a72b8600f0ae4 SHA512 fceb272fa521a7343609285ff5b299f66886b2ea53a1395178c3f05313e9439853422de65d20902669034c4edacdf32eb5674e16e64218b0444221c77cd4256c
 EBUILD seafile-client-8.0.5.ebuild 1159 BLAKE2B 2965f14117df12ecc190e570556f9d71821dd2e4ee8c01c4c04832e35fd5c471e64756392434d8fb679acc1b932200476b542507afe1c2d05af0e7db805d358f SHA512 a110c24d3d03b356297d614794bf4f6a7afc7c9936ca3cc96250d5d0f8da0855eddb2d3a40b1a438fe1414649cb2b30623592b01ded27adc6d330441a0bb15d8
+EBUILD seafile-client-8.0.6.ebuild 1228 BLAKE2B 94ebabe541be053ae9f698dbb055b87bf4b5f2ecb7300a2c7806382e4c38511fad8f33dfe6e0e1a6390dee32bd5ff80a0c1f1e6711be8174c47503d4e8fb59b2 SHA512 132dc1c0b80d0d4ecef7c99685603f5fe3081ef895866334a377f94b0fff493839c68f30b00c221b4dc11e5f37e5a073a34b9ebb82983dfa80e469e9d25e71a7
 MISC metadata.xml 577 BLAKE2B 2370893b5c79210e63c40cd24532db7f376f57bce60728359b8645dc77717e4453fd9e2abf95d7c67882104a88c402585c0493c0a52ca0f84eceafb2928d338a SHA512 810d37c18e32318a1e9797186d2d1f3c74adfb6366fa8d9ffc966adc46779e352550d5e01ac73a9fd259d14fe0d931e37835f2ccf5f42648e3a6a40c3029ad10
diff --git a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
deleted file mode 100644
index 9b2dd42cc926..000000000000
--- a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbf1d2f..05e8d4d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0)
- SET(SEAFILE_CLIENT_VERSION_PATCH 1)
- SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}")
- ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION})
-+ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26)
- INCLUDE(FindPkgConfig)
- 
- ## Build crash repoter on release build as default
diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
new file mode 100644
index 000000000000..4d3a3d172644
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1c4a4447..5747df46 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,14 +133,12 @@ ENDIF()
+ ####################
+ ###### BEGIN: QT configuration
+ ####################
+-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe)
+-EXECUTE_PROCESS(COMMAND
+-    bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'"
+-    OUTPUT_VARIABLE DETECTED_QT_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
++FIND_PACKAGE(Qt5Core)
++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION})
+ MESSAGE("Qt version: ${DETECTED_QT_VERSION}")
++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION)
+ EXECUTE_PROCESS(COMMAND
+-    bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
++    bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
+     OUTPUT_VARIABLE QT_VERSION_MAJOR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}")
diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild
deleted file mode 100644
index ffac16697ade..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:=
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-	"${FILESDIR}/${P}-glib-2.68.0.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild
deleted file mode 100644
index d2c2f9add43a..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RELEASE_COMMIT="837be8efd5cab4aea8fc1138ab91e93539a4e010"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:=
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-	"${FILESDIR}/${PN}-8.0.1-glib-2.68.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild
deleted file mode 100644
index 0173c0bb30e0..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RELEASE_COMMIT="c49c317f3bf19001c06f189d0706b6a3a2d6533c"
-
-inherit xdg cmake
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	shibboleth? ( dev-qt/qtwebengine:5[widgets] )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
-	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/seafile-client/seafile-client-8.0.4.ebuild b/net-misc/seafile-client/seafile-client-8.0.6.ebuild
index 243dcf911e7a..19c6f924fba8 100644
--- a/net-misc/seafile-client/seafile-client-8.0.4.ebuild
+++ b/net-misc/seafile-client/seafile-client-8.0.6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-RELEASE_COMMIT="7317fb425226961708c6dccf5c0607ba2a177797"
+# Upstream is moving tags repeatedly, then we use commit hash.
+RELEASE_COMMIT="1fb9ddd71fbf6f0252509aced527be459e240366"
 
 inherit xdg cmake
 
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-8.0.6-select-qt5.patch"
 	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
 )
 
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 8d8d0757eaba..3259e19696ba 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,11 +1,5 @@
-DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
-DIST seafile-8.0.2.tar.gz 732341 BLAKE2B 29bf3187a37c0f01261d3afba996e1165ddebe05a36f734fd3d7ee5d0368ae2f94b70cd9251799ddeeea2318c510094b7b2fe917ce06a6328aca00f378dcb9ae SHA512 772dfb060e381eb2395b7ab094e11865f13e71f8c767d31e4ca8b48eaadf74d5d447298ea261f9cd48ff126828829c8d258ca943b01890f72072a36753d8333b
-DIST seafile-8.0.3.tar.gz 738066 BLAKE2B 302de3b5a4f465429955d2819c7b43ddb305cccc76cc7cf67885a75747ec5dcad85d17f94975abdd3b3d54d49a5d9ea05ab7947c3a2b84764b50fe5fb10e7636 SHA512 c51edfc094aa509c730b1b3f4ceb911461081689c8cc2564fb866cddaa54c445d9ad12ca9e4e90e98b771eafc6b6e1496e052538a2475a03642cdceb9212115a
-DIST seafile-8.0.4.tar.gz 738250 BLAKE2B 5502160519144764de16fe50ccc922dd2bce43571aa3485758c23667cb1546e60683f2fe7778c5da6c7a4c18d78f544e72a40ba6857a58cec3fa2b817d7e5d82 SHA512 9dad4a4bd288598dbfea316002d0570d759274b55479432f528f78f3a241d6ec826960d65ab5ec5ea4eeca27586398e0db5b76cbbbed27ca3dbd3ac2fd2d7060
 DIST seafile-8.0.5.tar.gz 738268 BLAKE2B a142acd9613b4a4aba62640486ee3e79de13274f068e8db69693d93092123f73150e579a38e2aaffc0144cb03a88c56cdac20ca33c0c9a5d09bb8684f184e193 SHA512 712a5d445f586beb9cbd425298734181f2eef302dc2f1f7634c4182bd113a7818c948475e9981ce32af218fcc635254e4d5fea28d514ad6eafe169c4a41eb6f9
-EBUILD seafile-8.0.1-r1.ebuild 1103 BLAKE2B d42714f2b4909223f994678edfe2cb9ec032f50592575d5a22247a38cb1b02094f3650595f04d75afdbfe8300c2af9ec26975427c98b90516994eccdceb9f803 SHA512 7521111e276a83f550f3e379988c04a70510d4ed339afab5c066f166d8cbc236809edd49d6f24e10e0aa63958c6627fce977433bcb034c81dd83df6444bb67f4
-EBUILD seafile-8.0.2-r2.ebuild 1213 BLAKE2B 5614d818e2cf23103c5a1db6b0733da04a1abd7498debf42b3ec94111f24897dba5dfda293afacea167f5c5392ddf5af2de40886bac66c0ea7cb8bf49f175582 SHA512 d44eda5ac83330359c3d0156bc5b10001a28be620d213df701ab66679da7bb039e6685d2ea1486f4338583a10da935cab4ff074a04f7afcf8e38979ae4550956
-EBUILD seafile-8.0.3-r3.ebuild 1267 BLAKE2B 60775a827c4b7aacc32377f2700e2710a9be3916610926776b9786d8268e30c3d089b09e7701e1db3dbbe0126504d036adc96cf1405ad292f1b39e6ed5bb402a SHA512 f97a40f09f5aca49d353563d65ecb418c5f920f544f0153ce25d10712a85af86427abb29c44bf6a39b31b5e067bf25d78d500649b3a041eada50e99d5fc17736
-EBUILD seafile-8.0.4.ebuild 1289 BLAKE2B de09281328df4769efae92f99ccdb565310e3f7f7003ef757be5d94e23a0efc81016e07df6199809da47fb72c7b2539ef93d08bc1be9cd350c9d096a04974745 SHA512 d71caa7d17f06eb9d4f1d100c852269b830d6bc061ef8ea894e380d9b2db4933de7d9c7057920c48e720ef4a862a768b23b6b9d3fcf64b0c362632fe2aa0fc67
-EBUILD seafile-8.0.5.ebuild 1289 BLAKE2B 92d4ff84691bb34fd8ea798e9cebb81e1ef418a89ec726ee2386118f8270e9aed299c71377bc40e3e8cd7ba437a442701e3c3e71260901044c1c7e6efa5b5b17 SHA512 19c802d87bad3456ad28a59a20926da646982ffa331c297d3c802462c5b102af1e2ae9826e35f854ee8c8cb441257291d291c2c8a585115cc32234290d9c6217
+DIST seafile-8.0.6.tar.gz 738248 BLAKE2B c36904c459429985bf5a6b34546be7af2ba913b4dc5df860858cf73c0d0fe4797fc1fd64a70d8feb3ac2888404e30705540672cdbcc7cea4b91e6229939ed1e4 SHA512 261e1c58018f3e427e79a811f67322a2d0ce4cc8bfa913f029bd42bdfa5498f35ec5003cafc8eaf583b0b0ef9cd7159bc4f57136f4fd4270b38327a79e0f95cd
+EBUILD seafile-8.0.5.ebuild 1330 BLAKE2B e70d51bd1198187e096efcee2625fba41899c7b1a93b9a5b349568796f647e180f15b469d5fb7130fb4f6652a607e1c51a66b934c45dc5ed5de3d59d6bcbe0ad SHA512 28f32451ed5ba70e317dad6e750aacc31072dcdbab5f21f636a68931db83f5be7c3183924ac711979ccb1b04f2d79f59d0ae2a3c141329b15eb15687ba184e43
+EBUILD seafile-8.0.6.ebuild 1393 BLAKE2B bbd22916d81a92980398840f7a09288a0e4f915330bebf8f19ba74d7e1862b2b199f14720b59b111e38aadbe38d47e62aebd95286e0c4732bedddd904ce1ab4f SHA512 84634bb83f93f55b8d414820eb30c5897bc707515c916496648cc784a1bd86969a53f4cdbc994fafd7480cbeacf554d4dfb967df01e6f57a571ba3145beda13f
 MISC metadata.xml 478 BLAKE2B 2c1506537c1d19f3aa9f731cecf2f53181bdfb92c33d3100e8338e778e222b396ebfd5c7f5745e133583615ca61be625787792d39d3772cede50f8b923ab1a4f SHA512 20620dd548eec869bb219011b157d821cc3fd939602d2662c26e1148582c2a593375b36085fae939880e01d76a251e91f35b9ad657cbad0a1e27bdfdc46b932c
diff --git a/net-misc/seafile/seafile-8.0.1-r1.ebuild b/net-misc/seafile/seafile-8.0.1-r1.ebuild
deleted file mode 100644
index 46724483ffce..000000000000
--- a/net-misc/seafile/seafile-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-8.0.2-r2.ebuild b/net-misc/seafile/seafile-8.0.2-r2.ebuild
deleted file mode 100644
index 16d97a5b08c3..000000000000
--- a/net-misc/seafile/seafile-8.0.2-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/seafile/seafile-8.0.3-r3.ebuild b/net-misc/seafile/seafile-8.0.3-r3.ebuild
deleted file mode 100644
index 296b36c5b240..000000000000
--- a/net-misc/seafile/seafile-8.0.3-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/future[${PYTHON_USEDEP}]
-	')
-	dev-libs/openssl:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-libs/libevent:=
-	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	eautoreconf
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"/usr/bin/seaf-cli
-}
diff --git a/net-misc/seafile/seafile-8.0.5.ebuild b/net-misc/seafile/seafile-8.0.5.ebuild
index ef6a84798688..f378036fe6b2 100644
--- a/net-misc/seafile/seafile-8.0.5.ebuild
+++ b/net-misc/seafile/seafile-8.0.5.ebuild
@@ -30,7 +30,8 @@ RDEPEND="${PYTHON_DEPS}
 	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	net-misc/curl
 	sys-apps/util-linux
-	sys-libs/zlib"
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}
 	$(vala_depend)"
diff --git a/net-misc/seafile/seafile-8.0.4.ebuild b/net-misc/seafile/seafile-8.0.6.ebuild
index 6c9c198dc21a..442f75e3c208 100644
--- a/net-misc/seafile/seafile-8.0.4.ebuild
+++ b/net-misc/seafile/seafile-8.0.6.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-RELEASE_COMMIT="d01b8de6d378c69525e6ed57b84bd22579b96444"
+# Upstream is moving tags repeatedly, then we use commit hash.
+RELEASE_COMMIT="7a61feaba63006d11c09d1020593ba3fcb3fc717"
 
 inherit autotools python-single-r1 vala
 
@@ -30,7 +31,8 @@ RDEPEND="${PYTHON_DEPS}
 	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	net-misc/curl
 	sys-apps/util-linux
-	sys-libs/zlib"
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}
 	$(vala_depend)"
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index c7e39037063d..628609e102c7 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,5 +1,5 @@
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
-AUX ser2net.initd 1254 BLAKE2B dcd9efd5588661e91baf9f80dde20787345e3ea7be9fc0d01442cb1023c043a236ec88f1d8fa5e65658bc5e1134d5aa50950aa6cf9b9e954d9fafd2ccbef9019 SHA512 c7b875c4f63b217ee7d0fa7f4fc5bab20486b5c5401b90a46cf692fd3643ff9360d6004ace28d79d5dffd8c1aab6b24445045ce8dd785c19965033e28f784bd1
+AUX ser2net.initd 1251 BLAKE2B a22c21a2807e9c6c9e6ec19869b0de3871514c6cd38c36e0713ca93d392d56966e9ef63655afe7b2e86affa4c1dc0ee4837381cfce8c1b8cea980d7d23d0f51f SHA512 f92c39a2f54f04c31ff12c6bc92b86eb6b884e790e9856b15ce3d8f2db1f43c8084437f91ccbe259fc989deac462575cbe16a4ce5059f29857bd04258b6e6aee
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
 EBUILD ser2net-2.10.0-r1.ebuild 620 BLAKE2B ca674be4338a1086172eec784ae9250a524ba4db3ad10eec03ea219b52d03b5a4c88797f2c2877bc71aa088ec0318caa1173eaa397946962da82e30d923dba81 SHA512 a0b220160c3bdcdc60b8ab42f588d9b1aec94f706b0cb931c328ae336861ebea697051a98539681126b6effee939ae2448b1dc634c1ffa72b2534a3840ab1339
 MISC metadata.xml 245 BLAKE2B 283e669c2eaccbce6c5325e25d008486a91fee37eea3825d95b9659ba080b98865682e7713d1f2ccfb0b9fc4f1172dea97b8adf709582101ebe3b1dffb20f3da SHA512 01f6412344b7d183c04fe517d920e61d02ae502d820d2c41f49d3d4bdc9d76cf15429cf1dddbea33bb9d8a0c70cf2cc20d2d9a751258c41d1fe1a9aebd690ec4
diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd
index 7652bc9b0350..f7e22509e72a 100644
--- a/net-misc/ser2net/files/ser2net.initd
+++ b/net-misc/ser2net/files/ser2net.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Serial to network proxy (${RC_SVCNAME#*.})"
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 80b4698cc980..d0367648f37a 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,5 @@
 DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf
+DIST smb4k-3.1.2.tar.xz 3189176 BLAKE2B 5d34eca46015a939fe3c0c4e2c73882938e6e462e06d3138429c01f203d894be0625703c38767b0260ea8e349acf9b5ce739fda0daed2091527fc08d6a2fb84f SHA512 6871d831e4b4f1cf471e9b225eb0761549a3a754c82a219041c335f970965d7ffd897cac8becfca5e358e1664dc1afed31febe44531267c272e565d2039b3f4c
 EBUILD smb4k-3.1.1.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271
+EBUILD smb4k-3.1.2.ebuild 2044 BLAKE2B a52fa8577aceeb714a45cd7ee336e42553b881deb0db336a2a983efe4773483f70838fc1e6a58f004656aa5f44ebd305d150f829cc4cc47cc06f1447817a723b SHA512 0d124c8dfc8398dee0e571ac22cccde502f82293649eded446d0ff3fb99ab723674f72b5cf01bc3e7ccdde56b66e7ba615dcae56d31ae78029caa494c8556e7b
 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b
diff --git a/net-misc/smb4k/smb4k-3.1.2.ebuild b/net-misc/smb4k/smb4k-3.1.2.ebuild
new file mode 100644
index 000000000000..6afc6176d8df
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://apps.kde.org/smb4k/
+https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="+discovery plasma"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-fs/samba[cups]
+	discovery? (
+		net-libs/kdsoap:=
+		net-libs/kdsoap-ws-discovery-client
+	)
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
+		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index d212921501f3..786d850bb4c0 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
-EBUILD spice-gtk-0.39-r2.ebuild 3233 BLAKE2B 26ab9b4fb049b6896a2e94353de79debe37f8aa93cb56f7f83c885a3ade81bdaff1efd66336da1a045742acdf05d389c2b57fc6e5346b3fc729738e44d8e20b0 SHA512 b4445617911c4b4ae8829c496efc115b1314ede37e078953d08b3417419a5bff2cc4c664cac1aa8a408fe33ce3281b7301b37e702c28c52a691de1480123f94e
-EBUILD spice-gtk-9999.ebuild 3186 BLAKE2B 3c81547b005ed094146cf9fb8d323bef0d937d9853c105397ec9793420dfdbcfad93fd392de4fe2e4640d1f799f410171646a246040edf297dd944533d0f836a SHA512 8806a1e345db874f7e8a0b701d7c4ec7fc88430312cc98977c776e670e1bb964307167f71ab747ca91ce586ba096219c6cbe107ed6e5c472469c0b47e745577f
+EBUILD spice-gtk-0.39-r2.ebuild 3205 BLAKE2B 70c637fc3edd032462b4a5eef134d03e7f8b5805a96d0b3fa72fb1bae49aa2e49cd7db7b3c1f7399051a3a754aa96402cea83a5618313ca3e3fbefd8ee8a0e65 SHA512 6bc020c385e9ac49cb8f23d259c69d4c578377d9baa068885ac268ae4acb5c60dc4624bb1606aca0d14c8e31e49e3ff3a940716c2912eb867a0062630b1e0e4e
+EBUILD spice-gtk-9999.ebuild 3158 BLAKE2B c5a87f0de68702ad2ed030b4fd82fe7d945d9f468acf890744ed441ec3d5695ddfb80c01d0e8b26d12c5a723371b06e7f8c9440881989bc1c8c0271356917f5a SHA512 6bcd6a0cdceb6af987d9044b155236b46bb99fb2a7d0b2c5e607267004a41b092613bcf0a3177048d956c58f9a6ec11f7b92e81b5716923c910907729465c079
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
index 26009d625fee..e4af25b8d05c 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
@@ -66,7 +66,6 @@ DEPEND="${RDEPEND}
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index cac0f2b7b32f..5d2a172d0ec3 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -69,7 +69,6 @@ DEPEND="${RDEPEND}
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index 8c40856ccfcb..2816a6bd341d 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -4,7 +4,7 @@ AUX spiped.initd 649 BLAKE2B 2d516af5fc78d7ae13ca79ae8fe24756f484f6b7892d9acaa0a
 DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a
 DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae
 DIST spiped-1.6.2.tgz 142332 BLAKE2B ce9fe45223eec8bbb741eb3106b17a395347de2766c289def9897321cce9907e104b55752ff3b2c9c7deafd178aaeef1e8fa8afe82c2d25582004c8c92982df6 SHA512 d16262a3e8be876ca1ef1aac8bb38fae91f523a9af0d488eb0dfa23e0b9db795d2a021e55f31095d92f5b94e4516e30ea23f537c3b14a2f1b9871297e26cda76
-EBUILD spiped-1.6.0-r1.ebuild 1003 BLAKE2B 3fce5eaa3cc07533440f9217be1573e091bfb5de00252b882295b70c2e9be3daeab8166c56b99e3582cfaac75ccffd18a10ad9cfc8cdfb4e6fc20994a883b5b3 SHA512 2a08557de2bb8b99896b9e71e631b1810082a7ff3bee4adf3dd8b4e4c6f5926d5bdeb69eec82f89a31e06d515170f3d4f5a1433be2a1a135b82691e5dbb35f8d
-EBUILD spiped-1.6.1.ebuild 986 BLAKE2B a9c5f8d71274ca656cfa4025481a9d47febde9dcddb74e0c80ba9838cbe62b18d2ec582de737b04a9051dfc466fb13dc9b69aa5a60382137486398d4eae9030c SHA512 fbce87341ada6bfd415ad8af242e1c3dde0a64c113ca7d45825d032e07c669d0cb108daac5a4ebe531f6051f02932af9d55ad0bc2aa2a4966edb22e364624ec5
-EBUILD spiped-1.6.2.ebuild 986 BLAKE2B 4bee30784a3261e3dd2f27521fb9a780db4ca043e4b8fb9d197e889cff5b44df050e29c172bec3fe1b41441ef53fc2caffc603c05c9548a204262f977c3aa0c1 SHA512 e5dd789d4ac93a0c37ebff1276723218c0be4de61ffe029e24fb9be5c5af1e415a8afa35018a047cd70555407a72f4375b849eeabd205e11bd80c3c3a36d7d98
+EBUILD spiped-1.6.0-r1.ebuild 1005 BLAKE2B 5d53c2d9145d7b9d2fa19e8872f22124b9c3474eda09017057ae8c1314b9e737b5ff53de592eaeee61e812380e7f5a7f4aa99958e5746ec68acd11128f8970e5 SHA512 3e73ab18d716cb9becc8c57e4a31be36b6212cd0652bc63652a0652f907137e64fcc748494f1c275d8e145be8c262ba04738448aed173fe5b9a7b0aa5b05bdb3
+EBUILD spiped-1.6.1.ebuild 988 BLAKE2B 9262d5d080e96783dc28b07599b5513587ededfd04f0d83593c3354e96af5a881e86513f54d1d49f10470f89f96f619c8c0bf4532d6bca6b3bf6ff26930d55ec SHA512 a62de18ad3b305f684a905c33ee5a772e6a0871f8117d9a02422ca6dc2be97a53c0cfdd5ba16a211d7c3211ef6e614e09a1d384c4127413f7b56453513ec3890
+EBUILD spiped-1.6.2.ebuild 988 BLAKE2B 91c6fd31af508f1345220a4a564c09e843afa52c3f48c8b1b2cdc5c8aeb8183b6a13fc0a33249e1f31b1357978654b6c5c2b764f04bd52ddf66693795c3b376b SHA512 eb5915e5109cd6135d4c41bfeac002429a603439c7faf3e676bd2a7d57eb425659f4ea124c0f440a1048f63bb464e10422285ad1619b4fe21009aaf515c819af
 MISC metadata.xml 699 BLAKE2B eaaa8b3b267d2f2309f680d94e82f70dc0f7f6c2e9ed834df53009826f889fad860c69184d5b978efcab79d809cf164fd457582100ca23dba6fc3c7d5cbc3e23 SHA512 7f650be8cb2d106c9ed2d9b1f58a27a99be3adb9901b5e0681dae889c8f76150c99005d5595f4348c6188eef4bf4f2cb51f410d6c8f3b9159364b6d78b85ce8c
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
index 92bb76e69a0c..ea13d092d4c8 100644
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/spiped/spiped-1.6.1.ebuild b/net-misc/spiped/spiped-1.6.1.ebuild
index 447f555d5f3a..c317aff96986 100644
--- a/net-misc/spiped/spiped-1.6.1.ebuild
+++ b/net-misc/spiped/spiped-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 RESTRICT="test"
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/spiped/spiped-1.6.2.ebuild b/net-misc/spiped/spiped-1.6.2.ebuild
index 3ec7e11ae171..6237545faff9 100644
--- a/net-misc/spiped/spiped-1.6.2.ebuild
+++ b/net-misc/spiped/spiped-1.6.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 RESTRICT="test"
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 6dd8da31c811..e3c471f9057d 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -17,4 +17,4 @@ EBUILD sslh-1.22.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a970
 EBUILD sslh-1.22b.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
 EBUILD sslh-1.22c.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
 EBUILD sslh-9999.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387
-MISC metadata.xml 410 BLAKE2B a2f7e33b90ba192eda1386862bd556c8711173bea95c972ebfca138420fde97d263ea9392f6af32bca27a37322b4f622493193ee9b4eeac64396a77231c17ee5 SHA512 92bffeb22b135d860ca40d97825273398520fffc7e977c06531f52cc8c8b8cafafb7d06baae92a5690730a66a0c2fc228ff8b856996ff623d3d0d6e0bb269242
+MISC metadata.xml 442 BLAKE2B b2f7eeef70b4b2f204ff206707e5a63b096e9f29783322e334538ad812f0d8ba8767c9243abf89558c7a7f659b97c6334238be4a004e2671c59cd00e2ec4fa3f SHA512 3235b215629c09bb7ddb96c64a6b3f5fdb848bbc0cf89b585ae4328891d1b8e180ba0ab61a0786007deb074a74b6688c080d51de0eaf38ad1498fa72560429d5
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
index a739e8ce329a..4bd87c436580 100644
--- a/net-misc/sslh/metadata.xml
+++ b/net-misc/sslh/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>candrews@gentoo.org</email>
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index cedf934f18f9..50f72c2141c6 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,6 +1,6 @@
 AUX sysrepo-2.0.53-musl.patch 208 BLAKE2B 9cc49eeef2bd950c25259fdfbc308a8788bf2e8d97777db7a67abdda9cc66fa9a32c4221eefe82cd8b8b829d9848df6164ceffd3e63b251ce845ed0adc453456 SHA512 34d058d0a5dff6ea959ab0ee0882b6fc4c6c0ea257f790568bbd5f8cc12abb5405dbf7bb850d81d5b1836a34c231041157a0aba55ca5f67d570e85b2dce19b7c
 DIST sysrepo-2.0.53.tar.gz 669484 BLAKE2B f612080b316d6cf86ea70d88834f75b647dc16b29ad824829338d2144784bd7f425d3811055b9b956ef4e6820d467ecbe9a33a3d54a51a4024999b79e62b8255 SHA512 47949514df988a7a8a3b2a506f69baf6ea31bb32d5e80b85af968c827382cadf96e1ab237519308564a59ae67514d6ca3f5e300855259b9baf6ab49252a2eb12
 DIST sysrepo-2.1.42.tar.gz 712516 BLAKE2B 6ae56ada0156f49483ca9c3b2494a4bc8093ffa910a2f043e12f4cc5af2285580dfd0f950d5fccb2c00b5a299c9345045194b480ef857448479de5e838b49bbc SHA512 186eee0f1ddef28a1aa2d9a9038e9fcbfc829579f1a47eeefb4f2aa31d18f97ec2723bd04fe0684f80dacfba3d1a8da8748b564e310ffbdde5f18251c81d7405
-EBUILD sysrepo-2.0.53.ebuild 816 BLAKE2B 776d89625b42945d596f747a7b4c90791d26cf591103e859ee73f0c7801223a30db13b53006a4fd3a2a2b92aed0f6679e0c64a41534c1e399d574dd29c8adc1e SHA512 ce928151ad84cf4fb759f83ba7a36f8841ad86b43d4b7929173086561c406b4b3a38da7b243e79ae40c2f04f499c73b68ec9cc16dce13439a02937c4ff9bd1b9
+EBUILD sysrepo-2.0.53.ebuild 817 BLAKE2B 945398e8c90a9f38063cdfbe0b94a5749afc1580057b994984848b6cec59d60d7aba25206008daf98ba90993e708ff1f33d06b206eb04bcef5eb11bf37b41fba SHA512 8a0dfd76eec843331c3bb21b15455e95e92b13da7524477f1c7a5ecf421a0450bd3e39f0afeb8400fc442734d441a6d82f2c4d2004a432c957bf1e5fba2e73cd
 EBUILD sysrepo-2.1.42.ebuild 777 BLAKE2B 312ef3da87ae2f18eb0c19b07d99fae6e81222a52b0ed6ec1b7d3b6a7167d7cbf9ca7e1f709e21513e68f241e45435d311716d290aca951951f7cd9366061305 SHA512 a4fb7651fa0c20ed8aefa7fb2dfe66d9f26ee042a925d18d465732d33cd05153309a795935c936cae2e71f7f48eea9cbc04363185744a5d88ec44252bc065e48
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.0.53.ebuild b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
index b0aaacfd87b1..0a27e12a8305 100644
--- a/net-misc/sysrepo/sysrepo-2.0.53.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index bf55da32e7ad..49eaab6551ff 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -7,6 +7,11 @@ DIST teamviewer_15.23.9_amd64.tar.xz 63137476 BLAKE2B fcdbb980514f7261b75b23556c
 DIST teamviewer_15.23.9_arm64.tar.xz 62300228 BLAKE2B 2f27d6cee782d756e8007120e2dc847960b2011fff016c20745bb429d28bf07d3eef6bf4f4ac8411c1133dcd9ed3792e409dc6c3181b6a60afe98364e6fe1b7d SHA512 af3a9d3556918287bffadcaecc4f42b3a8435f60c5238d9091ae917f71c259458c3393cee8c3b3866617fd8bed67835519f9b1efe9d7ff6e4422f0fa6dc58dd4
 DIST teamviewer_15.23.9_armhf.tar.xz 56261744 BLAKE2B 24c1c4eb600d4ec7a8a5d0df002b5b54fdceb3e623bcb89dbbd4161ef5d2cf645ba1ff69f17708b996c1cdba5df50c262c6273f8491182006fd509a7ce636114 SHA512 5a767a53a12f4852395731e549be2d7ce2e674e127472b5c80999eff50b52a2781432cc39af3104e7bf16aa95bb63b14831ab197ea6c2c81d9021531ca8279c9
 DIST teamviewer_15.23.9_i386.tar.xz 62347476 BLAKE2B 2e9e6c27c2da518b21c1be6e281e9bb00b2ff2ab8618511b575853f2f8d3c0c159a5b89388a982a0958e9afd2da04de4036c524d56b741f45639b37ee90d1d60 SHA512 d209b246aaf48d998f69664d35788513a2b5d1ebb213e08639b0f35192859188e4556bc7470a4117d30852e5becc3d87355bf8ac0f78d5214f804a9d9e58da90
+DIST teamviewer_15.28.6_amd64.tar.xz 62382804 BLAKE2B a5ca2d7ec2ebcd0d374d7e2111be01eaea39c04ff0d4aedacf5bbcb415044a9a2adefc33a6822484cb40616f180be3fa8b6359a20a48ee3b908f1edf8fc2b946 SHA512 eb41417a43ff51562de399ca35a983e16d9b0aca09906c6c2f04154dbf65ecef924311887f9f863339724ecc7f408dd9d2e3122bd090e669517f07c3924958b9
+DIST teamviewer_15.28.6_arm64.tar.xz 63715936 BLAKE2B 86113dc1964eeb3af1f77e5a617cd6865bcc42e1bd14ee0477cb1ced4834e9d93169126f41b54b7db3f7099280386a79da7743ca2b019b835bdadd9253d28f88 SHA512 7b8ded4eb686487936ffe8789832c43dc3c0a14b902ecb855b4de31b49dfa4f3964fb576a0531dc993015bbf6e3bad5de589097a0c3ef8c3420f4999cb6ce519
+DIST teamviewer_15.28.6_armhf.tar.xz 57518200 BLAKE2B 78155d0efb4946c38e2c93c8071c3b01c9b9edd2c9a9c6228a8a6d6daa2075dfb81296580b25d16969a5dbcae256e0154ff848b02bd1ffd3ff76d448cd7b24a2 SHA512 050b316fa182a74a739f6d6dae285d3abc0ff305f4057c4cfd98583cca205006e4f26c4cd7b5ee7a3c31881f7625faae3e1df8164d14139d1e2fd3338206a021
+DIST teamviewer_15.28.6_i386.tar.xz 66093276 BLAKE2B 80c1454539752f84790fc53288626a64921317ca94659b0846e1870a76c015367000707f08d924c2df331295001cb0ae73155d110f6005a104d3bca4a05d25dd SHA512 f340adc495352e8b70e98e9f79455087353907dfd37203213050d226edc284bd819ee70cd326b6495e2019e3fb55de70f9cf73022345e275f979c91cde9ce341
 EBUILD teamviewer-15.21.4.ebuild 4892 BLAKE2B d977b161210d48da5deae5a13f9b7bc26ec6d958ef0c86eed82b25adcb7422cfb2242014c77421cf13b4946f552a0cffb2a96addd1baadf9377b285ae03e410f SHA512 79d960bdf2d4615a22d26cb1d32014be4812ce5f669965ceef1880c7d1597c092b602b58eaedc39ec89bdafea36c7968dc02352ab75cb975cd27c6d1cd61e833
 EBUILD teamviewer-15.23.9.ebuild 4887 BLAKE2B e869a3cf949bc8c4e021c3bb431d976ab417729820cb5c000c5f3ff2d26da85dcd78041bbf9a41a988fa505b17637f88bdef10a34d6f11f7e7048f06d4e3ea2e SHA512 6bb95f871fbd7bdf169895553c02d6dce662260ce0cfb35e8881e5d2c5d4365d836c34ceed237b8e8a8e10bb2f2826822f61f38ddaca9015ef891c59db72ac52
+EBUILD teamviewer-15.28.6.ebuild 4522 BLAKE2B f79168e36b016dcefd00818caf91a16de93cce98cf67ae52a41ed02577bcd29d74f75a2b8c2c9f7fd1cc839e3c52f8c1c9360647feab4f99dd73f3cb01204651 SHA512 ce7120c5226ac257e7e9c2309abc4e3817a16222eb39ea0679c4643c734438ca6d931098d89a744df61f3403c01cf895cb06c2f5095c93966252fff9c1750418
 MISC metadata.xml 398 BLAKE2B 445ffd891e67241252fcac645e4506315a23501976a36522f4bc9065b712e5b519f78bc523707014ab71dfccc796248094cc51edc43a0ecf9a1a3957a31d07c1 SHA512 a6364c26016b8fdcb0388f839fd1c04c83c0f83eff1661df75173eb81b426b6df9e3bb7ed1f44cce89010e8a94fbf12323d39a6534c4ae5105d7aa0a4883b0e3
diff --git a/net-misc/teamviewer/teamviewer-15.28.6.ebuild b/net-misc/teamviewer/teamviewer-15.28.6.ebuild
new file mode 100644
index 000000000000..733ad3a3da07
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.28.6.ebuild
@@ -0,0 +1,156 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature systemd xdg
+
+MY_MAJOR="$(ver_cut 1)"
+MY_P="${PN}${MY_MAJOR}"
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}"
+SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz )
+		arm? ( ${MY_URI}_armhf.tar.xz )
+		arm64? ( ${MY_URI}_arm64.tar.xz )
+		x86? ( ${MY_URI}_i386.tar.xz )"
+S="${WORKDIR}"/teamviewer
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+# Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libglvnd[X]
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	sys-libs/zlib:0/1[minizip]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+QA_PREBUILT="opt/${MY_P}/*"
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -i \
+		-e "/^ExecStart/s|${PN}|${MY_P}|" \
+		-e "/^PIDFile/s|/var/run/|/run/|" \
+		tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_P}" # install destination
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	local exe
+	for exe in $(find tv_bin -type f -executable -or -name '*.so' || die); do
+		fperms +x ${dst}/${exe}
+	done
+
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	local size
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png
+	done
+
+	dodoc -r doc
+
+	# Make docs available in expected location
+	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
+
+	# We need to keep docs uncompressed, bug #778617
+	docompress -x /usr/share/doc/${PF}/.
+
+	keepdir /etc/${MY_P}
+	dosym ../../etc/${MY_P} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_P}
+	dosym ../../var/log/${MY_P} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn
+	ewarn "Please note that the teamviewer gui works only when started from"
+	ewarn "a session initiated by a display manager." #799137
+	optfeature_header "Install one of the following display managers:"
+	optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index f8f922f0005b..502794180dd9 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,6 +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 telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
 EBUILD telnet-bsd-1.2-r2.ebuild 987 BLAKE2B 6dac32fbd4f801b5bdd417508aca59e167e321fc7404d29cabcda4ab86adc68f8bd1830b762c970ef141a62fae14c3c384911bdba2ff1605163cd6d6336fe60c SHA512 b2b4c7d5f80bb63d5283d9f1b57949ec8d6d60f3d2c2855c3376c08731ba5a4d14849e4772796a54f0b4d6e8df3c7effddb1e44f78036651089f587ced3f20d8
+EBUILD telnet-bsd-1.2-r3.ebuild 1025 BLAKE2B 1c616145fcc1126016273e71c478fa3d9bb4ba15db30c47f2c051f262f412a30fb3dd1b61864da9a597318aeb6d39110b4c7699132afc087d204ff0f0bd81c68 SHA512 e4c5834c0813c352ccd3cf927318899dcd44a2eed8700dbd931dbf68d7b27d8533d69f2b3ddd5f1e646598a2eb6e8ef9391185424add5556da26cec2f80fe142
 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch
new file mode 100644
index 000000000000..0194015968a7
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch
@@ -0,0 +1,42 @@
+diff --git a/telnet/misc-proto.h b/telnet/misc-proto.h
+index 5845751..777a700 100644
+--- a/telnet/misc-proto.h
++++ b/telnet/misc-proto.h
+@@ -63,7 +63,7 @@
+ #ifndef	__MISC_PROTO__
+ #define	__MISC_PROTO__
+ 
+-#include <sys/cdefs.h>
++#define	__P(protos) protos /* full-blown ANSI C */
+ 
+ void auth_encrypt_init __P((char *, char *, char *, int));
+ void auth_encrypt_user __P((char *));
+diff --git a/telnet/ring.h b/telnet/ring.h
+index 9ef8fb8..65762b2 100644
+--- a/telnet/ring.h
++++ b/telnet/ring.h
+@@ -28,8 +28,8 @@
+  *
+  */
+ 
+-#include <sys/cdefs.h>
+ #include <sys/types.h>
++#define	__P(protos) protos /* full-blown ANSI C */
+ #define P __P
+ 
+ /*
+diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c
+index 31897d8..3c43f8f 100644
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
+@@ -838,8 +838,10 @@ cleanup (int sig)
+    * receive another signal while we're in that function. */
+   sigfillset(&sigset);
+   sigprocmask(SIG_SETMASK, &sigset, &sigset);
++#if defined(logwtmp)
+   if (logout (p))
+     logwtmp (p, "", "");
++#endif
+   sigprocmask(SIG_SETMASK, &sigset, NULL);
+ #ifdef PARANOID_TTYS
+   /*
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
new file mode 100644
index 000000000000..c131d25aed1d
--- /dev/null
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="nls xinetd"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	!net-misc/netkit-telnetd
+"
+RDEPEND="${DEPEND}
+	xinetd? ( sys-apps/xinetd   )
+	!net-misc/netkit-telnetd
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fbsd.patch
+	"${FILESDIR}"/${PN}-1.2-format-security.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+	default
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/telnetd.xinetd telnetd
+	fi
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 5ec8aea513cb..d46b09b07de2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -2,7 +2,7 @@ AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21
 AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
-AUX tigervnc-1.12.0.initd 2119 BLAKE2B 95fd8f318b9f070d361f99533cdac6720343db0cbc1c50c8d50e1609fd98793ddad4e0630c98f0f50a73a93fa8c7bf46cbd54035ee9cdf127bbc02c994096154 SHA512 abba02324513875910c57e495adcc130f1e383ef2ef210b8e61a47066f23cebbbee35f9c6bc591021d1f88d25afbe0fd3d5a6e7786386fdc364134684e64206e
+AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
 AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
 AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
@@ -14,7 +14,7 @@ DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r3.ebuild 4836 BLAKE2B f63bdd34a19c69841cf92e267d261c156db4887c9f9cfc11b58e2fff68001ba2e269a9809f652c35cee9886871c60695667b0b080646042e7c9b76075e0f7061 SHA512 d2d1d9086e89b1d40721b688e5441a5ad12f34be1a1da4d71285ee2c64e58bf6b6d7049d384c0e6ba0f7903ec9d1d8c15c4cc12406e0c67d48ef23e60c785645
+EBUILD tigervnc-1.12.0-r5.ebuild 4912 BLAKE2B ce619fccea148d0c1cb54ee4ca1f8d750f6ba9026c40d8e382e5f58ae727c8d1f0179e644118592df85ffa2ada6a229c942b1138e3f0b1c20c25f3b39a935618 SHA512 ed2267828aeaeada0234d0003ddb683e4bcacd7df4e9fbdf561f3e92cdeb71f8ce98e2119f72941f508bfa918ad5adeb0bbea9bdc0680bfc0340c0e2259aa7ad
 EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0
-EBUILD tigervnc-9999.ebuild 4071 BLAKE2B 77cfd1cb406bd37003946fcf5f658b41b5460ea0ca74277bff9584c8d436af0d1b5a5502bdcfc4a325e00aed2690409c85323beab93c0ce2b97e026dc8b645fe SHA512 cd5a0730258c575324ec64d124fa883ee9823a48ffad0b5d20a3d25c400db8d266a168809de23f85bbd95a30af2a89fa722bffc5b0e48578b8b9e011acffabb2
-MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435
+EBUILD tigervnc-9999.ebuild 4072 BLAKE2B 8d9d1d942146ee2fd64e597bb362b444b88933fdbbf0412dcca117dc2be6abbb77e4260788fba900a00698e5b61b8742905d64c5587f2e1470aa6631cbcf72ef SHA512 a7e0a4b8a74a52296e157577c34de37bb70202171e37d2ea36af68860fdc86b72c4ee79bec18edf413e39ee98716444f44313a5e01c07674494bed963a59ab4a
+MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
index c27d9c01bd7e..187b3c7296b4 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -12,7 +12,8 @@ checkconfig() {
 	if [ -n "${DISPLAYS}" ]; then
 		if [ "$1" = "start" ]; then
 			for user in $DISPLAYS; do
-				if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
+				# bug #690046
+				if ! runuser -l "${user%%:*}" -c "[ -f ~/.vnc/passwd ]"; then
 					eerror "There are no passwords defined for user ${user%%:*}."
 					return 1
 				elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 18e35d3fa75e..9717615f517c 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="drm">Build with DRM support</flag>
 		<flag name="server">Build TigerVNC server</flag>
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index a87123a7d275..0b98ec1f8f59 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -9,7 +9,7 @@ inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
+HOMEPAGE="https://www.tigervnc.org"
 SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	server? (
 		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
@@ -20,33 +20,40 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+REQUIRED_USE="dri3? ( drm )"
 
 CDEPEND="
 	virtual/jpeg:0
 	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	sys-libs/pam
+	x11-libs/fltk:1
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/pixman
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
 		x11-libs/libXau
 		x11-libs/libXdamage
 		x11-libs/libXdmcp
+		x11-libs/libXfixes
 		x11-libs/libXfont2
 		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
 		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
 		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
 	)
-	xinerama? ( x11-libs/libXinerama )
 	"
 
 RDEPEND="${CDEPEND}
@@ -57,27 +64,21 @@ RDEPEND="${CDEPEND}
 	)"
 
 DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( virtual/jdk:1.8 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
+	drm? ( x11-libs/libdrm )
 	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
 		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
 		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+		opengl? ( media-libs/mesa )
 	)"
 
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
 PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
@@ -181,6 +182,9 @@ src_install() {
 		# comment out pam_selinux.so, the server does not start if missing
 		# part of bug #746227
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
 	else
 		local f
 		for f in x0vncserver vncconfig; do
@@ -189,12 +193,14 @@ src_install() {
 		done
 		rm -r "${ED}"/usr/{sbin,libexec} || die
 		rm -r "${ED}"/usr/share/man/man8 || die
+		rm -r "${ED}"/etc || die
 	fi
 }
 
 pkg_postinst() {
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	xdg_pkg_postinst
 
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
 		optfeature_header "Install any additional display manager package:" && \
 		optfeature "proper session support" ${OPTIONAL_DM}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 53fc1b9c571d..90b341d3f1e9 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -9,7 +9,7 @@ inherit autotools cmake flag-o-matic git-r3 systemd xdg
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
+HOMEPAGE="https://www.tigervnc.org"
 SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
 EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index a296f868bf73..08ec81b28db5 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -7,6 +7,6 @@ AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
 DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
 DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a
-EBUILD uftp-4.10.1-r1.ebuild 1437 BLAKE2B afd972e563d271d62da426a994bad3d12d080dc6f0aa0883dfce29c00e6f0f46c3948dc5db7e07de72a2ff927f03693c045eb1447a2730a2ba893c5a684ad537 SHA512 a5568b72718c8e81a655198bfde8af03d943a4855c7c9d6fbaffcd2d77d800c460f821581781b14549fb0649ea2524b28830bea121482e67a1c7bdb3fe9c696f
-EBUILD uftp-5.0-r1.ebuild 1187 BLAKE2B 57548d8a88f172b36dd8a5a0b36e983c9f063fe48b791faa5baea667454cf557602beafdd7587169b166ce8c05a454c2880b349648720c1d67795eb3378c446a SHA512 4b206ad0c9ae16ba5a2efeb8166b77be31acf899b0f5a85aaca39794488923a7320e37cc8242b6bc2c7ea1044fb6e3670034311c24c7a88ca4e230de8a749f48
+EBUILD uftp-4.10.1-r1.ebuild 1446 BLAKE2B e574ec5c675b1b08051c85ef5568e6550838e80ef830aa97cab872efe78e6c16dd835edc252f3a20ab31289d5d52dbbbc8c409822396bcd935bd7eb781bdb501 SHA512 b72ec63847ed647a06009b667e3c6d607e1d3bc4a18f85047514c18638dacecb85c81c5cf1cd99b79f34e387c96e2f999e8df50cecd81a285f36595cc75783a7
+EBUILD uftp-5.0-r1.ebuild 1196 BLAKE2B 668229d77d530a901afb74bf6a5f59c44b99a7a9c9aa0962aa1fffcc8608b933fe6dffd4fc6a5c6472281326a37ec80d0beba21367da54c83b4d0be946078644 SHA512 599ea7ec5cedcad09f3c29b8d02661c2593311deb67f70e202080b948dcb3df82ff1d5017d462871052cc3c90bea8327b5e01a113aad36b679aef7e73953f33d
 MISC metadata.xml 545 BLAKE2B 080f61b70407d01b5fec24a1495aa533aa812f51a41d3d155d353b46ef809df8b816bb9604c33c25851f5c69a6715ef5a402a029a5c83214b29b673052c029de SHA512 5b7ff28dc9ef94cd0ef7f189a7f0c072556f001f2ebcd1645b9565a2385c2aa6f7be482fc6411da7292fcea7fde502dceebba92691895569edc64df81f19fad4
diff --git a/net-misc/uftp/uftp-4.10.1-r1.ebuild b/net-misc/uftp/uftp-4.10.1-r1.ebuild
index b85e46fc8aa2..cd876c63f416 100644
--- a/net-misc/uftp/uftp-4.10.1-r1.ebuild
+++ b/net-misc/uftp/uftp-4.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,9 @@ PATCHES=(
 
 src_compile() {
 	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+
+	emake CC="$(tc-getCC)" ${opt} uftp uftp_keymgt
+	use server && emake CC="$(tc-getCC)" ${opt} uftpd uftpproxyd
 }
 
 src_install() {
diff --git a/net-misc/uftp/uftp-5.0-r1.ebuild b/net-misc/uftp/uftp-5.0-r1.ebuild
index 4df140fe4cbc..2720099e81a7 100644
--- a/net-misc/uftp/uftp-5.0-r1.ebuild
+++ b/net-misc/uftp/uftp-5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,8 +24,9 @@ PATCHES=(
 
 src_compile() {
 	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+
+	emake CC="$(tc-getCC)" ${opt} uftp uftp_keymgt
+	use server && emake CC="$(tc-getCC)" ${opt} uftpd uftpproxyd
 }
 
 src_install() {
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 607eaba5835b..a524ace4d6ce 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -6,6 +6,6 @@ DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8
 DIST whois-5.5.12.tar.gz 103268 BLAKE2B f9e132a0de189ede87342383f4b869529efe4d99ffdb12450ab909f4df135dbab40319b16d889533803783ed7de4a518ff81d267d0939b3040bf2e25bff8b711 SHA512 f46065d6df0dc6f7d33996e33f456cef9b313e025515916e0476c36255df2919e49f2dcb7666b179393a4429572ac7e099c2783d72cff73222953ac093484786
 EBUILD whois-5.5.10-r1.ebuild 1941 BLAKE2B e187093a1335885c467d0bed56fa1c0f15d37ef25a9047e6fd6a0ca0550dd7bbe7b792b9d1c7bd3c23b572ae83c7df7749a1b7c02465f845530cb150c800165f SHA512 3ea777e829c31260d1951dd9e3efeff28e33df092600e3f7f5d96a1f4f9cb7154671e6dd9283cc97a7efb7fc2d9174ae7e7f0dfc75afe66a142fabf5de803bd2
 EBUILD whois-5.5.11.ebuild 1941 BLAKE2B 22a19b0e416e2629a0970df690d373d6e0dc5892cdb672d159480c038c50b8b3ed5044e90a1620235feb39d5d20f697388803136c13182627848167d9054f143 SHA512 4f4bc41ac5754e630b3192f3550530e2656000c5d25e9665a8dc1e2dd3adfb3674139339ee2ca3586cdd3e2f70910c795b2aab0d7f63623d0337b40e90dc0b68
-EBUILD whois-5.5.12.ebuild 1916 BLAKE2B 5e5ef953551243c44c07f4b65c962813f7270f55c7e13fb00acecef0b0d933a492f84ba42ee8ef56f8460a9bd0b83432686c2afc548871ee64122482bf327574 SHA512 9009d5360b070d4959c6d3d09b997b0da87a4628e81f85347331571bde1a2a4c03ad88efc3a84f65d29ee59e6c439489381f680f1a2d535cea3790a3a01fa571
-EBUILD whois-9999.ebuild 1948 BLAKE2B 7efd9c6f3134692756555b99baab4842abcb92b0ff2b4a67ee049497f1fa4cd987d5f851d399c8a66b4c33398e6992383e6b674435f596b1a285520dbe96923c SHA512 083090b9dd254fd4e8c2bfb082c416e3b122697548071462a701be60d32220fa2e5850109bbc6d9cf45facf7cc2a2bd7351d0768146781ea095a15bc82c0cc84
+EBUILD whois-5.5.12.ebuild 1923 BLAKE2B 8aebbfb7d3bcd670355bc436292d7ec57fa1e17a72cd676924e46195066d0f2050c543fc7e2ead58fa539c33d4a1bbfc51188a36fc22f37a25a3efda0f6be98a SHA512 d6a9c8493f00233a829bac737ecfcd0893684349bc86fc62ed191ff0ec5d053e1323db9047cb1bac0e555da5610acbfe8d52582e86ba79b8a00440f75eda3acc
+EBUILD whois-9999.ebuild 1955 BLAKE2B f1dc35b6b4907d25dc09adc21331b7b7af947f19de70541d477cd88fd59fa650145dce37748cb4c03baa3c69835e7c7f29e7cbbd7b5f1132c83038a535b3f70d SHA512 8e51c9fd5d12a919e77ce82c1a3f477976ca250dae9c6bd7cb32dcd940e9506c77da1342a3f3fbee25419de356de612b1f62cc8ace2f77c645286b253ebc3524
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.12.ebuild b/net-misc/whois/whois-5.5.12.ebuild
index 7ddebc10e44a..e1d0e7edf616 100644
--- a/net-misc/whois/whois-5.5.12.ebuild
+++ b/net-misc/whois/whois-5.5.12.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index 350b7b60b378..8330f6ba0af9 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 2a73e890fee5..a804303fd7c1 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,6 +1,8 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
+DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
 EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
+EBUILD xmrig-6.17.0.ebuild 1341 BLAKE2B 4fd507e2a632944e37457aaba67f22031fbd7f39409f54b4818aa54606e66f2e72bc879093e1558247db5694add5b3b1963700b9ab7d05933962799d653d60b4 SHA512 4618b630f836af9d623c0b72460546c1f16c7f7d5b2c6db5275fe81a3c7e630670c8b975485dcdba976009b3df16a21cbeabd3a755e3b43cd7d43099a9da4f34
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.17.0.ebuild b/net-misc/xmrig/xmrig-6.17.0.ebuild
new file mode 100644
index 000000000000..0b726e03276b
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.17.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
index 6cffbc0626b3..69f0b841549a 100644
--- a/net-misc/yandex-disk/Manifest
+++ b/net-misc/yandex-disk/Manifest
@@ -1,4 +1,7 @@
 DIST yandex-disk-0.1.5.1039-1.fedora.i386.rpm 4556176 BLAKE2B 5ade043c21a13e678ca11b3074fb1392b99f461ef5a7bd7205b3d6ea984b20dec0ba086adb8b881eaf52888f04cf371dd63ce73432c3f82f31c895e03f31f073 SHA512 3c323e6aaa5fa669ef7efa80e4b899cd732a6b29235d81f635dce67d0ff59dafd01da8d9ea7b040242882f0e5e153f7cd623f4b993dfc390bc0a18d2811c1719
 DIST yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm 4743384 BLAKE2B 626a7e921567640b88d33fd426cc230bb92846a252b0960c51da9367f300b8622104db14c8788749e0f5cb484dffd9c9407994568449be769c24d2730cd0936a SHA512 9128d59f426de44b8c953d61ad07ffe886b5e864c5f20ba7ab1a69a47ab3269e5d4e39f4b92675f0ccaea43db1711184892a5e3178694bc453bc96e932045fa9
+DIST yandex-disk-0.1.6.1074-1.fedora.i386.rpm 4613237 BLAKE2B fa6c1643f11efb2cbbcda81cbc95c867abccf997f75352dbfcc93349e29694a0aa7c2d778847d77a6572fb4253dbb650564c5d744b3d9ea4320519d7bfc54ee5 SHA512 afb9d1e4896cecbedd005c6383bc44cc67e8b0df95dc1866e8d7540e3f9e73ad0584db93f987eb108c383f9ec6790d5cf80f804634f4d776b4b3459eb80c0bad
+DIST yandex-disk-0.1.6.1074-1.fedora.x86_64.rpm 4799146 BLAKE2B e51c7f39aa9fad7ad3316629b36e917d9555290168e3e58706c6f5b88ac4443286ebf741ae5aed36f39fd433710d2010eeba53199837598ee2821afec23c2cb5 SHA512 dab523455c6355ccb0b72019c9b8ea4c3e7f07e55081ae614866ad21927eef7026b3348eb46ede30dfe492ec37c11450484bee65cce829ab972badbb54c0d4cc
 EBUILD yandex-disk-0.1.5.1039_p1.ebuild 1146 BLAKE2B 488fcb76c4e137c1b97efe853ac75954ac841896db78e4ff1ea8d9b20eaec60819ba84f7f154917465a8a289a2ca3a8cd3e67d35faa5c8eb07020f7f64f991c2 SHA512 e40388863bdb78add11b34e1d5b37122577eb69502126f919f13d2aa320bfba7a875b59d38956e65478c2e0271dbf1d477eec4c0385427818e17a91a2c916944
+EBUILD yandex-disk-0.1.6.1074_p1.ebuild 1148 BLAKE2B 9907ae5954a730080b00be07219a02b3f45cb33c3916611053a64c9290542e6681c9a967c646fccd6a08529ad99a06857f985966fc29cbd6259e1e003abcc475 SHA512 03d536b1af008add60773f7a2adc5c19e402c6628022294f330952ff4fc2631fcfe30ff912a354df07e98756f00c0ba4d44824f3d4cdcfbea60d9dc865ffd6ea
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.6.1074_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.6.1074_p1.ebuild
new file mode 100644
index 000000000000..b8c324f9da4e
--- /dev/null
+++ b/net-misc/yandex-disk/yandex-disk-0.1.6.1074_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 rpm
+
+MY_P="${PN}-${PV/_p/-}"
+
+DESCRIPTION="CLI to access Yandex Disk file storage service"
+HOMEPAGE="https://disk.yandex.ru"
+SRC_URI="
+	amd64? ( https://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
+	x86? ( https://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
+"
+
+LICENSE="YDSLA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="app-arch/gzip"
+RDEPEND="sys-libs/zlib"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/yandex-disk"
+
+src_prepare() {
+	# bug #526312
+	sed -i \
+		-e '/have /d' \
+		-e 's/+o nospace/-o nospace/' \
+		-e '/^complete/s/-X //' \
+		etc/bash_completion.d/yandex-disk-completion.bash || die
+
+	# Uncompress man pages to prevent QA warnings, bug #731684
+	find usr/share/man -type f -name *.gz | xargs gunzip
+
+	eapply_user
+}
+
+src_install() {
+	exeinto /opt/bin
+	doexe usr/bin/yandex-disk
+	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
+	insinto /usr/share/man
+	doins -r usr/share/man/*
+	insinto /usr/share
+	doins -r usr/share/locale
+}
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
new file mode 100644
index 000000000000..3fd9f51740f3
--- /dev/null
+++ b/net-misc/ytmdl/Manifest
@@ -0,0 +1,4 @@
+AUX ytmdl-2022.3.16-setup.py-beautifulsoup4.patch 236 BLAKE2B 9dcd72217ed175c09cda8417e84892f2eff00737bb5bd6b0ac62492c021200cfffa490863b0bbb9eb141f94a8d809dfc7a3788624a93cfe82c454e792a4b56f9 SHA512 196959aec3f7da3fd00f23d30c9fc4a7659ca380358dacec886972371804bed666b19e3b17dda067a8e0053f621439a0105a2dd137cfb23e9774610937353bab
+DIST ytmdl-2022.3.16.tar.gz 51115 BLAKE2B 504d0d0de299c8989bb289769cd43645199a7f47b683885efc6eafde5643ed070cc66eeaf7b1c8f42d547b25f830c3bd8feb9abc0124b28d4d1900e5cf785c9d SHA512 5ad67fb981d5f3ea42d2f097cecf982f0971e824c5971aa8fbc664303f436c623ab03a9f0e31dba060b27eb7eb57b88452ba1ede9eb3385dc6acead9fa43e0d0
+EBUILD ytmdl-2022.3.16.ebuild 1356 BLAKE2B e9b341e2ab404ac72e99eaa148af4a4a46a49a228d3c66a8d730bca91bdc30d15317ad094aa8999d7b4b7de220e3bc3bca656ba16a8c401f8bdb396f20591130 SHA512 fdfc127fa39e8a9e47fe16aba3ec220f8903e055db343fa8dd17064737d237492c36c7e864953cbddf8e54c6db0c5efced19fb47d1fc191f9751094d2eb1d814
+MISC metadata.xml 405 BLAKE2B 2e8fe5e8225bfeb5ef0aaae903561ffa5cff5c1b58b10795965428b6bd100d5199eb0d8af3fb690bab5c71a0fb422480a4bcea68e03aa46c26109a05c04eaa77 SHA512 1bfeef632124aaffcc9f08527b701538c7f3dafe4eb8a10b5ebdf4ea4a1ae4899075b2a9ff9e8c298007e3e20f24a8d7f543bf2485ce5a27e5d396d2c69ebf30
diff --git a/net-misc/ytmdl/files/ytmdl-2022.3.16-setup.py-beautifulsoup4.patch b/net-misc/ytmdl/files/ytmdl-2022.3.16-setup.py-beautifulsoup4.patch
new file mode 100644
index 000000000000..c87655a7cdca
--- /dev/null
+++ b/net-misc/ytmdl/files/ytmdl-2022.3.16-setup.py-beautifulsoup4.patch
@@ -0,0 +1,12 @@
+index 4a50f0f..6decdd4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ req_pkgs = [
+     'itunespy',
+     'requests',
+     'colorama',
+-    'bs4',
++    'beautifulsoup4',
+     'downloader-cli',
+     'pyxdg',
+     'ffmpeg-python',
diff --git a/net-misc/ytmdl/metadata.xml b/net-misc/ytmdl/metadata.xml
new file mode 100644
index 000000000000..d985beeda195
--- /dev/null
+++ b/net-misc/ytmdl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/deepjyoti30/ytmdl/issues/</bugs-to>
+    <remote-id type="github">deepjyoti30/ytmdl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/ytmdl/ytmdl-2022.3.16.ebuild b/net-misc/ytmdl/ytmdl-2022.3.16.ebuild
new file mode 100644
index 000000000000..6874dc8933da
--- /dev/null
+++ b/net-misc/ytmdl/ytmdl-2022.3.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Simple app to get songs from youtube in mp3 format"
+HOMEPAGE="https://ytmdl.deepjyoti30.dev/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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/pyDes[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainzngs[${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}"/${P}-setup.py-beautifulsoup4.patch )
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp ${PN}.bash ${PN}
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /net-misc
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)