gentoo resync : 09.07.2022

2 files changed, 20 insertions, 23 deletions

diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 8cd6f7e85a2a..a0b1ba81919e 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,4 +1,4 @@
 AUX psad-2.2.4-var-run.patch 589 BLAKE2B 11c7095cc2eac066c44ae03d59787c92a7db095167f1e1b30c4e5f4931cdafbab6ddf092025e6cf885ce85d11763a429d02517ef8494eb9c9231c83d261aa687 SHA512 dfd46dc06ef1f5bacb1424dc3ef9df23c5dc28abe6c6b1ffcbf7720e1d134e983e581831e7ed04074592bd1865f3628c753b313b7df1f7fdf84d438e82c25464
 DIST psad-2.4.6.tar.bz2 2548405 BLAKE2B 7479ce4496343ca988da4dbe82190053385f1a8fa2e190002545c63f2e36283bc84293d932ebe147c9078923fa9e0527b4265fffdb8e1fd99bfc5d9955f9f3cd SHA512 a5de29b9ca0108aa8c6a325b725145f408dc517aeee4654596c7a037762f495a78827c64fc2e9c4284bc8db65caf0321982ecaf02de6d73784c2038e1078f42d
-EBUILD psad-2.4.6.ebuild 1925 BLAKE2B 20a8449109d8dafa7a2c649ccf6fc9e89be9b809eeb09f25a4c7effbc81c8aca9948751fd3a8fd210c497168597f2a3d5e09637007dffdc1282ae6f6d16f0e03 SHA512 1b4a4c607d848075cede65c6331a878dc1a755df98ef497ea0d470cf4fd4c8cad109c6ebbc9c4f99fe98130a38a01f20653c4cbe7bc8e90c66bbb312a85c5bd4
+EBUILD psad-2.4.6-r1.ebuild 1776 BLAKE2B 17642a5b7c18026fe5c958cb98e2f4c21deec88903ef2609dfbdf044fd2500d53c67661dd8e5596a508293ad8d0abb34651b53b06d96faba01bd8efd0ae82e6b SHA512 1e5f0991696675e1dec674c37510cec374262463817bb7b1f77c0f910f4807323d03f249d1dac2e216ff69592d0753f6581e1a34cbc23dce2375219b623119df
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-firewall/psad/psad-2.4.6.ebuild b/net-firewall/psad/psad-2.4.6-r1.ebuild
index 7a4da9029e17..d9125b0b0558 100644
--- a/net-firewall/psad/psad-2.4.6.ebuild
+++ b/net-firewall/psad/psad-2.4.6-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-#PERL_EXPORT_PHASE_FUNCTIONS=no
+EAPI=8
+
 inherit perl-module toolchain-funcs
 
 DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
 HOMEPAGE="https://www.cipherdyne.org/psad/"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ppc ~sparc x86"
 
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="
 	dev-perl/Bit-Vector
 	dev-perl/Date-Calc
@@ -23,11 +22,10 @@ RDEPEND="
 	net-misc/whois
 	virtual/logger
 	virtual/mailx
-	virtual/perl-Storable
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.4-var-run.patch
-)
+	virtual/perl-Storable"
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.4-var-run.patch )
 
 src_prepare() {
 	default
@@ -45,10 +43,10 @@ src_prepare() {
 src_configure() {
 	default
 
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		SRC_PREP="no" perl-module_src_configure
+	local d
+	for d in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${d} || die
+		perl-module_src_configure
 	done
 }
 
@@ -56,9 +54,9 @@ src_compile() {
 	tc-export CC
 	default
 
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
+	local d
+	for d in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${d} || die
 		perl-module_src_compile
 	done
 }
@@ -66,7 +64,6 @@ src_compile() {
 src_install() {
 	newbin misc/pscan psad-pscan
 
-	insinto /usr
 	dosbin kmsgsd psad psadwatchd
 	newsbin fwcheck_psad.pl fwcheck_psad
 
@@ -85,9 +82,9 @@ src_install() {
 	insinto /etc/psad/snort_rules
 	doins deps/snort_rules/*
 
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
+	local d
+	for d in IPTables-Parse IPTables-ChainMgr; do
+		cd "${S}"/deps/${d} || die
 		perl-module_src_install
 	done
 }