gentoo resync : 25.11.2020

4 files changed, 23 insertions, 39 deletions

diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index c54569ee2003..b6a3dd151743 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -8,7 +8,7 @@ AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
-EBUILD argus-3.0.8.2-r1.ebuild 2067 BLAKE2B ef1fe40bc38cc957a3c637313c34d2339f8ef2f1034928fa476ad8a1f92bdf075cf6b4c8d00b289a090a470221747c6841e1c6fa09566d8d584c892df864705f SHA512 7754f0257a9e35729defab6df1aa626a66c8560fdbad211dc60e79c574bcfcef814f39d8530d81ed3329a5385127b4664a39058df755286a1409d009e32ec9dc
-EBUILD argus-3.0.8.2-r2.ebuild 2165 BLAKE2B ccb45a1eedf0d5070bd75ceb28f6d4efb15505cffa2d653a6aabb9669e771e251c31dd3b8445fe667e172b3b86c278ce665da8a8c896379e1ae5b1afbdd7446f SHA512 1439de1ef098d5b0815367e997e7eb9ec93f5c4e3e8bd5262c5707e52e5bbf6ce459bcd5df927841cb629ca15192d05c54cf6ef87966d822c40ed021ef6e7d67
-EBUILD argus-3.0.8.3.ebuild 2088 BLAKE2B 39a3d169cd721baaa9edb4c9f9b9f841c80c2e0f0390c30c065291f879c18abc191f7015ef13a599e0f69b90ed4abf559ecf1de6e4ed256b7e6e4fda6873ffae SHA512 16266e0e61f26467cbab08782b8de8474297988bc0eff342f6a894b2faab3e9d8a3b1d4ea496fc68465f3dcaefa24ca18d3392df234aad4055f7f2e7f5fb2fb2
+EBUILD argus-3.0.8.2-r3.ebuild 2018 BLAKE2B 2e7f691e6b4d711ab805f8274b5cccc62afffb5ebc16640bc1121dd403d087a5385c5b1b95688371e8a2f21c661193f8263bb73b5d6c1f9da3484837ebdd18e1 SHA512 0c4f385b9d913aaa7870d3196625a166f38fa18b5eb4948f9e4ae5cfd2e6bbc162ba2e796a9b19df3f0fca20828000c6bbf6eac75c98781edbc8dc6b1b5d3e87
+EBUILD argus-3.0.8.2-r4.ebuild 2048 BLAKE2B 14495922f1c06df64278e94a75d1bedf97a2314ebdfc4592aaac74c45b2fc1bb9ab035d3b0aba9796fa47fcbe898bb9cfadd06fd4092fff8a9e21f1ca9c6e61d SHA512 b556f3de56e86c46786f3830ebe7aae0979f2d7f508c80d5ef22ba3ca28e5b81b8b5742e76e3f1b773250df8dfa00e8b87c488e4bd1d84598446dc49afa9fdd6
+EBUILD argus-3.0.8.3-r1.ebuild 2041 BLAKE2B 5286684a9d56de8fb3d79fade6f97243b844a112022edf7a2e7a98b763fe264e70a6a660e508b4cc679e6ee6f476eb6e317a46cc26856b9791ad30c5a9de186e SHA512 404cae82d5098a0fa30165adf153c37139eafb1eb59e99583bb3925fccb179bdab3f5459c5a3509c0a849cc927ee8967146c49cd4ab78f09ef2a76b362283e16
 MISC metadata.xml 378 BLAKE2B f5479fe68336ff3ee37d9e325b9b2c1a70eb399746512fec7e08e603c82c1183b8229e0b9ee1fae073f027ca7a7eabbf9e4607c9ab1b2fa6bb6fc8b6c9bdac6a SHA512 cbd4b2e58b229b6fa82e1b3628153113b611d7370e2f4fd3e662541f07d79c01aa5974cb797bcc67017034dc7f52373648b2cdb5a7f64a89391c7028303f591b
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
index 2e662864e3e6..a0f306223745 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils user
+
+inherit autotools epatch
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://www.qosient.com/argus/"
@@ -14,6 +15,8 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	sys-libs/zlib
@@ -22,7 +25,6 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
 DEPEND="
 	${RDEPEND}
 	>=sys-devel/bison-1.28
@@ -76,11 +78,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
index 807aab798e06..3ca4a4b18ff6 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r4.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 Audit Record Generation and Utilization System"
 HOMEPAGE="https://openargus.org/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug +libtirpc sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	sys-libs/zlib
@@ -22,9 +25,8 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.28
 	>=sys-devel/flex-2.4.6
 "
@@ -37,11 +39,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_rc/.rc.}
 
-pkg_setup() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 src_prepare() {
 	find . -type f -execdir chmod +w {} \; #561360
 	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -82,11 +79,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."
diff --git a/net-analyzer/argus/argus-3.0.8.3.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
index 8092871dded2..cc378b5cf4b8 100644
--- a/net-analyzer/argus/argus-3.0.8.3.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="https://openargus.org/"
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
+	acct-group/argus
+	acct-user/argus
 	net-libs/libnsl:=
 	net-libs/libpcap
 	net-libs/libtirpc
@@ -21,9 +24,8 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 "
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/bison-1.28
 	>=sys-devel/flex-2.4.6
 "
@@ -36,11 +38,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_rc/.rc.}
 
-pkg_setup() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 src_prepare() {
 	find . -type f -execdir chmod +w {} \; #561360
 	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
@@ -67,7 +64,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
@@ -84,11 +84,6 @@ src_install() {
 	keepdir /var/lib/argus
 }
 
-pkg_preinst() {
-	enewgroup argus
-	enewuser argus -1 -1 /var/lib/argus argus
-}
-
 pkg_postinst() {
 	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
 	elog "possible that the init script will fail to work."