net-analyzer/vnstat: port 1.17, 2.6 to GLEP 81 too

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 8 insertions, 14 deletions

diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index 5a1f12b3e07d..fceff0f93ca9 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
-inherit toolchain-funcs user verify-sig
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
@@ -22,14 +22,11 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-libs/check )
 "
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+RDEPEND+=" acct-group/vnstat
+	acct-user/vnstat
+	selinux? ( sec-policy/selinux-vnstatd )"
 BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
 
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /dev/null vnstat
-}
-
 src_prepare() {
 	default
 
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
index e1ce66f909cb..3d37feff320b 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user tmpfiles
+inherit systemd tmpfiles
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
@@ -36,7 +36,9 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-libs/check )
 "
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+RDEPEND+=" acct-group/vnstat
+	acct-user/vnstat
+	selinux? ( sec-policy/selinux-vnstatd )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-conf.patch
@@ -44,11 +46,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
 src_compile() {
 	emake ${PN} ${PN}d $(usex gd ${PN}i '')
 }