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

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

2 files changed, 10 insertions, 31 deletions

diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
index 8656ded05688..d1f4fc95e62a 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit user
 
 DESCRIPTION="library and programs to process reports from NetFlow data"
 HOMEPAGE="https://code.google.com/p/flow-tools/"
@@ -13,7 +12,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
-RDEPEND="sys-apps/tcp-wrappers
+RDEPEND="
+	acct-group/flows
+	acct-user/flows
+	sys-apps/tcp-wrappers
 	sys-libs/zlib
 	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
@@ -21,8 +23,8 @@ RDEPEND="sys-apps/tcp-wrappers
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)"
-
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-devel/bison"
 
@@ -35,10 +37,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
 )
 
-pkg_setup() {
-	pkg_douser
-}
-
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
@@ -68,12 +66,3 @@ src_install() {
 	fperms 0755 /var/lib/flows
 	fperms 0755 /var/lib/flows/bin
 }
-
-pkg_preinst() {
-	pkg_douser
-}
-
-pkg_douser() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index b95e64990111..d8ee002d2ccf 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="library and programs to process reports from NetFlow data"
 HOMEPAGE="https://github.com/5u623l20/flow-tools/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="
+	acct-group/flows
+	acct-user/flows
 	sys-apps/tcp-wrappers
 	sys-libs/zlib
 	mysql? ( dev-db/mysql-connector-c:0= )
@@ -39,15 +42,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.68.6-mysql.patch
 )
 
-pkg_douser() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
-
-pkg_setup() {
-	pkg_douser
-}
-
 src_prepare() {
 	default
 	sed -i -e 's|docbook-to-man|docbook2man|g' docs/Makefile.am || die
@@ -83,7 +77,3 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	pkg_douser
-}