gentoo auto-resync : 07:09:2022 - 16:36:21

3 files changed, 114 insertions, 0 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b1891f0ff23b..fd4010c0d199 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 263ed4cb6cf1..88e65d2bf953 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -13,6 +13,9 @@ DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 88e5246217f792c8258f0074ecb3
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114 SHA512 51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e3666672e651f0afc75c26cabbb457f0591d75f89
 DIST syncthing-1.20.4-deps.tar.xz 95873400 BLAKE2B 79b5ee4cbb36f611530ffcaeb5e9650811f80358c36a51d5362c525d86741ee768baa073a167ca184cd3aa5795b01a7a5f1c6648b9f07ca77c868b9152940de4 SHA512 424cca4aafd18b672e0027cbe4dc3895605009c037fc4005bdb48a1cb06be96d8377477ee77ab910478e24db9833d48b34b1d45f83c4792356ae75f5225bc163
 DIST syncthing-1.20.4.tar.gz 6320013 BLAKE2B 0aefc7470be80af12c349572ca14de3e1eb18f2da5ad804e8ee5899da331e4b3c86c8bcb04c3fcc54a7f944551555d6df7ec5fe8f5ce760faf658e9bfd02650b SHA512 a7af905fedc2bbb709df2b05274e7c584ba340f7f6a2f311291d2650cd656ebf567a106be53453dbe889dabac2620deccc8da49cd80dc41c43f45b8016cec193
+DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B 3cbf6d98758a453f16717ec974cb1fdb3ce2e5b2634fcc49a2385f047cf477fad6def173965d3b1b37554d58f95fa73d370a2d1c0a2e58f4b2a8fa580774a2ff SHA512 0d0d4bdfbed7d821364f87f53dee5557f015117b1cf96da9f9e2a9487c7b19a2126b6be8c604370ed4a83ab15612b4386cd1572bf48a673abf5b66c6fde92064
+DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B 390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320 SHA512 ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
 EBUILD syncthing-1.19.2.ebuild 2755 BLAKE2B 430cf79be8dfc730971d324721a335056e778549f922281f3741a8538b97dd6365c623a8391823a0cbf37cbc01a67b1f227f00b6b6043ace14311e1d5854c195 SHA512 d29603e80f0472fe56aab18c485aef9d6cb2fcef4bff1abb93a2ea497b5b043c20a59a8a9207c7fce0c56fbcae91cd456b3bc128ec728ec75ef83779fd0eb70c
 EBUILD syncthing-1.20.4.ebuild 2983 BLAKE2B d02ef4315e470ad00524e194b1ca875c7665a23137816fc944539e6ab2d1a136ffe62cb60b3d5920c4e64ea753728e6ddac48eb8d40d3abe613b3f28594ca9d7 SHA512 40a321219729aa5a45e9c15c0b6e0b24a07e0873c3850780ad96040d8ad24aaca904520a65ee2488658242eb515e653ddc7ccc28204ac1a72609406c30682b1f
+EBUILD syncthing-1.21.0.ebuild 2902 BLAKE2B 0a1e2f08da90723d279aa2efc4baf14d876b1997da4ca214e0eeb4b9fa1dcb831bfda756fc4f7105534b2123a1e7f555d668cc82495a3a285cd52ce00e75201e SHA512 c4d5258e7972ec814d0c2a556e0f50a350e940a1969403e8b2be0f56abf2e11951001d25aaf06da42fdac6dc79176bde5340e275cbb529ebd8118ac44d03b893
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild b/net-p2p/syncthing/syncthing-1.21.0.ebuild
new file mode 100644
index 000000000000..4f3b90d5f252
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -0,0 +1,111 @@
+# 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() {
+	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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}