1 |
commit: 84b3c8ea900896452c2fafac4710ecf6dafd0349 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 17 00:35:38 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 17 00:37:11 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b3c8ea |
7 |
|
8 |
net-analyzer/vnstat: port 1.17, 2.6 to GLEP 81 too |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../vnstat/{vnstat-1.17.ebuild => vnstat-1.17-r1.ebuild} | 11 ++++------- |
13 |
.../vnstat/{vnstat-2.6.ebuild => vnstat-2.6-r1.ebuild} | 11 ++++------- |
14 |
2 files changed, 8 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild |
17 |
similarity index 89% |
18 |
rename from net-analyzer/vnstat/vnstat-1.17.ebuild |
19 |
rename to net-analyzer/vnstat/vnstat-1.17-r1.ebuild |
20 |
index 5a1f12b3e07..fceff0f93ca 100644 |
21 |
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild |
22 |
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild |
23 |
@@ -4,7 +4,7 @@ |
24 |
EAPI=7 |
25 |
|
26 |
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc |
27 |
-inherit toolchain-funcs user verify-sig |
28 |
+inherit toolchain-funcs verify-sig |
29 |
|
30 |
DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" |
31 |
HOMEPAGE="https://humdi.net/vnstat/" |
32 |
@@ -22,14 +22,11 @@ DEPEND=" |
33 |
${RDEPEND} |
34 |
test? ( dev-libs/check ) |
35 |
" |
36 |
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" |
37 |
+RDEPEND+=" acct-group/vnstat |
38 |
+ acct-user/vnstat |
39 |
+ selinux? ( sec-policy/selinux-vnstatd )" |
40 |
BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" |
41 |
|
42 |
-pkg_setup() { |
43 |
- enewgroup vnstat |
44 |
- enewuser vnstat -1 -1 /dev/null vnstat |
45 |
-} |
46 |
- |
47 |
src_prepare() { |
48 |
default |
49 |
|
50 |
|
51 |
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild |
52 |
similarity index 91% |
53 |
rename from net-analyzer/vnstat/vnstat-2.6.ebuild |
54 |
rename to net-analyzer/vnstat/vnstat-2.6-r1.ebuild |
55 |
index e1ce66f909c..3d37feff320 100644 |
56 |
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild |
57 |
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild |
58 |
@@ -3,7 +3,7 @@ |
59 |
|
60 |
EAPI=7 |
61 |
|
62 |
-inherit systemd user tmpfiles |
63 |
+inherit systemd tmpfiles |
64 |
|
65 |
DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" |
66 |
HOMEPAGE="https://humdi.net/vnstat/" |
67 |
@@ -36,7 +36,9 @@ DEPEND=" |
68 |
${RDEPEND} |
69 |
test? ( dev-libs/check ) |
70 |
" |
71 |
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" |
72 |
+RDEPEND+=" acct-group/vnstat |
73 |
+ acct-user/vnstat |
74 |
+ selinux? ( sec-policy/selinux-vnstatd )" |
75 |
|
76 |
PATCHES=( |
77 |
"${FILESDIR}"/${PN}-2.2-conf.patch |
78 |
@@ -44,11 +46,6 @@ PATCHES=( |
79 |
"${FILESDIR}"/${PN}-2.2-run.patch |
80 |
) |
81 |
|
82 |
-pkg_setup() { |
83 |
- enewgroup vnstat |
84 |
- enewuser vnstat -1 -1 /var/lib/vnstat vnstat |
85 |
-} |
86 |
- |
87 |
src_compile() { |
88 |
emake ${PN} ${PN}d $(usex gd ${PN}i '') |
89 |
} |