Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/vnstat/, net-analyzer/vnstat/files/
Date: Thu, 27 Apr 2017 19:15:27
Message-Id: 1493320508.ebb9cc9bd067bed38f51ae61b39c5feb4a132a93.jer@gentoo
1 commit: ebb9cc9bd067bed38f51ae61b39c5feb4a132a93
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 27 19:12:31 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 27 19:15:08 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb9cc9b
7
8 net-analyzer/vnstat: Old.
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-analyzer/vnstat/Manifest | 2 -
13 net-analyzer/vnstat/files/vnstatd.initd | 36 -----------------
14 net-analyzer/vnstat/vnstat-1.15.ebuild | 69 --------------------------------
15 net-analyzer/vnstat/vnstat-1.16.ebuild | 71 ---------------------------------
16 4 files changed, 178 deletions(-)
17
18 diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
19 index 19e53d5148e..b22b3eca81e 100644
20 --- a/net-analyzer/vnstat/Manifest
21 +++ b/net-analyzer/vnstat/Manifest
22 @@ -1,3 +1 @@
23 -DIST vnstat-1.15.tar.gz 207712 SHA256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 SHA512 e6cf714c2c95ae7f82ec7852d23067da28f4fab83cf33726e4268a31f982ddf13c3bc30f17251a80f7c65d25f394cd05379a30e677687ce70f8c7b229ac0cb4e WHIRLPOOL 7cb68f5c054c96697e415f4d3c23074f36ba1b8fdd012abf732cb6e50eff0a4a862267ac252aace1d5d7fea38cd5f525113a9cdb7e27d9cd58fce373a68896c6
24 -DIST vnstat-1.16.tar.gz 211844 SHA256 420fec6c89229a100697f3189e824a1b81f7148dd651558f2ff03cc298308e8b SHA512 8906acebead4aef7ec7e96c4f9f17a2b9483f69cf530eb21d2ddc60de71b7690453bf533acfac298cf7e5184c23c7e6a886a757fdbfac3006cc09653c9a2cf6b WHIRLPOOL 1898fdefdbe4bbb75f7864b910786a42b6e6d462a6b35e9f55b26a3496086eb4b77cfa14908a9e0db0846fa85ae50c7c8eef652048445c461d06f866d2d32140
25 DIST vnstat-1.17.tar.gz 238397 SHA256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 WHIRLPOOL 38f64c6eadf7bbfcc1cd6cc3d8f8ea3da4846dd64caf242628ce9d0e6f9b8f565dff9d31ecd1633b3a0a8b5e7dcd4545f1adeafeb4f42547ad87be77317622e3
26
27 diff --git a/net-analyzer/vnstat/files/vnstatd.initd b/net-analyzer/vnstat/files/vnstatd.initd
28 deleted file mode 100644
29 index 1993b6414f8..00000000000
30 --- a/net-analyzer/vnstat/files/vnstatd.initd
31 +++ /dev/null
32 @@ -1,36 +0,0 @@
33 -#!/sbin/openrc-run
34 -# Copyright 1999-2012 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -extra_started_commands="reload"
38 -
39 -depend() {
40 - use net
41 -}
42 -
43 -VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/var/run/vnstatd/vnstatd.pid}"
44 -
45 -start() {
46 - ebegin "Starting vnstatd"
47 - checkpath -q -d -m 755 -o vnstat:vnstat /var/run/vnstatd
48 - start-stop-daemon --start --quiet \
49 - --pidfile "${VNSTATD_PIDFILE}" \
50 - --user vnstat --group vnstat \
51 - --nicelevel ${VNSTATD_NICELEVEL:-0} \
52 - --exec /usr/bin/vnstatd -- \
53 - -d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
54 - eend $?
55 -}
56 -
57 -stop() {
58 - ebegin "Stopping vnstatd"
59 - start-stop-daemon --stop --quiet \
60 - --pidfile "${VNSTATD_PIDFILE}"
61 - eend $?
62 -}
63 -
64 -reload() {
65 - ebegin "Reloading vnstatd configuration"
66 - kill -HUP $(< "${VNSTATD_PIDFILE}") &>/dev/null
67 - eend $?
68 -}
69
70 diff --git a/net-analyzer/vnstat/vnstat-1.15.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
71 deleted file mode 100644
72 index 3210f90bdf7..00000000000
73 --- a/net-analyzer/vnstat/vnstat-1.15.ebuild
74 +++ /dev/null
75 @@ -1,69 +0,0 @@
76 -# Copyright 1999-2017 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=5
80 -inherit toolchain-funcs user
81 -
82 -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
83 -HOMEPAGE="http://humdi.net/vnstat/"
84 -SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
85 -
86 -LICENSE="GPL-2"
87 -SLOT="0"
88 -KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
89 -IUSE="gd selinux test"
90 -
91 -COMMON_DEPEND="
92 - gd? ( media-libs/gd[png] )
93 -"
94 -DEPEND="
95 - ${COMMON_DEPEND}
96 - test? ( dev-libs/check )
97 -"
98 -RDEPEND="
99 - ${COMMON_DEPEND}
100 - selinux? ( sec-policy/selinux-vnstatd )
101 -"
102 -
103 -pkg_setup() {
104 - enewgroup vnstat
105 - enewuser vnstat -1 -1 /dev/null vnstat
106 -}
107 -
108 -src_prepare() {
109 - tc-export CC
110 -
111 - sed -i \
112 - -e 's|vnstat[.]log|vnstatd.log|' \
113 - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
114 - -e 's|/var/run|/run|' \
115 - cfg/${PN}.conf || die
116 - sed -i \
117 - -e '/PIDFILE/s|/var/run|/run|' \
118 - src/common.h || die
119 -}
120 -
121 -src_compile() {
122 - emake ${PN} ${PN}d $(usex gd ${PN}i '')
123 -}
124 -
125 -src_install() {
126 - use gd && dobin vnstati
127 - dobin vnstat vnstatd
128 -
129 - exeinto /etc/cron.hourly
130 - newexe "${FILESDIR}"/vnstat.cron vnstat
131 -
132 - insinto /etc
133 - doins cfg/vnstat.conf
134 - fowners root:vnstat /etc/vnstat.conf
135 -
136 - newconfd "${FILESDIR}"/vnstatd.confd vnstatd
137 - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
138 -
139 - use gd && doman man/vnstati.1
140 - doman man/vnstat.1 man/vnstatd.1
141 -
142 - newdoc INSTALL README.setup
143 - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
144 -}
145
146 diff --git a/net-analyzer/vnstat/vnstat-1.16.ebuild b/net-analyzer/vnstat/vnstat-1.16.ebuild
147 deleted file mode 100644
148 index 1c810d09039..00000000000
149 --- a/net-analyzer/vnstat/vnstat-1.16.ebuild
150 +++ /dev/null
151 @@ -1,71 +0,0 @@
152 -# Copyright 1999-2016 Gentoo Foundation
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=6
156 -inherit toolchain-funcs user
157 -
158 -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
159 -HOMEPAGE="http://humdi.net/vnstat/"
160 -SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
161 -
162 -LICENSE="GPL-2"
163 -SLOT="0"
164 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
165 -IUSE="gd selinux test"
166 -
167 -COMMON_DEPEND="
168 - gd? ( media-libs/gd[png] )
169 -"
170 -DEPEND="
171 - ${COMMON_DEPEND}
172 - test? ( dev-libs/check )
173 -"
174 -RDEPEND="
175 - ${COMMON_DEPEND}
176 - selinux? ( sec-policy/selinux-vnstatd )
177 -"
178 -
179 -pkg_setup() {
180 - enewgroup vnstat
181 - enewuser vnstat -1 -1 /dev/null vnstat
182 -}
183 -
184 -src_prepare() {
185 - default
186 -
187 - tc-export CC
188 -
189 - sed -i \
190 - -e 's|vnstat[.]log|vnstatd.log|' \
191 - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
192 - -e 's|/var/run|/run|' \
193 - cfg/${PN}.conf || die
194 - sed -i \
195 - -e '/PIDFILE/s|/var/run|/run|' \
196 - src/common.h || die
197 -}
198 -
199 -src_compile() {
200 - emake ${PN} ${PN}d $(usex gd ${PN}i '')
201 -}
202 -
203 -src_install() {
204 - use gd && dobin vnstati
205 - dobin vnstat vnstatd
206 -
207 - exeinto /etc/cron.hourly
208 - newexe "${FILESDIR}"/vnstat.cron vnstat
209 -
210 - insinto /etc
211 - doins cfg/vnstat.conf
212 - fowners root:vnstat /etc/vnstat.conf
213 -
214 - newconfd "${FILESDIR}"/vnstatd.confd vnstatd
215 - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
216 -
217 - use gd && doman man/vnstati.1
218 - doman man/vnstat.1 man/vnstatd.1
219 -
220 - newdoc INSTALL README.setup
221 - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
222 -}