Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
Date: Tue, 12 Mar 2019 10:22:37
Message-Id: 1552385217.7a737731b1a86eb47b32983fa6289dcacc5cc6ce.marecki@gentoo
1 commit: 7a737731b1a86eb47b32983fa6289dcacc5cc6ce
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 12 10:06:57 2019 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 12 10:06:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a737731
7
8 net-p2p/syncthing: remove old
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 net-p2p/syncthing/Manifest | 2 -
14 net-p2p/syncthing/syncthing-0.14.38.ebuild | 123 -----------------------------
15 net-p2p/syncthing/syncthing-0.14.51.ebuild | 123 -----------------------------
16 3 files changed, 248 deletions(-)
17
18 diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
19 index a16b5b7fbe4..7ee4f9d3aaa 100644
20 --- a/net-p2p/syncthing/Manifest
21 +++ b/net-p2p/syncthing/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5
24 -DIST syncthing-0.14.51.tar.gz 10970620 BLAKE2B ba41debaddf217069b47901d0c43f163ff0ae3ca4aadb8689401195cfc9f11a3ed641d2d96a590821adac62d12d0ff83df26a4a336ca09476d755b8230a63c87 SHA512 d670b1df341c8da95d38170e03b40deb19dfcdf0c0df9b4630c74b4fcc979bd9a863c0ca0510e28739bac14b1aad51ce40abe695765186acad78ea0d7eb3a20c
25 DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
26 DIST syncthing-1.0.0.tar.gz 10601948 BLAKE2B f9b509b78850efb315e33afff49f8468e3ea97a4aac90752e07851604960e817dbdcdb9824f2a6174b1f066ac277a119eea5aff75f6247a43652b70a5ff4f9af SHA512 79adbce03524665d02c1ca772fdf5aca68d9e41ee4bc02bcb9ac6ed0d8dca2fe8582139f52a0fe895ad5eb15c372d686277077ff884b67de1d45419e19407603
27
28 diff --git a/net-p2p/syncthing/syncthing-0.14.38.ebuild b/net-p2p/syncthing/syncthing-0.14.38.ebuild
29 deleted file mode 100644
30 index ca236b559e8..00000000000
31 --- a/net-p2p/syncthing/syncthing-0.14.38.ebuild
32 +++ /dev/null
33 @@ -1,123 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -EGO_PN="github.com/${PN}/${PN}"
40 -
41 -inherit golang-vcs-snapshot systemd user versionator
42 -
43 -DESCRIPTION="Open Source Continuous File Synchronization"
44 -HOMEPAGE="https://syncthing.net"
45 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="MPL-2.0"
48 -SLOT="0"
49 -KEYWORDS="amd64 arm x86"
50 -IUSE="selinux tools"
51 -
52 -RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
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 - go run build.go -version "v${PV}" -no-upgrade install \
82 - $(usex tools "all" "") || die "build failed"
83 -}
84 -
85 -src_test() {
86 - cd src/${EGO_PN} || die
87 - go run build.go test || die "test failed"
88 -}
89 -
90 -src_install() {
91 - pushd src/${EGO_PN} >& /dev/null || die
92 - doman man/*.[157]
93 - einstalldocs
94 -
95 - dobin bin/syncthing
96 - if use tools ; then
97 - exeinto /usr/libexec/syncthing
98 - local exe
99 - for exe in bin/* ; do
100 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
101 - done
102 - fi
103 - popd >& /dev/null || die
104 -
105 - # openrc and systemd service files
106 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
107 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
108 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
109 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
110 -
111 - keepdir /var/{lib,log}/${PN}
112 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
113 - insinto /etc/logrotate.d
114 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
115 -
116 - if use tools ; then
117 - # openrc and systemd service files
118 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
119 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
120 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
121 -
122 - insinto /etc/logrotate.d
123 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
124 - fi
125 -}
126 -
127 -pkg_postinst() {
128 - local v
129 - for v in ${REPLACING_VERSIONS}; do
130 - if [[ $(get_version_component_range 2) -gt \
131 - $(get_version_component_range 2 ${v}) ]]; then
132 - ewarn "Version ${PV} is not protocol-compatible with version" \
133 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
134 - ewarn "Make sure all your devices are running at least version" \
135 - "0.$(get_version_component_range 2).0."
136 - fi
137 - ewarn "Syncthing OpenRC init script now uses the upstream default of"
138 - ewarn ""
139 - ewarn " /var/lib/${PN}/.config/${PN}"
140 - ewarn ""
141 - ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
142 - ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
143 - ewarn "using the old Gentoo default. Systemd users are not affected."
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.51.ebuild b/net-p2p/syncthing/syncthing-0.14.51.ebuild
159 deleted file mode 100644
160 index ada15a2f82f..00000000000
161 --- a/net-p2p/syncthing/syncthing-0.14.51.ebuild
162 +++ /dev/null
163 @@ -1,123 +0,0 @@
164 -# Copyright 1999-2018 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=6
168 -
169 -EGO_PN="github.com/${PN}/${PN}"
170 -
171 -inherit golang-vcs-snapshot systemd user eapi7-ver
172 -
173 -DESCRIPTION="Open Source Continuous File Synchronization"
174 -HOMEPAGE="https://syncthing.net"
175 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
176 -
177 -LICENSE="MPL-2.0"
178 -SLOT="0"
179 -KEYWORDS="~amd64 ~arm ~x86"
180 -IUSE="selinux tools"
181 -
182 -RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
183 -
184 -DOCS=( README.md AUTHORS CONTRIBUTING.md )
185 -
186 -pkg_setup() {
187 - enewgroup ${PN}
188 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
189 -
190 - if use tools ; then
191 - # separate user for the relay server
192 - enewgroup strelaysrv
193 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
194 - # and his home folder
195 - keepdir /var/lib/strelaysrv
196 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
197 - fi
198 -}
199 -
200 -src_prepare() {
201 - default
202 - sed -i \
203 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
204 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
205 - || die
206 -}
207 -
208 -src_compile() {
209 - export GOPATH="${S}:$(get_golibdir_gopath)"
210 - cd src/${EGO_PN} || die
211 - go run build.go -version "v${PV}" -no-upgrade install \
212 - $(usex tools "all" "") || die "build failed"
213 -}
214 -
215 -src_test() {
216 - cd src/${EGO_PN} || die
217 - go run build.go test || die "test failed"
218 -}
219 -
220 -src_install() {
221 - pushd src/${EGO_PN} >& /dev/null || die
222 - doman man/*.[157]
223 - einstalldocs
224 -
225 - dobin bin/syncthing
226 - if use tools ; then
227 - exeinto /usr/libexec/syncthing
228 - local exe
229 - for exe in bin/* ; do
230 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
231 - done
232 - fi
233 - popd >& /dev/null || die
234 -
235 - # openrc and systemd service files
236 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
237 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
238 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
239 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
240 -
241 - keepdir /var/{lib,log}/${PN}
242 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
243 - insinto /etc/logrotate.d
244 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
245 -
246 - if use tools ; then
247 - # openrc and systemd service files
248 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
249 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
250 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
251 -
252 - insinto /etc/logrotate.d
253 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
254 - fi
255 -}
256 -
257 -pkg_postinst() {
258 - local v
259 - for v in ${REPLACING_VERSIONS}; do
260 - if [[ $(ver_cut 2) -gt \
261 - $(ver_cut 2 ${v}) ]]; then
262 - ewarn "Version ${PV} is not protocol-compatible with version" \
263 - "0.$(($(ver_cut 2) - 1)).x or lower."
264 - ewarn "Make sure all your devices are running at least version" \
265 - "0.$(ver_cut 2).0."
266 - fi
267 - ewarn "Syncthing OpenRC init script now uses the upstream default of"
268 - ewarn ""
269 - ewarn " /var/lib/${PN}/.config/${PN}"
270 - ewarn ""
271 - ewarn "as its configuration directory. Please set SYNCTHING_HOMEDIR"
272 - ewarn "to /var/lib/${PN} in /etc/conf.d/${PN} if you wish to continue"
273 - ewarn "using the old Gentoo default. Systemd users are not affected."
274 - done
275 -
276 - # check if user syncthing-relaysrv exists
277 - # if yes, warn that it has been moved to strelaysrv
278 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
279 - ewarn
280 - ewarn "The user and group for the relay server have been changed"
281 - ewarn "from syncthing-relaysrv to strelaysrv"
282 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
283 - ewarn " userdel -r syncthing-relaysrv"
284 - ewarn " groupdel syncthing-relaysrv"
285 - fi
286 -}