subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-p2p\/syncthing\/"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-04-10 Thread Marek Szuba

commit: ad09fdaf443dfa76b4e3c9e743249f56f1f420fc
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr 10 10:12:48 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr 10 10:36:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad09fdaf

net-p2p/syncthing: add 1.27.6, drop 1.27.4

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest | 2 +-
 net-p2p/syncthing/{syncthing-1.27.4.ebuild => syncthing-1.27.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index be04ced4cd13..1dfe1d3b2277 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,2 @@
 DIST syncthing-1.27.2.tar.gz 14967954 BLAKE2B 
8f033e18679f7accc3d461566da88fa45b2e1c8dc1b1b5ace2732e3987d82e8d458c42dc3571f7d1199cf35667be72fcf81b65efa9cd2dac65297bc86b03e284
 SHA512 
6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9
-DIST syncthing-1.27.4.tar.gz 15085218 BLAKE2B 
25a87551f9c1af2b30076fb439a93a26335c63290f1192d2bc040d526fc9b3c2948103db84dd5fcb16d67810b228e23aa3f1e6f9e9a79dbdb75b983ff4376064
 SHA512 
fc28ca066adeccd10281a6ccd50c336942bfbbdaedd954028cc2ee40c09ad85ef0a7fcfe733d3045d6979dd22cddd2fa5979d605440ebe3d2fd90c7f911c3c73
+DIST syncthing-1.27.6.tar.gz 15147926 BLAKE2B 
63003b95f0458ece86aeeff8871ebe591f31ffda713427a7ded9d852a38770514143119983d3b28e82fe570992e1a35b9bcdb5d268fa5d3b4d23073edc2e811b
 SHA512 
2dbffd6002d557cc7ec3beab10d00f0e531d71ba60ed75fc20fd49f3d0c79b28197ed1c6795ef42717d12b8f4f594d1cadc8a67d0925f7f7f1cd20d1baa6edae

diff --git a/net-p2p/syncthing/syncthing-1.27.4.ebuild 
b/net-p2p/syncthing/syncthing-1.27.6.ebuild
similarity index 100%
rename from net-p2p/syncthing/syncthing-1.27.4.ebuild
rename to net-p2p/syncthing/syncthing-1.27.6.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-03-25 Thread Marek Szuba

commit: c25f12bcd836b4be66507748d76c1940967e280d
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 25 10:36:49 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 25 10:36:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25f12bc

net-p2p/syncthing: keyword 1.27.4 for ~riscv

At long last, builds and tests fine.

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.4.ebuild 
b/net-p2p/syncthing/syncthing-1.27.4.ebuild
index b3b0c4165490..496c68046afa 100644
--- a/net-p2p/syncthing/syncthing-1.27.4.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/files/, net-p2p/syncthing/

2024-03-23 Thread Marek Szuba

commit: cdd08394168c0219a13d51cf2f12b991c07509bc
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Mar 23 17:10:42 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Mar 23 17:12:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd08394

net-p2p/syncthing: add 1.27.4

Closes: https://bugs.gentoo.org/927343
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest |   1 +
 .../files/syncthing-1.27.4-tests_race.patch|  24 +
 net-p2p/syncthing/syncthing-1.27.4.ebuild  | 113 +
 3 files changed, 138 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 6eccaa287843..be04ced4cd13 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
 DIST syncthing-1.27.2.tar.gz 14967954 BLAKE2B 
8f033e18679f7accc3d461566da88fa45b2e1c8dc1b1b5ace2732e3987d82e8d458c42dc3571f7d1199cf35667be72fcf81b65efa9cd2dac65297bc86b03e284
 SHA512 
6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9
+DIST syncthing-1.27.4.tar.gz 15085218 BLAKE2B 
25a87551f9c1af2b30076fb439a93a26335c63290f1192d2bc040d526fc9b3c2948103db84dd5fcb16d67810b228e23aa3f1e6f9e9a79dbdb75b983ff4376064
 SHA512 
fc28ca066adeccd10281a6ccd50c336942bfbbdaedd954028cc2ee40c09ad85ef0a7fcfe733d3045d6979dd22cddd2fa5979d605440ebe3d2fd90c7f911c3c73

diff --git a/net-p2p/syncthing/files/syncthing-1.27.4-tests_race.patch 
b/net-p2p/syncthing/files/syncthing-1.27.4-tests_race.patch
new file mode 100644
index ..1c83a03ec00f
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.27.4-tests_race.patch
@@ -0,0 +1,24 @@
+--- a/build.go
 b/build.go
+@@ -34,7 +34,6 @@
+   "time"
+ 
+   _ "github.com/syncthing/syncthing/lib/automaxprocs"
+-  buildpkg "github.com/syncthing/syncthing/lib/build"
+ )
+ 
+ var (
+@@ -416,13 +415,6 @@
+   }
+   args = append(args, "-timeout", timeout)
+ 
+-  if runtime.GOARCH == "amd64" {
+-  switch runtime.GOOS {
+-  case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , 
"windows": # See https://github.com/golang/go/issues/27089
+-  args = append(args, "-race")
+-  }
+-  }
+-
+   if coverage {
+   args = append(args, "-covermode", "atomic", "-coverprofile", 
"coverage.txt", "-coverpkg", strings.Join(pkgs, ","))
+   }

diff --git a/net-p2p/syncthing/syncthing-1.27.4.ebuild 
b/net-p2p/syncthing/syncthing-1.27.4.ebuild
new file mode 100644
index ..b3b0c4165490
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.27.4.ebuild
@@ -0,0 +1,113 @@
+# 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.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
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-15 Thread Marek Szuba

commit: 6486bf82209e475faa36a20f2e0a5ab0fea4120f
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jan 15 15:31:01 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jan 15 15:31:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6486bf82

net-p2p/syncthing: drop 1.26.1

No versions vulnerable to CVE-2023-49295 left in the tree.

Bug: https://bugs.gentoo.org/922059
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 -
 net-p2p/syncthing/syncthing-1.26.1.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index bb3c9f6bc456..6eccaa287843 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1 @@
-DIST syncthing-1.26.1.tar.gz 15020478 BLAKE2B 
679536a4a5cbd5299458253b69308fbffcd20fe25273d05ae91c7ff80af98e486af277855fc6d66a7487b88b3fe532be5f85766dac4c9ab766d199b824de5740
 SHA512 
932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d
 DIST syncthing-1.27.2.tar.gz 14967954 BLAKE2B 
8f033e18679f7accc3d461566da88fa45b2e1c8dc1b1b5ace2732e3987d82e8d458c42dc3571f7d1199cf35667be72fcf81b65efa9cd2dac65297bc86b03e284
 SHA512 
6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
deleted file mode 100644
index d740098c727d..
--- a/net-p2p/syncthing/syncthing-1.26.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.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
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-15 Thread Sam James

commit: c0fc33a9eaf6b5e8b3739686e7dc881464ca3234
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 15 14:01:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 15 14:01:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fc33a9

net-p2p/syncthing: Stabilize 1.27.2 x86, #922105

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
index 500b7d1a085d..205ee1f2e74d 100644
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-15 Thread Sam James

commit: 9b175cd8347425dd05a3eb42634f3d657b73d709
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 15 14:01:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 15 14:01:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b175cd8

net-p2p/syncthing: Stabilize 1.27.2 amd64, #922105

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
index 205ee1f2e74d..5892d724014d 100644
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-14 Thread Sam James

commit: d7413aac127f4f87889c40e4a49167efb596432c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 14 14:36:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 14 14:36:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7413aac

net-p2p/syncthing: Stabilize 1.27.2 arm, #922105

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
index 4bf79f604aa9..500b7d1a085d 100644
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-14 Thread Sam James

commit: 341d565b843ec7a82b98278d4e0f16b721405a8a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 14 14:15:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 14 14:15:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341d565b

net-p2p/syncthing: Stabilize 1.27.2 ppc64, #922105

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
index ca78de917ac8..bac7f5eeae56 100644
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-14 Thread Sam James

commit: bfe1a229406772798bd97800e6628b3782e4537c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 14 14:15:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 14 14:15:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe1a229

net-p2p/syncthing: Stabilize 1.27.2 arm64, #922105

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.27.2.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
index bac7f5eeae56..4bf79f604aa9 100644
--- a/net-p2p/syncthing/syncthing-1.27.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2024-01-14 Thread Marek Szuba

commit: 9f763e4a6da965488e80eca7a9b2aca9d2429074
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jan 14 12:38:56 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jan 14 12:41:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f763e4a

net-p2p/syncthing: add 1.27.2, drop 1.27.1

Guess what, another problem with bundled quic-go.

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest | 2 +-
 net-p2p/syncthing/{syncthing-1.27.1.ebuild => syncthing-1.27.2.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index cc3d0018f627..bb3c9f6bc456 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,2 @@
 DIST syncthing-1.26.1.tar.gz 15020478 BLAKE2B 
679536a4a5cbd5299458253b69308fbffcd20fe25273d05ae91c7ff80af98e486af277855fc6d66a7487b88b3fe532be5f85766dac4c9ab766d199b824de5740
 SHA512 
932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d
-DIST syncthing-1.27.1.tar.gz 14964498 BLAKE2B 
9b7f7657192418235792337be18f21d0801c365fab0386e747531aa952d530a685ce5f04c07d44b6fbd576beb423eea776713e5a767cf77cd913d3dd67f0a04f
 SHA512 
ef343cc6cf1b5a6dd28e787abc196c533ea6aa85590c96941faf56a16d95240eee75262d0fd4c8b6cf44fe99a8cbb485365baafcd11d7a4107372a7b1d1c
+DIST syncthing-1.27.2.tar.gz 14967954 BLAKE2B 
8f033e18679f7accc3d461566da88fa45b2e1c8dc1b1b5ace2732e3987d82e8d458c42dc3571f7d1199cf35667be72fcf81b65efa9cd2dac65297bc86b03e284
 SHA512 
6b6bd57268b32b5db2377cf813229de978e26de606ac3bf2b515ddb35fd8131fafdb88abbfac1cb7d0f443224538cca7a6eba64f4bd737135f5a1c98e76439f9

diff --git a/net-p2p/syncthing/syncthing-1.27.1.ebuild 
b/net-p2p/syncthing/syncthing-1.27.2.ebuild
similarity index 98%
rename from net-p2p/syncthing/syncthing-1.27.1.ebuild
rename to net-p2p/syncthing/syncthing-1.27.2.ebuild
index 6be654e9d91a..ca78de917ac8 100644
--- a/net-p2p/syncthing/syncthing-1.27.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.27.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-27 Thread Marek Szuba

commit: d087715a4ba18fb132954c8b098ad105b0629868
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec 27 15:27:28 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec 27 15:28:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d087715a

net-p2p/syncthing: drop 1.24.0, 1.25.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.24.0.ebuild | 113 --
 net-p2p/syncthing/syncthing-1.25.0.ebuild | 113 --
 3 files changed, 228 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 6200cfb5ad14..cc3d0018f627 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,4 +1,2 @@
-DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B 
aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61
 SHA512 
bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908
-DIST syncthing-1.25.0.tar.gz 15010308 BLAKE2B 
7b6ea7f87e6d77550f659b8839aca2cebecca547058e0a768144e00863bf92f1b67ceffcdbc08e0a51ee62b4d0a93610b9efcb15045f35837021a4c263ff6933
 SHA512 
f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f
 DIST syncthing-1.26.1.tar.gz 15020478 BLAKE2B 
679536a4a5cbd5299458253b69308fbffcd20fe25273d05ae91c7ff80af98e486af277855fc6d66a7487b88b3fe532be5f85766dac4c9ab766d199b824de5740
 SHA512 
932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d
 DIST syncthing-1.27.1.tar.gz 14964498 BLAKE2B 
9b7f7657192418235792337be18f21d0801c365fab0386e747531aa952d530a685ce5f04c07d44b6fbd576beb423eea776713e5a767cf77cd913d3dd67f0a04f
 SHA512 
ef343cc6cf1b5a6dd28e787abc196c533ea6aa85590c96941faf56a16d95240eee75262d0fd4c8b6cf44fe99a8cbb485365baafcd11d7a4107372a7b1d1c

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
deleted file mode 100644
index d740098c727d..
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-26 Thread Sam James

commit: 1e00026c36949399e803a4dce5f50fab544a26ba
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 21:25:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 21:25:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e00026c

net-p2p/syncthing: Stabilize 1.26.1 amd64, #920734

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
index 854da7b0bf75..3bf35f271522 100644
--- a/net-p2p/syncthing/syncthing-1.26.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.26.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-26 Thread Arthur Zamarin

commit: a031b460d32cab9eda87e4aff8e621e88335c2af
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 26 19:25:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 26 19:25:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a031b460

net-p2p/syncthing: Stabilize 1.26.1 ppc64, #920734

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
index 48fdaf4c0513..854da7b0bf75 100644
--- a/net-p2p/syncthing/syncthing-1.26.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.26.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-26 Thread Arthur Zamarin

commit: b77bd51bfe6ee064ce69a6d9e38d7679eb3abbf2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 26 18:45:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 26 18:45:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77bd51b

net-p2p/syncthing: Stabilize 1.26.1 arm, #920734

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
index 797674e39b6c..48fdaf4c0513 100644
--- a/net-p2p/syncthing/syncthing-1.26.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.26.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-26 Thread Arthur Zamarin

commit: 48156b069fecd7457f7b140fc20688177e2c0200
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec 26 18:45:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec 26 18:45:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48156b06

net-p2p/syncthing: Stabilize 1.26.1 arm64, #920734

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
index 6be654e9d91a..797674e39b6c 100644
--- a/net-p2p/syncthing/syncthing-1.26.1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.26.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-12-24 Thread Marek Szuba

commit: 8a11d18443d498eca5f12c70688e45926573a2ea
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 24 18:00:10 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 24 21:06:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a11d184

net-p2p/syncthing: add 1.27.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.27.1.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index adc8e972cd91..6200cfb5ad14 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1,4 @@
 DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B 
aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61
 SHA512 
bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908
 DIST syncthing-1.25.0.tar.gz 15010308 BLAKE2B 
7b6ea7f87e6d77550f659b8839aca2cebecca547058e0a768144e00863bf92f1b67ceffcdbc08e0a51ee62b4d0a93610b9efcb15045f35837021a4c263ff6933
 SHA512 
f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f
 DIST syncthing-1.26.1.tar.gz 15020478 BLAKE2B 
679536a4a5cbd5299458253b69308fbffcd20fe25273d05ae91c7ff80af98e486af277855fc6d66a7487b88b3fe532be5f85766dac4c9ab766d199b824de5740
 SHA512 
932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d
+DIST syncthing-1.27.1.tar.gz 14964498 BLAKE2B 
9b7f7657192418235792337be18f21d0801c365fab0386e747531aa952d530a685ce5f04c07d44b6fbd576beb423eea776713e5a767cf77cd913d3dd67f0a04f
 SHA512 
ef343cc6cf1b5a6dd28e787abc196c533ea6aa85590c96941faf56a16d95240eee75262d0fd4c8b6cf44fe99a8cbb485365baafcd11d7a4107372a7b1d1c

diff --git a/net-p2p/syncthing/syncthing-1.27.1.ebuild 
b/net-p2p/syncthing/syncthing-1.27.1.ebuild
new file mode 100644
index ..6be654e9d91a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.27.1.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.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
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-11-21 Thread Marek Szuba

commit: 76963afd580bf8319fa5d8d43a74d44b84833283
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 21 09:46:09 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 21 10:04:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76963afd

net-p2p/syncthing: add 1.26.1

Closes: https://bugs.gentoo.org/917041
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.26.1.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index aa72f8263191..adc8e972cd91 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,3 @@
 DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B 
aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61
 SHA512 
bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908
 DIST syncthing-1.25.0.tar.gz 15010308 BLAKE2B 
7b6ea7f87e6d77550f659b8839aca2cebecca547058e0a768144e00863bf92f1b67ceffcdbc08e0a51ee62b4d0a93610b9efcb15045f35837021a4c263ff6933
 SHA512 
f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f
+DIST syncthing-1.26.1.tar.gz 15020478 BLAKE2B 
679536a4a5cbd5299458253b69308fbffcd20fe25273d05ae91c7ff80af98e486af277855fc6d66a7487b88b3fe532be5f85766dac4c9ab766d199b824de5740
 SHA512 
932c0faf1d7b9af67474ac4729d867b7495a023459aa59ed5f4210b5cba5ef5561bc82020f6e202dda549086db06c20844e7e5541f136892a8916c25439c754d

diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild 
b/net-p2p/syncthing/syncthing-1.26.1.ebuild
new file mode 100644
index ..6be654e9d91a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.26.1.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.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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-22 Thread Marek Szuba

commit: 425a8c337317682cf800bbbc5fe311229529d940
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Oct 22 10:58:44 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Oct 22 11:03:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425a8c33

net-p2p/syncthing: add 1.25.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.25.0.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 359351066e73..aa72f8263191 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
 DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B 
aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61
 SHA512 
bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908
+DIST syncthing-1.25.0.tar.gz 15010308 BLAKE2B 
7b6ea7f87e6d77550f659b8839aca2cebecca547058e0a768144e00863bf92f1b67ceffcdbc08e0a51ee62b4d0a93610b9efcb15045f35837021a4c263ff6933
 SHA512 
f9f36bd9a98afda1b48c24ded94b1ba8fd8a0b0c426f6335827fc1b0508845d46f05b69aad05d2127afbca5f10c9b0ba40727f8ed68e35616306396a8287500f

diff --git a/net-p2p/syncthing/syncthing-1.25.0.ebuild 
b/net-p2p/syncthing/syncthing-1.25.0.ebuild
new file mode 100644
index ..6be654e9d91a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.25.0.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.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
+}
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-22 Thread Marek Szuba

commit: 80db608c53092de2dfd4e8ac3746bee6dabdc7da
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Oct 22 10:28:44 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Oct 22 11:03:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80db608c

net-p2p/syncthing: drop 1.23.6, 1.23.7

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.23.6.ebuild | 113 --
 net-p2p/syncthing/syncthing-1.23.7.ebuild | 113 --
 3 files changed, 228 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 7679c8cc09f2..359351066e73 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1 @@
-DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B 
ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139
 SHA512 
32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
-DIST syncthing-1.23.7.tar.gz 14314457 BLAKE2B 
61efe4119617d8f63208b6ff579b5008580f3fb33b88d70fcab056cbe505950f0c71050a5e90213aad651b1efdb55bd45eefbcfd0f285a2e9e3b8c2e0ea569e9
 SHA512 
c52a0e80eb572b2f59b0be244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e
 DIST syncthing-1.24.0.tar.gz 18625515 BLAKE2B 
aeff0ab43fca0d6f440e6ccacb1a947e22131d625d8600eebaf9cc285a3ed51ab52cd9f13e64be79e290ba07d6181aafe5176922cf01d24ec65cc0882d1d7a61
 SHA512 
bc53ee04b3454642606047d2009fb9adaafd509d0a4e52a4b6e57565bf502615bfcbc29e15b30733ee8eace62685b00a784347f63c2986ccf90b70631f858908

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
deleted file mode 100644
index 4aa920023bb7..
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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="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="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-19 Thread Sam James

commit: b24700948a2b002b3471277c3155bdc16b45d4fe
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 19 13:34:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 19 13:36:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2470094

net-p2p/syncthing: bdepend on >=dev-lang/go-1.20.0 for 1.24.0

Closes: https://bugs.gentoo.org/916008
Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index 775dfc6ccb00..d740098c727d 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.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.20.0"
 
 DOCS=( README.md AUTHORS CONTRIBUTING.md )

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-09 Thread Sam James

commit: 555640afc1cfb4f2ebf6aae46b5170852e7b94bd
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 21:45:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 21:45:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555640af

net-p2p/syncthing: Stabilize 1.24.0 amd64, #915498

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index 62fcdb4c34f8..775dfc6ccb00 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-09 Thread Sam James

commit: f52ddb780713bc0e2184909675d045f1cf570543
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 20:29:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 20:30:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52ddb78

net-p2p/syncthing: Stabilize 1.24.0 x86, #915498

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index 95c6e03dd98e..62fcdb4c34f8 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-09 Thread Sam James

commit: b23a4c02192340353b29b16ca0bfaafdd6a55e4e
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 20:01:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 20:01:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23a4c02

net-p2p/syncthing: Stabilize 1.24.0 ppc64, #915498

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index 0e2962149322..95c6e03dd98e 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-09 Thread Sam James

commit: e422a71668b36858b3a7f2c4881b4afb2074aa00
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 19:12:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 19:12:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e422a716

net-p2p/syncthing: Stabilize 1.24.0 arm, #915498

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index d8e3bf08df7a..60b0d14fc354 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-10-09 Thread Sam James

commit: c78eaa1dea0e82f2d3de9c879d3e1e42ed178979
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 19:12:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 19:12:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78eaa1d

net-p2p/syncthing: Stabilize 1.24.0 arm64, #915498

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.24.0.ebuild 
b/net-p2p/syncthing/syncthing-1.24.0.ebuild
index 60b0d14fc354..0e2962149322 100644
--- a/net-p2p/syncthing/syncthing-1.24.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.24.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-09-07 Thread Marek Szuba

commit: 8c44d74c8d73fe8b62482574516f8e2e292d6ed4
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  7 09:22:20 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  7 09:27:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c44d74c

net-p2p/syncthing: add 1.24.0

Now with go-1.21 support. Standing by for 1.22 breakage in 3..2..1...

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.24.0.ebuild | 112 ++
 2 files changed, 113 insertions(+)

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 
c52a0e80eb572b2f59b0be244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e
+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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-22 Thread Marek Szuba

commit: 0a58a352f65ff3897b13d838b43d03566520383e
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 22 21:26:26 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 22 21:35:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a58a352

net-p2p/syncthing: drop 1.23.5

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 -
 net-p2p/syncthing/syncthing-1.23.5.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index cdeb9a28c16b..3bcd12763d70 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1,2 @@
-DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B 
e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9
 SHA512 
ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
 DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B 
ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139
 SHA512 
32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
 DIST syncthing-1.23.7.tar.gz 14314457 BLAKE2B 
61efe4119617d8f63208b6ff579b5008580f3fb33b88d70fcab056cbe505950f0c71050a5e90213aad651b1efdb55bd45eefbcfd0f285a2e9e3b8c2e0ea569e9
 SHA512 
c52a0e80eb572b2f59b0be244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
deleted file mode 100644
index 4aa920023bb7..
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-22 Thread Sam James

commit: d6a9838b5ce177c62341cd9e768fa79f623ebbd4
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 22 11:16:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 22 11:16:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a9838b

net-p2p/syncthing: Stabilize 1.23.6 x86, #912752

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index 06ca2574c5b4..4aa920023bb7 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-22 Thread Sam James

commit: 733cc3bfee0626f1de7c6d09e9b586602ed3be42
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 22 10:33:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 22 10:33:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733cc3bf

net-p2p/syncthing: Stabilize 1.23.6 amd64, #912752

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index 6b208134a32b..06ca2574c5b4 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-21 Thread Sam James

commit: 7df036243393eba982e6c253388ccba2f1a7bc47
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 21 17:49:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 21 17:49:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df03624

net-p2p/syncthing: Stabilize 1.23.6 arm64, #912752

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index 09fd57afc441..6b208134a32b 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-21 Thread Sam James

commit: a746f44845d2de7bb2700d08126103578e2023cb
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 21 17:42:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 21 17:42:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a746f448

net-p2p/syncthing: Stabilize 1.23.6 arm, #912752

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index 0108dee3ba34..09fd57afc441 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm ~arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-21 Thread Sam James

commit: 7dcc26dd1539198ce16aa548ecf1ef37bda1eeba
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 21 17:42:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 21 17:42:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dcc26dd

net-p2p/syncthing: Stabilize 1.23.6 ppc64, #912752

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
index 56d37e45d3da..0108dee3ba34 100644
--- a/net-p2p/syncthing/syncthing-1.23.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-12 Thread Marek Szuba

commit: e75def1cd52999d061e2aa93f8dac8f30df97e89
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Aug 12 19:43:13 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Aug 12 21:06:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75def1c

net-p2p/syncthing: add 1.23.7

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.23.7.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index f955a9cb7c60..cdeb9a28c16b 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,3 @@
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B 
e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9
 SHA512 
ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
 DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B 
ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139
 SHA512 
32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796
+DIST syncthing-1.23.7.tar.gz 14314457 BLAKE2B 
61efe4119617d8f63208b6ff579b5008580f3fb33b88d70fcab056cbe505950f0c71050a5e90213aad651b1efdb55bd45eefbcfd0f285a2e9e3b8c2e0ea569e9
 SHA512 
c52a0e80eb572b2f59b0be244ded68e8807ad6d65ecb9b94efa0eaae9c80fcae42e28665b0d0f95aa1018553fdab95f5d52a5dbab8ec700206b5644de28e

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 ..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="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-08-12 Thread Marek Szuba

commit: 5283f10049f4e0abbdb9b2247adfac77cf26441c
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Aug 12 19:39:21 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Aug 12 21:06:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5283f100

net-p2p/syncthing: require https://github.com/syncthing/syncthing/issues/9034) so hopefully we
won't have to wait for a proper resolution.

Closes: https://bugs.gentoo.org/912060
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 1 +
 net-p2p/syncthing/syncthing-1.23.6.ebuild | 1 +
 2 files changed, 2 insertions(+)

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="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-07-10 Thread Marek Szuba

commit: fa8c5289990a70406ac4550a2d9054d2a4a6ee74
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 10 22:19:21 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 10 23:04:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8c5289

net-p2p/syncthing: add 1.23.6

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.23.6.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 4a1eb75f9699..f955a9cb7c60 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B 
e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9
 SHA512 
ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
+DIST syncthing-1.23.6.tar.gz 14213659 BLAKE2B 
ef4f1a8bbf5bce6c7bc9bf80f55c875b5edfd5c10481676ddff9b1579afc518723a28d83424e62a178192f795b30526eca912a3e0d20be1901b065c431acf139
 SHA512 
32162bcf1677015d3359a141968c9e3544c8bd631905489a11bf79f45fa4ae442e8dc0f24c19c2b55defd88b3d5b56ae35d352aac9c09f6b82c50fd8b27fc796

diff --git a/net-p2p/syncthing/syncthing-1.23.6.ebuild 
b/net-p2p/syncthing/syncthing-1.23.6.ebuild
new file mode 100644
index ..d8e3bf08df7a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.6.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() {
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Marek Szuba

commit: 0e69d298d016e0b8c970785bca2e9b3652b11ee8
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jun  8 13:15:14 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jun  8 13:16:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e69d298

net-p2p/syncthing: drop 1.23.4-r1

No versions vulnerable to CVE-2022-46165 left in the tree.

Bug: https://bugs.gentoo.org/908034
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest   |   1 -
 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 112 ---
 2 files changed, 113 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index e6ca187f0ebe..4a1eb75f9699 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1 @@
-DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 
5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94
 SHA512 
cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B 
e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9
 SHA512 
ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
deleted file mode 100644
index 775dfc6ccb00..
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Arthur Zamarin

commit: 0a14322c8966f4440a9c5ee01ab72def214e57c9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 12:22:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 12:22:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a14322c

net-p2p/syncthing: Stabilize 1.23.5 arm, #908046

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index f53fe6f5f0ce..4003d4acb28f 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Arthur Zamarin

commit: 346a87bcccd1ee9dc4c77d550c60731e52aad34d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 12:22:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 12:22:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346a87bc

net-p2p/syncthing: Stabilize 1.23.5 x86, #908046

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index f98a8d8966f5..775dfc6ccb00 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Arthur Zamarin

commit: 952dea6fac92a009ee5aaefc7452920d26fb7802
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 12:22:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 12:22:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952dea6f

net-p2p/syncthing: Stabilize 1.23.5 arm64, #908046

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index 4003d4acb28f..90147b7c4f72 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Arthur Zamarin

commit: cfc6ad0cf1dcb0575fbef635208ae5bef70f8bea
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 12:22:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 12:22:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc6ad0c

net-p2p/syncthing: Stabilize 1.23.5 ppc64, #908046

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index 90147b7c4f72..f98a8d8966f5 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-08 Thread Arthur Zamarin

commit: 1d83344b66335071642f75e877163196fb75e095
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 12:22:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 12:22:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d83344b

net-p2p/syncthing: Stabilize 1.23.5 amd64, #908046

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index d8e3bf08df7a..f53fe6f5f0ce 100644
--- a/net-p2p/syncthing/syncthing-1.23.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-06-07 Thread Marek Szuba

commit: 8a45b5e839415229854940b522cada5a48567aac
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun  7 21:55:43 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun  7 21:55:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a45b5e8

net-p2p/syncthing: add 1.23.5

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.23.5.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index c110d98011cb..e6ca187f0ebe 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
 DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 
5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94
 SHA512 
cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3
+DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B 
e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9
 SHA512 
ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc

diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild 
b/net-p2p/syncthing/syncthing-1.23.5.ebuild
new file mode 100644
index ..d8e3bf08df7a
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.5.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() {
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-09 Thread Marek Szuba

commit: 69a989620e94e8161450305eeb78ed634b248284
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue May  9 13:38:06 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue May  9 13:38:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a98962

net-p2p/syncthing: drop 1.23.2

Bye-bye vendor tarballs!

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.23.2.ebuild | 112 --
 2 files changed, 114 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 6e1d1b72b486..c110d98011cb 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,3 +1 @@
-DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B 
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
 SHA512 
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
-DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B 
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
 SHA512 
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d
 DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 
5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94
 SHA512 
cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
deleted file mode 100644
index 7016139c791e..
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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}/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 ~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
-)
-
-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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-05 Thread Arthur Zamarin

commit: abff3f4e3715fb17e7f30c76cb9e94f2586c4c9f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 09:35:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 09:35:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abff3f4e

net-p2p/syncthing: Stabilize 1.23.4-r1 arm64, #905702

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index 80659dfd4d44..775dfc6ccb00 100644
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-04 Thread Jakov Smolić

commit: fef111cb4ee17b08dd858a78fe7c0f6ab293c1fb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  4 19:09:27 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  4 19:09:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef111cb

net-p2p/syncthing: Stabilize 1.23.4-r1 amd64, #905702

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index b63f5ad087ca..80659dfd4d44 100644
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-04 Thread Arthur Zamarin

commit: 9323ebf4f075596a9cd9c938ea025eeac100a735
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 18:53:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 18:53:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9323ebf4

net-p2p/syncthing: Stabilize 1.23.4-r1 ppc64, #905702

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index fcdde4a01b58..b63f5ad087ca 100644
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm ~arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-04 Thread Arthur Zamarin

commit: 913338e32e0cd0e35d1a50698aa78614afc0ed94
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 18:40:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 18:40:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913338e3

net-p2p/syncthing: Stabilize 1.23.4-r1 x86, #905702

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index 60b0d14fc354..fcdde4a01b58 100644
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-04 Thread Arthur Zamarin

commit: c316186dbea55b425e3ad732634188753daa1d35
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 15:23:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 15:23:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c316186d

net-p2p/syncthing: Stabilize 1.23.4-r1 arm, #905702

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index d8e3bf08df7a..60b0d14fc354 100644
--- a/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 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"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-05-04 Thread Marek Szuba

commit: 21bcbf1b7363f0345f4e27cce032cfcd40795a64
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu May  4 14:07:28 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu May  4 14:08:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bcbf1b

net-p2p/syncthing: update icon cache

Closes: https://bugs.gentoo.org/905585
Signed-off-by: Marek Szuba  gentoo.org>

 .../syncthing/{syncthing-1.23.4.ebuild => syncthing-1.23.4-r1.ebuild}   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-p2p/syncthing/syncthing-1.23.4.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
similarity index 98%
rename from net-p2p/syncthing/syncthing-1.23.4.ebuild
rename to net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
index f16df5f58ff0..d8e3bf08df7a 100644
--- a/net-p2p/syncthing/syncthing-1.23.4.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.4-r1.ebuild
@@ -103,8 +103,10 @@ src_install() {
 
 pkg_postinst() {
xdg_desktop_database_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
xdg_desktop_database_update
+   xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-16 Thread Marek Szuba

commit: 54d60a9683bd4b4b6aa545d4de6afda59f897de0
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Apr 16 19:35:37 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Apr 16 19:35:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d60a96

net-p2p/syncthing: drop 1.21.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.21.0.ebuild | 112 --
 2 files changed, 114 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index eb298a22efd3..6e1d1b72b486 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,5 +1,3 @@
-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
 DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B 
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
 SHA512 
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
 DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B 
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
 SHA512 
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d
 DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 
5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94
 SHA512 
cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
deleted file mode 100644
index 48a816e848bb..
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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}/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 )"
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-11 Thread Arthur Zamarin

commit: 5af0743413ac74d00bd94c50d32d851fd8c7cfd8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 11 18:24:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 11 18:24:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af07434

net-p2p/syncthing: Stabilize 1.23.2 amd64, #904108

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
index a5ca8215560c..7016139c791e 100644
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-11 Thread Arthur Zamarin

commit: 38f526ecda1a85da72435f6423402346affd5abb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 11 18:17:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 11 18:17:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f526ec

net-p2p/syncthing: Stabilize 1.23.2 x86, #904108

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
index 10d8d48cee24..a5ca8215560c 100644
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-10 Thread Sam James

commit: 77e6f7135e845b5e4b3b5bffb5f6f17cff4e1ec1
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 10:51:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 10:51:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e6f713

net-p2p/syncthing: Stabilize 1.23.2 ppc64, #904108

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
index fb88afde436a..10d8d48cee24 100644
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-10 Thread Sam James

commit: 6b94f67a8d81fdbcda724cc18ac69f60c3a75d5a
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 10:39:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 10:39:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b94f67a

net-p2p/syncthing: Stabilize 1.23.2 arm, #904108

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
index 9dce310b16db..fb88afde436a 100644
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-10 Thread Sam James

commit: d31aa09f0ff8463249765242a3f155d3fd3dc783
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 10:37:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 10:37:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31aa09f

net-p2p/syncthing: Stabilize 1.23.2 arm64, #904108

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.23.2.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
index b0131fe7f83f..9dce310b16db 100644
--- a/net-p2p/syncthing/syncthing-1.23.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-04-05 Thread Marek Szuba

commit: f98aba37d7a628b7954253d63345bbe37c13ae76
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr  5 21:19:47 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr  5 21:20:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98aba37

net-p2p/syncthing: add 1.23.4

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   1 +
 net-p2p/syncthing/syncthing-1.23.4.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 83f2ee51dcec..eb298a22efd3 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,3 +2,4 @@ DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B 
3cbf6d98758a453f16717ec974cb1
 DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B 
390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320
 SHA512 
ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
 DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B 
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
 SHA512 
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
 DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B 
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
 SHA512 
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d
+DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 
5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94
 SHA512 
cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3

diff --git a/net-p2p/syncthing/syncthing-1.23.4.ebuild 
b/net-p2p/syncthing/syncthing-1.23.4.ebuild
new file mode 100644
index ..f16df5f58ff0
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.4.ebuild
@@ -0,0 +1,110 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-03-25 Thread Marek Szuba

commit: 4a983b0440b04fabd7aa7394181a9980242557af
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Mar 25 21:54:10 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Mar 25 21:54:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a983b04

net-p2p/syncthing: drop 1.22.2

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.22.2.ebuild | 112 --
 2 files changed, 114 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index e57788d6ba60..83f2ee51dcec 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,6 +1,4 @@
 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
-DIST syncthing-1.22.2-deps.tar.xz 101162440 BLAKE2B 
74e846b191ca7aefdaca4784d2c4c3ed3d412695820dff2280c13c8c2c498a746b54210ca3bbc310fbd8693c8dedbab5bf51078ff01e345bd0ced54559b76106
 SHA512 
b9e23e1d50bc27ffab1e66f08a67b910fa3c869e514f68c17cae73d717f4a0452b93ad7d0a6ec475f4e1055a6d4d85bcd8e7f85692a6088baa96e2af710739c0
-DIST syncthing-1.22.2.tar.gz 6339424 BLAKE2B 
69a6350a5166af8cd670090b440fb9b932a6d1169fc649588277d90aff305604302bc368b61f542252b06b5212c1c094f720e39c1be6f8375fc7e8f8d2f7bdef
 SHA512 
5b724beb139ec2701222cf77c540cb3f4525db3b1102ccc9ac55829dda668e7fe4b962c7263fbe6bc4efa813d0e783486a7b329f903ded1cef47be585c1e8787
 DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B 
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
 SHA512 
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
 DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B 
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
 SHA512 
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d

diff --git a/net-p2p/syncthing/syncthing-1.22.2.ebuild 
b/net-p2p/syncthing/syncthing-1.22.2.ebuild
deleted file mode 100644
index 9284130b9c50..
--- a/net-p2p/syncthing/syncthing-1.22.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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}/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 ~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="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/files/, net-p2p/syncthing/

2023-03-08 Thread Marek Szuba

commit: 258b078422e2aad516119787da45a8c2d8c0aa78
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Mar  8 11:32:23 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Mar  8 13:22:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258b0784

net-p2p/syncthing: add 1.23.2, drop 1.23.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest |  4 ++--
 .../files/syncthing-1.23.2-tests_race.patch| 25 ++
 ...thing-1.23.0.ebuild => syncthing-1.23.2.ebuild} |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 7da9131d05eb..e57788d6ba60 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,5 +2,5 @@ DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B 
3cbf6d98758a453f16717ec974cb1
 DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B 
390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320
 SHA512 
ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
 DIST syncthing-1.22.2-deps.tar.xz 101162440 BLAKE2B 
74e846b191ca7aefdaca4784d2c4c3ed3d412695820dff2280c13c8c2c498a746b54210ca3bbc310fbd8693c8dedbab5bf51078ff01e345bd0ced54559b76106
 SHA512 
b9e23e1d50bc27ffab1e66f08a67b910fa3c869e514f68c17cae73d717f4a0452b93ad7d0a6ec475f4e1055a6d4d85bcd8e7f85692a6088baa96e2af710739c0
 DIST syncthing-1.22.2.tar.gz 6339424 BLAKE2B 
69a6350a5166af8cd670090b440fb9b932a6d1169fc649588277d90aff305604302bc368b61f542252b06b5212c1c094f720e39c1be6f8375fc7e8f8d2f7bdef
 SHA512 
5b724beb139ec2701222cf77c540cb3f4525db3b1102ccc9ac55829dda668e7fe4b962c7263fbe6bc4efa813d0e783486a7b329f903ded1cef47be585c1e8787
-DIST syncthing-1.23.0-deps.tar.xz 101340488 BLAKE2B 
00dc20c5b2aee91bb84a9014ac7ff38828aa8faa396a3567dbb3469409f22566a36bf50a6dc20ddd38803e3f0a1d7229a1e685328cc4a6e4285a808f29f14eb8
 SHA512 
2fcdc7dd29c75d2f1ee0e385f2d1728021acd32e06f7e48013ba54615b4793ae033e1f05e607925618b095388bb48b78f14561e5866a285a9e7e7659c26caff1
-DIST syncthing-1.23.0.tar.gz 6342650 BLAKE2B 
165b7bceb88a5ba8443b1393c50b28c6c4dbc7cdd74383ff7718d5594050703e2f6bd66c41c00cd7bf35fe54ff85c9837fb9f59c578eb71acb588b078faa074d
 SHA512 
b0122923ad3ed4cc50aafe89bb94e13b44998483db0b1df795e05ff17bcbc029a17ed3af187b615154cf88d4c964cb5bdb84e25b6f5548ccf29545b6d2a1cd4f
+DIST syncthing-1.23.2-deps.tar.xz 101786324 BLAKE2B 
5ab47ce288ece8ef53a14f3769650ba945c4b0cb8c314964694690c4d6b34c4161ccd256deae1a29bd97f0441610810dbb9af6dd9b90786c709a03adb1a6f511
 SHA512 
94fb5031ce471af2ed462d83bdfff8c290df8e83917e09c5571ef1e585fe3a9c4d4b4119b529b5af974be58b7e92c1e07c17fe9810d0d9c011323f344f37f83e
+DIST syncthing-1.23.2.tar.gz 6529048 BLAKE2B 
cda30a17000c5cf59b90d68148c0b375c36145e3d497409c49060cddcee794951bd72e8d0f97be7b66cb5c595c2d7232b64b06df2d9a37a48e02d614367cf8c0
 SHA512 
3f182aad9714d299205a0379d32121adb018d5d7fb31f199a108f1a6b7822452e1b10a27c05516d232004469a1f20f086465fbbc163f10ed9375273a8b90ff9d

diff --git a/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch 
b/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch
new file mode 100644
index ..8d9e6819d101
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.23.2-tests_race.patch
@@ -0,0 +1,25 @@
+--- a/build.go
 b/build.go
+@@ -32,8 +32,6 @@
+   "strings"
+   "text/template"
+   "time"
+-
+-  buildpkg "github.com/syncthing/syncthing/lib/build"
+ )
+ 
+ var (
+@@ -409,13 +409,6 @@
+   }
+   args = append(args, "-timeout", timeout)
+ 
+-  if runtime.GOARCH == "amd64" {
+-  switch runtime.GOOS {
+-  case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , 
"windows": # See https://github.com/golang/go/issues/27089
+-  args = append(args, "-race")
+-  }
+-  }
+-
+   if coverage {
+   args = append(args, "-covermode", "atomic", "-coverprofile", 
"coverage.txt", "-coverpkg", strings.Join(pkgs, ","))
+   }

diff --git a/net-p2p/syncthing/syncthing-1.23.0.ebuild 
b/net-p2p/syncthing/syncthing-1.23.2.ebuild
similarity index 98%
rename from net-p2p/syncthing/syncthing-1.23.0.ebuild
rename to net-p2p/syncthing/syncthing-1.23.2.ebuild
index 9284130b9c50..b0131fe7f83f 100644
--- a/net-p2p/syncthing/syncthing-1.23.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.23.2.ebuild
@@ -20,13 +20,13 @@ RDEPEND="acct-group/syncthing
tools? ( >=acct-user/stdiscosrv-1
>=acct-user/strelaysrv-1 )
selinux? ( sec-policy/selinux-syncthing )"
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-02-02 Thread William Hubbs

commit: 74030a590a1be5655920aa9c26a07e5cb73a43b5
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Feb  3 06:08:12 2023 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Feb  3 06:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74030a59

net-p2p/syncthing: set bdepend for < go 1.20

Bug: https://bugs.gentoo.org/892978
Signed-off-by: William Hubbs  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 3 ++-
 net-p2p/syncthing/syncthing-1.22.2.ebuild | 3 ++-
 net-p2p/syncthing/syncthing-1.23.0.ebuild | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 08426c842e6e..48a816e848bb 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,6 +20,7 @@ RDEPEND="acct-group/syncthing
tools? ( >=acct-user/stdiscosrv-1
>=acct-user/strelaysrv-1 )
selinux? ( sec-policy/selinux-syncthing )"
+BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2023-01-19 Thread Marek Szuba

commit: 2e9def0bf12cf714e5804ee5199bfd597e67199a
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jan 19 10:00:41 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jan 19 10:38:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9def0b

net-p2p/syncthing: add 1.23.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.23.0.ebuild | 111 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index e97fbacd4aa8..7da9131d05eb 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,3 +2,5 @@ DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B 
3cbf6d98758a453f16717ec974cb1
 DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B 
390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320
 SHA512 
ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
 DIST syncthing-1.22.2-deps.tar.xz 101162440 BLAKE2B 
74e846b191ca7aefdaca4784d2c4c3ed3d412695820dff2280c13c8c2c498a746b54210ca3bbc310fbd8693c8dedbab5bf51078ff01e345bd0ced54559b76106
 SHA512 
b9e23e1d50bc27ffab1e66f08a67b910fa3c869e514f68c17cae73d717f4a0452b93ad7d0a6ec475f4e1055a6d4d85bcd8e7f85692a6088baa96e2af710739c0
 DIST syncthing-1.22.2.tar.gz 6339424 BLAKE2B 
69a6350a5166af8cd670090b440fb9b932a6d1169fc649588277d90aff305604302bc368b61f542252b06b5212c1c094f720e39c1be6f8375fc7e8f8d2f7bdef
 SHA512 
5b724beb139ec2701222cf77c540cb3f4525db3b1102ccc9ac55829dda668e7fe4b962c7263fbe6bc4efa813d0e783486a7b329f903ded1cef47be585c1e8787
+DIST syncthing-1.23.0-deps.tar.xz 101340488 BLAKE2B 
00dc20c5b2aee91bb84a9014ac7ff38828aa8faa396a3567dbb3469409f22566a36bf50a6dc20ddd38803e3f0a1d7229a1e685328cc4a6e4285a808f29f14eb8
 SHA512 
2fcdc7dd29c75d2f1ee0e385f2d1728021acd32e06f7e48013ba54615b4793ae033e1f05e607925618b095388bb48b78f14561e5866a285a9e7e7659c26caff1
+DIST syncthing-1.23.0.tar.gz 6342650 BLAKE2B 
165b7bceb88a5ba8443b1393c50b28c6c4dbc7cdd74383ff7718d5594050703e2f6bd66c41c00cd7bf35fe54ff85c9837fb9f59c578eb71acb588b078faa074d
 SHA512 
b0122923ad3ed4cc50aafe89bb94e13b44998483db0b1df795e05ff17bcbc029a17ed3af187b615154cf88d4c964cb5bdb84e25b6f5548ccf29545b6d2a1cd4f

diff --git a/net-p2p/syncthing/syncthing-1.23.0.ebuild 
b/net-p2p/syncthing/syncthing-1.23.0.ebuild
new file mode 100644
index ..31dc10e28ac6
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.23.0.ebuild
@@ -0,0 +1,111 @@
+# 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}/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 ~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
+)
+
+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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-12-16 Thread WANG Xuerui

commit: fa71401105577f98f3186a7da0f7437ae59477ab
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Dec 13 06:14:45 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat Dec 17 06:38:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa714011

net-p2p/syncthing: keyword 1.22.2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-p2p/syncthing/syncthing-1.22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.22.2.ebuild 
b/net-p2p/syncthing/syncthing-1.22.2.ebuild
index 4f3b90d5f252..30c491a557cd 100644
--- a/net-p2p/syncthing/syncthing-1.22.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.22.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-12-12 Thread Marek Szuba

commit: 7b32ecb784fb2bce55a88fb14eeb48e5b88d9e90
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Dec 12 22:45:27 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Dec 12 22:45:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b32ecb7

net-p2p/syncthing: add 1.22.2, drop 1.22.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest| 4 ++--
 .../syncthing/{syncthing-1.22.1.ebuild => syncthing-1.22.2.ebuild}| 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 9eb675ff0bc1..e97fbacd4aa8 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,4 +1,4 @@
 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
-DIST syncthing-1.22.1-deps.tar.xz 96691264 BLAKE2B 
6e53008ea0fc1fd719db4be4f9430fd805f59babb86d47f933f470bfa27757c50bea907ac9fd5290ef9180375e1bc747cd4b3c426406944f2b1eab16a24b58df
 SHA512 
974c880bbac0712254387d9c24a7c72b6d6683005bafc649b7994dd676a906cb9eff5efeb70704e7c5b053e368a026db38efd8f5f78415d299e49b7f8dcd772c
-DIST syncthing-1.22.1.tar.gz 6332134 BLAKE2B 
d05af17fdff2c3b4bee63aea550d38dac71637f862daaf350ff1fa50d9815039a49e1ba1c18a9062e7fe962006ca62c3335739923a6e0efc3867c19339b2841e
 SHA512 
6f1f83f489bc6e155fef4ed6e876d2afe63f1b6233c324a0fe77702118df11c4b8d3c61e11dbff79ead8f0d12a4abe3af9fa7659dd72ba2c83fee2f524d7a780
+DIST syncthing-1.22.2-deps.tar.xz 101162440 BLAKE2B 
74e846b191ca7aefdaca4784d2c4c3ed3d412695820dff2280c13c8c2c498a746b54210ca3bbc310fbd8693c8dedbab5bf51078ff01e345bd0ced54559b76106
 SHA512 
b9e23e1d50bc27ffab1e66f08a67b910fa3c869e514f68c17cae73d717f4a0452b93ad7d0a6ec475f4e1055a6d4d85bcd8e7f85692a6088baa96e2af710739c0
+DIST syncthing-1.22.2.tar.gz 6339424 BLAKE2B 
69a6350a5166af8cd670090b440fb9b932a6d1169fc649588277d90aff305604302bc368b61f542252b06b5212c1c094f720e39c1be6f8375fc7e8f8d2f7bdef
 SHA512 
5b724beb139ec2701222cf77c540cb3f4525db3b1102ccc9ac55829dda668e7fe4b962c7263fbe6bc4efa813d0e783486a7b329f903ded1cef47be585c1e8787

diff --git a/net-p2p/syncthing/syncthing-1.22.1.ebuild 
b/net-p2p/syncthing/syncthing-1.22.2.ebuild
similarity index 100%
rename from net-p2p/syncthing/syncthing-1.22.1.ebuild
rename to net-p2p/syncthing/syncthing-1.22.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-11-04 Thread Marek Szuba

commit: be18d536d02e43ba654b1d9425e14311d383cd6e
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov  5 00:23:13 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov  5 00:24:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be18d536

net-p2p/syncthing: add 1.22.1, drop 1.22.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest| 4 ++--
 .../syncthing/{syncthing-1.22.0.ebuild => syncthing-1.22.1.ebuild}| 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 0c5f690a21a1..9eb675ff0bc1 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,4 +1,4 @@
 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
-DIST syncthing-1.22.0-deps.tar.xz 97369828 BLAKE2B 
ad8fbaf51f6d07f1f034e52c457c4a6da432faee43cb66fe23c77a49d01e333403616aadd7643bcbbcef6403e3574a0a30dbf0e6bffb196ae30ba1bc70602577
 SHA512 
da054614abed605b54bbdb189d9c352a887c817c72f123fc6dde66923fc7d0bed551055c17eae4b88f1f347c3f85362b436267bb2ac9adb8297c325d9b38
-DIST syncthing-1.22.0.tar.gz 6345841 BLAKE2B 
96c17290c971224d90be661cb80f95fceddee61dd9c90437d051ac48954802fd66ae0178f784238e99f0c63cdaf5c12768bcd679bb91a4728fa86536a24f90a7
 SHA512 
151119ad526e4c9cddb6889449c43fcc7f91dd3c4bd44cb5e4f40839c55202d8fcd8dff9212e4f0fdf0176c97dfe904d3cf68fdd7c609942344a13f534652c0d
+DIST syncthing-1.22.1-deps.tar.xz 96691264 BLAKE2B 
6e53008ea0fc1fd719db4be4f9430fd805f59babb86d47f933f470bfa27757c50bea907ac9fd5290ef9180375e1bc747cd4b3c426406944f2b1eab16a24b58df
 SHA512 
974c880bbac0712254387d9c24a7c72b6d6683005bafc649b7994dd676a906cb9eff5efeb70704e7c5b053e368a026db38efd8f5f78415d299e49b7f8dcd772c
+DIST syncthing-1.22.1.tar.gz 6332134 BLAKE2B 
d05af17fdff2c3b4bee63aea550d38dac71637f862daaf350ff1fa50d9815039a49e1ba1c18a9062e7fe962006ca62c3335739923a6e0efc3867c19339b2841e
 SHA512 
6f1f83f489bc6e155fef4ed6e876d2afe63f1b6233c324a0fe77702118df11c4b8d3c61e11dbff79ead8f0d12a4abe3af9fa7659dd72ba2c83fee2f524d7a780

diff --git a/net-p2p/syncthing/syncthing-1.22.0.ebuild 
b/net-p2p/syncthing/syncthing-1.22.1.ebuild
similarity index 100%
rename from net-p2p/syncthing/syncthing-1.22.0.ebuild
rename to net-p2p/syncthing/syncthing-1.22.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-11 Thread Marek Szuba

commit: 2b1eb6624b94ab6d6532d7ee4102efdd46b00580
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 11 09:18:22 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 11 09:18:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1eb662

net-p2p/syncthing: drop 1.19.2

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.19.2.ebuild | 105 --
 2 files changed, 107 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 57c3ef1213e1..0c5f690a21a1 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,5 +1,3 @@
-DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
-DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
 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
 DIST syncthing-1.22.0-deps.tar.xz 97369828 BLAKE2B 
ad8fbaf51f6d07f1f034e52c457c4a6da432faee43cb66fe23c77a49d01e333403616aadd7643bcbbcef6403e3574a0a30dbf0e6bffb196ae30ba1bc70602577
 SHA512 
da054614abed605b54bbdb189d9c352a887c817c72f123fc6dde66923fc7d0bed551055c17eae4b88f1f347c3f85362b436267bb2ac9adb8297c325d9b38

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
deleted file mode 100644
index 7425a1b095db..
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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 )"
-# Bug #86348
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-10 Thread Agostino Sarubbo

commit: 83fe34e369d998f8521f5465bac79442f07be9ba
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 10 07:02:45 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 10 07:02:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fe34e3

net-p2p/syncthing: Stabilize 1.21.0 amd64, #874780

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 75d86441c3cd..08426c842e6e 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-09 Thread Agostino Sarubbo

commit: c608f338275b0b9b2592223149ab881d2c3f9cf9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:54:16 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:54:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c608f338

net-p2p/syncthing: Stabilize 1.21.0 x86, #874780

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 39f0d8283dd2..75d86441c3cd 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-09 Thread Agostino Sarubbo

commit: 216249f665769e22e8d126b065c32fc1ba482ce5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:51:37 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:51:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216249f6

net-p2p/syncthing: Stabilize 1.21.0 ppc64, #874780

Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 60f6e323b5fe..39f0d8283dd2 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-08 Thread Sam James

commit: c284411bf745751450297131416529faf1b51177
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 23:10:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 23:10:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c284411b

net-p2p/syncthing: Stabilize 1.21.0 arm64, #874780

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 1b4ec6ec2d75..60f6e323b5fe 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-08 Thread Sam James

commit: 1fa3c17b199bc84d18502a266789ae7d83103560
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 23:10:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 23:10:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa3c17b

net-p2p/syncthing: Stabilize 1.21.0 arm, #874780

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.21.0.ebuild 
b/net-p2p/syncthing/syncthing-1.21.0.ebuild
index 4f3b90d5f252..1b4ec6ec2d75 100644
--- a/net-p2p/syncthing/syncthing-1.21.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-04 Thread Marek Szuba

commit: 90ac7015750e6c20b86e7f3aa9a1a976cc2d2caa
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct  4 12:19:24 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct  4 12:50:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ac7015

net-p2p/syncthing: add 1.22.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.22.0.ebuild | 111 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 9026c1ecd31a..57c3ef1213e1 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,3 +2,5 @@ DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
 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
+DIST syncthing-1.22.0-deps.tar.xz 97369828 BLAKE2B 
ad8fbaf51f6d07f1f034e52c457c4a6da432faee43cb66fe23c77a49d01e333403616aadd7643bcbbcef6403e3574a0a30dbf0e6bffb196ae30ba1bc70602577
 SHA512 
da054614abed605b54bbdb189d9c352a887c817c72f123fc6dde66923fc7d0bed551055c17eae4b88f1f347c3f85362b436267bb2ac9adb8297c325d9b38
+DIST syncthing-1.22.0.tar.gz 6345841 BLAKE2B 
96c17290c971224d90be661cb80f95fceddee61dd9c90437d051ac48954802fd66ae0178f784238e99f0c63cdaf5c12768bcd679bb91a4728fa86536a24f90a7
 SHA512 
151119ad526e4c9cddb6889449c43fcc7f91dd3c4bd44cb5e4f40839c55202d8fcd8dff9212e4f0fdf0176c97dfe904d3cf68fdd7c609942344a13f534652c0d

diff --git a/net-p2p/syncthing/syncthing-1.22.0.ebuild 
b/net-p2p/syncthing/syncthing-1.22.0.ebuild
new file mode 100644
index ..4f3b90d5f252
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.22.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}"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-10-03 Thread Marek Szuba

commit: d581b10476b8480129ac04b2615dd07bb4723a09
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct  4 00:47:41 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct  4 00:52:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d581b104

net-p2p/syncthing: drop 1.20.4

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.20.4.ebuild | 113 --
 2 files changed, 115 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 004b504bab53..9026c1ecd31a 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,6 +1,4 @@
 DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
-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

diff --git a/net-p2p/syncthing/syncthing-1.20.4.ebuild 
b/net-p2p/syncthing/syncthing-1.20.4.ebuild
deleted file mode 100644
index 5d5f0fcee8c1..
--- a/net-p2p/syncthing/syncthing-1.20.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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 )"
-# Bug #863488. Will no longer be needed come 1.21.0.
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-09-07 Thread Marek Szuba

commit: 0b273099509f16f8127be5b93c7f7b1698188d7b
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Sep  7 10:11:04 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Sep  7 12:26:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b273099

net-p2p/syncthing: add 1.21.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.21.0.ebuild | 111 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 7cf0975a8ee1..004b504bab53 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,3 +2,5 @@ DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
 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

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 ..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}"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-09-01 Thread Marek Szuba

commit: 2885917f0f95ff17cc722867b160d0da0a64389d
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  1 15:20:24 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  1 15:34:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2885917f

net-p2p/syncthing: drop 1.20.2, 1.20.3

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   4 --
 net-p2p/syncthing/syncthing-1.20.2.ebuild | 105 ---
 net-p2p/syncthing/syncthing-1.20.3.ebuild | 113 --
 3 files changed, 222 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 8a9cf07bedf6..7cf0975a8ee1 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,8 +1,4 @@
 DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
-DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B 
ddac0c324dc9fedfebb4e7b261dbee301c8fafb473f46959f11df64a311ef32fd7c5dfe3857c0993ee895bb1f92810dd304b95a91447876c2078a4b3f526c393
 SHA512 
fb060910a33a83f5fdeab01889acf02cd8717e2906eaa34c175882b7b664ae24c1a4d3fba1d112dd01d03ff215c2c40419eda4293bba9e8e31a717a59168838b
-DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 
4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918
 SHA512 
f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137
-DIST syncthing-1.20.3-deps.tar.xz 96198124 BLAKE2B 
196bffdd1004a00545c046ac3f3f4a2db3f5c779c3e9d0f1fbe1417f8cd27f6b8969a7c4f8c515ad85abad9391b5dbf9b64a6acf949f17b982e6465658d296d2
 SHA512 
5f8b52af226c2e86be84bb5dfe06a1e76d21f90aaf84cd44d9724cb0c0f918bb80c88fe0fe2c70ff6942626659492ceb5b3d618efa65d401f63eeff8ab6052a0
-DIST syncthing-1.20.3.tar.gz 6304903 BLAKE2B 
61534220a633c8cf9b99e60a43032834874bdf6f3cfd26c81b578148a22ac0d3443f112e5763e3fb916cfea6d7f55564bdfec967e8fa83f0c9502f1dbbe8689c
 SHA512 
429fb13de8b34459794d7c9dff66abe0e6c12086a27af71d90934c2ac09f2a332a103eaa7149baa0b1920ddb676380ab2c0fbcc025d80d032dd7d8d67284328a
 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

diff --git a/net-p2p/syncthing/syncthing-1.20.2.ebuild 
b/net-p2p/syncthing/syncthing-1.20.2.ebuild
deleted file mode 100644
index cf1dfef89e20..
--- a/net-p2p/syncthing/syncthing-1.20.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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 )"
-# Bug #86348
-BDEPEND="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 )"
-# Bug #86348
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-08-24 Thread Marek Szuba

commit: 224231cbddca4442b921558a4a5633b0e28ec81a
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Aug 24 15:26:12 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Aug 24 15:36:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224231cb

net-p2p/syncthing: add 1.20.4

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.20.4.ebuild | 113 ++
 2 files changed, 115 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 0993fc270020..8a9cf07bedf6 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -4,3 +4,5 @@ DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B 
ddac0c324dc9fedfebb4e7b261dbe
 DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 
4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918
 SHA512 
f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137
 DIST syncthing-1.20.3-deps.tar.xz 96198124 BLAKE2B 
196bffdd1004a00545c046ac3f3f4a2db3f5c779c3e9d0f1fbe1417f8cd27f6b8969a7c4f8c515ad85abad9391b5dbf9b64a6acf949f17b982e6465658d296d2
 SHA512 
5f8b52af226c2e86be84bb5dfe06a1e76d21f90aaf84cd44d9724cb0c0f918bb80c88fe0fe2c70ff6942626659492ceb5b3d618efa65d401f63eeff8ab6052a0
 DIST syncthing-1.20.3.tar.gz 6304903 BLAKE2B 
61534220a633c8cf9b99e60a43032834874bdf6f3cfd26c81b578148a22ac0d3443f112e5763e3fb916cfea6d7f55564bdfec967e8fa83f0c9502f1dbbe8689c
 SHA512 
429fb13de8b34459794d7c9dff66abe0e6c12086a27af71d90934c2ac09f2a332a103eaa7149baa0b1920ddb676380ab2c0fbcc025d80d032dd7d8d67284328a
+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

diff --git a/net-p2p/syncthing/syncthing-1.20.4.ebuild 
b/net-p2p/syncthing/syncthing-1.20.4.ebuild
new file mode 100644
index ..5d5f0fcee8c1
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.20.4.ebuild
@@ -0,0 +1,113 @@
+# 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 )"
+# Bug #863488. Will no longer be needed come 1.21.0.
+BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-08-04 Thread Marek Szuba

commit: 63fd9a31c537f61f7b916f8c64c7727c50f7f608
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Aug  4 13:49:03 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Aug  4 14:05:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fd9a31

net-p2p/syncthing: require https://bugs.gentoo.org/863488
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 ++
 net-p2p/syncthing/syncthing-1.20.2.ebuild | 2 ++
 net-p2p/syncthing/syncthing-1.20.3.ebuild | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index 469c501469b1..7425a1b095db 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -20,6 +20,8 @@ RDEPEND="acct-group/syncthing
tools? ( >=acct-user/stdiscosrv-1
>=acct-user/strelaysrv-1 )
selinux? ( sec-policy/selinux-syncthing )"
+# Bug #86348
+BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-07-12 Thread Marek Szuba

commit: 0b88e0cdddadc85b0215bb3fcd104a80542e15d0
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 12 15:33:29 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 12 15:39:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b88e0cd

net-p2p/syncthing: add 1.20.3

Now with icons for .desktop files.

Closes: https://bugs.gentoo.org/857000
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.20.3.ebuild | 111 ++
 2 files changed, 113 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a464a6f86cf8..0993fc270020 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -2,3 +2,5 @@ DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
 DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B 
ddac0c324dc9fedfebb4e7b261dbee301c8fafb473f46959f11df64a311ef32fd7c5dfe3857c0993ee895bb1f92810dd304b95a91447876c2078a4b3f526c393
 SHA512 
fb060910a33a83f5fdeab01889acf02cd8717e2906eaa34c175882b7b664ae24c1a4d3fba1d112dd01d03ff215c2c40419eda4293bba9e8e31a717a59168838b
 DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 
4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918
 SHA512 
f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137
+DIST syncthing-1.20.3-deps.tar.xz 96198124 BLAKE2B 
196bffdd1004a00545c046ac3f3f4a2db3f5c779c3e9d0f1fbe1417f8cd27f6b8969a7c4f8c515ad85abad9391b5dbf9b64a6acf949f17b982e6465658d296d2
 SHA512 
5f8b52af226c2e86be84bb5dfe06a1e76d21f90aaf84cd44d9724cb0c0f918bb80c88fe0fe2c70ff6942626659492ceb5b3d618efa65d401f63eeff8ab6052a0
+DIST syncthing-1.20.3.tar.gz 6304903 BLAKE2B 
61534220a633c8cf9b99e60a43032834874bdf6f3cfd26c81b578148a22ac0d3443f112e5763e3fb916cfea6d7f55564bdfec967e8fa83f0c9502f1dbbe8689c
 SHA512 
429fb13de8b34459794d7c9dff66abe0e6c12086a27af71d90934c2ac09f2a332a103eaa7149baa0b1920ddb676380ab2c0fbcc025d80d032dd7d8d67284328a

diff --git a/net-p2p/syncthing/syncthing-1.20.3.ebuild 
b/net-p2p/syncthing/syncthing-1.20.3.ebuild
new file mode 100644
index ..4f3b90d5f252
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.20.3.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
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-06-08 Thread Marek Szuba

commit: 8c8091ab14909927057b5192fa29a85164441a18
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun  8 22:38:20 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun  8 22:38:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8091ab

net-p2p/syncthing: add 1.20.2, drop 1.20.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest| 4 ++--
 .../syncthing/{syncthing-1.20.1.ebuild => syncthing-1.20.2.ebuild}| 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a8ff9fb4ac2d..a464a6f86cf8 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,4 +1,4 @@
 DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
-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
+DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B 
ddac0c324dc9fedfebb4e7b261dbee301c8fafb473f46959f11df64a311ef32fd7c5dfe3857c0993ee895bb1f92810dd304b95a91447876c2078a4b3f526c393
 SHA512 
fb060910a33a83f5fdeab01889acf02cd8717e2906eaa34c175882b7b664ae24c1a4d3fba1d112dd01d03ff215c2c40419eda4293bba9e8e31a717a59168838b
+DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 
4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918
 SHA512 
f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137

diff --git a/net-p2p/syncthing/syncthing-1.20.1.ebuild 
b/net-p2p/syncthing/syncthing-1.20.2.ebuild
similarity index 100%
rename from net-p2p/syncthing/syncthing-1.20.1.ebuild
rename to net-p2p/syncthing/syncthing-1.20.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/files/

2022-05-26 Thread Conrad Kostecki

commit: 86050840cdca4973e35ea81d2101b4d63d5cbf80
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu May 26 18:14:25 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu May 26 20:30:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86050840

net-p2p/syncthing: remove unused file

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25649
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-p2p/syncthing/files/syncthing.initd-r1 | 32 --
 1 file changed, 32 deletions(-)

diff --git a/net-p2p/syncthing/files/syncthing.initd-r1 
b/net-p2p/syncthing/files/syncthing.initd-r1
deleted file mode 100644
index cc7e1b75e985..
--- a/net-p2p/syncthing/files/syncthing.initd-r1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SYNCTHING_USER=${SYNCTHING_USER:-syncthing}
-SYNCTHING_GROUP=${SYNCTHING_GROUP:-syncthing}
-SYNCTHING_HOMEDIR=${SYNCTHING_HOMEDIR:-/var/lib/syncthing/.config/syncthing}
-SYNCTHING_LOGFILE=${SYNCTHING_LOGFILE:-/var/log/syncthing/syncthing.log}
-SYNCTHING_UMASK=${SYNCTHING_UMASK:-007}
-SYNCTHING_IONICE=${SYNCTHING_IONICE:-0}
-SYNCTHING_NICE=${SYNCTHING_NICE:-0}
-
-description="Syncthing is an open, trustworthy and decentralized cloud storage 
system"
-command="/usr/bin/syncthing"
-command_args="-no-browser -home=${SYNCTHING_HOMEDIR} ${SYNCTHING_OPTS}"
-pidfile="/run/syncthing.pid"
-command_background="yes"
-command_user="${SYNCTHING_USER}:${SYNCTHING_GROUP}"
-umask="${SYNCTHING_UMASK}"
-start_stop_daemon_args="--ionice ${SYNCTHING_IONICE} \
-  --nicelevel ${SYNCTHING_NICE}"
-output_log="\"${SYNCTHING_LOGFILE}\""
-error_log="\"${SYNCTHING_LOGFILE}\""
-
-depend() {
-  need localmount net
-}
-
-start_pre() {
-  checkpath -q -d -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_HOMEDIR}
-  checkpath -q -f -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_LOGFILE}
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-15 Thread Jakov Smolić

commit: 8b873dc01165152e5c25c6be5913594f3685588d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 19:03:47 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 19:03:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b873dc0

net-p2p/syncthing: Stabilize 1.19.2 x86, #844877

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index 56b4f2366cdd..469c501469b1 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-15 Thread Jakov Smolić

commit: c2e606363f4f7b8a531ef6dc00b09757fce209ab
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 16:05:47 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 16:05:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e60636

net-p2p/syncthing: Stabilize 1.19.2 amd64, #844877

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index a0790b41d720..56b4f2366cdd 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-15 Thread Jakov Smolić

commit: 47e26d4b6cb1be2c7e18d9e3b2d8e8e11a0e00bd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 11:52:48 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 11:52:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e26d4b

net-p2p/syncthing: Stabilize 1.19.2 ppc64, #844877

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index 27b0fb743857..a0790b41d720 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-15 Thread Jakov Smolić

commit: 9715d0d2e6223ff0ed4be75c8abc84b30f4b6b08
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 11:40:39 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 11:40:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9715d0d2

net-p2p/syncthing: Stabilize 1.19.2 arm, #844877

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index 602b88210caa..f720a77630b6 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-15 Thread Jakov Smolić

commit: 1c13eeb5eb84144811aad628bac572376043f0f3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 11:40:40 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 11:40:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c13eeb5

net-p2p/syncthing: Stabilize 1.19.2 arm64, #844877

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.19.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
index f720a77630b6..27b0fb743857 100644
--- a/net-p2p/syncthing/syncthing-1.19.2.ebuild
+++ b/net-p2p/syncthing/syncthing-1.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-05-08 Thread Marek Szuba

commit: 758a5f0dcbd5ff618e8733066603a05548583299
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May  6 12:25:38 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun May  8 20:51:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758a5f0d

net-p2p/syncthing: add 1.20.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.20.1.ebuild | 103 ++
 2 files changed, 105 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 397e723fb63b..b7b47ed97907 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -777,3 +777,5 @@ 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 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89
+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

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 ..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}
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-04-09 Thread Marek Szuba

commit: b79032bcbe3ff53f6b62ff097a24f32895683055
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Apr  9 23:19:27 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Apr  9 23:35:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79032bc

net-p2p/syncthing: drop 1.19.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 -
 net-p2p/syncthing/syncthing-1.19.1.ebuild | 108 --
 2 files changed, 110 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 81832018091d..397e723fb63b 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -775,7 +775,5 @@ DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B 
c2ac3c9619e396db470c9951dfc11
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B 
e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519
 SHA512 
ef74b50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST 
sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 
35 BLAKE2B 
ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7
 SHA512 
4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST syncthing-1.18.5.tar.gz 6168905 BLAKE2B 
4555351e6bad90cf3fde76971bc500f47f628ed1690f843d7404f47a20bcd4570c8aa7791ebe26c1abfe21550b18e1dc3a6354b98223589e27f8424ab5784bd4
 SHA512 
10968cdbc7357909bc34e2d82691c2a905c66ef5874eeb93e3b9c9a454df0122551feaf454b916e1ca3363a87f0699628a08f44ab1edecd8fb7d1fa78ef87af5
-DIST syncthing-1.19.1-vendor.tar.xz 2533860 BLAKE2B 
e6bef97ef9a9128d4be2b2f799e9e0f1a93fe3868a8c53d7f09e099d5aef9458d904c331b9c6367f7bd0ac1f64d730c127ae75fce4da055cdb03a39c4dc582f5
 SHA512 
02291d6e0fe424b2c9f432b08805a97e9d301291f39475ff8808627e7d3ac15a394ad339248d8bc8039a4b01479585b0f6a8ad3c8d63dc11a0fa2da0cb99c4ad
-DIST syncthing-1.19.1.tar.gz 6194909 BLAKE2B 
2445c1892e2c971b5f293ec8ac045eafc37ead14623053b566b14fbaef597079edbf212398de69deada251170526212da8ce5e6c8c50ccd691ee46b27729171d
 SHA512 
78fc3a0d5b65f7d7951e3cec6e8ec9a724f9752272df242219cda12c24b126f7251bc6517834dfce4476655022bb8e29ba139756fc84664065f06cd1dc2dcf2d
 DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
 DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89

diff --git a/net-p2p/syncthing/syncthing-1.19.1.ebuild 
b/net-p2p/syncthing/syncthing-1.19.1.ebuild
deleted file mode 100644
index 08a3fa9556f4..
--- a/net-p2p/syncthing/syncthing-1.19.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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}-vendor.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 )"
-# Bug #835408
-BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-04-06 Thread Marek Szuba

commit: 7010fce8b8c852a3e3860baf8427a4d8022a4e23
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr  6 21:43:40 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr  6 21:44:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7010fce8

net-p2p/syncthing: add 1.19.2

Closes: https://bugs.gentoo.org/835408
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   2 +
 net-p2p/syncthing/syncthing-1.19.2.ebuild | 103 ++
 2 files changed, 105 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 598b0eada5bd..81832018091d 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -777,3 +777,5 @@ 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.1-vendor.tar.xz 2533860 BLAKE2B 
e6bef97ef9a9128d4be2b2f799e9e0f1a93fe3868a8c53d7f09e099d5aef9458d904c331b9c6367f7bd0ac1f64d730c127ae75fce4da055cdb03a39c4dc582f5
 SHA512 
02291d6e0fe424b2c9f432b08805a97e9d301291f39475ff8808627e7d3ac15a394ad339248d8bc8039a4b01479585b0f6a8ad3c8d63dc11a0fa2da0cb99c4ad
 DIST syncthing-1.19.1.tar.gz 6194909 BLAKE2B 
2445c1892e2c971b5f293ec8ac045eafc37ead14623053b566b14fbaef597079edbf212398de69deada251170526212da8ce5e6c8c50ccd691ee46b27729171d
 SHA512 
78fc3a0d5b65f7d7951e3cec6e8ec9a724f9752272df242219cda12c24b126f7251bc6517834dfce4476655022bb8e29ba139756fc84664065f06cd1dc2dcf2d
+DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 
88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d
 SHA512 
92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1
+DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 
0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114
 SHA512 
51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e372e651f0afc75c26cabbb457f0591d75f89

diff --git a/net-p2p/syncthing/syncthing-1.19.2.ebuild 
b/net-p2p/syncthing/syncthing-1.19.2.ebuild
new file mode 100644
index ..602b88210caa
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.19.2.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
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-03-22 Thread Marek Szuba

commit: 67b0938cd21260c36e55f33b45f044c3e6c0edaf
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Mar 22 13:30:49 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Mar 22 13:32:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b0938c

net-p2p/syncthing: bdepend on https://bugs.gentoo.org/835408
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 ++
 net-p2p/syncthing/syncthing-1.19.1.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index 3ef6bd639508..7c7b5f6e6d7d 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -801,6 +801,8 @@ RDEPEND="acct-group/syncthing
tools? ( >=acct-user/stdiscosrv-1
>=acct-user/strelaysrv-1 )
selinux? ( sec-policy/selinux-syncthing )"
+# Bug #835408
+BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-03-01 Thread Marek Szuba

commit: 6a1ee1909c384ece19823d5efbee972e5026acde
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Mar  1 15:18:46 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Mar  1 16:47:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1ee190

net-p2p/syncthing: add 1.19.1, drop 1.19.0

Now with a vendor tarball instead of EGO_SUM.

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|  27 +-
 net-p2p/syncthing/syncthing-1.19.0.ebuild | 892 --
 net-p2p/syncthing/syncthing-1.19.1.ebuild | 106 
 3 files changed, 108 insertions(+), 917 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index b588dcc1d6f6..598b0eada5bd 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -50,10 +50,6 @@ DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.mod 86 
BLAKE2B 6c2c22f1d58
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.zip 16105 BLAKE2B 
0b066c6e8641294301749adfdd4afb2093444518b66fbc2d03ed3507551cf1a326d1e4e781701f57884d2d4112278e711ea3ee9cdaa203f7a93c2484608a8564
 SHA512 
27350fbcf1f6b76b704af269766b408f8ef2500b9ae4ba22f311839bae3d1148c12a59f7f940dbfbe528824918c6b06f9856cce39dba73756e2c2636659aa890
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.mod 234 BLAKE2B 
732ccd6b3505a9e36be879380dddbce1d65e8fe27fd186dfae75d3b81cb0aa20610d3e3f604746a42ab7e250eaae6d4aed0688fb7e3f9bfa95b19f5b43a4127e
 SHA512 
22abb8dc8abb1eb99306422691b32e933c739860254c5ebc9d2ccb183847dd75878d1cbb14d5f4e61bc742692ed5b06afda0de49c62b00767211c38258054aa0
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.zip 299271 BLAKE2B 
dbe043f0a6354412d0406f3f1f3efe6ed51ca27676466514315fc5db991a4f709113fbf4691d2c09e44f1e1fb9a25fbd1e961c97a4698cedfb3b52326a5ae593
 SHA512 
004f93a5223dcced0377b3b500fe7a8ac9ceba0bd3d3a3804d558fe4052267e698d009176e4dc26f43cf20b8f9e0c4c8f8e58368e729020d2930c59faef2b640
-DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.3.0.mod 297 BLAKE2B 
1f973220f23715a01ddca1d5294ddba319e8a8da80a18be50059017893acd3e46aed4d80853ca59c3c040843db596c0620aa37ce1a2d92addc4e0071f1defa9e
 SHA512 
82847c9bbdd2ca8e9e5dbba25ce93a6cda33f60c0a65324523f8809acd1b9804d272836f948e5bd47a6c67ffb1a3ff32eb0ce93f82f449ca0aac41b76e6eafc0
-DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.3.0.zip 307845 BLAKE2B 
b2bde64d3ad2a88dbe1efbdb3e76467d8b75ffcc65333f627c60c530424a46ad9f29dcd17fae262653a483be203803deb4a52217bc57781c0938beb53fe18fe9
 SHA512 
18eca99c5216d53240e72c8a26767bb8b56304967bb38dc469802ab52972afbc06ca441f271447d2a94d59fb58bb9cd1f630eea45a1fd8e1bf319b40d4a8c331
-DIST 
github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20210801044451-80ca428c5142.mod 43 
BLAKE2B 
6517cf8c1420535e288d34c3c9c92f7e01d657a637912f58b716a9924af5c82c2826205ec7a79860b29016147cedb1f8da9f076e0693c5972a5f0d7f67410270
 SHA512 
8f063c0cf2e14e9b398016b08c6b91a7b776473a6f1d2b3475a2d0f1efcb862922fe874408d505a7283b441742a09315ec768962dfc0d4edd0781f6775babad7
-DIST 
github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20210801044451-80ca428c5142.zip 
10103 BLAKE2B 
b474713c9867c5437cf67c592b78a6fcdaad4328e2d13dd24557ec8dc65866c2bf086b1ba6e0e37154d993eaf5da9806bc0640fe3d2201b4a531af0a6761c062
 SHA512 
1690195265ead6cce9f1bd12a6fbdfce4ab93093f703267440147f80fdd5990deff7d58ba4093dface08a09ea740f4bd15349c8a84fc9cb2c8e39aeb8368d65a
 DIST 
github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod
 38 BLAKE2B 
2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de950478545319ea0b867de7
 SHA512 
072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST 
github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod
 38 BLAKE2B 
2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de950478545319ea0b867de7
 SHA512 
072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST 
github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 
35 BLAKE2B 
873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad
 SHA512 
7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
@@ -131,8 +127,6 @@ DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 
BLAKE2B 0122d72cea8833
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5.mod 102 BLAKE2B 
c096713531ccc3c357cf951e296fa6d4cb5619a408f24097f6d61db1610a7940704e913387b051f0d7cea97b950f87d1d659b2de94942d4b6b7eeb90fba8e7e6
 SHA512 
8ecc75e46e529812efc2e20f6bbc044929aaeba393c291fbde9b3c9365db5c4e7c06b07dc2b4484326609521eb09cb55ab6f9d8976fe1450bf4f52a962a35429
 DIST 
github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6-0.20210915003542-8b1f7f90f6b1.mod 
102 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/, net-p2p/syncthing/files/

2022-02-03 Thread Marek Szuba

commit: 19a6e728720243d7a697f5082949d772d8b8ed09
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Feb  3 15:10:38 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Feb  3 15:31:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a6e728

net-p2p/syncthing: add 1.19.0, drop 1.18.6-r1

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest | 28 +--
 .../files/syncthing-1.18.6-build-out.patch | 30 
 ...ng-1.18.6-r1.ebuild => syncthing-1.19.0.ebuild} | 41 +-
 3 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 2b4de885a223..b588dcc1d6f6 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -50,6 +50,10 @@ DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.mod 86 
BLAKE2B 6c2c22f1d58
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.zip 16105 BLAKE2B 
0b066c6e8641294301749adfdd4afb2093444518b66fbc2d03ed3507551cf1a326d1e4e781701f57884d2d4112278e711ea3ee9cdaa203f7a93c2484608a8564
 SHA512 
27350fbcf1f6b76b704af269766b408f8ef2500b9ae4ba22f311839bae3d1148c12a59f7f940dbfbe528824918c6b06f9856cce39dba73756e2c2636659aa890
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.mod 234 BLAKE2B 
732ccd6b3505a9e36be879380dddbce1d65e8fe27fd186dfae75d3b81cb0aa20610d3e3f604746a42ab7e250eaae6d4aed0688fb7e3f9bfa95b19f5b43a4127e
 SHA512 
22abb8dc8abb1eb99306422691b32e933c739860254c5ebc9d2ccb183847dd75878d1cbb14d5f4e61bc742692ed5b06afda0de49c62b00767211c38258054aa0
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.17.zip 299271 BLAKE2B 
dbe043f0a6354412d0406f3f1f3efe6ed51ca27676466514315fc5db991a4f709113fbf4691d2c09e44f1e1fb9a25fbd1e961c97a4698cedfb3b52326a5ae593
 SHA512 
004f93a5223dcced0377b3b500fe7a8ac9ceba0bd3d3a3804d558fe4052267e698d009176e4dc26f43cf20b8f9e0c4c8f8e58368e729020d2930c59faef2b640
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.3.0.mod 297 BLAKE2B 
1f973220f23715a01ddca1d5294ddba319e8a8da80a18be50059017893acd3e46aed4d80853ca59c3c040843db596c0620aa37ce1a2d92addc4e0071f1defa9e
 SHA512 
82847c9bbdd2ca8e9e5dbba25ce93a6cda33f60c0a65324523f8809acd1b9804d272836f948e5bd47a6c67ffb1a3ff32eb0ce93f82f449ca0aac41b76e6eafc0
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.3.0.zip 307845 BLAKE2B 
b2bde64d3ad2a88dbe1efbdb3e76467d8b75ffcc65333f627c60c530424a46ad9f29dcd17fae262653a483be203803deb4a52217bc57781c0938beb53fe18fe9
 SHA512 
18eca99c5216d53240e72c8a26767bb8b56304967bb38dc469802ab52972afbc06ca441f271447d2a94d59fb58bb9cd1f630eea45a1fd8e1bf319b40d4a8c331
+DIST 
github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20210801044451-80ca428c5142.mod 43 
BLAKE2B 
6517cf8c1420535e288d34c3c9c92f7e01d657a637912f58b716a9924af5c82c2826205ec7a79860b29016147cedb1f8da9f076e0693c5972a5f0d7f67410270
 SHA512 
8f063c0cf2e14e9b398016b08c6b91a7b776473a6f1d2b3475a2d0f1efcb862922fe874408d505a7283b441742a09315ec768962dfc0d4edd0781f6775babad7
+DIST 
github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20210801044451-80ca428c5142.zip 
10103 BLAKE2B 
b474713c9867c5437cf67c592b78a6fcdaad4328e2d13dd24557ec8dc65866c2bf086b1ba6e0e37154d993eaf5da9806bc0640fe3d2201b4a531af0a6761c062
 SHA512 
1690195265ead6cce9f1bd12a6fbdfce4ab93093f703267440147f80fdd5990deff7d58ba4093dface08a09ea740f4bd15349c8a84fc9cb2c8e39aeb8368d65a
 DIST 
github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod
 38 BLAKE2B 
2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de950478545319ea0b867de7
 SHA512 
072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST 
github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod
 38 BLAKE2B 
2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de950478545319ea0b867de7
 SHA512 
072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST 
github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 
35 BLAKE2B 
873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad
 SHA512 
7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
@@ -127,6 +131,8 @@ DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 
BLAKE2B 0122d72cea8833
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5.mod 102 BLAKE2B 
c096713531ccc3c357cf951e296fa6d4cb5619a408f24097f6d61db1610a7940704e913387b051f0d7cea97b950f87d1d659b2de94942d4b6b7eeb90fba8e7e6
 SHA512 
8ecc75e46e529812efc2e20f6bbc044929aaeba393c291fbde9b3c9365db5c4e7c06b07dc2b4484326609521eb09cb55ab6f9d8976fe1450bf4f52a962a35429
 DIST 
github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6-0.20210915003542-8b1f7f90f6b1.mod 
102 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/, net-p2p/syncthing/files/

2022-01-27 Thread Marek Szuba

commit: a121cdb69c3887a83315cb88dbb285712176a779
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jan 27 14:11:01 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jan 27 14:15:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a121cdb6

net-p2p/syncthing: make syncthing OpenRC service ready for multiple instances

Thanks-to: Till Schäfer  uni-dortmund.de>
Closes: https://bugs.gentoo.org/831735
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/files/syncthing.confd|  4 +++
 net-p2p/syncthing/files/syncthing.initd-r2 | 33 ++
 ...ng-1.18.6.ebuild => syncthing-1.18.6-r1.ebuild} |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/files/syncthing.confd 
b/net-p2p/syncthing/files/syncthing.confd
index 33773dc7fdf9..eb70f1adef95 100644
--- a/net-p2p/syncthing/files/syncthing.confd
+++ b/net-p2p/syncthing/files/syncthing.confd
@@ -20,5 +20,9 @@
 # Nice level of syncthing
 #SYNCTHING_NICE="0"
 
+# Where the syncthing GUI should listen. Can be a http(s) URI or a Unix domain 
socket
+#SYNCTHING_GUI_ADDRESS="http://127.0.0.1:8384;
+#SYNCTHING_GUI_ADDRESS="unix:/run/syncthing.sock"
+
 # Extra options for syncthing
 #SYNCTHING_OPTS=""

diff --git a/net-p2p/syncthing/files/syncthing.initd-r2 
b/net-p2p/syncthing/files/syncthing.initd-r2
new file mode 100644
index ..d8e46180df12
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing.initd-r2
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SYNCTHING_USER=${SYNCTHING_USER:-syncthing}
+SYNCTHING_GROUP=${SYNCTHING_GROUP:-syncthing}
+SYNCTHING_HOMEDIR=${SYNCTHING_HOMEDIR:-/var/lib/syncthing/.config/syncthing}
+SYNCTHING_LOGFILE=${SYNCTHING_LOGFILE:-/var/log/syncthing/syncthing.log}
+SYNCTHING_UMASK=${SYNCTHING_UMASK:-007}
+SYNCTHING_IONICE=${SYNCTHING_IONICE:-0}
+SYNCTHING_NICE=${SYNCTHING_NICE:-0}
+SYNCTHING_GUI_ADDRESS=${SYNCTHING_GUI_ADDRESS:-http://127.0.0.1:8384}
+
+description="Syncthing is an open, trustworthy and decentralized cloud storage 
system"
+command="/usr/bin/syncthing"
+command_args="-no-browser -home=${SYNCTHING_HOMEDIR} 
-gui-address=${SYNCTHING_GUI_ADDRESS} ${SYNCTHING_OPTS}"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="yes"
+command_user="${SYNCTHING_USER}:${SYNCTHING_GROUP}"
+umask="${SYNCTHING_UMASK}"
+start_stop_daemon_args="--ionice ${SYNCTHING_IONICE} \
+  --nicelevel ${SYNCTHING_NICE}"
+output_log="\"${SYNCTHING_LOGFILE}\""
+error_log="\"${SYNCTHING_LOGFILE}\""
+
+depend() {
+  need localmount net
+}
+
+start_pre() {
+  checkpath -q -d -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_HOMEDIR}
+  checkpath -q -f -o ${SYNCTHING_USER}:${SYNCTHING_GROUP} ${SYNCTHING_LOGFILE}
+}

diff --git a/net-p2p/syncthing/syncthing-1.18.6.ebuild 
b/net-p2p/syncthing/syncthing-1.18.6-r1.ebuild
similarity index 99%
rename from net-p2p/syncthing/syncthing-1.18.6.ebuild
rename to net-p2p/syncthing/syncthing-1.18.6-r1.ebuild
index e7512849c254..dfa6d9a4188d 100644
--- a/net-p2p/syncthing/syncthing-1.18.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.6-r1.ebuild
@@ -855,7 +855,7 @@ src_install() {
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-r1 ${PN}
+   newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
 
keepdir /var/log/${PN}
insinto /etc/logrotate.d

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/files/, net-p2p/syncthing/

2022-01-18 Thread Marek Szuba

commit: e921bbd70d0b628442f5ae1dc2d2abe0440b8cd2
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jan 18 15:52:56 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jan 18 16:40:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e921bbd7

net-p2p/syncthing: drop 1.18.4

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest |   1 -
 net-p2p/syncthing/files/stdiscosrv.initd   |  30 -
 net-p2p/syncthing/files/stdiscosrv.service |  17 -
 net-p2p/syncthing/files/strelaysrv.initd   |  30 -
 net-p2p/syncthing/files/syncthing.initd|  34 --
 net-p2p/syncthing/syncthing-1.18.4.ebuild  | 883 -
 6 files changed, 995 deletions(-)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 834d4526781d..2b4de885a223 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -776,6 +776,5 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B 
f1f0ba35f0ffd200ed37c06b20
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B 
c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7
 SHA512 
2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B 
e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519
 SHA512 
ef74b50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST 
sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 
35 BLAKE2B 
ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7
 SHA512 
4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
-DIST syncthing-1.18.4.tar.gz 6168557 BLAKE2B 
b1abb649f406ca010b956c0dfd8920b6d7d6297433a93a2d27d09f2fbcd0220a32f8237fde1d301199749af162f6f29dfb3caa177839841f155c79acec9b4799
 SHA512 
176ff8f40c0d6644b8f81583e09e9f8a411548772ffdbbd70fcca20371511a8faa4311d23c7bd3815f0205c00b9b7284846fce3183ffbca6bb9460e6aef7f0d8
 DIST syncthing-1.18.5.tar.gz 6168905 BLAKE2B 
4555351e6bad90cf3fde76971bc500f47f628ed1690f843d7404f47a20bcd4570c8aa7791ebe26c1abfe21550b18e1dc3a6354b98223589e27f8424ab5784bd4
 SHA512 
10968cdbc7357909bc34e2d82691c2a905c66ef5874eeb93e3b9c9a454df0122551feaf454b916e1ca3363a87f0699628a08f44ab1edecd8fb7d1fa78ef87af5
 DIST syncthing-1.18.6.tar.gz 6168847 BLAKE2B 
1f5c962bf78c0628eee07bdd2655810deedb7ba75148cffc4d612ed6032b5d6719af9fc09b8980e3326198967681b8741abde131f277b0098b48c0768288e565
 SHA512 
81bdb08b2297a53e155b39258fb07ac85f528ab67d8a456399684d396e86f2bdf9a26a531448e1227aa1aefbeefa76906a8d841b71617a4aaf2b70b3db63160a

diff --git a/net-p2p/syncthing/files/stdiscosrv.initd 
b/net-p2p/syncthing/files/stdiscosrv.initd
deleted file mode 100644
index 333b980897b3..
--- a/net-p2p/syncthing/files/stdiscosrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-SD_USER=stdiscosrv
-SD_GROUP=stdiscosrv
-SD_HOMEDIR=/var/lib/stdiscosrv
-SD_LOGFILE=/var/log/syncthing/stdiscosrv.log
-
-
-description="Discovery service for syncthing"
-command="/usr/libexec/syncthing/stdiscosrv"
-command_args="${SD_OPTS}"
-pidfile="/run/stdiscosrv.pid"
-start_stop_daemon_args="--background
-  --user ${SD_USER}
-  --group ${SD_GROUP}
-  --chdir \"${SD_HOMEDIR}\"
-  --make-pidfile
-  --stdout \"${SD_LOGFILE}\"
-  --stderr \"${SD_LOGFILE}\"
-  "
-
-depend() {
-  need net
-}
-
-start_pre() {
-  checkpath -q -d -o ${SD_USER}:${SD_GROUP} ${SD_HOMEDIR}
-  checkpath -q -f -o ${SD_USER}:${SD_GROUP} ${SD_LOGFILE}
-}

diff --git a/net-p2p/syncthing/files/stdiscosrv.service 
b/net-p2p/syncthing/files/stdiscosrv.service
deleted file mode 100644
index 4011c7d4c5bd..
--- a/net-p2p/syncthing/files/stdiscosrv.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Syncthing discovery server
-After=network.target
-
-[Service]
-User=stdiscosrv
-Group=stdiscosrv
-ExecStart=/usr/libexec/syncthing/stdiscosrv
-WorkingDirectory=/var/lib/stdiscosrv
-
-PrivateTmp=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-p2p/syncthing/files/strelaysrv.initd 
b/net-p2p/syncthing/files/strelaysrv.initd
deleted file mode 100644
index 7eb77be26fda..
--- a/net-p2p/syncthing/files/strelaysrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-SR_USER=strelaysrv
-SR_GROUP=strelaysrv
-SR_HOMEDIR=/var/lib/strelaysrv

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/files/, net-p2p/syncthing/

2022-01-18 Thread Marek Szuba

commit: 4c317ff343d33abac8337fc9e4175a5034264860
Author: Alexandra Parker  gmail  com>
AuthorDate: Thu Jan 13 18:48:39 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jan 18 16:40:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c317ff3

net-p2p/syncthing: support cross compilation (take 2)

now with support for USE=tools

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexandra Parker  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23778
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/syncthing-1.18.6-build-out.patch | 30 ++
 net-p2p/syncthing/syncthing-1.18.6.ebuild  |  6 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch 
b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
new file mode 100644
index ..20dc63dca2f5
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
@@ -0,0 +1,30 @@
+diff --git a/build.go b/build.go
+index c2e1059398..7888c834d2 100644
+--- a/build.go
 b/build.go
+@@ -47,6 +47,7 @@ var (
+   cc string
+   runstring
+   benchRun   string
++  buildOut   string
+   debugBinarybool
+   coverage   bool
+   long   bool
+@@ -374,6 +375,7 @@ func parseFlags() {
+   flag.StringVar(, "run", "", "Specify which tests to run")
+   flag.StringVar(, "bench", "", "Specify which benchmarks to 
run")
+   flag.BoolVar(, "with-next-gen-gui", withNextGenGUI, 
"Also build 'newgui'")
++  flag.StringVar(, "build-out", "", "Set the '-o' value for 'go 
build'")
+   flag.Parse()
+ }
+ 
+@@ -506,6 +508,9 @@ func build(target target, tags []string) {
+   }
+ 
+   args := []string{"build", "-v"}
++  if buildOut != "" {
++  args = append(args, "-o", buildOut)
++  }
+   args = appendParameters(args, tags, target.buildPkgs...)
+   runPrint(goCmd, args...)
+ }

diff --git a/net-p2p/syncthing/syncthing-1.18.6.ebuild 
b/net-p2p/syncthing/syncthing-1.18.6.ebuild
index 60872181cf9e..e7512849c254 100644
--- a/net-p2p/syncthing/syncthing-1.18.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.6.ebuild
@@ -807,6 +807,7 @@ 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.18.6-build-out.patch
 )
 
 src_prepare() {
@@ -828,8 +829,9 @@ src_prepare() {
 }
 
 src_compile() {
-   go run build.go -version "v${PV}" -no-upgrade install \
-   $(usex tools "all" "") || die "build failed"
+   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() {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-13 Thread Arthur Zamarin

commit: 5a6932e7a2e857a7d0db0b43d58e77f1371da275
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jan 13 18:41:52 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jan 13 18:41:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6932e7

net-p2p/syncthing: Stabilize 1.18.5 arm64, #831073

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index 8f24ac06c65a..3ef6bd639508 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/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 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-13 Thread Arthur Zamarin

commit: 221d863c5bf5194789bf0f698fc0b24b794ae6b8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jan 13 18:40:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jan 13 18:40:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221d863c

net-p2p/syncthing: Stabilize 1.18.5 ppc64, #831073

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index cd3d65664324..8f24ac06c65a 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-13 Thread Marek Szuba

commit: c8c1f5c254e2d89e7a4fa854cf1f31be4fc25bb0
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jan 13 10:43:21 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jan 13 10:53:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c1f5c2

net-p2p/syncthing: Revert "support cross compilation"

Turns out this breaks USE=tools.

This reverts commit 743f726479d8f20dc7e13f6d54f83bab4d71c70f.

Closes: https://bugs.gentoo.org/831099
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 4 +---
 net-p2p/syncthing/syncthing-1.18.6.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index fd83398eff20..cd3d65664324 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -828,10 +828,8 @@ src_prepare() {
 }
 
 src_compile() {
-   go run build.go -version "v${PV}" -no-upgrade build \
+   go run build.go -version "v${PV}" -no-upgrade install \
$(usex tools "all" "") || die "build failed"
-   mkdir bin || die
-   mv "${PN}$(go env GOEXE)" bin/ || die
 }
 
 src_test() {

diff --git a/net-p2p/syncthing/syncthing-1.18.6.ebuild 
b/net-p2p/syncthing/syncthing-1.18.6.ebuild
index 6df612469482..60872181cf9e 100644
--- a/net-p2p/syncthing/syncthing-1.18.6.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.6.ebuild
@@ -828,10 +828,8 @@ src_prepare() {
 }
 
 src_compile() {
-   go run build.go -version "v${PV}" -no-upgrade build \
+   go run build.go -version "v${PV}" -no-upgrade install \
$(usex tools "all" "") || die "build failed"
-   mkdir bin || die
-   mv "${PN}$(go env GOEXE)" bin/ || die
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-12 Thread Sam James

commit: a54767d5bcc828154d826449620c11f58104aacc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 00:32:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 00:32:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54767d5

net-p2p/syncthing: Stabilize 1.18.5 amd64, #831073

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index 8c2d10585eb3..fd83398eff20 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-12 Thread Sam James

commit: 6e8a642816151ce8a5ee7dc5f9f6950db4977028
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 00:31:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 00:31:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8a6428

net-p2p/syncthing: Stabilize 1.18.5 arm, #831073

Signed-off-by: Sam James  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index 166e218c17fb..8c2d10585eb3 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-12 Thread Marek Szuba

commit: 5b4557dda45c9fc7776717c41f8cba9b9a24cc07
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 12 14:25:38 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 12 21:52:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4557dd

net-p2p/syncthing: add 1.18.6

Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/Manifest|   3 +
 net-p2p/syncthing/syncthing-1.18.6.ebuild | 885 ++
 2 files changed, 888 insertions(+)

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index e357434de559..834d4526781d 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -244,6 +244,8 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.zip 124624 
BLAKE2B 45c3568404212f0304a
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.22.0.mod 697 BLAKE2B 
ca7272f288d2ddc7d207c4e07aabd3a7ee72ce709bfadba36543c268ff260e7b16c1e2df4eb280a042df02b8134596fbaaac8502924d56283c5be4ffc62d8bcd
 SHA512 
f09e4799139ba0a0e635ba159b6381205d8b1ed98073dfb7a5760817a7a43ad330c79d485c8a0167ab900795feefb9c9450257221980bc54d81b44a3f8d958c5
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.mod 646 BLAKE2B 
de936cd0ba8f001e958cf99d355750f221ef2e0d09f191d0cb2523c22a5a475afc0e8b5e91302ec23faa1595e21094a74a7d09fa02504fdd34f7431c4fcaec56
 SHA512 
b95fdb9bf88b21d6b216c66d8091e0b967e6924d78fad7a586497723d17c2ab69e8318f55afff453b1c3e3c8baa077c013d3f53b3c1b9edbc0c986984a7a41c9
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.zip 744542 BLAKE2B 
92a778755817371999db9ff7a29ac83e530b42ba4bcc8554f7f099a69e1fc77c6b0cfd920480d0a4bf88afea602500f963eeab97f5b7c34c73065d5daf4e411c
 SHA512 
6c89652f78922e4bf4813ce3ebcf14654a5229d3a893979352563a29e1c9bb6c49d4f157ee95b026358ea1ebdce331810bd712dd74241a8911f41fcd222f0f83
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.24.0.mod 646 BLAKE2B 
de936cd0ba8f001e958cf99d355750f221ef2e0d09f191d0cb2523c22a5a475afc0e8b5e91302ec23faa1595e21094a74a7d09fa02504fdd34f7431c4fcaec56
 SHA512 
b95fdb9bf88b21d6b216c66d8091e0b967e6924d78fad7a586497723d17c2ab69e8318f55afff453b1c3e3c8baa077c013d3f53b3c1b9edbc0c986984a7a41c9
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.24.0.zip 745821 BLAKE2B 
925cb321a8e9660c32f0a87d2460b91de2cdce9b526660124ceeb01ed2ca28e9ce9139fcd7f35b47f84e2805690eeb6a1457d13a98b967989bc172526003d2f0
 SHA512 
1cb1d58272f727e24f3fad5d8c3007bfabe01d80966e6e3f35e821b4296bc755356d2622c2c73cc371609cbb76fb9ed0ff2715051b2c2c7d372cfdcfe01f0d4a
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 
0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104
 SHA512 
6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
 DIST 
github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 
BLAKE2B 
0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d
 SHA512 
8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod 178 BLAKE2B 
1044039faf6fb3c3d61c9b00ebf83caa7812cdd7b7787945b7f9f106b88899906d646a6f00f81361e14aa48e053a2177309cd59f1a63cabb706a832d5a7cda6c
 SHA512 
3db41fe780063d019ba2e84c08116f754f5cf6de31dd4432364c7f9f808d802218d3eb039e10eec0dba6fe6ab836799663c5f3789a12f308605d0a52934a2960
@@ -776,3 +778,4 @@ DIST 
sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST 
sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 
35 BLAKE2B 
ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7
 SHA512 
4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST syncthing-1.18.4.tar.gz 6168557 BLAKE2B 
b1abb649f406ca010b956c0dfd8920b6d7d6297433a93a2d27d09f2fbcd0220a32f8237fde1d301199749af162f6f29dfb3caa177839841f155c79acec9b4799
 SHA512 
176ff8f40c0d6644b8f81583e09e9f8a411548772ffdbbd70fcca20371511a8faa4311d23c7bd3815f0205c00b9b7284846fce3183ffbca6bb9460e6aef7f0d8
 DIST syncthing-1.18.5.tar.gz 6168905 BLAKE2B 
4555351e6bad90cf3fde76971bc500f47f628ed1690f843d7404f47a20bcd4570c8aa7791ebe26c1abfe21550b18e1dc3a6354b98223589e27f8424ab5784bd4
 SHA512 
10968cdbc7357909bc34e2d82691c2a905c66ef5874eeb93e3b9c9a454df0122551feaf454b916e1ca3363a87f0699628a08f44ab1edecd8fb7d1fa78ef87af5
+DIST syncthing-1.18.6.tar.gz 6168847 BLAKE2B 
1f5c962bf78c0628eee07bdd2655810deedb7ba75148cffc4d612ed6032b5d6719af9fc09b8980e3326198967681b8741abde131f277b0098b48c0768288e565
 SHA512 
81bdb08b2297a53e155b39258fb07ac85f528ab67d8a456399684d396e86f2bdf9a26a531448e1227aa1aefbeefa76906a8d841b71617a4aaf2b70b3db63160a

diff --git

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-12 Thread Jakov Smolić

commit: 2a68650950319d85d090f6af762b2ab30206a9d7
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jan 12 17:08:17 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jan 12 17:08:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a686509

net-p2p/syncthing: Stabilize 1.18.5 x86, #831073

Signed-off-by: Jakov Smolić  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index 097eb15a959f..166e218c17fb 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -793,7 +793,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

[gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/

2022-01-11 Thread Marek Szuba

commit: 743f726479d8f20dc7e13f6d54f83bab4d71c70f
Author: Alexandra Parker  gmail  com>
AuthorDate: Sat Jan  8 07:09:42 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jan 11 18:38:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743f7264

net-p2p/syncthing: support cross compilation

Closes: https://github.com/gentoo/gentoo/pull/23693
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexandra Parker  gmail.com>
Signed-off-by: Marek Szuba  gentoo.org>

 net-p2p/syncthing/syncthing-1.18.5.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-p2p/syncthing/syncthing-1.18.5.ebuild 
b/net-p2p/syncthing/syncthing-1.18.5.ebuild
index c7614a65ba08..097eb15a959f 100644
--- a/net-p2p/syncthing/syncthing-1.18.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -828,8 +828,10 @@ src_prepare() {
 }
 
 src_compile() {
-   go run build.go -version "v${PV}" -no-upgrade install \
+   go run build.go -version "v${PV}" -no-upgrade build \
$(usex tools "all" "") || die "build failed"
+   mkdir bin || die
+   mv "${PN}$(go env GOEXE)" bin/ || die
 }
 
 src_test() {

1 2 3 4 >

1 - 100 of 302 matches

Mail list logo