gentoo auto-resync : 30:08:2024 - 12:00:55

20 files changed, 55 insertions, 299 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c3b1a31c833f..0f0f77d585df 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 13159fee58fa..e26c7bf39cec 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,17 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 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-202.4.5551.tar.gz 113668681 BLAKE2B 2590c89af767803b77ff7bd57e4978c90a90be6f6394f7058393045fa4f3c68ae97ab365a460eccf38ab1e0b0a58b0e33aa482348a0bdf040dbe71d0bf683eeb SHA512 d5176c6c4b8f178fced661ef6df73fb767c3e7ff7f111df4829ab258d218586e128acb4187de6d840a0faca5a8766ea97b77c4d5c915fbd944be458ff07b8765
-DIST dropbox-lnx.x86-203.4.4857.tar.gz 113474071 BLAKE2B 109111bca49d7c59d9f7c28b9c012953b8cb01a116cdfe757b0c37b9a168e12ed61501cf313c5b5264fbbafa1528d5e2c884de51c3e3a18318dfd195b14ff7d1 SHA512 54945ecb11094d1a73a96f0469415eee8c2b936a22f8a9410ea5cac75e5eda4b3db72def487eef6f113e6bac7eb656403587fbaab4503bb331032648225660a3
-DIST dropbox-lnx.x86-204.4.5420.tar.gz 113538291 BLAKE2B bd8bb5a2ff327627d9664f93a9c68cc01b6a745b69fa1d312e3f64da7edc9ef62da45807d5fdfcdcad194a5eebf6562b67e22abce241c435c37c9d46d485cae9 SHA512 868350b68e77a91d4a1e74ede5cf4b219b998089956c1827c96f36fd6401a8bf058d573d31485e1ca94e7d2c72a6c20f34563d5c04ed2833971d8f2bc41de08e
+DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95133b5117277cd635c8a77ec3e7ca8338538e5a6a2c4a23f3ef0186184bc1dc770b3c7f3a219f00faa6 SHA512 cd7ad8fea652f0713a00e7fbd88d6c22949dde216040f2ba7c903db70cb6c5c9ec85202831c0863c3bb2cf339b4ea0c6731d7b2d56750b63a4f36160815e4346
 DIST dropbox-lnx.x86-205.4.5765.tar.gz 114089572 BLAKE2B 503650c9fe49c1142872b829892c3759924af57c0327d49b3891f78cbad9b8aa4964861b719023ce5dc837fac98937559635a3e9c16da5b352b104c3cba792c3 SHA512 35715777719c10f38b54e92e24af5d6af85e4caedb7b45bef0693f93d7b0faa0da81b772f821ff4c4a60065e68ac98769cdf0655cce557550d1040f1c765598e
-DIST dropbox-lnx.x86_64-202.4.5551.tar.gz 116236652 BLAKE2B f8a7c45ed45ce70580cb0c2f23e83c06098b8792e4a47b01f8ea9d2b1674b6d6470450edc25d58917630106b9f3ba49c20e87829b2f594d9e3a458d2586276fe SHA512 2d33f9f6d7a8b59f381ed43033c7638a54ae0a84f68845127505f6eb7ef00fbae490d7ba8d4f5e31790a39348612db665591e2785870acf816d60ca6d20097c3
-DIST dropbox-lnx.x86_64-203.4.4857.tar.gz 116080942 BLAKE2B 44b039a1478bc48a01c2a6c81250417c753dacbac0c7b393e2bf5b1ed1fdcb06855432c6f48bdc3d734d036f5f6e769eee6fdc9ac1685d003db711c9a6646112 SHA512 372ebe6a621f9df7143a4f685d9a6c305d3b124813b13514dd56a409ec473240115000bbedad624efc40c36660811e4a347f0847a9c9a1e0e526f20559f3390d
-DIST dropbox-lnx.x86_64-204.4.5420.tar.gz 116062581 BLAKE2B a9740c2c7d1c36fa1b263c65c3bce119e0974409451af0e17038184de4986a6a5349b7b687c4f484fadd8d3698ddeb030358cd22a4a0e28a9d46eb88b64f9544 SHA512 850804590b7fc1932ef421451355e47b55ecf40c1090382317b4dad168f6dad67448ec9df59296da010a50f39dce1e62621177f7e0b3c250bcb1be33daf62ceb
 DIST dropbox-lnx.x86_64-205.4.5765.tar.gz 116601880 BLAKE2B 40fbef3634736e4350d7b5e3bcf70d9daf1524d06b7707a7abeeff53020e2e51e3816a42903fc172ea9b8c721b769450d56cdb3f2fd562e114ce377b8cca4465 SHA512 9b9246ad573f0b04a9a403e6c71e2924da453f448a69bf8e24b1d662a80461b19a8fb75d29411006cf6b38b2227f4e5e94c57f481612d89621fc2ce985d8d450
-EBUILD dropbox-202.4.5551.ebuild 2854 BLAKE2B 83fb409fd9c6af41a884408f2258e3563a2d146f1fba8edfcc7e5fee674b8396cc1a674207533091721a2709118cdf655f24c5871ecdda663eb96da9b05b3861 SHA512 17f3737762fbaf48508b911b9605b629a876f3a503367298250ced4e81d599b6d496ef7f8b2742c0ccb9df89d8f8002ee732bd66f67148d474ae79fc96336ba8
-EBUILD dropbox-203.4.4857.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785
-EBUILD dropbox-204.4.5420.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785
-EBUILD dropbox-205.4.5765.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785
+DIST dropbox-lnx.x86_64-206.4.6506.tar.gz 116749927 BLAKE2B 231172bf0e51e6a316b76f21043258f99e3f771a241983848f0551db60189a624239e9cdd3110128d499028203d3d4511026da91c371da4ba73c6046ae2ad1b5 SHA512 80dfbefe898819f5880433aa87c7bdce52555c59173c01eb4dc464f12805aa14ea4d2f0dbcd31731d694f6151c3ec14f9e62db1b6ab35d4fdac3cefabd2660aa
+EBUILD dropbox-205.4.5765.ebuild 2834 BLAKE2B b394708041f4de081fc3635bdf1d33e7694249f8a1b47cb6f0f53b79c77e1a689af43d4f7d2405d8b0ab6883b00a7ce4d167552255ef7ebe02321565019ddb5c SHA512 a142818ec00fa55df0117a417227c3da29a1a4e52baaebc4e2d32c1e88e7dad9c76778dc4e9c5c7a9b1a27449ac75054d9cc579f4096e84c75051322b04cd762
+EBUILD dropbox-206.4.6506.ebuild 2715 BLAKE2B 7e8e784d7698892ae3ef7b7baabeb6a8e89f96545b65a69702c1ed4389db96c3681aaf17c8338f7fdc0aec38cd89cfd03735ba2ad92fedd7ed0bc97a3f3d4c3f SHA512 1d03fbd01bdc7999d39ad8b5737cd0967f71242ec16dc5c9e3feff84a1481743db62ebc0f13065383521ed46cd511fc29dba8fb17b5606586f1be94bb475472f
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-203.4.4857.ebuild b/net-misc/dropbox/dropbox-203.4.4857.ebuild
deleted file mode 100644
index 7d9715a71882..000000000000
--- a/net-misc/dropbox/dropbox-203.4.4857.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-204.4.5420.ebuild b/net-misc/dropbox/dropbox-204.4.5420.ebuild
deleted file mode 100644
index 7d9715a71882..000000000000
--- a/net-misc/dropbox/dropbox-204.4.5420.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-205.4.5765.ebuild b/net-misc/dropbox/dropbox-205.4.5765.ebuild
index 7d9715a71882..da3bda691687 100644
--- a/net-misc/dropbox/dropbox-205.4.5765.ebuild
+++ b/net-misc/dropbox/dropbox-205.4.5765.ebuild
@@ -10,12 +10,12 @@ 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
+	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
 "
 
 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"
@@ -89,7 +89,7 @@ src_install() {
 
 	if use X; then
 		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
 	fi
 
 	make_desktop_entry "${PN}" "Dropbox" "dropbox"
diff --git a/net-misc/dropbox/dropbox-202.4.5551.ebuild b/net-misc/dropbox/dropbox-206.4.6506.ebuild
index e90baaad900e..9aafe425d4d6 100644
--- a/net-misc/dropbox/dropbox-202.4.5551.ebuild
+++ b/net-misc/dropbox/dropbox-206.4.6506.ebuild
@@ -8,14 +8,13 @@ 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
+	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
+	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
 "
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
+KEYWORDS="-* ~amd64"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
@@ -89,7 +88,7 @@ src_install() {
 
 	if use X; then
 		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
 	fi
 
 	make_desktop_entry "${PN}" "Dropbox" "dropbox"
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
index 6f5a8b3ed500..f5e53cfb1c06 100644
--- a/net-misc/kio-zeroconf-common/Manifest
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -1,5 +1,5 @@
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
 DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
-EBUILD kio-zeroconf-common-24.05.2.ebuild 448 BLAKE2B ac58deceb6fc5a67dd03df44bfc1f34f86c86f81371167104ba6b0fb8fb84819b14d3d18a85bd4de7e1d04003c9ce82f449ed44c03d201fb811ffb31f6ba7a51 SHA512 6f0c8285cc1ec86cdb04695674c7b1e22a97caef0fc4c7c6c31e795ff6f92d9c0957aeb312734b1bfbfb6d1fe5e4c321f095d5479b1d8145bb8f13e7485b3ad2
+EBUILD kio-zeroconf-common-24.05.2.ebuild 447 BLAKE2B 6cee0a0f4d7642edfda070b657459ddc498c5a3458a9c934646fe83daf053b34b2e763782c5245cfdeb69b2eaab6478476312703a162699ae9fd68868bee39f5 SHA512 b469931bc1f0457d49a7acf52340a6dd59d0e449c5857a819cd91de7a6e3c7504eb18e71ff9efb5e2afa8cae3417c4fa277a7776d91b4d76225aada14fabe26a
 EBUILD kio-zeroconf-common-24.08.0.ebuild 450 BLAKE2B e96da0725386e84d2d5b3af4603528cff9221a5c238d26e148349516c2ff264659d82c6076e9a249423085bbed488fcd3d788fb855480ce5c7d8072429953b5d SHA512 c62ad5501ab99989a0fa07cda01d92eee86247201cab9ddeff164d5c8a72e4bbb7edf6b0ed819320b90f6e6b4ce9b4a662c362dc39a6dac31f81aac995b1540b
 MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
index b628e031d233..91fb277a7f82 100644
--- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2.ebuild
@@ -10,7 +10,7 @@ inherit ecm-common gear.kde.org
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 RDEPEND="
 	!<net-misc/kio-zeroconf-23.08.5-r1:5
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index 075c87bc0504..1b5686b87fb5 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,8 +1,7 @@
 DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
 DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
-EBUILD kio-zeroconf-23.08.5-r1.ebuild 803 BLAKE2B 314497805bc89cc99b5823f42a211ced249416e1c183eee9a3f08c33e082f1e700b43823eaca5f82c21b03deb1fe2d98acd8c8a780b6b64c69468573977dd6f8 SHA512 f7311ce3448a055047c5b6f81ba32690896bd82b5806720b48a2ff2a1ee98668dbe588231c0edd307400ff5474f1e048e7bf5866498c05b39d05154aea19f7b7
-EBUILD kio-zeroconf-23.08.5.ebuild 900 BLAKE2B 31511b68fc1fde36743d4eda7530feaa77d6a11e79dd48c920d61aee84216f910ce8c1254182d41d630343a8c288df9e9c33ab8643312c981ef72131c7d19c27 SHA512 81299817a158568a5d1f8f053d7cd57b14d5bebe207b997991b3efaff8fdd75d99c86c8f9a321b8efa35527864a11631a9c5c99c5f33f7538f5fc960972363ea
+EBUILD kio-zeroconf-23.08.5-r1.ebuild 802 BLAKE2B f3503fdce374b18a251213a9706e1e5e9f458e6c31a9258cc6091e6a5161a41fa9c7819ad663bdbab926d65b41747cc204bee050f12d0591ad622d8b4ecd1c30 SHA512 2dbf45f6b5cb56db4af826fa1c6ae9ecda891d269aa367ea4610ccc9e91c5ebed612bdf7aa9e3a6ef7be58233c83cd3ab925380b3c68e3ffde5408a9a14a975b
 EBUILD kio-zeroconf-24.05.2-r1.ebuild 813 BLAKE2B 052942177ddc903e5011ec489895cff317c9ed7f92d1971860b3658f604cfa8d55de486e8b4143a4d3b3295a3b3dc3d4432967b41ad1644f94d56b5fb369b044 SHA512 31f81f413b57d83fbb4a612335e95793fd201b02abe25b09abc1bc456712f5f8d7800d56618bac8f46882d42f333c33f734e1df6befabd4f89c59ebafbaaec58
 EBUILD kio-zeroconf-24.08.0.ebuild 813 BLAKE2B 670614f2aac9548b8383395d477a68a1a38f28ae86d7214b64dc9726b5ad9dd8f54eef85b0d12348a5f39119b403af5922182d50a032f3476d2c0b5fe2d69578 SHA512 651e4b2f109295ae363a12c96ecd3c2d0041c93fe03c17d16de0571b1bb9233651f2e5259e7002097473ec866d2d26cff0949ca0f449a16c0fe592d10cf5008a
-MISC metadata.xml 501 BLAKE2B 467c829559f7cb706ba27fe6400ac8282b9270faadb574fa78ea977c35075a29e8d4c98267f3c4bfdb83d2c39dc8abd3b5db3e94acc3ffaf5cd5c1c52bd9c3bf SHA512 dba3e3de6cb07e240e7664806b196c748df3604e22e84a265b01bbdc2a56192ed1906b30a76c79d6d8c98763c8651c3a3dcff30a0fc942c22a65901234ad2740
+MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild
index d57384a10c34..6724a7a9a616 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discover
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild
deleted file mode 100644
index 3300b2034c62..000000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kf6compat"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( net-misc/kio-zeroconf:6 )
-"
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm "${D}"/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml \
-			"${D}"/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml \
-			"${D}"/usr/share/remoteview/zeroconf.desktop || die
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/net-misc/kio-zeroconf/metadata.xml b/net-misc/kio-zeroconf/metadata.xml
index 8697c2472ca5..cb61f990580f 100644
--- a/net-misc/kio-zeroconf/metadata.xml
+++ b/net-misc/kio-zeroconf/metadata.xml
@@ -9,7 +9,4 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="kde-invent">network/kio-zeroconf</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 2b87fba2fcff..600393a96403 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,6 +3,7 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59
 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673
+AUX tigervnc-1.14.0-typo-VncAuth.patch 763 BLAKE2B 6e0f209159aac2f6ed78784606b7d3fd4a3bb618321249eb75452441f8781571e08da8a83fb657559e75e81f0ebf5d55affb5f965c0523adf5cdf349aa2cfcd3 SHA512 8c4c80b735060a15e25eec17ec155e321f1b6fa3bf5367838cbaababc3850a0894ae89fb53821b8efced801cc97295b8602b19d9a99e72767e00b402288d990a
 AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6
 AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4
 AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60
@@ -11,6 +12,6 @@ DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
 EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a
-EBUILD tigervnc-1.14.0.ebuild 5601 BLAKE2B 1a3846d6b22ff6ba386085c90617b33900d647d2987de019035714bfa3854fe91964ecb54a05f7529032b51ed1268f8e2bb833e34af2e4054224bd2c7c932c9f SHA512 33c9fe94bca0497669743eef6e966d6eef60be7db45d14fa55218508a1453b65be4a922f39f0ffd290d513cc0bbf82c4bf3f3c566b0bd31d1b5f263d710b0d3d
+EBUILD tigervnc-1.14.0-r1.ebuild 5654 BLAKE2B 07d66216434342d7f49e8d2305f503f29d70144ed9ab301d2ad4cd2742efcb75236aa72ad1811724de797379f98815b5ec682cbf52a204ae15dfa522c783c2d1 SHA512 27cbe12e11d1ef6e128fa72ce1dcb4ab70872ac73fad6127a803d5e30087221cebab5ec149b86f1ff793948fc015bb91587351c3b161ce03264904ec7fd8df01
 EBUILD tigervnc-9999.ebuild 5451 BLAKE2B 969ff59f69636c982e7c4bbf6fae54941b1d0f71950135d62700b31d28166e84708de6a4d5b0f3f3e0e3e3b05f37a3e5b7c15a3ad9154a1c8709f7428071b1bf SHA512 7fbb6c3eaaafb0284816e6a0c93524991f3b4d506cf93d3e3563b5f4da5264b8541e27a5420fcc8716a252b78694ecffc1b2eae0834d5f4b1057b58971db08a0
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
new file mode 100644
index 000000000000..8408fb77db5f
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/938694
+https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582
+
+From 4f6a3521874da5a67fd746389cfa9b6199eb3582 Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 29 Jul 2024 16:16:08 +0200
+Subject: [PATCH] Add missing comma in default security type list
+
+Otherwise it merges with the next entry, removing both of them from the
+default list.
+--- a/common/rfb/SecurityClient.cxx
++++ b/common/rfb/SecurityClient.cxx
+@@ -60,7 +60,7 @@ StringParameter SecurityClient::secTypes
+  "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,"
+ #endif
+ #ifdef HAVE_NETTLE
+- "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII"
++ "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII,"
+ #endif
+  "VncAuth,None",
+ ConfViewer);
diff --git a/net-misc/tigervnc/tigervnc-1.14.0.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
index 858119355b1a..771510fc74c3 100644
--- a/net-misc/tigervnc/tigervnc-1.14.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
 	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+	"${FILESDIR}"/${P}-typo-VncAuth.patch # bug #938694
 )
 
 src_unpack() {
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index e55c697828c0..bd166b5313d7 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -6,6 +6,6 @@ AUX tinyssh.initd 807 BLAKE2B e133e79f49fef0f65e9230cbc7fca2d541261652a4acb07a6a
 AUX tinyssh.service 214 BLAKE2B c02041eeb9109fef53a5d08f66d1807eb545d1da1dd9f38f4da4e07860e1fe80bc58a15bed98b7dfc8a9205e1d8852a0d726afc6fe256b187c75212834778f8f SHA512 220c2507b329bc4e4d38caccce8f278ee61d2b9ed6874f36c8e69785edb5021cbb2796d6f5bb51b60d45f1f00306799f5ffbdb26d83fe6db14f69198d4e27d43
 AUX tinyssh.socket 222 BLAKE2B 4bc71c8a1f8c45280350324af7c53f891f937b6854bf9647086db7339dd89a47254a8d9f3ced88352ce76cab0d02c326f2109e38c87f81b86336703336bd2a49 SHA512 e3cfb592135d8e1f99781ce17ed580a1854dd70bc8102971ef61654ec32933ae1e8e40f5cb79440b21115764fd301c18b25d59dc722367819f8991cb386dabbc
 DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90
-EBUILD tinyssh-20240101-r1.ebuild 1712 BLAKE2B f1e95b425be38a5cd431721cc1ac2fc6e14588326b35b35e569bcdf9ac9a9748d00309e37d6b778ec53de8efae8096eeca377c8e916c311bb19a98e6bae255fa SHA512 10d49feabdcda3cb984e68156e759be65a0985153561ce9175bec380ca1adac11873064d2fa7c24d1c892c5ad6135a43421db9827623fd877307cdf648c29c3f
-EBUILD tinyssh-99999999.ebuild 1723 BLAKE2B a88a2ae7721664524098e9f2bcf301e7e16d3bc161505b03999d499b5ca1604a0e09489c069cc256a8af5d17c295c3b6e960cb445f0eb1f0c1e0a8ffcd916792 SHA512 4d9215ab5ba4fa6bebfe6cd9be2bdee7c9202194a3c1c2023f492cea0f389d136f0f1d7bd25b342eb37926693b84b2fc32e5e22f673f8ab2a84a048a24766fa1
+EBUILD tinyssh-20240101-r2.ebuild 1895 BLAKE2B 359a09a4b665b6081db414af2b77e9450cc66bae8256a4437792df733061b3e376f54811abb9a6f2292f8127f8b5198e366d065b04ea12bcc8206f443854ef80 SHA512 d29aac74abc210a20b8785615b267e8a96f4953507df3e09e06856c44570c973f1d6314c92197340707a9e5dc5a5546d325d556c4f28202f2b557aff614b84f4
+EBUILD tinyssh-99999999.ebuild 1853 BLAKE2B 42603829346e6c5194fb31e642ef230949d98cad81734bfe6c08809aebd2aacbc180799228f8d58686116fa49492077342cf4b9d6026f15aa875898829af0b50 SHA512 95d80af4561f3bb4b09c4e8a608c80af8fa5d459c9fa59fb1d57edb38aac70b27d9d6d14e4ec5a78346200a7cb99f9845e9b391a0c3e3a0bdb34b69a51b64401
 MISC metadata.xml 2107 BLAKE2B 6e166d2ea373129eb377c030dac7eae8ac06937cdd4ffd2c1afdc4abae691569be7ae5a46a634e9c2a4c13bbfbc915285ee8244f13d88d2219f94dbca38da58f SHA512 845cc482edd4e62a12e3cf3d01699b2e44d4ac9424170c7b867719c5c400aaafd5cb150866f4af309c208211dbba80a52e52bb72ec09d4cf7bbb4a4556a60232
diff --git a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
index 442fb8e5f171..db7411fdc4a4 100644
--- a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
+++ b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs
 
@@ -46,10 +46,11 @@ src_compile() {
 
 	if use sodium
 	then
+		# -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>`
 		emake \
 			CC="$(tc-getCC)" \
 			LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
-			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
 			LDFLAGS="${LDFLAGS}"
 	else
 		emake CC="$(tc-getCC)"
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 4b288ff014ec..9d2ed3e6c433 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs
 
@@ -28,10 +28,11 @@ RDEPEND="
 	sys-apps/ucspi-tcp
 "
 
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
+PATCHES=(
+	"${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
+)
 
+src_prepare() {
 	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
 	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
 	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
@@ -44,10 +45,11 @@ src_compile() {
 
 	if use sodium
 	then
+		# -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>`
 		emake \
 			CC="$(tc-getCC)" \
 			LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
-			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
 			LDFLAGS="${LDFLAGS}"
 	else
 		emake CC="$(tc-getCC)"
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 5d0a702455e6..4e81b8aa3e25 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -6,6 +6,6 @@ DIST whois-5.5.21.tar.gz 109621 BLAKE2B b1cf42f1a60e5009e5882f154432d5974f45c1bf
 DIST whois-5.5.23.tar.gz 109709 BLAKE2B 4985c26b90d8afa678e8cdca2b25f7b5a55c300555c5ac1595ff0c35fb65e35bf6e5dc5733e0364172fecdc2071565f08d1fb38ff5b9671714792d6b7baa2a63 SHA512 6e2caf1ce28edcd561287ea7a072a069851caee42fd47850b8555e03dd353ad79a338ceae2f9b8fa98c0e06a16dbeef5a7a6d422a76d8a141c92d8e9e82aebc3
 EBUILD whois-5.5.20.ebuild 1872 BLAKE2B 554c9632f0474e1d2ef5383e918a0588b00ad4275f23ac3521f42e297fd5bde0067371e30007f5fc100c0788a0a9b3df11406173544371bd248929fd2eb2c6b2 SHA512 eba345f65717b94a9573bffd421991f9f66c1aa0408b2749cb427b05788c09439b2b073af864302aed2c2943df0b88d9698613476aa343b6e9bfc33f634aae27
 EBUILD whois-5.5.21.ebuild 1872 BLAKE2B 21666d7d1489239067bc8367cfd35f628ed3d4f59a181464333dc4687c9813a564b9eaa6e2ae867894e19323594950a9984949548fee845c66e8a595b8d644b8 SHA512 8c6f8b06608245def88a42449963b0b13108fbffa3a08393e841c28679716bf30a09cf9acecd4f7172520b8f4e69533ae2c67a3d4d358341edfa308d0c18780e
-EBUILD whois-5.5.23.ebuild 1873 BLAKE2B 9d9005a5f61032e01e2ecb46d057c9630bdb1a2b2caa4030d3b61097747373859fc697c777790e72c9d40d0c881b24146651f2b1dfc128e993a53928409c060f SHA512 fd8e90c5685a79185c78c9a160c02d840b76e3c407502824bd2f12ba94705b6ed1b0658401035b0c367d77967bd4ce115b1dec5aebfbe36c9b2e4b3551c4e6aa
+EBUILD whois-5.5.23.ebuild 1872 BLAKE2B 21666d7d1489239067bc8367cfd35f628ed3d4f59a181464333dc4687c9813a564b9eaa6e2ae867894e19323594950a9984949548fee845c66e8a595b8d644b8 SHA512 8c6f8b06608245def88a42449963b0b13108fbffa3a08393e841c28679716bf30a09cf9acecd4f7172520b8f4e69533ae2c67a3d4d358341edfa308d0c18780e
 EBUILD whois-9999.ebuild 1879 BLAKE2B ee4e86da146786b66a8d5d1868a80ca2de1412b64c3187fef75337aa46d8f89533a81625217d988d2b397d1d817b7333402d869d65a0579842bc45860e9fde4e SHA512 de7b20b198eeba5cea42357e8849d31eacd0f13276577d279c0b16b45072f1a6623c61ff1443983a6482e1a16b4e8d9f7ab1a48de561aa5bbd9914cd04889036
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.23.ebuild b/net-misc/whois/whois-5.5.23.ebuild
index 6729222bc0ec..b5be510bfed5 100644
--- a/net-misc/whois/whois-5.5.23.ebuild
+++ b/net-misc/whois/whois-5.5.23.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~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"