gentoo resync : 25.11.2020

4 files changed, 13 insertions, 19 deletions

diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 57c8bae6b719..627ba27cfd7c 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -2,7 +2,7 @@ AUX darkstat-3.0.719-strncpy-off-by-one.patch 471 BLAKE2B 45e738a9a777173924df26
 AUX darkstat-confd 911 BLAKE2B 35cb512c3727176218a16508d3b61ddf003081997d8f52918c5b9b7e762c882f878bd3317c737931d29cbf3aba1a7c375ebf067a394da41d15b95b3d97768437 SHA512 cf5b222a45a406d4e6b03860a9053a9c25c88d793e86525ebe38dbf292a69f00dc073b12179818e7e7b669f4a706d70eebe9bfeda363c7c5003c035639f41bbc
 AUX darkstat-initd 1461 BLAKE2B 4f0aca1bb12661de4ea1c2d5ea7dd9733833aafbe012ea0019d536ee1d45fa0cffc5a7a210783e9bbd3c5c5b236dc6f505ee0807b8ad2bd6ef78e48fa676a386 SHA512 2441b9c7dfa0c3ddb8a5ab6fd396d42a1ae4cb84ac15477c932f719ccfae53179ae5bd3ac947f6a98ee14728c7f31bbc176887c144ed4f5053632aad262d8226
 DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
-EBUILD darkstat-3.0.719-r1.ebuild 1802 BLAKE2B a62da0634ce64b39fce71aa5f2b649854be26e45f0d88875903bf7539003c5523984dc7788d1f4edda67ee55eb5a60c9b95f923e5ac39909986130e849c3f9cc SHA512 7a2cdefdc62188077cd62112301911c08095c8f081956501c810804d88a55080b4f67d0606a2cfb1e1c495ba8a5e0737d7d8bd67e98e4f34b885092aa5ee665d
-EBUILD darkstat-3.0.719.ebuild 1718 BLAKE2B 7c01b6c99a239bdf2c6c7ba84b9846a2873a8b7ff5cf3000b76018eeec3dadfb008f71c317a4d39982b9dc41de44d6011688423d106894b82ae4fa47a1e5dd3b SHA512 18371bdff718f03a28f17abf88c3dd713096650350246f46defd7459aa32100f01e74a1178816173c69dbbf0c37df53c4476198c1d44be9c73c6b2ee56ce86cb
-EBUILD darkstat-9999999.ebuild 1831 BLAKE2B ee48031b952a17d9f95f6332f5ca0526fc494ac7f76a5e2dce64235628aa943fbe21344078eb186e028702b74b81364ad8c53a77961f1a83ceb3733199e7eb31 SHA512 df4e23789762b2d5e4fcddb964b999b53caf374a584aa4b5edbf2a46dbec1b721aeceec28406e1c6f179c40bc0906911cf9e471594da77afb12f1c9866202b2a
+EBUILD darkstat-3.0.719-r2.ebuild 1693 BLAKE2B 8d739222a60aacd47dfafd7b913db182fe533afa20bc470ae29f2d09af8e965cc0aba4158be19f81cedf6ae59aeb138b9095151da040378355fc6464589a8eec SHA512 64bc9d1e189d7d16de8fda9083aa30ad6aaf3dce43ab3855a7ac0af9ce00ad6f67085e2ca62794db61bb9581e585d105fb094a7bbee03bfc8ec08792ae2b6686
+EBUILD darkstat-3.0.719-r3.ebuild 1780 BLAKE2B de855346a7375bd48572d2cd0f49923649b36572674af6fd0a70e7c3291b2f4b9458bd6b3ba2cc73518ede1c6ac6a89db2cef08a8b029113dd1548311cbe2943 SHA512 5de532416453b855f829fc28048b88d15b0aba65348b3d4f3972be2f7d651f7b87174f8f0dc9b41691fe46b683eb111dcae083d03dcd174140f630e3a4090ced
+EBUILD darkstat-9999999.ebuild 1809 BLAKE2B c4464879938ea296aa2f67b5d617587317bc199e947547dd5e2588603633536821f06608d2dca04ae2497b25d7905d7afb9d5f0affd08e025ea7c604c7c8d071 SHA512 061052f55525bb9f6247459e7f585224d05036fc6e444ac0635c57847fbeca9c9179e619169c1f401e1b01211e73922ee45c5e0f6f3f5e755ef920a84c2ae00e
 MISC metadata.xml 536 BLAKE2B 7ff89764c1281848b7345be779d1694d4a439fc0a211fc10feb37302a184ce78d984c941e374192bbefb1a22e1ce13ae63a1ab96c37fb4ff539aef0edeb7a58f SHA512 5950789030e76ea0a95fbf8cd53e702ee8d55af96ed12aef4d6e6ae658ba01e949f875283a2f5c0c12f15fe7beec18704bf14bea1d89c5321df505cd2ae3d5bb
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
index eb3e78e31c6c..041df6e159de 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
index dd21a625d201..d67ebb1e93f5 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 294f80c7140d..4ca39eb748e3 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=$(