gentoo auto-resync : 12:02:2023 - 09:56:54

23 files changed, 833 insertions, 70 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d10d32785c71..d6718ffc20b7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 65819f63db91..301244320011 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,10 +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-165.4.4300.tar.gz 108837531 BLAKE2B 9d5bf7d29807e4f746027ac26bb03cc7a9b730eb2ff04eaa1a2a08af594d60c90b6551ee726124c1390ce692fa3addcb02176c1074d3067c2f92f8d8c0ceda6f SHA512 1c873b4531b4116a6f2913b7688119c7dfaaf3ac886cf65ec692793901bc327252d9623c247b0d99ec55b01e2dc0bf7950927061583a3583d016426fe46ae427
 DIST dropbox-lnx.x86-166.4.2920.tar.gz 108842039 BLAKE2B 6d814c8afd84d32f72901ec2afb80c7bd54e37b8498c54f5bc1aa6bebf249a1106b428118f79992afcaf0228dbf7d4039b01d8c5c6752cf5f97a344735497bdc SHA512 f05075424892d42cfb64ed9642931460235b4a3fdf70387832db1838c17b9636ef9a0f279633e8d2ddbb9f730d3a62b13458bb6b3c35ea5f481f0f4ad2964581
-DIST dropbox-lnx.x86_64-165.4.4300.tar.gz 110517781 BLAKE2B 6a858cb0a4d7c4947326629cdfae045c65f8db0af80750cb59f504e73f7ddf8fcb2a8425b161e5df7676769c1fdf279dbb63d11200d2ddf83c4d7d35b1b79d78 SHA512 591f290782d77cd234a6e7857fbb4316135a43408fb4697765c80c5d6180d51ebff1d8cba235a9e2a673af5d5349285a0ea5524424d09fc136e23abfceaa6aa7
+DIST dropbox-lnx.x86-167.4.4719.tar.gz 108269070 BLAKE2B d8a559feb00b7c27228c7f5d7794b64fb096d69061a0674b9c70dd03b8518590e3fc1482a85e521caa50b6012d4c13726aa512a2fd21ea4c5faf32e8cbe70b71 SHA512 3dbcea89364c5a9e2947a54369eb3144b7a894674059cb9f6e9ca2d4ad5ee9a4de095825cc343ea12e03630536433c2db05d06b157f416ba28acdb32d3210c05
 DIST dropbox-lnx.x86_64-166.4.2920.tar.gz 110591254 BLAKE2B 21977a6dcf94cf5963488c5dd3ef9106b449e39210bd315c5b216c208f04c25a40bb49377bc654758d746a4eb8429e454a9a85a6179df9765a3cefc78eb21022 SHA512 2aa90eb422b2a224a3d5ff70b9b3a76b0ac4bc0f8301b35f0db1b08c495e83041a49be445f2fa3945ce4ba3726230294fca190ec367ce5c5a49ada35bd965e85
-EBUILD dropbox-165.4.4300.ebuild 2854 BLAKE2B 4dee65271164156807a438491e0c7f498a6dc7846e52779bffb4f1ae6412fa8d34200ee45d6d303fb1b2d1a5da374d5e4a72f3916335acc21541d70f72256f54 SHA512 61be728fabb64052400b6a39a8278c0a66ea749069dbdc0a39933a004d11113b576bbb7f3c5cc08a185f774a8f010aeeedf14eec22a3a2a84bf4d6ad039b290c
+DIST dropbox-lnx.x86_64-167.4.4719.tar.gz 110035190 BLAKE2B 2b29ec4371cc0db6ebd49d0355fb3d11a20f20824e5f090058f481af18b8572efe7d574dabaacb3fc513577a2c6e0854fc493e7e7ed9019ab33baa8d54285a0c SHA512 8aaa27266281a7ec0c95fad4ad716ba8f54e3c9efaf0e3cde89b288fa01e9ffb7d5e070745c6378f03b89193c823cc96c822a5e2e6386e7174b0b7af2c53fd5c
 EBUILD dropbox-166.4.2920.ebuild 2854 BLAKE2B 4dee65271164156807a438491e0c7f498a6dc7846e52779bffb4f1ae6412fa8d34200ee45d6d303fb1b2d1a5da374d5e4a72f3916335acc21541d70f72256f54 SHA512 61be728fabb64052400b6a39a8278c0a66ea749069dbdc0a39933a004d11113b576bbb7f3c5cc08a185f774a8f010aeeedf14eec22a3a2a84bf4d6ad039b290c
+EBUILD dropbox-167.4.4719.ebuild 2856 BLAKE2B 0ac0c639bd225d163c1316a34f3b56f28735904ddf3a0fd93f5fe0ea99d68c8ea3125b9e7e1d6cbebcfff79818ddcd71a3571dd9b7e1d60a52da95fc907d08fc SHA512 cdad53d6c9b2857a49e7f48769f6d70885348dfed624a03fd95ac72cae1c04cf8ad3afd4ead369027500d95a7f75aebe0811fc687a609b3b9b732797512a0133
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-165.4.4300.ebuild b/net-misc/dropbox/dropbox-167.4.4719.ebuild
index b0b4cee9bbeb..e1949fb60f88 100644
--- a/net-misc/dropbox/dropbox-165.4.4300.ebuild
+++ b/net-misc/dropbox/dropbox-167.4.4719.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/frr/Manifest b/net-misc/frr/Manifest
index aa2c9ae8000d..5e8d749ab6af 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -7,6 +7,6 @@ DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9
 DIST frr-8.4.1.tar.gz 9886182 BLAKE2B be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24beffff1 SHA512 69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
 EBUILD frr-8.2.2.ebuild 3482 BLAKE2B 1ecdd7877961ea2ba1629754dcaf13f8f6f784ec97f2156028028818205d19562db8a49abfa4476b8dcc5cba2abcdba744cb14cc1bd00812d4edc3e7e8f13ad1 SHA512 11153b799fc929bef902330fc1349f37ecfb0ebb7c1f2bacd795a50c42fc6f256c488b02df3538143bd4825c3ebf8ba78629b55296c91997d421f61faa02c800
-EBUILD frr-8.4.1.ebuild 3527 BLAKE2B 5cf9bc7c4b68d50208f522287ae4ae08f8c5efab7e4d467c5ed25b098eb768e4489d3f07364d45c8f5ad992066df14275e1e36ac9735d4e4990c07fcfd1f6c17 SHA512 4c2d8c0f39ce1a1e568453d2820bb7e78cfad084de8edfd4124ec84fce7ccadacf41f8aedb9dca79b92837f0468e5523e031c1877e710e22645609a21773f2c7
+EBUILD frr-8.4.1.ebuild 3525 BLAKE2B 05934e057cdc0d5d394b4b728df1c4f9355b79d1b0f4dfd7f36af04d4098b94d7bc76711de78de8c3d78ab127aed9a314bc4e8e34f097b4d8b0e4320cd893e2f SHA512 739869fe756d8d56a9216d9eea04574b82b82af351cc24fabf86c4d670161c6a116b6351385f19673b44416d92619566cca85f09499f959d8869d9ce35363f4c
 EBUILD frr-8.4.2.ebuild 3571 BLAKE2B 17dba82c3ac741a59cb6b3c19cbc0776c6f4f22c5a6322e8199b085ecdbba816f0f6ed1d74b3705358a1fe6adbe35c463a309e7a622de24616d90ae9ac3bdc33 SHA512 18bc611dee687f1ce3ac2c02e68a5c25394084e46df34b4d0b2c319b904a37929d8439f430c60338109d07ad1365bea41efd788d6129182041b2bd2c446d640e
 MISC metadata.xml 845 BLAKE2B 5a563fb20d00884598122763e39d8ce4ef6f7a28b811517a4a01b892636c1ec7cfcf3b0e8bccf838882a8fac309bdbda8dd4fd093f7f58795bd0b711087aeff5 SHA512 1ba4423cf6be189aeec21a0f3a6623c48d61c39fca94dc7dc675fcfdd472c6063b3eefe3f11f5b0de385e759a5488f464a413b7ba1bfc8ae9913563bac6dd264
diff --git a/net-misc/frr/frr-8.4.1.ebuild b/net-misc/frr/frr-8.4.1.ebuild
index dedac1e7cf84..1edebad2d2fe 100644
--- a/net-misc/frr/frr-8.4.1.ebuild
+++ b/net-misc/frr/frr-8.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest
index 9d8c1d6d9884..f29341cf5c0a 100644
--- a/net-misc/gvrpcd/Manifest
+++ b/net-misc/gvrpcd/Manifest
@@ -3,4 +3,4 @@ AUX gvrpcd-respect-ldflags.patch 465 BLAKE2B 1dc62e0caf54d120bdeaa3ad621f624ef00
 AUX init.gvrpcd 1055 BLAKE2B 6de4641a5c383769a8da604dc37a915a165a3164d4430a4ab70d8cd2a001e77dfb06ff60f22c830efec84a71e4155e7896c9de5c858e5279ebdb5a330d95212c SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7
 DIST gvrpcd-1.3.tar.gz 12066 BLAKE2B dbe28e45b9efdeca7f4d21fdd3e4cf0470b3cbe90866ee024ad0b681b6a6825ca9844cb06e58eaae95fe38561caece1607c0c0473dbc85affcc72b6be966eb86 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444
 EBUILD gvrpcd-1.3-r1.ebuild 682 BLAKE2B 708fa3ece73fdfdec017690017c2b7a16372da952d1d7283e2a6bad794e2b03ced5cabc1d0053bb69fbddfade815d3dbcc9016e434dad142fd06f49423d16644 SHA512 a8300c6264031d0a6f6057c3969ec5d586af277c05e4b2beee4c909ca45b8df502e72b1941cf1bd0998b08dbbebf7559e060910184696845998e466a6af3a13e
-MISC metadata.xml 514 BLAKE2B 7de5ef4412f36dfcc1d96163f60360ce87ed0b45b71137fdce91e090313308958a2bcbbbf77c405fbc0d7c52d3139e2c1800980d915fe7cdb2c85384210e7606 SHA512 20a8a4b61ae713c5429d7f01f3dadf8ac38ba721fda0803e55a9e8c6d7974180f83286fb8f41c144c8ec5043c2c993352b1b657cc2783714f3b46bce6f138662
+MISC metadata.xml 407 BLAKE2B ab107cbc4c6048f4c83a38eb81c55d47a3038ca92aa431afc54d2ae77c936ef6e40eb91436f8e9bb763180635fa41ff6de80de45688c5ef64a9e4973ecd2ac81 SHA512 1c353d7c2ee066109e5adac1fb327715dacfb830d066032971d7beac80add3749ac0f49ed5125fdbc63910c5cb371a533a4023fdb8081351ad665bb32b6d8cfa
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index 0ff04871e75a..c10db277fd54 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/metadata.xml
@@ -5,11 +5,7 @@
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-<maintainer type="project" proxied="proxy">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 5d6dd1d2c8ca..dcd028856f49 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,8 +6,10 @@ DIST NetworkManager-1.40.10.tar.xz 6595772 BLAKE2B fd36de7a06599b5b350a0c31a711f
 DIST NetworkManager-1.40.12.tar.xz 6520720 BLAKE2B 53b142e7eeb333e5293b361e8e918e471f242ae51f7058fc820e065714be2efef49bfd38571abb631aab9fa37f80fbba7d6d1aaf201a8ce24b097989308888a4 SHA512 567188e32406a1d5a43419fbd0186e2a47453b78674db1f2e0842bed1fe148cea0b93c92f4920a44cc74e76f968672dafcebdf2845debabbce947f39cb520cdf
 DIST NetworkManager-1.40.6.tar.xz 6596776 BLAKE2B 32e2a496d68d183a44a15f9ecfef18f5c7fcbc7ba5e27e0eb62825edb0ebbcf8ec34dcdd6d4da953aa46029d7063197f549cae13eb3622dd1f52c92aa5961941 SHA512 cd8ced0598ea4224cfde23a157108c872bb3935e539029571110b6a0bb4bf3637ad8e3afe8e5f162890ed557e8b42a803bc4e18db00e1de840dd0fa20643e036
 DIST NetworkManager-1.40.8.tar.xz 6518080 BLAKE2B 90a65dde96b3127a5438aa4add47e66887c940a86598109bde74f9bc56d317c41f835858a0b2ea89dca228f7fcc43e811b20e0d4528018ebe95947114f405cb4 SHA512 1c3f986c0f37160fced3cc790f6e569ae2185aec2bb2b5ef9635848ba493d4e920cc7ea83cd34a8df7bc12902d071238f9ae6aeb7721658ac54ba862f7c822ef
+DIST NetworkManager-1.42.0.tar.xz 6720056 BLAKE2B 1bd59c2b7e004437ce47a69d187ed79e426e4e1f16b6e8106bef9afcad0cfd86ebfb9b3189533028f343dd757e6b6c3ca6031751b0c20fb2844d2b5be11079b1 SHA512 d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c
 EBUILD networkmanager-1.40.10.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
 EBUILD networkmanager-1.40.12.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
 EBUILD networkmanager-1.40.6.ebuild 12529 BLAKE2B 2da7c08c4c1b8096c5fcdf2fb1b64057486bc89606a724fea04b04397860cbbdd88872425c216c92a2aa3f6b08a58f926e05e5d134c4fb52dda0437c533d2ed7 SHA512 f5ec872aa13144a50db211cae322ec3edef98a7fe11cd7099a90002a831b103334543d63df4499f80e2ebdd8814cef983d37f14754bbbbcb6da60886a1f7235f
 EBUILD networkmanager-1.40.8.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
+EBUILD networkmanager-1.42.0.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.42.0.ebuild b/net-misc/networkmanager/networkmanager-1.42.0.ebuild
new file mode 100644
index 000000000000..3c379b76059d
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.42.0.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="NetworkManager"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? (
+		dev-libs/nspr[${MULTILIB_USEDEP}]
+		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
+	)
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5:= )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( virtual/resolvconf )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+
+	# bug 809695
+	if tc-is-clang && use lto; then
+		eerror "Clang does not support -flto-partition"
+		die "Please use gcc or turn off USE=lto flag when building with clang"
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_setup
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+meson_nm_program() {
+	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+meson_nm_native_program() {
+	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+
+		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
+		-Dnetconfig=no
+		-Dconfig_dns_rc_manager_default=auto
+
+		$(meson_nm_program dhclient "" /sbin/dhclient)
+		-Ddhcpcanon=no
+		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	if use tools ; then
+		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
+	else
+		emesonargs+=( -Dreadline=none )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 08f9eb991b7c..043d728352fa 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,8 +1,9 @@
 AUX nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch 1640 BLAKE2B de9db48474db68effda44643d102f68435eb907a450a1b674db8059f84c40bb47fd428fc08979ccddec3610a46d907d232da5bd3ad035c2628df6ef8ad9fc46b SHA512 40e40b93b71d9236b325527a63c96a52cc05b10032911faacc3e2c33bd9d990b911a4c783b99b7ba91d95ee54a6945132dd1b93ea7a5d4f041783eecd6accd89
+AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
 DIST nextcloud-client-3.6.4.tar.gz 15451930 BLAKE2B 47b379513927d0f7fa20d41be67f75196ffbae6318d947d759f69d9561e27641d71e9a0accd197673f995d4aab90fa30dd1f1faa4dee446545f586ca28599cff SHA512 7a9378e78e1e678e72898d1cca2188ba9f5488f565c72db49d70e9d3d6d8124c8fae7856226fb3b47edcb37cacaadc8f0fbc5ff3b6914e4ebb777a4ebd633513
 DIST nextcloud-client-3.6.6.tar.gz 15497450 BLAKE2B 904f6f2a71a8c556fb4b9cb3710d09fff9888a7ea7c923d6dd7b42bd69bb2900a63525e5331bba893cb92663be7bdeaa228047a7af28bb3cdde7edb64f342c6c SHA512 b9fe96f9f8ac70c4c586b58f1b460e293d73e979d6b849d232112c7601463fd48608e8a093f3a8b0c2dc5a417e20e8aff3c2c3582eb7bce0fcb9f15e3d909327
 EBUILD nextcloud-client-3.6.1-r1.ebuild 2459 BLAKE2B 21080df548cb532e266696205edf08892909d66b4d5c2998f97455d1220189b542260e90598ae890a51db40ea744e1f815d34ac0f854f03cf9ed134c6b43bcc3 SHA512 c613b5733b2d21e9916cb69c76915ed5c29bb65128bf2a010b06227e57d19ea88e3dcaf29a34ecf8f82b3365c060e207f73a23b3a9351883385463e05633cc91
 EBUILD nextcloud-client-3.6.4-r3.ebuild 2511 BLAKE2B a54abc08d7664c5bbdd35de19bc11a5a3207296163c7ac1cfbdbe2bcc807e567878c019503f6c7613cc874b0157c14e95930c5445106ddeb6d7e7d0cbf446e88 SHA512 90800d9c2dc4166a40429506c726fd49dda2130667ce9a4b3ba20b96fefbcae0c5af03238f13b5152e546fa4ec46566229eb2d7be3f43410b06625d3a66abb91
-EBUILD nextcloud-client-3.6.6.ebuild 2376 BLAKE2B c624f33ac65d2563da07b05e9cedf3a445197d9c1d401d4ceaa4601a189d797d7923315acfccd0d7c494e3ae80a3e18b0ee71c0332ed3ab8eeb9bf252b500ccf SHA512 1b16c4fe364b0edbce2da25d5ce52c9dc4e86dd7ec8dd164c56e9adc5bff0726070bf8dccb97f4cf35cdf7d868804fade2dced84d0f2f23f3777e8582622a462
+EBUILD nextcloud-client-3.6.6.ebuild 2449 BLAKE2B 3903c3b5c3347748cdb3c150a7555a00fe243ca1ac1eea9f54bd4db1029a25b2c901298f237cc1bb2538ad98e9d5c5478516bb6cf00cec2af2bfb38800d103be SHA512 45fde1f02621f56962c86346a383d1c41d52cb91cca52b91efe287d3c5b58f9a33c18a41584468e7b66f3d6f884c0c600a0b50ce1af61b46cbd01ff7cd836cea
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
new file mode 100644
index 000000000000..2c3d23c1ff35
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch
@@ -0,0 +1,31 @@
+Gentoo's toolchain always sets F_S (level 2 at minimum) by default.
+
+https://bugs.gentoo.org/890072
+--- a/cmake/modules/DefineCompilerFlags.cmake
++++ b/cmake/modules/DefineCompilerFlags.cmake
+@@ -47,12 +47,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+     if (CMAKE_BUILD_TYPE)
+         string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-        if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND (NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]"))
+-            check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+-            if (WITH_FORTIFY_SOURCE)
+-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+-            endif (WITH_FORTIFY_SOURCE)
+-        endif()
+     endif()
+ endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -31,10 +31,6 @@ if(NOT MSVC)
+   endif()
+ 
+   string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+-  if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND ((NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]") AND (NOT ${CMAKE_CXX_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]")))
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+-  endif()
+ 
+   if (CMAKE_CXX_COMPILER MATCHES "Clang")
+     # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
index 8496954d4804..943bb9b77797 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
 src_prepare() {
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 11ba791c6d5d..ffcbeb1b2b0c 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p15-r1.ebuild 4449 BLAKE2B ac0f4d4ebc632237f68078e41644651f6f874e0d5c6809c5bcfd781550c414ca2fe7f68ed2e5f1b018d49faedd52daf70cd04e7bee69e73a52cd58a160a51136 SHA512 b377d9ed8095999240e5982f93a8492f91fc1ab372e487d455118f56d1048571dcf583343317c4a0b87b93c7fb09bb22286ca50d4684db6fd6ebf88b2c30c442
-EBUILD ntp-4.2.8_p15-r4.ebuild 4506 BLAKE2B b53b1428c321db0cc286fa8eda35902ddb49815c533473bc854ffd84625ff8fa5d72b7a0fc409cbef96ad1dbd7658a50028bb4f46963a9cd7b1f9a613c3e01e0 SHA512 e315c0e5e2a862dc1c1e559a31e804c3da68776349173b82c95aa358f092e0f3883445109feaf65172578da87296ab906fcde561de3fe449ac9b87ba927305e6
+EBUILD ntp-4.2.8_p15-r4.ebuild 4602 BLAKE2B 86a2365227477a4cd2ded88e717c5e24746a8bb0308b7ddd3c2673c361ee1287222e3629f20567e677acf12cabd94fd64ebf4990a6696ca65fb8bf1de87419a5 SHA512 cb0ed9b46e666f022372d2bc16baa4f399c5621b0699295e18752e8972165347c41be46a8015142ba41341f6bbc9269f7955b1da57be6db8c5da515fad19244a
 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
index e9d6da16067d..74177b9e9309 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
@@ -67,6 +67,9 @@ src_configure() {
 	# blah, no real configure options #176333
 	export ac_cv_header_dns_sd_h=$(usex zeroconf)
 	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Unity builds, we don't really need support for it, bug #804109
+	export PATH_RUBY=/bin/false
+
 	local myeconfargs=(
 		--with-lineeditlibs=readline,edit,editline
 		--with-yielding-select
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index ae02c4195aa7..fdc6cf8c5e66 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,5 +2,6 @@ DIST Remmina-v1.4.27.tar.bz2 1975470 BLAKE2B 09ce4cd29f476a307dce4c35d8304b8383d
 DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
 EBUILD remmina-1.4.27.ebuild 2702 BLAKE2B c481ef70b489d8d35fcc94baba872cdfa21b1111ad853bf15a5928ab4d35da724aafd968803ef824cd13736d523973fa1db0bc01ed6c0d85168c82f149d40293 SHA512 454453b963eeeeb1be58aac6db22ad4909672b0d1ab238cd911e101aeb5883776ab609951422345b2ae4b7b9691a90209e07505c195ce6619f01baf91fa55ecb
 EBUILD remmina-1.4.29-r1.ebuild 2706 BLAKE2B dd15edd37d77276438e44bfd08895d9bf30ac2aead365d0e7a7556b0bb83a86ee8c38fc1c3bdc32f9f962fc58209b3239eb6688e4e7b7fc3b4b3fbb3c16dca0c SHA512 b46a5027b4a0eea624e8a5206746fa2bcdde075184d81b90c56220886cf6d2f53f453f81981c7f9f41b5a7788ece6e3e0e1f13f4efac46956e9b11c3c2b0b175
+EBUILD remmina-1.4.29-r2.ebuild 2666 BLAKE2B 9725d95b20ebe9fe0c1fa13ffe60a35a647161bc299533aa0aa253aac81be145ff4ce41be24fc2f0e0cd235e13ea88e3906e6bb17213c34c251f0adf08a3d809 SHA512 c346640010221b427ec7e3f02f0a479374a7305a5f02a41f60b8e8e4e2952e9cc3a917f79ef08c197dd154faf444a33261e9a6c5616e70c2f7f1c9f443cbcf40
 EBUILD remmina-1.4.29.ebuild 2700 BLAKE2B 0189ecd073daab151c4dd42e0d7c4edafeeead44e2c8fd17f3bc26dfc6dd38e828463bd4d5a6c738be31f463c8620373f00ad290d9e0b7c228910672e1ca5b75 SHA512 dd26f3906654ad7c822e9282249172713da221a4abe3d694b7a04e322a1700539558248a8e70fc049a31d2e6ddcbee4b8b3045892c04d849cbe2bf7c16f2a727
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.29-r2.ebuild b/net-misc/remmina/remmina-1.4.29-r2.ebuild
new file mode 100644
index 000000000000..790b0d0b43f2
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.29-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake optfeature python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libayatana-appindicator )
+	crypt? ( dev-libs/libgcrypt:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	python? ( ${PYTHON_DEPS} )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4.1 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 2961dbc3f08e..8e33f8199d9d 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -2,8 +2,10 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4
 DIST spice-gtk-0.40-meson-0.63.patch.xz 5932 BLAKE2B 5188e46236024575543125226404a24490faf37e9b764e8b8e2935620c6a908f6ca93f35c2a414306bb3c6646c0e47b2fd12ced83a7829ad8c118a1188b44ed8 SHA512 7b4ea4cf48b1e95bbc81c7eaa54b135333a8dba8167959e8baa7b50398d6542f2ac3d98fdb493995abb47b2a6bfb2ac75c393dda795cf69b7335ca6e3b1ddb70
 DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 DIST spice-gtk-0.41.tar.xz 827320 BLAKE2B bed8e62647ca9fde8a3b534a3d9720dee829f222442edb589e6ff569ce9a49f16e3c99bad4798a22e8a551d0d89875043c2335e2b08a80901483ace6a1948d6d SHA512 bfd97c98c8bdbc29da0f26c38dfcf75d9f17e5358d4c7fa9c36e4974d0df3ce92409ca568dfc790d43f581d00b94090d9e60154e83220a719d678b596c87fcef
+DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137
 EBUILD spice-gtk-0.40-r1.ebuild 3860 BLAKE2B 073cb314b10794cda4e3bd56789bad21697e8e211775c9331bd38316b26340bad460d345a2777ff2739b30794850823944a60e1e2a9aa5ec76508948cc649151 SHA512 de7bd0c934ee817022621021548e87187389264ad8648ed0dd8b432767bef1dea63b734a8cc061c6e6ef290061a6c8391cfd9ca96e88d920b1422095a89b3061
 EBUILD spice-gtk-0.41-r1.ebuild 3705 BLAKE2B 4964c83adc8d8694655b6268529abad0ba4b37095a0928e9aa98c571e7e4f69de23ab95b341f3b1708371edf664050d5d7b0b56a8a1de4ab4dd0b4f989b75c1c SHA512 42e65cc900d1830343e972aeb1ac1a368178e5348ef2e20e1adcd7a3616d398a8f2666765c91be43fb8366bbd71b4e7651c61f18256f8df5fe52514ad6f294aa
 EBUILD spice-gtk-0.41.ebuild 3722 BLAKE2B 01cbe4283c03ad9263d7d12ebf723ac2e8cc43b2631bd06fba2e2494bb468f71cf9922b4887ce434e831f43181101517bf363e0d9ebb1654696c1510117820d5 SHA512 de5b069ac0a78096fb439d1263b024758feebbe66e0573f605744f8025467c43ee0a42af5f0d77c37ad22786601132a1a34d9771d054760db2edb26bdc977c57
+EBUILD spice-gtk-0.42.ebuild 3715 BLAKE2B a25d7fa4415629f375f0652c6e4d187ede96745d403e647b8ad883f4ecc7b00d54ec0e66d55513fe093fab1ac9161bd6bd2185ae9dbc65e44419c8b886b78a9d SHA512 9067d4894fd4719d5f673dbec94e9f9093247ebb528a181da03ecc06512920c90a3f1d3ffadf4772e39eb3dbeae46931ef5d2eaa4797667b2ba978ca8ed44f8d
 EBUILD spice-gtk-9999.ebuild 3708 BLAKE2B 7fd961954d00a1ddaf20572aeef35f160d973d54b1c9f3e89b3a1b02f57b8f51ed6945bc68eae8303699848fa0b96616232c6816f97906a3bf6c19787475103c SHA512 d09f9cb4d7a945a63f157aa03dc99c27ff2bc2faa2e94f394932b1200fa092ed1295519f66421d0c527f1d3960917735e67e9cc7c7fc0de5e997cdfff5f95b60
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.42.ebuild b/net-misc/spice-gtk/spice-gtk-0.42.ebuild
new file mode 100644
index 000000000000..9c71f454c6ae
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.42.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
+	inherit git-r3
+
+	SPICE_PROTOCOL_VER=9999
+else
+	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+	SPICE_PROTOCOL_VER=0.14.3
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/opus
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	x11-libs/libX11
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	introspection? ( dev-libs/gobject-introspection )
+	dev-libs/openssl:=
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwdata
+		>=sys-apps/usbredir-0.4.2
+		virtual/acl
+		virtual/libusb:1
+		policykit? (
+			>=sys-auth/polkit-0.110-r1
+		)
+	)
+	webdav? (
+		net-libs/phodav:3.0
+		net-libs/libsoup:3.0
+	)
+"
+# TODO: spice-gtk has an automagic dependency on media-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( media-libs/libva:= )
+	arm64? ( media-libs/libva:= )
+	x86? ( media-libs/libva:= )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
+BDEPEND="
+	dev-perl/Text-CSV
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature lz4)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+		$(meson_feature wayland wayland-protocols)
+	)
+
+	if use elibc_musl; then
+		emesonargs+=(
+			-Dcoroutine=gthread
+		)
+	fi
+
+	if use usbredir; then
+		emesonargs+=(
+			-Dusb-acl-helper-dir=/usr/libexec
+			-Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 5f9e966a3f6f..432d3e348581 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,6 +3,8 @@ AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc55
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
+DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb
 EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12
 EBUILD stunnel-5.65-r2.ebuild 2894 BLAKE2B 9289a73af6b9e1b14d90287291985e398a6e0d0b53b0a25ad40eb768e76497faffa3953aa81b2c7fa046f083cf00cf3ba97854ef2f94d8cf376db1d98ecf97c6 SHA512 e86ff7399928275d4560b1a8205684c3b7493e49fe2f76e3de0055c69e173ed7d9361d84be79b436e86b8814cf78df31383963f2034127c4c5a6ce3aa22f236a
+EBUILD stunnel-5.68.ebuild 2894 BLAKE2B 855818cda850df7cc5718a60a41115e010fd63b8636469abaf974a0cc1430364001b79383b0b82eb3f0f8ec171f4e2965d0e0f5e8503ef7bed88f7c84e0e2890 SHA512 4955a57b15754be383ac22ac7461c5f28b33685d50baf0f42b6346f9eeaa2e7eeff7a8db8e07b3a5c0b07bd654164c0dd65a71188f6b811384053414fd446922
 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3
diff --git a/net-misc/stunnel/stunnel-5.68.ebuild b/net-misc/stunnel/stunnel-5.68.ebuild
new file mode 100644
index 000000000000..da5e7cfd5e1e
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
index abdbf32a856d..30941cac0a77 100644
--- a/net-misc/yandex-disk/Manifest
+++ b/net-misc/yandex-disk/Manifest
@@ -1,7 +1,4 @@
-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
 DIST yandex-disk-0.1.6.1080-1.fedora.i386.rpm 4613067 BLAKE2B 1d893b0420d6146aea7d10d4603c28fccd6e6c93eb3c6c414d5c91b3ebd77dd770fc20445b5c0e5892994a32d9fdfa18d3aa5cc011be3894381e63b833b76630 SHA512 68f8952556b822d1de0b99827f4667257caab8ff3c744c280da682d7bf9647877dcbad5547946f92d230bd8dd27b50f5695e5af6cdd6c8c4ed20ca22cbe5e914
 DIST yandex-disk-0.1.6.1080-1.fedora.x86_64.rpm 4799367 BLAKE2B cc0fabe1479c0c66b06dd7fab943de32e1ad9477b3c03bc39c0859ba5b802bad8909d721b5fc2445943e86213bcc9ce68bf5f37eb6c151d5c211243176ae126c SHA512 d0845a825b1d4db773947c1101fa6aee38df43167486e4fae1d2db1e7fc7a49326882848eb742b069b3b2f6c1e9d617f6203dd8a3f67dd136dfa1f7bc1c8bfea
-EBUILD yandex-disk-0.1.6.1074_p1.ebuild 1146 BLAKE2B fbf4603297858ca17b5214fd2333a7c475c688299ff54449b1bc1bcf0c66a999f404f1114960c48b0f8b7664b437675b621ade7056608f996dd330d8b5ed83a4 SHA512 5ba30765c099b9704f2ad2db8251cdea27d8f42e4cdc8f7ad81170abeedf2ad82720efb7e465cda7dc1917b9ae95210ce2515c1bdfad865c64c66ae072e7b8cc
-EBUILD yandex-disk-0.1.6.1080_p1.ebuild 1148 BLAKE2B 9907ae5954a730080b00be07219a02b3f45cb33c3916611053a64c9290542e6681c9a967c646fccd6a08529ad99a06857f985966fc29cbd6259e1e003abcc475 SHA512 03d536b1af008add60773f7a2adc5c19e402c6628022294f330952ff4fc2631fcfe30ff912a354df07e98756f00c0ba4d44824f3d4cdcfbea60d9dc865ffd6ea
+EBUILD yandex-disk-0.1.6.1080_p1.ebuild 1146 BLAKE2B 7ba5ac813697023cbb605dfe0cf426a3002bf91609ff5ae39d36153420534be4feff1e7b4b5fbd9a47f6a80613c32aaa3f1c59f293d584da100bfeb195a77349 SHA512 0242207aef80830e6daf3926a74824d28ee9e8a9352a59fea84c047dfa497368396061532cc7d5967c1bd970c33645ed7077fcb93982227b0a59712edcb7c883
 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
deleted file mode 100644
index a0f7e45880f7..000000000000
--- a/net-misc/yandex-disk/yandex-disk-0.1.6.1074_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild
index b8c324f9da4e..03cbfb1d044d 100644
--- a/net-misc/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild
+++ b/net-misc/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="YDSLA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 DEPEND="app-arch/gzip"
 RDEPEND="sys-libs/zlib"