gentoo auto-resync : 08:06:2023 - 15:45:39

3 files changed, 2 insertions, 116 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index b094774b657e..59debb5176cb 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -10,8 +10,6 @@ AUX syncthing-1.3.4-TestIssue5063_timeout.patch 641 BLAKE2B 193a86b692bd65059f01
 AUX syncthing.confd 733 BLAKE2B dec494bd35422f57dd8b6d848325933da909000d79b3d3193cff26528f13f639f221ba9b801356694da6720f35b84bf6aa024120024e547dc8b2fc84c5b18b91 SHA512 84f2731866b279d16dd2e17c27987fd99e7440c334771ed44e2204405b97082d7d68bc56257fa13befcc3e2cdfdbd40c7c4be3a614b259c4e7ca2c327a24bb9f
 AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48e933fa1c67b7beb72281617c3a11d2e379e97a6e57c2378ae8d88fbdb7c80ba3d6e9513833eebd06eff5 SHA512 4f86a81112df1ba15f92bd88999ba632e4a3ba4a6e5a150b2d60a82011bd35f177f86e81a51e95e10b99f4be7698ebd2786ca423635d576872fccec7607c1564
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
-DIST syncthing-1.23.4.tar.gz 14141457 BLAKE2B 5c0edf12062a0a26858b6d6b76e9de527a2b0bcab5bf718baba94a22c95d0ffcdb39ea6c4855b1ba4bff3eeb1b83f42375f3fca9d016041d0130d9980d3d9c94 SHA512 cf86b61af000e2b9555f1dee0dfc6c340254859b753d3af2d88ea7de8f49137e7dea2bc98a6d8e526b35707918761f010a93ff8ee243f49945364f2e7f928ae3
 DIST syncthing-1.23.5.tar.gz 14196275 BLAKE2B e9d44ed83546ea28e474379c7b3141e447e4f595cf8587220fe76d64844b1ee57551f56b06a7244afc3af45728c19bd76b6ba923da03983dc7ae9799ac36d9a9 SHA512 ef41c7bf8e693e3db5ea7c3cd645580a89131cc0fb48e12a50a24af28c86533bf973c58daea7cda5822544602c366a21f299c88dcd601e3913b6a08d5f4564dc
-EBUILD syncthing-1.23.4-r1.ebuild 2887 BLAKE2B 09ab0937a5697393094861c25f0ba64cd4bf9a4ca90e9c627d2599724d30efa8a35079c65219df615709d75e719a438e2222059a5dbfba05ef88cc8e98c16390 SHA512 1a3ff5674a898c68e5632c7cbf01445386c44a4ab009815283e8ec14ff86ee87b11275e323986c4633a0593e9e6a07a821cc690791d874748e4516a84ffb14be
-EBUILD syncthing-1.23.5.ebuild 2892 BLAKE2B d62d3764dbde48e231ddfff877bc324d3ae50ec2be2ccb8c05aacd72d933a2159a50c315db514e21ab1329bf67440f1b44da6a9e5d4448ab2eb2a5d037b1754d SHA512 819771dd2c2312e0176e93bc5cc1d5fd9fd7fb4bdd1a114666a69720e9855aefbb35554f9d48fe8e68cf6627dd3b041e6579a83fbc6c44b77d675974a9aa8ed5
+EBUILD syncthing-1.23.5.ebuild 2887 BLAKE2B 09ab0937a5697393094861c25f0ba64cd4bf9a4ca90e9c627d2599724d30efa8a35079c65219df615709d75e719a438e2222059a5dbfba05ef88cc8e98c16390 SHA512 1a3ff5674a898c68e5632c7cbf01445386c44a4ab009815283e8ec14ff86ee87b11275e323986c4633a0593e9e6a07a821cc690791d874748e4516a84ffb14be
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
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..000000000000
--- 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
-		newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/syncthing/syncthing-1.23.5.ebuild b/net-p2p/syncthing/syncthing-1.23.5.ebuild
index d8e3bf08df7a..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