1 |
commit: 2885917f0f95ff17cc722867b160d0da0a64389d |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 1 15:20:24 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 1 15:34:38 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2885917f |
7 |
|
8 |
net-p2p/syncthing: drop 1.20.2, 1.20.3 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
net-p2p/syncthing/Manifest | 4 -- |
13 |
net-p2p/syncthing/syncthing-1.20.2.ebuild | 105 --------------------------- |
14 |
net-p2p/syncthing/syncthing-1.20.3.ebuild | 113 ------------------------------ |
15 |
3 files changed, 222 deletions(-) |
16 |
|
17 |
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest |
18 |
index 8a9cf07bedf6..7cf0975a8ee1 100644 |
19 |
--- a/net-p2p/syncthing/Manifest |
20 |
+++ b/net-p2p/syncthing/Manifest |
21 |
@@ -1,8 +1,4 @@ |
22 |
DIST syncthing-1.19.2-deps.tar.xz 206531144 BLAKE2B 88e5246217f792c8258f0074ecb3e917e03fb3f4b7d32d0f17cb9501c5a6fdbe31f77ce8a5af02e5dcefb3711464e16159e5b7fee564470d6eb5c7718a29032d SHA512 92e080544c6a24ad501d0bfacca2743d5285cc5348817b915f5c944fa57d8876c69fa328553ccb5135d514fcb7d970eac17b546467b4563a8e93e976e446bdd1 |
23 |
DIST syncthing-1.19.2.tar.gz 6197504 BLAKE2B 0db0f286a79ef8b9c4b74f9aa2da275f216d0a1cb5e10ec7fbd9a479c55f81ec8b8c06b2dbea6aed135eccf6bf539499c8852a8586bd37c4d0ba9969503a2114 SHA512 51641574e01daf591083e00aa956aeb0b6820eeb660c34dc0c161d2edfc183786dfa3bf50f75b6502b73440e3666672e651f0afc75c26cabbb457f0591d75f89 |
24 |
-DIST syncthing-1.20.2-deps.tar.xz 96286888 BLAKE2B ddac0c324dc9fedfebb4e7b261dbee301c8fafb473f46959f11df64a311ef32fd7c5dfe3857c0993ee895bb1f92810dd304b95a91447876c2078a4b3f526c393 SHA512 fb060910a33a83f5fdeab01889acf02cd8717e2906eaa34c175882b7b664ae24c1a4d3fba1d112dd01d03ff215c2c40419eda4293bba9e8e31a717a59168838b |
25 |
-DIST syncthing-1.20.2.tar.gz 6303918 BLAKE2B 4a9786558584ee3d11d7dc278e99d98a57b727dd2b1e61a82357bc4f9be5d025b3e5b003ae0d44e033991c8fe91aa9668dd653a8dedd200e4d385a827c361918 SHA512 f4abf939ce4023df8bd619d8be393dedc657a9e62d99b3793af32ca88a4478ba6640ccecd6b4ae009a06656e74bca3e462bef717ad17a6e9fa6ac00ef77ea137 |
26 |
-DIST syncthing-1.20.3-deps.tar.xz 96198124 BLAKE2B 196bffdd1004a00545c046ac3f3f4a2db3f5c779c3e9d0f1fbe1417f8cd27f6b8969a7c4f8c515ad85abad9391b5dbf9b64a6acf949f17b982e6465658d296d2 SHA512 5f8b52af226c2e86be84bb5dfe06a1e76d21f90aaf84cd44d9724cb0c0f918bb80c88fe0fe2c70ff6942626659492ceb5b3d618efa65d401f63eeff8ab6052a0 |
27 |
-DIST syncthing-1.20.3.tar.gz 6304903 BLAKE2B 61534220a633c8cf9b99e60a43032834874bdf6f3cfd26c81b578148a22ac0d3443f112e5763e3fb916cfea6d7f55564bdfec967e8fa83f0c9502f1dbbe8689c SHA512 429fb13de8b34459794d7c9dff66abe0e6c12086a27af71d90934c2ac09f2a332a103eaa7149baa0b1920ddb676380ab2c0fbcc025d80d032dd7d8d67284328a |
28 |
DIST syncthing-1.20.4-deps.tar.xz 95873400 BLAKE2B 79b5ee4cbb36f611530ffcaeb5e9650811f80358c36a51d5362c525d86741ee768baa073a167ca184cd3aa5795b01a7a5f1c6648b9f07ca77c868b9152940de4 SHA512 424cca4aafd18b672e0027cbe4dc3895605009c037fc4005bdb48a1cb06be96d8377477ee77ab910478e24db9833d48b34b1d45f83c4792356ae75f5225bc163 |
29 |
DIST syncthing-1.20.4.tar.gz 6320013 BLAKE2B 0aefc7470be80af12c349572ca14de3e1eb18f2da5ad804e8ee5899da331e4b3c86c8bcb04c3fcc54a7f944551555d6df7ec5fe8f5ce760faf658e9bfd02650b SHA512 a7af905fedc2bbb709df2b05274e7c584ba340f7f6a2f311291d2650cd656ebf567a106be53453dbe889dabac2620deccc8da49cd80dc41c43f45b8016cec193 |
30 |
|
31 |
diff --git a/net-p2p/syncthing/syncthing-1.20.2.ebuild b/net-p2p/syncthing/syncthing-1.20.2.ebuild |
32 |
deleted file mode 100644 |
33 |
index cf1dfef89e20..000000000000 |
34 |
--- a/net-p2p/syncthing/syncthing-1.20.2.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,105 +0,0 @@ |
37 |
-# Copyright 1999-2022 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=8 |
41 |
- |
42 |
-inherit desktop go-module systemd xdg-utils |
43 |
- |
44 |
-DESCRIPTION="Open Source Continuous File Synchronization" |
45 |
-HOMEPAGE="https://syncthing.net" |
46 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
47 |
- https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz" |
48 |
- |
49 |
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
52 |
-IUSE="selinux tools" |
53 |
- |
54 |
-RDEPEND="acct-group/syncthing |
55 |
- acct-user/syncthing |
56 |
- tools? ( >=acct-user/stdiscosrv-1 |
57 |
- >=acct-user/strelaysrv-1 ) |
58 |
- selinux? ( sec-policy/selinux-syncthing )" |
59 |
-# Bug #86348 |
60 |
-BDEPEND="<dev-lang/go-1.19" |
61 |
- |
62 |
-DOCS=( README.md AUTHORS CONTRIBUTING.md ) |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch |
66 |
- "${FILESDIR}"/${PN}-1.18.4-tool_users.patch |
67 |
-) |
68 |
- |
69 |
-src_prepare() { |
70 |
- # Bug #679280 |
71 |
- xdg_environment_reset |
72 |
- |
73 |
- default |
74 |
- sed -i \ |
75 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/stdiscosrv|' \ |
76 |
- cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service \ |
77 |
- || die |
78 |
- sed -i \ |
79 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ |
80 |
- cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ |
81 |
- || die |
82 |
- |
83 |
- # We do not need this and it sometimes causes build failures |
84 |
- rm -rf cmd/stupgrades |
85 |
-} |
86 |
- |
87 |
-src_compile() { |
88 |
- GOARCH= go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \ |
89 |
- ${GOARCH:+-goarch="${GOARCH}"} \ |
90 |
- build $(usex tools "all" "") || die "build failed" |
91 |
-} |
92 |
- |
93 |
-src_test() { |
94 |
- go run build.go test || die "test failed" |
95 |
-} |
96 |
- |
97 |
-src_install() { |
98 |
- doman man/*.[157] |
99 |
- einstalldocs |
100 |
- |
101 |
- dobin bin/syncthing |
102 |
- domenu etc/linux-desktop/*.desktop |
103 |
- if use tools; then |
104 |
- exeinto /usr/libexec/syncthing |
105 |
- local exe |
106 |
- for exe in bin/* ; do |
107 |
- [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" |
108 |
- done |
109 |
- fi |
110 |
- |
111 |
- systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service |
112 |
- systemd_douserunit etc/linux-systemd/user/${PN}.service |
113 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
114 |
- newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} |
115 |
- |
116 |
- keepdir /var/log/${PN} |
117 |
- insinto /etc/logrotate.d |
118 |
- newins "${FILESDIR}"/${PN}.logrotate ${PN} |
119 |
- |
120 |
- if use tools; then |
121 |
- systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service |
122 |
- newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv |
123 |
- newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv |
124 |
- |
125 |
- systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service |
126 |
- newconfd "${FILESDIR}"/strelaysrv.confd strelaysrv |
127 |
- newinitd "${FILESDIR}"/strelaysrv.initd-r1 strelaysrv |
128 |
- |
129 |
- insinto /etc/logrotate.d |
130 |
- newins "${FILESDIR}"/stdiscosrv.logrotate strelaysrv |
131 |
- newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv |
132 |
- fi |
133 |
-} |
134 |
- |
135 |
-pkg_postinst() { |
136 |
- xdg_desktop_database_update |
137 |
-} |
138 |
- |
139 |
-pkg_postrm() { |
140 |
- xdg_desktop_database_update |
141 |
-} |
142 |
|
143 |
diff --git a/net-p2p/syncthing/syncthing-1.20.3.ebuild b/net-p2p/syncthing/syncthing-1.20.3.ebuild |
144 |
deleted file mode 100644 |
145 |
index 687924d4f607..000000000000 |
146 |
--- a/net-p2p/syncthing/syncthing-1.20.3.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,113 +0,0 @@ |
149 |
-# Copyright 1999-2022 Gentoo Authors |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI=8 |
153 |
- |
154 |
-inherit desktop go-module systemd xdg-utils |
155 |
- |
156 |
-DESCRIPTION="Open Source Continuous File Synchronization" |
157 |
-HOMEPAGE="https://syncthing.net" |
158 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
159 |
- https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz" |
160 |
- |
161 |
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense" |
162 |
-SLOT="0" |
163 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
164 |
-IUSE="selinux tools" |
165 |
- |
166 |
-RDEPEND="acct-group/syncthing |
167 |
- acct-user/syncthing |
168 |
- tools? ( >=acct-user/stdiscosrv-1 |
169 |
- >=acct-user/strelaysrv-1 ) |
170 |
- selinux? ( sec-policy/selinux-syncthing )" |
171 |
-# Bug #86348 |
172 |
-BDEPEND="<dev-lang/go-1.19" |
173 |
- |
174 |
-DOCS=( README.md AUTHORS CONTRIBUTING.md ) |
175 |
- |
176 |
-PATCHES=( |
177 |
- "${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch |
178 |
- "${FILESDIR}"/${PN}-1.18.4-tool_users.patch |
179 |
-) |
180 |
- |
181 |
-src_prepare() { |
182 |
- # Bug #679280 |
183 |
- xdg_environment_reset |
184 |
- |
185 |
- default |
186 |
- sed -i \ |
187 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/stdiscosrv|' \ |
188 |
- cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service \ |
189 |
- || die |
190 |
- sed -i \ |
191 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ |
192 |
- cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ |
193 |
- || die |
194 |
- |
195 |
- # We do not need this and it sometimes causes build failures |
196 |
- rm -rf cmd/stupgrades |
197 |
-} |
198 |
- |
199 |
-src_compile() { |
200 |
- GOARCH= go run build.go -version "v${PV}" -no-upgrade -build-out=bin/ \ |
201 |
- ${GOARCH:+-goarch="${GOARCH}"} \ |
202 |
- build $(usex tools "all" "") || die "build failed" |
203 |
-} |
204 |
- |
205 |
-src_test() { |
206 |
- go run build.go test || die "test failed" |
207 |
-} |
208 |
- |
209 |
-src_install() { |
210 |
- local icon_size |
211 |
- |
212 |
- doman man/*.[157] |
213 |
- einstalldocs |
214 |
- |
215 |
- dobin bin/syncthing |
216 |
- |
217 |
- domenu etc/linux-desktop/*.desktop |
218 |
- for icon_size in 32 64 128 256 512; do |
219 |
- newicon -s ${icon_size} assets/logo-${icon_size}.png ${PN}.png |
220 |
- done |
221 |
- newicon -s scalable assets/logo-only.svg ${PN}.svg |
222 |
- |
223 |
- if use tools; then |
224 |
- exeinto /usr/libexec/syncthing |
225 |
- local exe |
226 |
- for exe in bin/* ; do |
227 |
- [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" |
228 |
- done |
229 |
- fi |
230 |
- |
231 |
- systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service |
232 |
- systemd_douserunit etc/linux-systemd/user/${PN}.service |
233 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
234 |
- newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} |
235 |
- |
236 |
- keepdir /var/log/${PN} |
237 |
- insinto /etc/logrotate.d |
238 |
- newins "${FILESDIR}"/${PN}.logrotate ${PN} |
239 |
- |
240 |
- if use tools; then |
241 |
- systemd_dounit cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service |
242 |
- newconfd "${FILESDIR}"/stdiscosrv.confd stdiscosrv |
243 |
- newinitd "${FILESDIR}"/stdiscosrv.initd-r1 stdiscosrv |
244 |
- |
245 |
- systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service |
246 |
- newconfd "${FILESDIR}"/strelaysrv.confd strelaysrv |
247 |
- newinitd "${FILESDIR}"/strelaysrv.initd-r1 strelaysrv |
248 |
- |
249 |
- insinto /etc/logrotate.d |
250 |
- newins "${FILESDIR}"/stdiscosrv.logrotate strelaysrv |
251 |
- newins "${FILESDIR}"/strelaysrv.logrotate strelaysrv |
252 |
- fi |
253 |
-} |
254 |
- |
255 |
-pkg_postinst() { |
256 |
- xdg_desktop_database_update |
257 |
-} |
258 |
- |
259 |
-pkg_postrm() { |
260 |
- xdg_desktop_database_update |
261 |
-} |