[gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/

[David Seifert]

commit:     9debbf90feae5dde7a8bbb7e14af0eadeffc3042
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 15:29:50 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 15:29:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9debbf90

net-analyzer/darkstat: [QA] Port to GLEP 81

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{darkstat-3.0.719.ebuild => darkstat-3.0.719-r2.ebuild}    | 10 ++++------
 .../{darkstat-3.0.719-r1.ebuild => darkstat-3.0.719-r3.ebuild} |  8 +++-----
 net-analyzer/darkstat/darkstat-9999999.ebuild                  |  8 +++-----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
similarity index 94%
rename from net-analyzer/darkstat/darkstat-3.0.719.ebuild
rename to net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
index eb3e78e31c6..041df6e159d 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -50,10 +52,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat`

diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
similarity index 96%
rename from net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
rename to net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index dd21a625d20..d67ebb1e93f 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -13,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -54,10 +56,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=$(

diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 294f80c7140..4ca39eb748e 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 user
+
+inherit autotools git-r3
 
 DESCRIPTION="Network traffic analyzer with cute web interface"
 HOMEPAGE="https://unix4lyfe.org/darkstat/"
@@ -16,6 +17,7 @@ BDEPEND="
 	app-editors/vim-core
 "
 DEPEND="
+	acct-user/darkstat
 	dev-libs/libbsd
 	net-libs/libpcap
 	sys-libs/zlib
@@ -57,10 +59,6 @@ src_install() {
 	chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
 }
 
-pkg_preinst() {
-	enewuser darkstat
-}
-
 pkg_postinst() {
 	# Workaround bug #141619
 	DARKSTAT_CHROOT_DIR=$(