Merge updates from master

6 files changed, 115 insertions, 2 deletions

diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 173db97b65d5..8f6d17a1192d 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,3 +1,3 @@
 DIST git-machete-3.17.6.gh.tar.gz 1638444 BLAKE2B 91995dec3dba53cd538db549248d9c42932ab4f4c3b7f016d60e4999617bd428c1c4fcfae3bc2aca75bba7bf62b4466e139ddada47a962f0f7d876cd220dbe34 SHA512 0766997db950a04ed5eec560be7fe1e76370d2c5f747bf121241280d44a3aff094c5828535bd11831ce1b326e05d48c8e4edf620c1dcccfbeb20e9d94c3cf023
 DIST git-machete-3.18.0.gh.tar.gz 1639576 BLAKE2B cd77ef6c86dc2eee6430bec5d371566082dd9243dc9a99d7b60e78155ce7340f8f798d59073acbb65e75483389d8ffd9a6f75520ed9f1aaa517ea31281dbd672 SHA512 ca070000020defa69e4b8592ee77e8b7f6e7a8b0397b90f0f5b6b31a9d46a85f3d17ed96b7795fab145794182d7b40dd8acd9bda498533deada6e6efae24dbca
-DIST git-machete-3.18.1.gh.tar.gz 1640667 BLAKE2B 6918c7cee6957b431a743b81f2de0851090c5562a7f298df09d77273c9bbdf6da35cebe282d2341dafa735a98ad060fafc99abf70edefd090acf59a3ce675229 SHA512 8090c1c60b3422e58c68c4e1317e49477d75b8daef101b315bc6b242515a3586beecb442488819374eeda7076c40fa09369024ba6b57866464b68e22abd18a59
+DIST git-machete-3.18.2.gh.tar.gz 1640834 BLAKE2B c6d19b2207fcfa649ff5a1a32a5764b7c133c0bbf9f4ee16b6dbf9b1085d328e355d7267ab07f76ae4ebb6de4db94256a85bd8fc89a4a2e54724955452f7f616 SHA512 7a1aff9e3f8a4792a33de455e97a3435a64e4a9feede2d53aa12a8d7c12528a00e232a756726b94267acb8d25264e6122240b30cf3498db03de4fafb6c6fe725
diff --git a/dev-vcs/git-machete/git-machete-3.18.1.ebuild b/dev-vcs/git-machete/git-machete-3.18.2.ebuild
index c26324c6913a..c26324c6913a 100644
--- a/dev-vcs/git-machete/git-machete-3.18.1.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.18.2.ebuild
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3bcd12763d70..7679c8cc09f2 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,3 @@
 DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139 SHA512 32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
 DIST syncthing-1.23.7.tar.gz 14314457 BLAKE2B 61efe4119617d8f63208b6ff579b5008580f3fb33b88d70fcab056cbe505950f0c71050a5e90213aad651b1efdb55bd45eefbcfd0f285a2e9e3b8c2e0ea569e9 SHA512 c52a0e80eb572b2f59b0be2222244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e
+DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61 SHA512 bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908
diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild b/net-p2p/syncthing/syncthing-1.24.0.ebuild
new file mode 100644
index 000000000000..d8e3bf08df7a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop go-module systemd xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( >=acct-user/stdiscosrv-1
+		>=acct-user/strelaysrv-1 )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+	"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
+	"${FILESDIR}"/${PN}-1.23.2-tests_race.patch
+)
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/stdiscosrv|' \
+		cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service \
+		|| die
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	GOARCH= go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \
+		${GOARCH:+-goarch="${GOARCH}"} \
+		build $(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	local icon_size
+
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+
+	domenu etc/linux-desktop/*.desktop
+	for icon_size in 32 64 128 256 512; do
+		newicon -s ${icon_size} assets/logo-${icon_size}.png ${PN}.png
+	done
+	newicon -s scalable assets/logo-only.svg ${PN}.svg
+
+	if use tools; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	if use tools; then
+		systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service
+		newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv
+		newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}"/strelaysrv.confd strelaysrv
+		newinitd "${FILESDIR}"/strelaysrv.initd-r1 strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stdiscosrv.logrotate strelaysrv
+		newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index bac868fc07d8..7215fc15d341 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,3 +1,3 @@
 DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
 DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
-DIST fwupd-1.9.4.tar.xz 3836580 BLAKE2B 7d5f97bb804759cb2b48e8bbe6c5c8c0ad6bc835e3f2ca7385ddf830dc8d7e8bd5c658a4bccccce02853e5282aa90ac8f0494a47822d22e07b1dd7600f9aea9a SHA512 c9c3242dc93a1dea967115383377b72dfc813c68b9328e97f581d0d7327daf7b6665323037e9353312ae5debe52fbfec869cfe743bbeae4ab6fbc6ff48562da7
+DIST fwupd-1.9.5.tar.xz 3847088 BLAKE2B 0926f97a79d7795f3bd8ea71841a072b8f725800d9b33eaf6fc54c62e67f53e41faa5558979a53b0e83094d8dfd3b3263bc462380498c00484e29500ca6baf8c SHA512 19c152746d4d44f00c5bf3ed36b97249cb0a8fdedab351706a7d4e761fb142d096351555392b535ce976cb9e925505246542525a90319a2560f753a675ff26cf
diff --git a/sys-apps/fwupd/fwupd-1.9.4.ebuild b/sys-apps/fwupd/fwupd-1.9.5.ebuild
index 568558450cfa..568558450cfa 100644
--- a/sys-apps/fwupd/fwupd-1.9.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.5.ebuild