gentoo resync : 25.11.2020

3 files changed, 12 insertions, 33 deletions

diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 31c270a2ecf5..db2a7db25ea7 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -8,6 +8,6 @@ AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511d
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740
-EBUILD flow-tools-0.68.5.1-r10.ebuild 1674 BLAKE2B 0388edf037c985e35961e04268db72741ca859bf0018759849e54e66451bea1876c65dd0bc419d3b05d53755aeb6b7d1a8b722845d53d124638a469b04503cac SHA512 954c240c465fdda3dad18f15b95fcde793979c5589f5db31f3c67fc12e0aca539e91c6052f13daffae806010d1b3d26be132048a9ab4d9ab9ea64e2b256fa63e
-EBUILD flow-tools-0.68.6.ebuild 1928 BLAKE2B 2e4ad0d586558a6fe1e1afbcebe8876d0711a562bc9d50f28f437f47f8c12cc1a90c6c2a310757f1dd7af4b2c626ddc26896839c66c7a19a978ddc64e4689267 SHA512 cc3d7801996709869f4ff7a630d650406f924639e8023d87e4abb76dd13152560105e0157f749cad8ba13ac96b78640928ef33f3c9677ff7940c27c2d2e62a23
+EBUILD flow-tools-0.68.5.1-r11.ebuild 1570 BLAKE2B 9777743a331cda77929b901175b8c9fce0f0619d28bbc6263bbbca6a22931de0bd7077176cbf27a0a5004f491d3dcb4878f7802a17a162016b8a7e9aa70621b1 SHA512 e95fb5cc31790bda2a7f3384ff76d2c140b359d9f321c09c8127ad77a995d07333bf18941ae54a29be1940fd411383c9cae8ad0a6c629b3d052ebb1429beaaaf
+EBUILD flow-tools-0.68.6-r1.ebuild 1821 BLAKE2B 4c62192f40635eb9afcdc3eca578deebde35e5a28c5ee25e1eba927ef9d34131a42cf662a81debcd783394a407d79c7a0f17f2b566d066d092c40aed83a22efd SHA512 5aecaa30e76eda57314d959e90d78a4a87983f95fb9a3ca6c8d951a95d9948c2d6a3a6ef814965e08e997c3a06fa4adb21f26f3014d124b737583192f986a65d
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
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
-}