gentoo auto-resync : 13:08:2023 - 00:09:03

4 files changed, 119 insertions, 2 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 089728493eec..50e2fbae0289 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -12,6 +12,8 @@ AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9 SHA512 ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
 DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139 SHA512 32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
-EBUILD syncthing-1.23.5.ebuild 2887 BLAKE2B 09ab0937a5697393094861c25f0ba64cd4bf9a4ca90e9c627d2599724d30efa8a35079c65219df615709d75e719a438e2222059a5dbfba05ef88cc8e98c16390 SHA512 1a3ff5674a898c68e5632c7cbf01445386c44a4ab009815283e8ec14ff86ee87b11275e323986c4633a0593e9e6a07a821cc690791d874748e4516a84ffb14be
-EBUILD syncthing-1.23.6.ebuild 2892 BLAKE2B d62d3764dbde48e231ddfff877bc324d3ae50ec2be2ccb8c05aacd72d933a2159a50c315db514e21ab1329bf67440f1b44da6a9e5d4448ab2eb2a5d037b1754d SHA512 819771dd2c2312e0176e93bc5cc1d5fd9fd7fb4bdd1a114666a69720e9855aefbb35554f9d48fe8e68cf6627dd3b041e6579a83fbc6c44b77d675974a9aa8ed5
+DIST syncthing-1.23.7.tar.gz 14314457 BLAKE2B 61efe4119617d8f63208b6ff579b5008580f3fb33b88d70fcab056cbe505950f0c71050a5e90213aad651b1efdb55bd45eefbcfd0f285a2e9e3b8c2e0ea569e9 SHA512 c52a0e80eb572b2f59b0be2222244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e
+EBUILD syncthing-1.23.5.ebuild 2915 BLAKE2B edfda20c32e041d7172efd31ee762d443f2788fdb395593a552003851387ddfac891f2ca231524fd06cbae74dd3cbe9c6b3345f49d95ad30185d41b4cb50ec10 SHA512 0092a7d80c3f9a23d0f6da1c6d5cba2665047097f329db8d85188363a367a146a88c73ae05920bbfa93a241daad9f3222b8f3b3d7d0953a6bd2946cb78c78e14
+EBUILD syncthing-1.23.6.ebuild 2920 BLAKE2B 702a664af9d4d5b86b37abddb115ef41b958128edb48ca5be0361344196ef36b2becee55d93ed9d4bbe750e8a440daa0b9d7ef4021b288874b101c484fad019c SHA512 8702fbbf62bd1fcc6e5386bef1f2fa1ddba81059fbf04d32f558e14a56ca76265464a1eccbd8675935ba359109cbd69c9bec3e6327f89f518d1ae3eabad19336
+EBUILD syncthing-1.23.7.ebuild 2920 BLAKE2B 702a664af9d4d5b86b37abddb115ef41b958128edb48ca5be0361344196ef36b2becee55d93ed9d4bbe750e8a440daa0b9d7ef4021b288874b101c484fad019c SHA512 8702fbbf62bd1fcc6e5386bef1f2fa1ddba81059fbf04d32f558e14a56ca76265464a1eccbd8675935ba359109cbd69c9bec3e6327f89f518d1ae3eabad19336
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index 775dfc6ccb00..4aa920023bb7 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -19,6 +19,7 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
+BDEPEND="<dev-lang/go-1.21"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
 
diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index d8e3bf08df7a..56d37e45d3da 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -19,6 +19,7 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
+BDEPEND="<dev-lang/go-1.21"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )
 
diff --git a/net-p2p/syncthing/syncthing-1.23.7.ebuild b/net-p2p/syncthing/syncthing-1.23.7.ebuild
new file mode 100644
index 000000000000..56d37e45d3da
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.7.ebuild
@@ -0,0 +1,113 @@
+# 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 )"
+BDEPEND="<dev-lang/go-1.21"
+
+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
+}