gentoo resync : 12.05.2022

2 files changed, 106 insertions, 0 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 27652b12721e..0c3144d2c055 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -789,6 +789,9 @@ DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.m
 DIST syncthing-1.18.5.tar.gz 6168905 BLAKE2B 4555351e6bad90cf3fde76971bc500f47f628ed1690f843d7404f47a20bcd4570c8aa7791ebe26c1abfe21550b18e1dc3a6354b98223589e27f8424ab5784bd4 SHA512 10968cdbc7357909bc34e2d82691c2a905c66ef5874eeb93e3b9c9a454df0122551feaf454b916e1ca3363a87f0699628a08f44ab1edecd8fb7d1fa78ef87af5
 DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d SHA512 92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114 SHA512 51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e3666672e651f0afc75c26cabbb457f0591d75f89
+DIST syncthing-1.20.1-deps.tar.xz 206808680 BLAKE2B 2808af40205cf7af25c9ba4d7bc1c181e598ddc3675955c6766eb278b86b30d63ef6aa84b9dfcf5687fa51f4ef596a4ea8067102aeb0fbca83800120570597eb SHA512 4d34abf541db8abd5cfd346b2276465038a5b17de3cd92c77125c0accef842890d18fdb737908bd08fcc9f20cc3ea983365e2c812b7b5b9f1980e7dbd5cd1ac1
+DIST syncthing-1.20.1.tar.gz 6202692 BLAKE2B 7525f7cfc1757ef86b503ccc2be85b29341f9a038eb517b48552aa62cba75a635121b21baf5279964056541af4b3aa8f4c4cbc26de3825953751217333a0434a SHA512 04c5e2daeb7c3076824b4a955b8cc0008e952bce094a62fb656b6c31d6a4c149e1c97eec5e1029d7483a197783599f742272930bde8359361ab18ac6b8b6a292
 EBUILD syncthing-1.18.5.ebuild 45619 BLAKE2B ed836a28c762f7952cda1f43f39c13440cf608103bd7097b804d59d90140201f6e772f30ff7559caa701d404313c77c9219851ea22d82b399e9ed3b9e798d4a6 SHA512 1f6a797777debbfc04368bdfb3a09895b460e3e9afe70c9158bbf61bd88f294fc460e4c975fda45d0ffeadc3c32ecbca97bbe7b8a85a1ba1ccd31507fbb58706
 EBUILD syncthing-1.19.2.ebuild 2719 BLAKE2B 3ca938eddacc33343876319ab01791a8a651adc59d2811df4ed251fe103b513e45e8198566f2db0d226b1ed4ddceb1bd450d355d392eb465f85856046eb9500c SHA512 8cf4b943d176d88cb9059e03067dfd2c7330c5167583b6d6c375abf42045bf7ab9221bcebce1da9d701bd9396d21e498c8cdf1cd6109b4f0225cc97e1bd82cbc
+EBUILD syncthing-1.20.1.ebuild 2719 BLAKE2B 3ca938eddacc33343876319ab01791a8a651adc59d2811df4ed251fe103b513e45e8198566f2db0d226b1ed4ddceb1bd450d355d392eb465f85856046eb9500c SHA512 8cf4b943d176d88cb9059e03067dfd2c7330c5167583b6d6c375abf42045bf7ab9221bcebce1da9d701bd9396d21e498c8cdf1cd6109b4f0225cc97e1bd82cbc
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.20.1.ebuild b/net-p2p/syncthing/syncthing-1.20.1.ebuild
new file mode 100644
index 000000000000..602b88210caa
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.20.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 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}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+)
+
+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
+
+	# We do not need this and it sometimes causes build failures
+	rm -rf cmd/stupgrades
+}
+
+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() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	domenu etc/linux-desktop/*.desktop
+	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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}