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: Fri, 26 Aug 2016 09:24:53
Message-Id: 1472203465.136ef02f922588ec4698e608386af8603791bcac.djc@gentoo
1 commit: 136ef02f922588ec4698e608386af8603791bcac
2 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 23 11:15:53 2016 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 26 09:24:25 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136ef02f
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.0-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 ea16cb4..8eb1358 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.0.tar.gz 6368723 SHA256 bfa25ee766be4fb53c98df9aad99f57e562715280ed73445abe15ce2a713588e SHA512 68202cdd1db1c7cee77345e9c4786b4b3c97f69fb13df0b7450e40a2eacea75315324998a5e8286968cc5d462276dd75d4622f12038753734a09aae6ade6ac9e WHIRLPOOL 37da9eaff26f16fbafc30b1aa0b90b129832b85fc5cb95995a7d9570cbcdec40307b4d10a6547fbd6252bcd83b19a9a23fd9c618012eea4bf53cf89cbb8bc20a
23 DIST syncthing-0.14.3.tar.gz 6380761 SHA256 1c7ce74db4bf780463c04ed3d5677296ad2bb347f3e35fe4229eb26893a6604a SHA512 f9586013253ad031e1940e73f01f8ca398820e9ffeef0978fcd51079c535c04957c0be1314ecc635251ae06300c6b4141077ac5c3c8e7e9741d58e4545a7f3ba WHIRLPOOL b226642a41b8288ecd50eff5013a0c7b92e3f73dba85726f7bbbd529c0b6caeff85954205fcc7faf00bb9b5d18ff0809b93ddf7d0d4553815b3627bd2eb71c30
24 DIST syncthing-0.14.4.tar.gz 6387191 SHA256 5c29e2d3de4c35cf917df801c50a195f1cea612a31879c28a8474ce923c23551 SHA512 0540d1e58b67d13401ecff4988897d185b04ca44f360c68cc52a2be8e70661cd6b84d6eae2b8f56e5a0f590efd9a8462f477f0492e5903992102a6c66bd3534e WHIRLPOOL 4d5502c8e1d1577cc7223c88a7e364b853d7a2e469d9cdbbc01de98dd679fad61d3278ee8ff444acc10fec83bd460fce086b4ef47b2c0db17f7f0ec6f1377f90
25 DIST syncthing-0.14.5.tar.gz 6387026 SHA256 32979e333a77dcd4e2ba9cb9c74404f9fd06891032c84b1285bcb779c9e132b6 SHA512 c60e3205624e49de34c17a77cf3a8e7af49572a53faa97a6dca7e57a7009c068f70f986e4e3f60774514e3b74a09edff4e6843563456d4ff97b408843a9a06fb WHIRLPOOL 6283cf0cf0440a1333f4a27bdc5fcef389df975d177cd0cd41f7174164c9b9abc79dddbb9a64c394808b8ec4fa77b1f92fd67f2276d9b0277886d1a25437ef4e
26
27 diff --git a/net-p2p/syncthing/syncthing-0.14.0-r1.ebuild b/net-p2p/syncthing/syncthing-0.14.0-r1.ebuild
28 deleted file mode 100644
29 index 6b30bdc..00000000
30 --- a/net-p2p/syncthing/syncthing-0.14.0-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/syncthing/syncthing"
40 -EGIT_COMMIT=v${PV}
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/${EGIT_COMMIT}.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 - ST_BUILD="build"
84 - if use tools ; then
85 - ST_BUILD=""
86 - fi
87 - go run build.go -version "v${PV}" -no-upgrade ${ST_BUILD} || die "build failed"
88 -}
89 -
90 -src_test() {
91 - cd src/${EGO_PN} || die
92 - go run build.go test || die "test failed"
93 -}
94 -
95 -src_install() {
96 - cd src/${EGO_PN} || die
97 - doman man/*.[157]
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 -}