Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
Date: Sat, 26 Nov 2016 12:06:59
Message-Id: 1480161991.d605a3630d9ad4b602b973162992c5ad3997b5dd.soap@gentoo
1 commit: d605a3630d9ad4b602b973162992c5ad3997b5dd
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 23 13:43:05 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 12:06:31 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d605a363
7
8 net-p2p/syncthing: remove old
9
10 Package-Manager: portage-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/2913
12
13 net-p2p/syncthing/Manifest | 1 -
14 net-p2p/syncthing/syncthing-0.14.11.ebuild | 122 -----------------------------
15 2 files changed, 123 deletions(-)
16
17 diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
18 index cacc9b7..812f601 100644
19 --- a/net-p2p/syncthing/Manifest
20 +++ b/net-p2p/syncthing/Manifest
21 @@ -1,5 +1,4 @@
22 DIST syncthing-0.14.10.tar.gz 6439231 SHA256 abd0695f12a4bc1dbb9ac1c5f3a9caf7b20e3c2cdeee9ab3859d66df98070dce SHA512 69f9d7ab3b3df663604d0da272d35abcf47553ae7e0b825d22385a3331848621597d35c6bd4b9591231c1160d9fb2c8d368fb9845f0d2e80aef7833acb829b7a WHIRLPOOL bf63ee69f889ed54f5bded339224a131ef2aa9781df4cbfbfb7d279fe83c9268c9ca350ccbaa3f8509d46297e05754f2454d854d96966ef366340bc05fef29cd
23 -DIST syncthing-0.14.11.tar.gz 6455020 SHA256 7d6b85724cf7a9b5cf0ded602f8cd132e02f1809c3d5d59593d6b78248c75e9f SHA512 ff326096da47c1b14a0c2c89ade96e79342c63b5d412d7bb5031fc1d489c9468f245d296b971a7e5b90183a4b2f4a8e8fe7d8ab0b01ca06fc780dd277523a68e WHIRLPOOL cd8d4dfd701783cc05403349f48acbf0ab6eb2e760ff00104bca337dd2b8868fda4eb6e1860a6d5402ffc4bcc3973ab24c2094a1fd481ef958b514138400ecc3
24 DIST syncthing-0.14.12.tar.gz 6464612 SHA256 0778785636e2c095f8f6cd353a206e0e1b1db37c40a4c79156a08eaaffcff81f SHA512 89e6bc7ae351da8904cb8d84af912f6864a66ad509dedbc74cda9ba2eaa5035f0e5123d76402070ca3251fde3caeb94eb25897cef23152265651a9478835bc9d WHIRLPOOL 66a96998d1aec638de770dc5fb424a46aa13d84e86a8584e7b41b2014ac3c1df2627eaf2faf42ddca11b0b9cf54cc676609a2483b307c7e8242f2ab8e37d5998
25 DIST syncthing-0.14.6.tar.gz 6390369 SHA256 481d9e88db0c3b3e9b0c796fa6dbb62447f0da69022c77f0065370873b0909ff SHA512 2a6d7dda6f014b1fce75d3199afdde517344524356e3881bb3cac035adc53dae3401260f072099a60d31394279e386c1d0e661fe21a5df0f1bf6b9808017ba34 WHIRLPOOL e24ce88d5448d4f599a3de52c049d5eed3531d7072b9dbf731ec684e648b580f02b559e0b72f441b4bc41aeb8500e7e78cc2379aeb029b35c7b91bb7e411970e
26 DIST syncthing-0.14.9.tar.gz 6431103 SHA256 c04350e66a88ec027daa0d72f9fea5815ac73dc8543c271fe2fa0b53657c5502 SHA512 19d4e6ab9ad76c16e4406914b125626c9bec1d76b1ce28e776e357dd78cee1e0a4117346927376ab8292a0c6ba4843bc32c04abdf25bae9e6010343306873079 WHIRLPOOL 879c5eae5aade78e596fdd1f4f1da595a9c48e2b521fc0a9616af5721a7d3dd117d392fe654650bc0d9ca613a395e689ffbbe47c4b76a16a4bfccf8e621d145b
27
28 diff --git a/net-p2p/syncthing/syncthing-0.14.11.ebuild b/net-p2p/syncthing/syncthing-0.14.11.ebuild
29 deleted file mode 100644
30 index ade2ed9..00000000
31 --- a/net-p2p/syncthing/syncthing-0.14.11.ebuild
32 +++ /dev/null
33 @@ -1,122 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=6
39 -
40 -EGO_PN="github.com/${PN}/${PN}"
41 -
42 -inherit golang-vcs-snapshot systemd user versionator
43 -
44 -DESCRIPTION="Open Source Continuous File Synchronization"
45 -HOMEPAGE="https://syncthing.net"
46 -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="MPL-2.0"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~x86 ~arm"
51 -IUSE="tools"
52 -
53 -DOCS=(README.md AUTHORS CONTRIBUTING.md)
54 -
55 -pkg_setup() {
56 - enewgroup ${PN}
57 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
58 -
59 - if use tools ; then
60 - # separate user for the relay server
61 - enewgroup strelaysrv
62 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
63 - # and his home folder
64 - keepdir /var/lib/strelaysrv
65 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
66 - fi
67 -}
68 -
69 -src_prepare() {
70 - default
71 - sed -i \
72 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
73 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
74 - || die
75 -}
76 -
77 -src_compile() {
78 - export GOPATH="${S}:$(get_golibdir_gopath)"
79 - cd src/${EGO_PN} || die
80 - # If we pass "build" to build.go, it builds only syncthing itself, and
81 - # places the binary in the root folder. If we do not pass "build", all the
82 - # tools are built, and all binaries are placed in folder ./bin.
83 - go run build.go -version "v${PV}" -no-upgrade $(usex tools "" "build") \
84 - || die "build failed"
85 -}
86 -
87 -# Tests sometimes fail, reported upstream
88 -# https://github.com/syncthing/syncthing/issues/3735
89 -src_test() {
90 - cd src/${EGO_PN} || die
91 - go run build.go test || die "test failed"
92 -}
93 -
94 -src_install() {
95 - pushd src/${EGO_PN} >& /dev/null || die
96 - doman man/*.[157]
97 - einstalldocs
98 -
99 - if use tools ; then
100 - dobin bin/syncthing
101 - exeinto /usr/libexec/syncthing
102 - local exe
103 - for exe in bin/* ; do
104 - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
105 - done
106 - else
107 - dobin syncthing
108 - fi
109 - popd >& /dev/null || die
110 -
111 - # openrc and systemd service files
112 - systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
113 - systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
114 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
115 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
116 -
117 - keepdir /var/{lib,log}/${PN}
118 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
119 - insinto /etc/logrotate.d
120 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
121 -
122 - if use tools ; then
123 - # openrc and systemd service files
124 - systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
125 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
126 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
127 -
128 - insinto /etc/logrotate.d
129 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
130 - fi
131 -}
132 -
133 -pkg_postinst() {
134 - local v
135 - for v in ${REPLACING_VERSIONS}; do
136 - if [[ $(get_version_component_range 2) -gt \
137 - $(get_version_component_range 2 ${v}) ]]; then
138 - ewarn "Version ${PV} is not protocol-compatible with version" \
139 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
140 - ewarn "Make sure all your devices are running at least version" \
141 - "0.$(get_version_component_range 2).0."
142 - fi
143 - done
144 -
145 - # check if user syncthing-relaysrv exists
146 - # if yes, warn that it has been moved to strelaysrv
147 - if [[ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]]; then
148 - ewarn
149 - ewarn "The user and group for the relay server have been changed"
150 - ewarn "from syncthing-relaysrv to strelaysrv"
151 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
152 - ewarn " userdel -r syncthing-relaysrv"
153 - ewarn " groupdel syncthing-relaysrv"
154 - fi
155 -}