gentoo auto-resync : 30:09:2024 - 01:25:52

4 files changed, 14 insertions, 246 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index fca54fe0b584..2cd922906d06 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -12,13 +12,9 @@ AUX syncthing.confd 733 BLAKE2B dec494bd35422f57dd8b6d848325933da909000d79b3d319
 AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48e933fa1c67b7beb72281617c3a11d2e379e97a6e57c2378ae8d88fbdb7c80ba3d6e9513833eebd06eff5 SHA512 4f86a81112df1ba15f92bd88999ba632e4a3ba4a6e5a150b2d60a82011bd35f177f86e81a51e95e10b99f4be7698ebd2786ca423635d576872fccec7607c1564
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-1.27.10.tar.gz 15431543 BLAKE2B e6c745e10beed7fa705aa5839440dc3e7fe730348bf7119c853bbd93cfb5e6d5fd920f37b9aec1774c175f24d1a5b70fc921d4222a69a432b6dcb777a6641e97 SHA512 caf24474790b7c40edbca27191a977dfc1009445129abc89cc4f3d0abecd20219d1e82e10947dde03763323d46ce951d1bdfa210189f13cdd9759541e6fdb6c8
-DIST syncthing-1.27.2.tar.gz 14967954 BLAKE2B 8f033e18679f7accc3d461566da88fa45b2e1c8dc1b1b5ace2732e3987d82e8d458c42dc3571f7d1199cf35667be72fcf81b65efa9cd2dac65297bc86b03e284 SHA512 6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9
-DIST syncthing-1.27.6.tar.gz 15147926 BLAKE2B 63003b95f0458ece86aeeff8871ebe591f31ffda713427a7ded9d852a38770514143119983d3b28e82fe570992e1a35b9bcdb5d268fa5d3b4d23073edc2e811b SHA512 2dbffd6002d557cc7ec3beab10d00f0e531d71ba60ed75fc20fd49f3d0c79b28197ed1c6795ef42717d12b8f4f594d1cadc8a67d0925f7f7f1cd20d1baa6edae
-DIST syncthing-1.27.8.tar.gz 15305526 BLAKE2B f3458792f474f661e5420058d9c2991d04b74f5414b8e23c8c8e140e96ac45c7dea72017e3d1349cd8ef3b6a22a64b41f171ba3ac2bdf436a9a3460673ec201d SHA512 9f2d8cd70a8b269553919be07b63cb5dc9e83fe761596a1e1012339b10733f9619b35c532d66b8be1dc1a0888373308b1b6dab0f895c81e994d66c942734cbe6
+DIST syncthing-1.27.12.tar.gz 15553432 BLAKE2B df4ecaacb2986152755bcc6b20570856217b49dcffae45ff9cb3e1bc32eb648eb709fdf79c9051e73eff7b61adcf7078daed1d06d22a0d65061eb99a25b8aa02 SHA512 4e46124936ab7670d2929b0817b014c5d9ab6c94a9ce47368c796ab59b1f03c7da983ade358ae98be7c83fb4b70d2c3a3709827257be9dc61c0d0e113022dd85
 DIST syncthing-1.27.9.tar.gz 15394317 BLAKE2B a7b02c57d897c3fc56734d039e5cf0eceaf802258e3a9fd34d667a9e22ff75db0bd1cf6b8d5be8b8e9d4eb772145222bee7d3154b004c437bbab23f33fb98e66 SHA512 11c56dcf3b44f87581560b4f8f8f76d6ee851fc0421d85f458a32c3900bd0ee6bb2964b7d5253a343d61ba57e3aa40f2f8a94d6f5d5d5b0cf27dc1cc28a14fa1
 EBUILD syncthing-1.27.10.ebuild 2999 BLAKE2B 5e2030658aab20a068f582dc0ee0321dae29dcc993ab51e7ebfadb50addeb4bc82e7ed49d6389e9972af938b12db5555259864b020992a3787c6832a36a1659e SHA512 a33a8d04a774afc559c9c0a1f140d0fb164ffaa001cc2a2d5aceba1521914e5c73b7845c89a4636279f0a1886bea509e5043561ec582353734855d2e1285f913
-EBUILD syncthing-1.27.2.ebuild 2918 BLAKE2B ba78b1eb3e761a50c4111fa2cec4eb9d17eac0f28301cf9f78a812012e8d9193d0c4453e6a2b60e937da66f1e3ab0e0434b24bd9d52d38e57f93aaa51b3c46c0 SHA512 9bcda8e8817123a15dd7121e8c55ec23de3ac4cefde0bd1c98499e12a06c58a4e5cd6c1e6301f03b5ee3baa31a9b39d42fc281e9d5aef2d7989b8add85eba8e7
-EBUILD syncthing-1.27.6.ebuild 2926 BLAKE2B f73738a9865382837eab37ed578ff56dede86eb354680b829bb1331ec6c2367904f869cffc61f2fd338c9450044a7321dc2554877f8ffb47e40331a1485bd8d5 SHA512 d145013488471fe9dff5034402c82012148709a798a24741e3ef1e2ebe7ef2b62075171b91668fe278196680bdbec7689e053c14e4c43bdc22d4cbdf1e4cf161
-EBUILD syncthing-1.27.8.ebuild 2991 BLAKE2B dcc9da06b027ee3f32bd5121fb0ca7bace52d3a2627f11a4e5a71c3a52490a9bce087e96c627c4e7466790e80927f6e44e28d88fb184a4b36aad869cd5ce0d42 SHA512 27f41b61e034922593a6ee4c0768e6ca9365f9494fa0e92967c4cbcea06a73af7a5c8ab5b8afad8a70f47a2b15f274b8537cb5a8a8b6c99e7bd25fcb6fe2568d
+EBUILD syncthing-1.27.12.ebuild 3013 BLAKE2B 5c31e1d648624f3701f1f4d0ba165a63caf28a149c20e47bc29241ca87571d890bf8ea1d98dba6f861e89207c55e7ee35fdca6a23d0bee77b6a5c4112c7a6e38 SHA512 f57af88f87aea3727dc7d32be397c29cb3fe0e060b260489ca9e479246e330f267cf79fa884c4046c6900599c0549716bdedf1ef11347d41f214c5e40bd10e48
 EBUILD syncthing-1.27.9.ebuild 3004 BLAKE2B b5c1513358b5469e2f8e6aecd0abe3dc5d8d70c9627cdf5762ecb79d09ee27fb3367d476e856288cc426005740038b3a74906110f7c633977e35640a733d4016 SHA512 99f296c71df6c689273e425442167b3fd83d588a52b20f7dced18dc73592037aae6b7baeab53eff86467b361a16794e926087f556e969a16c16a8ddd6cde0bfd
 MISC metadata.xml 875 BLAKE2B 55f23b2af63de22383e3ea26f2b5db552b888ec73e086c6d852794b3ac334b91f3e3e83cc38f4448b6d794df8cec442a3627b396c2e2926b32e348f6703356f1 SHA512 4a3d03f16e3376e86f85a2ebe15ade456ee5a577a36f789cec206cf2002cf2dc04e9673c2b316eb50998610fd2e52d8669b11d015ebb7372ba94596e94954dc3
diff --git a/net-p2p/syncthing/syncthing-1.27.8.ebuild b/net-p2p/syncthing/syncthing-1.27.12.ebuild
index bab8a66073d5..7890d7f8bffc 100644
--- a/net-p2p/syncthing/syncthing-1.27.8.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.12.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 inherit desktop go-module systemd xdg-utils
 
 DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
+HOMEPAGE="https://syncthing.net https://github.com/syncthing/syncthing"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v${PV}.tar.gz -> ${P}.tar.gz"
 
 S="${WORKDIR}"/${PN}
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
@@ -21,14 +21,14 @@ RDEPEND="acct-group/syncthing
 	tools? ( >=acct-user/stdiscosrv-1
 		>=acct-user/strelaysrv-1 )
 	selinux? ( sec-policy/selinux-syncthing )"
-BDEPEND=">=dev-lang/go-1.20.0"
+BDEPEND=">=dev-lang/go-1.21.0"
 
 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.27.4-tests_race.patch
+	"${FILESDIR}"/${PN}-1.23.2-tests_race.patch
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
 }
 
 src_compile() {
-	GOARCH= go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \
+	GOARCH= CGO_ENABLED=1 go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \
 		${GOARCH:+-goarch="${GOARCH}"} \
 		build $(usex tools "all" "") || die "build failed"
 }
@@ -70,15 +70,7 @@ src_install() {
 	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_dounit etc/linux-systemd/system/${PN}@.service
 	systemd_douserunit etc/linux-systemd/user/${PN}.service
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
@@ -91,6 +83,12 @@ src_install() {
 	doins etc/firewall-ufw/${PN}
 
 	if use tools; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+
 		systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service
 		newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv
 		newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv
diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild b/net-p2p/syncthing/syncthing-1.27.2.ebuild
deleted file mode 100644
index 5892d724014d..000000000000
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 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.20.0"
-
-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/net-p2p/syncthing/syncthing-1.27.6.ebuild b/net-p2p/syncthing/syncthing-1.27.6.ebuild
deleted file mode 100644
index ba025ac9ffde..000000000000
--- a/net-p2p/syncthing/syncthing-1.27.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 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 ~riscv 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.20.0"
-
-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.27.4-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
-}