1 |
commit: 2eeae6f639c633cad2487eb96be3e06faf32e135 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 20 08:40:54 2019 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 20 08:54:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eeae6f6 |
7 |
|
8 |
net-p2p/syncthing: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
12 |
|
13 |
net-p2p/syncthing/Manifest | 1 - |
14 |
net-p2p/syncthing/syncthing-0.14.52.ebuild | 123 ----------------------- |
15 |
net-p2p/syncthing/syncthing-1.1.4-r1.ebuild | 149 ---------------------------- |
16 |
3 files changed, 273 deletions(-) |
17 |
|
18 |
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest |
19 |
index 5fdf0ecad1a..a5b468baac2 100644 |
20 |
--- a/net-p2p/syncthing/Manifest |
21 |
+++ b/net-p2p/syncthing/Manifest |
22 |
@@ -73,6 +73,5 @@ DIST github.com-syndtr-goleveldb-c3a204f8e965.tar.gz 147696 BLAKE2B 22156bca1e20 |
23 |
DIST github.com-thejerf-suture-v3.0.2.tar.gz 18047 BLAKE2B 6b6915ca6db2a8b8e8ae5f34150b862d16b2b82227c25022e7b5f258849c340d57d345a1b8cb87fc14ea7eb36b72025a55b2844270c01830e68bb2177b5dd82f SHA512 08780cdcd8d2a86fe1c42f80a0b7c05ab1aee2a1aef4caef462111bad65a28dbfac2c05f7339de80b698f7b22609f19b52588ecf4d4ea0e971e0d57c55da78e4 |
24 |
DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5 |
25 |
DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 23973 BLAKE2B e272dc6a3f433d0b1479438a251561071e32a25f83784350f25cbbc0022ee1b23da4cac21e2eba76326ffd2838e93edbba816e593ab2bb3b703fd2c1ae65f15d SHA512 cc7ae47017191bd71136796334dd77b9f90e2564d348fa2c03086b593fb73f07cbd5ffe48f3d43ea2f7f32b64ed10f3a095013b27ee6afc25d08eb60f99d72a1 |
26 |
-DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce |
27 |
DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba |
28 |
DIST syncthing-1.2.1.tar.gz 4740427 BLAKE2B 2f102100030f646f069a51c5af7c5ab448ea59fa0629d78b14432e32cbfbe90f1b95c49cc3d5812b8cd228ef0454ba5d95f9ddf5910492370018234bc1c66438 SHA512 226386af38c3e99434496f24aa571bd1edd3d1e0528dac06c08b4148b2c63b898b67261728cc6c92dbd0496c24b32f0b1189571d03f6ab5dd592e78f2a5beb3b |
29 |
|
30 |
diff --git a/net-p2p/syncthing/syncthing-0.14.52.ebuild b/net-p2p/syncthing/syncthing-0.14.52.ebuild |
31 |
deleted file mode 100644 |
32 |
index 03e82c266f2..00000000000 |
33 |
--- a/net-p2p/syncthing/syncthing-0.14.52.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,123 +0,0 @@ |
36 |
-# Copyright 1999-2019 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-EGO_PN="github.com/${PN}/${PN}" |
42 |
- |
43 |
-inherit golang-vcs-snapshot systemd user eapi7-ver |
44 |
- |
45 |
-DESCRIPTION="Open Source Continuous File Synchronization" |
46 |
-HOMEPAGE="https://syncthing.net" |
47 |
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
48 |
- |
49 |
-LICENSE="MPL-2.0" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 arm x86" |
52 |
-IUSE="selinux tools" |
53 |
- |
54 |
-RDEPEND="selinux? ( sec-policy/selinux-syncthing )" |
55 |
- |
56 |
-DOCS=( README.md AUTHORS CONTRIBUTING.md ) |
57 |
- |
58 |
-pkg_setup() { |
59 |
- enewgroup ${PN} |
60 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} |
61 |
- |
62 |
- if use tools ; then |
63 |
- # separate user for the relay server |
64 |
- enewgroup strelaysrv |
65 |
- enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv |
66 |
- # and his home folder |
67 |
- keepdir /var/lib/strelaysrv |
68 |
- fowners strelaysrv:strelaysrv /var/lib/strelaysrv |
69 |
- fi |
70 |
-} |
71 |
- |
72 |
-src_prepare() { |
73 |
- default |
74 |
- sed -i \ |
75 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ |
76 |
- src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ |
77 |
- || die |
78 |
-} |
79 |
- |
80 |
-src_compile() { |
81 |
- export GOPATH="${S}:$(get_golibdir_gopath)" |
82 |
- cd src/${EGO_PN} || die |
83 |
- go run build.go -version "v${PV}" -no-upgrade install \ |
84 |
- $(usex tools "all" "") || die "build failed" |
85 |
-} |
86 |
- |
87 |
-src_test() { |
88 |
- cd src/${EGO_PN} || die |
89 |
- go run build.go test || die "test failed" |
90 |
-} |
91 |
- |
92 |
-src_install() { |
93 |
- pushd src/${EGO_PN} >& /dev/null || die |
94 |
- doman man/*.[157] |
95 |
- einstalldocs |
96 |
- |
97 |
- dobin bin/syncthing |
98 |
- if use tools ; then |
99 |
- exeinto /usr/libexec/syncthing |
100 |
- local exe |
101 |
- for exe in bin/* ; do |
102 |
- [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" |
103 |
- done |
104 |
- fi |
105 |
- popd >& /dev/null || die |
106 |
- |
107 |
- # openrc and systemd service files |
108 |
- systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service |
109 |
- systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service |
110 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
111 |
- newinitd "${FILESDIR}/${PN}.initd" ${PN} |
112 |
- |
113 |
- keepdir /var/{lib,log}/${PN} |
114 |
- fowners ${PN}:${PN} /var/{lib,log}/${PN} |
115 |
- insinto /etc/logrotate.d |
116 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
117 |
- |
118 |
- if use tools ; then |
119 |
- # openrc and systemd service files |
120 |
- systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service |
121 |
- newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv |
122 |
- newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv |
123 |
- |
124 |
- insinto /etc/logrotate.d |
125 |
- newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv |
126 |
- fi |
127 |
-} |
128 |
- |
129 |
-pkg_postinst() { |
130 |
- local v |
131 |
- for v in ${REPLACING_VERSIONS}; do |
132 |
- if [[ $(ver_cut 2) -gt \ |
133 |
- $(ver_cut 2 ${v}) ]]; then |
134 |
- ewarn "Version ${PV} is not protocol-compatible with version" \ |
135 |
- "0.$(($(ver_cut 2) - 1)).x or lower." |
136 |
- ewarn "Make sure all your devices are running at least version" \ |
137 |
- "0.$(ver_cut 2).0." |
138 |
- fi |
139 |
- ewarn "Syncthing OpenRC init script now uses the upstream default of" |
140 |
- ewarn "" |
141 |
- ewarn " /var/lib/${PN}/.config/${PN}" |
142 |
- ewarn "" |
143 |
- ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR" |
144 |
- ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue" |
145 |
- ewarn "using the old Gentoo default. Systemd users are not affected." |
146 |
- done |
147 |
- |
148 |
- # check if user syncthing-relaysrv exists |
149 |
- # if yes, warn that it has been moved to strelaysrv |
150 |
- if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then |
151 |
- ewarn |
152 |
- ewarn "The user and group for the relay server have been changed" |
153 |
- ewarn "from syncthing-relaysrv to strelaysrv" |
154 |
- ewarn "The old user and group are not deleted automatically. Delete them by running:" |
155 |
- ewarn " userdel -r syncthing-relaysrv" |
156 |
- ewarn " groupdel syncthing-relaysrv" |
157 |
- fi |
158 |
-} |
159 |
|
160 |
diff --git a/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild b/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild |
161 |
deleted file mode 100644 |
162 |
index c0734439f11..00000000000 |
163 |
--- a/net-p2p/syncthing/syncthing-1.1.4-r1.ebuild |
164 |
+++ /dev/null |
165 |
@@ -1,149 +0,0 @@ |
166 |
-# Copyright 1999-2019 Gentoo Authors |
167 |
-# Distributed under the terms of the GNU General Public License v2 |
168 |
- |
169 |
-EAPI=7 |
170 |
- |
171 |
-EGO_PN="github.com/${PN}/${PN}" |
172 |
- |
173 |
-EGO_VENDOR=( |
174 |
- "github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca" |
175 |
- "github.com/AudriusButkevicius/recli v0.0.5" |
176 |
- "github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a" |
177 |
- "github.com/calmh/du v1.0.1" |
178 |
- "github.com/calmh/xdr v1.1.0" |
179 |
- "github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81" |
180 |
- "github.com/d4l3k/messagediff v1.2.1" |
181 |
- "github.com/davecgh/go-spew v1.1.1" |
182 |
- "github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff" |
183 |
- "github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420" |
184 |
- "github.com/gogo/protobuf v1.2.1" |
185 |
- "github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4" |
186 |
- "github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9" |
187 |
- "github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006" |
188 |
- "github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2" |
189 |
- "github.com/kr/pretty v0.1.0" |
190 |
- "github.com/lib/pq v1.1.1" |
191 |
- "github.com/mattn/go-isatty v0.0.7" |
192 |
- "github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d" |
193 |
- "github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390" |
194 |
- "github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64" |
195 |
- "github.com/oschwald/geoip2-golang v1.3.0" |
196 |
- "github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f" |
197 |
- "github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02" |
198 |
- "github.com/pkg/errors v0.8.1" |
199 |
- "github.com/pmezard/go-difflib v1.0.0" |
200 |
- "github.com/prometheus/client_golang v0.9.2" |
201 |
- "github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50" |
202 |
- "github.com/sasha-s/go-deadlock v0.2.0" |
203 |
- "github.com/stretchr/testify v1.2.2" |
204 |
- "github.com/syncthing/notify 4e389ea6c0d84e6195eb585ffaf62c8c143306ae" |
205 |
- "github.com/syndtr/goleveldb 34011bf325bce385408353a30b101fe5e923eb6e" |
206 |
- "github.com/thejerf/suture v3.0.2" |
207 |
- "github.com/urfave/cli v1.20.0" |
208 |
- "github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa" |
209 |
- "golang.org/x/crypto 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 github.com/golang/crypto" |
210 |
- "golang.org/x/net 351d144fa1fc0bd934e2408202be0c29f25e35a0 github.com/golang/net" |
211 |
- "golang.org/x/sys 4d1cda033e0619309c606fc686de3adcf599539e github.com/golang/sys" |
212 |
- "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text" |
213 |
- "golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time" |
214 |
- "gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber" |
215 |
- "gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check" |
216 |
- "gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap" |
217 |
- "gopkg.in/yaml.v2 v2.0.0 github.com/go-yaml/yaml" |
218 |
- # These are only used by the test suite but conditional vendoring is messy |
219 |
- "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" |
220 |
- "github.com/golang/protobuf v1.2.0" |
221 |
- "github.com/matttproud/golang_protobuf_extensions v1.0.1" |
222 |
- "github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" |
223 |
- "github.com/prometheus/common v0.1.0" |
224 |
- "github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4" |
225 |
-) |
226 |
- |
227 |
-inherit golang-vcs-snapshot systemd xdg-utils |
228 |
- |
229 |
-DESCRIPTION="Open Source Continuous File Synchronization" |
230 |
-HOMEPAGE="https://syncthing.net" |
231 |
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
232 |
- ${EGO_VENDOR_URI}" |
233 |
- |
234 |
-LICENSE="MPL-2.0" |
235 |
-SLOT="0" |
236 |
-KEYWORDS="~amd64 ~arm ~x86" |
237 |
-IUSE="selinux tools" |
238 |
- |
239 |
-BDEPEND=">=dev-lang/go-1.12" |
240 |
-RDEPEND="acct-group/syncthing |
241 |
- acct-user/syncthing |
242 |
- tools? ( acct-group/stdiscosrv |
243 |
- acct-group/strelaysrv |
244 |
- acct-user/stdiscosrv |
245 |
- acct-user/strelaysrv ) |
246 |
- selinux? ( sec-policy/selinux-syncthing )" |
247 |
- |
248 |
-DOCS=( README.md AUTHORS CONTRIBUTING.md ) |
249 |
- |
250 |
-src_prepare() { |
251 |
- # Bug #679280 |
252 |
- xdg_environment_reset |
253 |
- |
254 |
- default |
255 |
- sed -i \ |
256 |
- 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ |
257 |
- src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ |
258 |
- || die |
259 |
-} |
260 |
- |
261 |
-src_compile() { |
262 |
- export GOPATH="${S}:$(get_golibdir_gopath)" |
263 |
- cd src/${EGO_PN} || die |
264 |
- go run build.go -version "v${PV}" -no-upgrade install \ |
265 |
- $(usex tools "all" "") || die "build failed" |
266 |
-} |
267 |
- |
268 |
-src_test() { |
269 |
- cd src/${EGO_PN} || die |
270 |
- go run build.go test || die "test failed" |
271 |
-} |
272 |
- |
273 |
-src_install() { |
274 |
- pushd src/${EGO_PN} >& /dev/null || die |
275 |
- doman man/*.[157] |
276 |
- einstalldocs |
277 |
- |
278 |
- dobin bin/syncthing |
279 |
- if use tools ; then |
280 |
- exeinto /usr/libexec/syncthing |
281 |
- local exe |
282 |
- for exe in bin/* ; do |
283 |
- [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" |
284 |
- done |
285 |
- fi |
286 |
- popd >& /dev/null || die |
287 |
- |
288 |
- # openrc and systemd service files |
289 |
- systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service |
290 |
- systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service |
291 |
- newconfd "${FILESDIR}/${PN}.confd" ${PN} |
292 |
- newinitd "${FILESDIR}/${PN}.initd" ${PN} |
293 |
- |
294 |
- keepdir /var/{lib,log}/${PN} |
295 |
- fowners ${PN}:${PN} /var/{lib,log}/${PN} |
296 |
- insinto /etc/logrotate.d |
297 |
- newins "${FILESDIR}/${PN}.logrotate" ${PN} |
298 |
- |
299 |
- if use tools ; then |
300 |
- # openrc and systemd service files |
301 |
- |
302 |
- systemd_dounit "${FILESDIR}/stdiscosrv.service" |
303 |
- newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv |
304 |
- newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv |
305 |
- |
306 |
- systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service |
307 |
- newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv |
308 |
- newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv |
309 |
- |
310 |
- insinto /etc/logrotate.d |
311 |
- newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv |
312 |
- newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv |
313 |
- fi |
314 |
-} |