Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
Date: Sun, 04 Dec 2016 00:51:13
Message-Id: 1480812658.fa4bc5d21662c5621cc52a78616a4e66837b01e9.monsieurp@gentoo
1 commit: fa4bc5d21662c5621cc52a78616a4e66837b01e9
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 2 00:05:04 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 4 00:50:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4bc5d2
7
8 net-p2p/syncthing: remove old.
9
10 Package-Manager: portage-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/2979
12
13 net-p2p/syncthing/Manifest | 2 -
14 net-p2p/syncthing/syncthing-0.14.6.ebuild | 122 ------------------------------
15 net-p2p/syncthing/syncthing-0.14.9.ebuild | 122 ------------------------------
16 3 files changed, 246 deletions(-)
17
18 diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
19 index e3524be..76d121b 100644
20 --- a/net-p2p/syncthing/Manifest
21 +++ b/net-p2p/syncthing/Manifest
22 @@ -1,5 +1,3 @@
23 DIST syncthing-0.14.10.tar.gz 6439231 SHA256 abd0695f12a4bc1dbb9ac1c5f3a9caf7b20e3c2cdeee9ab3859d66df98070dce SHA512 69f9d7ab3b3df663604d0da272d35abcf47553ae7e0b825d22385a3331848621597d35c6bd4b9591231c1160d9fb2c8d368fb9845f0d2e80aef7833acb829b7a WHIRLPOOL bf63ee69f889ed54f5bded339224a131ef2aa9781df4cbfbfb7d279fe83c9268c9ca350ccbaa3f8509d46297e05754f2454d854d96966ef366340bc05fef29cd
24 DIST syncthing-0.14.12.tar.gz 6464612 SHA256 0778785636e2c095f8f6cd353a206e0e1b1db37c40a4c79156a08eaaffcff81f SHA512 89e6bc7ae351da8904cb8d84af912f6864a66ad509dedbc74cda9ba2eaa5035f0e5123d76402070ca3251fde3caeb94eb25897cef23152265651a9478835bc9d WHIRLPOOL 66a96998d1aec638de770dc5fb424a46aa13d84e86a8584e7b41b2014ac3c1df2627eaf2faf42ddca11b0b9cf54cc676609a2483b307c7e8242f2ab8e37d5998
25 DIST syncthing-0.14.13.tar.gz 6468568 SHA256 13bce8afff0814817a0d70cdd4deddcdb2fa46494561976ad75e238a0ffbdb47 SHA512 24f7f46e965df962a3759b1fdad15bded4b2b3c81a9a266798570b9686c3aad40a7ba99507ad5955ee2a5f1ed5224a8ba89b20459c65ca5f5338f2958d42fcf8 WHIRLPOOL 73d971209b1d6548b43e3209a019030278cafa69cf2e7b17ac442c3c3639c6867f0fd22ebcf96bf9fa4e071f9e053d75909b9d77684966837bba12ac3fafa7b1
26 -DIST syncthing-0.14.6.tar.gz 6390369 SHA256 481d9e88db0c3b3e9b0c796fa6dbb62447f0da69022c77f0065370873b0909ff SHA512 2a6d7dda6f014b1fce75d3199afdde517344524356e3881bb3cac035adc53dae3401260f072099a60d31394279e386c1d0e661fe21a5df0f1bf6b9808017ba34 WHIRLPOOL e24ce88d5448d4f599a3de52c049d5eed3531d7072b9dbf731ec684e648b580f02b559e0b72f441b4bc41aeb8500e7e78cc2379aeb029b35c7b91bb7e411970e
27 -DIST syncthing-0.14.9.tar.gz 6431103 SHA256 c04350e66a88ec027daa0d72f9fea5815ac73dc8543c271fe2fa0b53657c5502 SHA512 19d4e6ab9ad76c16e4406914b125626c9bec1d76b1ce28e776e357dd78cee1e0a4117346927376ab8292a0c6ba4843bc32c04abdf25bae9e6010343306873079 WHIRLPOOL 879c5eae5aade78e596fdd1f4f1da595a9c48e2b521fc0a9616af5721a7d3dd117d392fe654650bc0d9ca613a395e689ffbbe47c4b76a16a4bfccf8e621d145b
28
29 diff --git a/net-p2p/syncthing/syncthing-0.14.6.ebuild b/net-p2p/syncthing/syncthing-0.14.6.ebuild
30 deleted file mode 100644
31 index 3d1e955..00000000
32 --- a/net-p2p/syncthing/syncthing-0.14.6.ebuild
33 +++ /dev/null
34 @@ -1,122 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=6
40 -
41 -EGO_PN="github.com/${PN}/${PN}"
42 -
43 -inherit golang-vcs-snapshot systemd user versionator
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 ~x86 ~arm"
52 -IUSE="tools"
53 -
54 -DOCS="README.md AUTHORS CONTRIBUTING.md"
55 -
56 -pkg_setup() {
57 - enewgroup ${PN}
58 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
59 -
60 - if use tools ; then
61 - # separate user for the relay server
62 - enewgroup strelaysrv
63 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
64 - # and his home folder
65 - keepdir /var/lib/strelaysrv
66 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
67 - fi
68 -}
69 -
70 -src_prepare() {
71 - default
72 - sed -i \
73 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
74 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
75 - || die
76 -}
77 -
78 -src_compile() {
79 - export GOPATH="${S}:$(get_golibdir_gopath)"
80 - cd src/${EGO_PN} || die
81 - # If we pass "build" to build.go, it builds only syncthing itself, and
82 - # places the binary in the root folder. If we do not pass "build", all the
83 - # tools are built, and all binaries are placed in folder ./bin.
84 - ST_BUILD="build"
85 - if use tools ; then
86 - ST_BUILD=""
87 - fi
88 - go run build.go -version "v${PV}" -no-upgrade ${ST_BUILD} || die "build failed"
89 -}
90 -
91 -src_test() {
92 - cd src/${EGO_PN} || die
93 - go run build.go test || die "test failed"
94 -}
95 -
96 -src_install() {
97 - cd src/${EGO_PN} || die
98 - doman man/*.[157]
99 - einstalldocs
100 -
101 - if use tools ; then
102 - dobin bin/syncthing
103 - exeinto /usr/libexec/syncthing
104 - for exe in bin/* ; do
105 - [[ "${exe}" = "bin/syncthing" ]] || doexe "${exe}"
106 - done
107 - else
108 - dobin syncthing
109 - fi
110 -
111 - # openrc and systemd service files
112 - systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service \
113 - "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}-resume.service
114 - systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
115 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
116 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
117 -
118 - keepdir /var/{lib,log}/${PN}
119 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
120 - insinto /etc/logrotate.d
121 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
122 -
123 - if use tools ; then
124 - # openrc and systemd service files
125 - systemd_dounit "${S}"/src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
126 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
127 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
128 -
129 - insinto /etc/logrotate.d
130 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
131 - fi
132 -}
133 -
134 -pkg_postinst() {
135 - local v
136 - for v in ${REPLACING_VERSIONS}; do
137 - if [[ $(get_version_component_range 2) -gt \
138 - $(get_version_component_range 2 ${v}) ]]; then
139 - ewarn "Version ${PV} is not protocol-compatible with version" \
140 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
141 - ewarn "Make sure all your devices are running at least version" \
142 - "0.$(get_version_component_range 2).0."
143 - fi
144 - done
145 -
146 - # check if user syncthing-relaysrv exists
147 - # if yes, warn that it has been moved to strelaysrv
148 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
149 - ewarn
150 - ewarn "The user and group for the relay server have been changed"
151 - ewarn "from syncthing-relaysrv to strelaysrv"
152 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
153 - ewarn " userdel -r syncthing-relaysrv"
154 - ewarn " groupdel syncthing-relaysrv"
155 - fi
156 -}
157
158 diff --git a/net-p2p/syncthing/syncthing-0.14.9.ebuild b/net-p2p/syncthing/syncthing-0.14.9.ebuild
159 deleted file mode 100644
160 index 3d1e955..00000000
161 --- a/net-p2p/syncthing/syncthing-0.14.9.ebuild
162 +++ /dev/null
163 @@ -1,122 +0,0 @@
164 -# Copyright 1999-2016 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -# $Id$
167 -
168 -EAPI=6
169 -
170 -EGO_PN="github.com/${PN}/${PN}"
171 -
172 -inherit golang-vcs-snapshot systemd user versionator
173 -
174 -DESCRIPTION="Open Source Continuous File Synchronization"
175 -HOMEPAGE="https://syncthing.net"
176 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
177 -
178 -LICENSE="MPL-2.0"
179 -SLOT="0"
180 -KEYWORDS="~amd64 ~x86 ~arm"
181 -IUSE="tools"
182 -
183 -DOCS="README.md AUTHORS CONTRIBUTING.md"
184 -
185 -pkg_setup() {
186 - enewgroup ${PN}
187 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
188 -
189 - if use tools ; then
190 - # separate user for the relay server
191 - enewgroup strelaysrv
192 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
193 - # and his home folder
194 - keepdir /var/lib/strelaysrv
195 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
196 - fi
197 -}
198 -
199 -src_prepare() {
200 - default
201 - sed -i \
202 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
203 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
204 - || die
205 -}
206 -
207 -src_compile() {
208 - export GOPATH="${S}:$(get_golibdir_gopath)"
209 - cd src/${EGO_PN} || die
210 - # If we pass "build" to build.go, it builds only syncthing itself, and
211 - # places the binary in the root folder. If we do not pass "build", all the
212 - # tools are built, and all binaries are placed in folder ./bin.
213 - ST_BUILD="build"
214 - if use tools ; then
215 - ST_BUILD=""
216 - fi
217 - go run build.go -version "v${PV}" -no-upgrade ${ST_BUILD} || die "build failed"
218 -}
219 -
220 -src_test() {
221 - cd src/${EGO_PN} || die
222 - go run build.go test || die "test failed"
223 -}
224 -
225 -src_install() {
226 - cd src/${EGO_PN} || die
227 - doman man/*.[157]
228 - einstalldocs
229 -
230 - if use tools ; then
231 - dobin bin/syncthing
232 - exeinto /usr/libexec/syncthing
233 - for exe in bin/* ; do
234 - [[ "${exe}" = "bin/syncthing" ]] || doexe "${exe}"
235 - done
236 - else
237 - dobin syncthing
238 - fi
239 -
240 - # openrc and systemd service files
241 - systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service \
242 - "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}-resume.service
243 - systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
244 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
245 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
246 -
247 - keepdir /var/{lib,log}/${PN}
248 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
249 - insinto /etc/logrotate.d
250 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
251 -
252 - if use tools ; then
253 - # openrc and systemd service files
254 - systemd_dounit "${S}"/src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
255 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
256 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
257 -
258 - insinto /etc/logrotate.d
259 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
260 - fi
261 -}
262 -
263 -pkg_postinst() {
264 - local v
265 - for v in ${REPLACING_VERSIONS}; do
266 - if [[ $(get_version_component_range 2) -gt \
267 - $(get_version_component_range 2 ${v}) ]]; then
268 - ewarn "Version ${PV} is not protocol-compatible with version" \
269 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
270 - ewarn "Make sure all your devices are running at least version" \
271 - "0.$(get_version_component_range 2).0."
272 - fi
273 - done
274 -
275 - # check if user syncthing-relaysrv exists
276 - # if yes, warn that it has been moved to strelaysrv
277 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
278 - ewarn
279 - ewarn "The user and group for the relay server have been changed"
280 - ewarn "from syncthing-relaysrv to strelaysrv"
281 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
282 - ewarn " userdel -r syncthing-relaysrv"
283 - ewarn " groupdel syncthing-relaysrv"
284 - fi
285 -}