Gentoo Archives: gentoo-commits

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/
Date: Sat, 24 Sep 2016 08:55:01
Message-Id: 1474707280.ff061f9bd25e497b5d00aa8667b7bfec83584e25.djc@gentoo
1 commit: ff061f9bd25e497b5d00aa8667b7bfec83584e25
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 21 11:51:56 2016 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 24 08:54:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff061f9b
7
8 net-p2p/syncthing: remove old
9
10 Package-Manager: portage-2.3.0
11
12 net-p2p/syncthing/Manifest | 1 -
13 net-p2p/syncthing/syncthing-0.14.4-r1.ebuild | 122 ---------------------------
14 2 files changed, 123 deletions(-)
15
16 diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
17 index f16b3ac..b84d9d8 100644
18 --- a/net-p2p/syncthing/Manifest
19 +++ b/net-p2p/syncthing/Manifest
20 @@ -1,5 +1,4 @@
21 DIST syncthing-0.13.10.tar.gz 4292039 SHA256 a86c7948afabc6e7b07f217d5200fb1e36cde5bb13373d99cc67d5dc991ce3be SHA512 199c38644a7e5d43777ca2e497d5304d8e77485d21aeed9a00efc74dd98bfb0c473dd0bf3230b8e1e9742315915419f198bb8d0a9b294d2f6fe918b6e0175812 WHIRLPOOL a6f82ce032455e78122b9958ddab885b187bd7d46e1a00ca64f855d1ad6e3c25538b8304318ce7fba7753bd1ee17a91325a774ed27d8f1bcb635915937742b96
22 -DIST syncthing-0.14.4.tar.gz 6387191 SHA256 5c29e2d3de4c35cf917df801c50a195f1cea612a31879c28a8474ce923c23551 SHA512 0540d1e58b67d13401ecff4988897d185b04ca44f360c68cc52a2be8e70661cd6b84d6eae2b8f56e5a0f590efd9a8462f477f0492e5903992102a6c66bd3534e WHIRLPOOL 4d5502c8e1d1577cc7223c88a7e364b853d7a2e469d9cdbbc01de98dd679fad61d3278ee8ff444acc10fec83bd460fce086b4ef47b2c0db17f7f0ec6f1377f90
23 DIST syncthing-0.14.5.tar.gz 6387026 SHA256 32979e333a77dcd4e2ba9cb9c74404f9fd06891032c84b1285bcb779c9e132b6 SHA512 c60e3205624e49de34c17a77cf3a8e7af49572a53faa97a6dca7e57a7009c068f70f986e4e3f60774514e3b74a09edff4e6843563456d4ff97b408843a9a06fb WHIRLPOOL 6283cf0cf0440a1333f4a27bdc5fcef389df975d177cd0cd41f7174164c9b9abc79dddbb9a64c394808b8ec4fa77b1f92fd67f2276d9b0277886d1a25437ef4e
24 DIST syncthing-0.14.6.tar.gz 6390369 SHA256 481d9e88db0c3b3e9b0c796fa6dbb62447f0da69022c77f0065370873b0909ff SHA512 2a6d7dda6f014b1fce75d3199afdde517344524356e3881bb3cac035adc53dae3401260f072099a60d31394279e386c1d0e661fe21a5df0f1bf6b9808017ba34 WHIRLPOOL e24ce88d5448d4f599a3de52c049d5eed3531d7072b9dbf731ec684e648b580f02b559e0b72f441b4bc41aeb8500e7e78cc2379aeb029b35c7b91bb7e411970e
25 DIST syncthing-0.14.7.tar.gz 6434379 SHA256 5586f24e10e695bf2a3db1f2bfd2b8bf986753ecbc9919c922e2ba10c0bbb119 SHA512 883c8c7b060b7f216bcaf54393614f56f730772ccda91dc1c08545e26b439dca8532fcda1bd406ba07f32aad747af14174cd8d72be3349f5030d985ac90af0e3 WHIRLPOOL d736c6ade06e81b3de94a3dd72ef7888cfa1f30c3097870fde4ce80d332b9ee2dedfeae5bec9e511d63ac34b4828010147c5ab238a84d807f1c1c2047be28400
26
27 diff --git a/net-p2p/syncthing/syncthing-0.14.4-r1.ebuild b/net-p2p/syncthing/syncthing-0.14.4-r1.ebuild
28 deleted file mode 100644
29 index e18e316..00000000
30 --- a/net-p2p/syncthing/syncthing-0.14.4-r1.ebuild
31 +++ /dev/null
32 @@ -1,122 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
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 ~x86 ~arm"
50 -IUSE="tools"
51 -
52 -DOCS="README.md AUTHORS CONTRIBUTING.md"
53 -
54 -pkg_setup() {
55 - enewgroup ${PN}
56 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
57 -
58 - if use tools ; then
59 - # separate user for the relay server
60 - enewgroup strelaysrv
61 - enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
62 - # and his home folder
63 - keepdir /var/lib/strelaysrv
64 - fowners strelaysrv:strelaysrv /var/lib/strelaysrv
65 - fi
66 -}
67 -
68 -src_prepare() {
69 - default
70 - sed -i \
71 - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
72 - src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
73 - || die
74 -}
75 -
76 -src_compile() {
77 - export GOPATH="${S}:$(get_golibdir_gopath)"
78 - cd src/${EGO_PN} || die
79 - # If we pass "build" to build.go, it builds only syncthing itself, and
80 - # places the binary in the root folder. If we do not pass "build", all the
81 - # tools are built, and all binaries are placed in folder ./bin.
82 - ST_BUILD="build"
83 - if use tools ; then
84 - ST_BUILD=""
85 - fi
86 - go run build.go -version "v${PV}" -no-upgrade ${ST_BUILD} || die "build failed"
87 -}
88 -
89 -src_test() {
90 - cd src/${EGO_PN} || die
91 - go run build.go test || die "test failed"
92 -}
93 -
94 -src_install() {
95 - cd src/${EGO_PN} || die
96 - doman man/*.[157]
97 - einstalldocs
98 -
99 - if use tools ; then
100 - dobin bin/syncthing
101 - exeinto /usr/libexec/syncthing
102 - for exe in bin/* ; do
103 - [ "${exe}" = "bin/syncthing" ] || doexe "${exe}"
104 - done
105 - else
106 - dobin syncthing
107 - fi
108 -
109 - # openrc and systemd service files
110 - systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service \
111 - "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}-resume.service
112 - systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
113 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
114 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
115 -
116 - keepdir /var/{lib,log}/${PN}
117 - fowners ${PN}:${PN} /var/{lib,log}/${PN}
118 - insinto /etc/logrotate.d
119 - newins "${FILESDIR}/${PN}.logrotate" ${PN}
120 -
121 - if use tools ; then
122 - # openrc and systemd service files
123 - systemd_dounit "${S}"/src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
124 - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
125 - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
126 -
127 - insinto /etc/logrotate.d
128 - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
129 - fi
130 -}
131 -
132 -pkg_postinst() {
133 - local v
134 - for v in ${REPLACING_VERSIONS}; do
135 - if [[ $(get_version_component_range 2) -gt \
136 - $(get_version_component_range 2 ${v}) ]]; then
137 - ewarn "Version ${PV} is not protocol-compatible with version" \
138 - "0.$(($(get_version_component_range 2) - 1)).x or lower."
139 - ewarn "Make sure all your devices are running at least version" \
140 - "0.$(get_version_component_range 2).0."
141 - fi
142 - done
143 -
144 - # check if user syncthing-relaysrv exists
145 - # if yes, warn that it has been moved to strelaysrv
146 - if [ -n "$(egetent passwd syncthing-relaysrv 2>/dev/null)" ]; then
147 - ewarn
148 - ewarn "The user and group for the relay server have been changed"
149 - ewarn "from syncthing-relaysrv to strelaysrv"
150 - ewarn "The old user and group are not deleted automatically. Delete them by running:"
151 - ewarn " userdel -r syncthing-relaysrv"
152 - ewarn " groupdel syncthing-relaysrv"
153 - fi
154 -}