gentoo resync : 28.04.2021

2 files changed, 29 insertions, 23 deletions

diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest
index 4c4cba3094da..21e41964b540 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -2,5 +2,5 @@ AUX havp-0.92a-pkg-config-libclamav.patch 1479 BLAKE2B b52880a1f776aa21a2623aa71
 AUX havp-0.92a-run.patch 1084 BLAKE2B 82d5c1fe4ba2b55d398c056d7858c3a571bae5affbe8e220681d89cfcfed3fb05e9d0c34fc54fed5c170f81c8810dcadd1f6a660592571729cc6d3d6c5fed957 SHA512 e8e213b635984ef67a81917fc33eb086d31400b009e657da0dc96bc4fc46659dd41ede9a4a809d7221a949564e38fbb613e649b45fb9555bc4989548eac993e6
 AUX havp.initd 1523 BLAKE2B 165a6cacdd65ee037f86b36973fa95b43e895438536b76b54ec44fa13ceeeea9abcc428a1fb6ea5fa04800118e0f81c367cc9d6f2d7b230e79d04701e0bf4508 SHA512 ada07f2c6037b101b4b9563b2b9056447520f5b30c59e0606e7f1641f5da097a8619672ff021faa6627d224d89a3242dd8130f22d56d835be913dbcb11f355d7
 DIST havp-0.92a.tar.gz 121987 BLAKE2B 9d34d789ac1c5e6785fc337d661d48797d2622ec6638765219486ca8110c1ff2cb8e365f677bda68940bebaa41f339bfb3c561e08dc259b7ae9ca204964495c6 SHA512 3eb742519795a7d10520bdc1c78af0d3bf580a56e14f90bff9f519607a4e82cbf704372bd6da2fc05fcd436d580f4c226874d8df7770d22e2160b5d01afb9c62
-EBUILD havp-0.92a-r2.ebuild 1817 BLAKE2B c1a452ae5302488c5c8fa274c30ceb890bce1fe540c486f9e0cd5391d6ee09483f13affae1ebb5d22568b6b5f41710273f272b19e933dba1b2521b80e7e65616 SHA512 1294724855be37556111e8a1f1c5fc8143262f5e6c78014a4a538209008e49efbe01e22d4c972b37881ec6cc726b31b26bce7f93db832dd8b6e27b379cae7e2c
+EBUILD havp-0.92a-r3.ebuild 1806 BLAKE2B bd29c4fafc4be01f56b2428e8f5089884bedca6b4b10795fc25b69d949100c4d808b5bd7558115cd3c93e41a407b0c4e35ad60400bc68350c0be2dcd6c1bad54 SHA512 4d4d035175e9a007a1acd843b1d7cdae326bfbd7df17f0a258e2b8f402820041500f083989f35ad96fa91de8f4ce9946437e435cde1e63d8cdeb36242a6abe1e
 MISC metadata.xml 305 BLAKE2B d11f8994a06d4eb9c00d969a622bad3115eb391e8fab610d7328885da36656f16dc7bca1bfc91a20969a9a1711b10af795e21da81702744f388ef9338d5e0de2 SHA512 9d35bba251c660db53dbb238edff0ac868f79d8101a3b2ea9e950593f5587f417d657c02c51afcb425195df40577403a4f1fac80ef474043e4dc21add9fd1c1e
diff --git a/net-proxy/havp/havp-0.92a-r2.ebuild b/net-proxy/havp/havp-0.92a-r3.ebuild
index 973a5a81aee3..e29ca2eab914 100644
--- a/net-proxy/havp/havp-0.92a-r2.ebuild
+++ b/net-proxy/havp/havp-0.92a-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils toolchain-funcs user
+inherit autotools toolchain-funcs
 
 DESCRIPTION="HTTP AntiVirus Proxy"
 HOMEPAGE="http://www.server-side.de/"
@@ -15,17 +15,19 @@ KEYWORDS="amd64 x86"
 IUSE="clamav ssl"
 
 DEPEND="clamav? ( >=app-antivirus/clamav-0.98.5 )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	acct-group/havp
+	acct-user/havp
+"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
-}
+PATCHES=(
+	"${FILESDIR}"/havp-0.92a-run.patch
+	"${FILESDIR}"/${P}-pkg-config-libclamav.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.92a-run.patch \
-		"${FILESDIR}"/${P}-pkg-config-libclamav.patch
+	default
 
 	sed -i configure.in -e '/^CFLAGS=/d' || die
 	mv configure.{in,ac} || die
@@ -36,26 +38,30 @@ src_prepare() {
 src_configure() {
 	tc-export AR
 	export CFLAGS="${CXXFLAGS}"
-	econf \
-		$(use_enable clamav) \
-		$(use_enable ssl ssl-tunnel) \
+
+	local myeconfargs=(
+		$(use_enable clamav)
+		$(use_enable ssl ssl-tunnel)
 		--localstatedir=/var
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	dosbin ${PN}/${PN}
+	dosbin havp/havp
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newinitd "${FILESDIR}/havp.initd" havp
 
+	rm -r etc/havp/havp.config.in || die
 	insinto /etc
-	rm -r etc/${PN}/${PN}.config.in
-	doins -r etc/${PN}
+	doins -r etc/havp
 
-	dodoc ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {
-	ewarn "/var/tmp/${PN} must be on a filesystem with mandatory locks!"
+	ewarn "/var/tmp/havp must be on a filesystem with mandatory locks!"
 	ewarn "You should add  \"mand\" to the mount options on the relevant line in /etc/fstab."
 
 	if use ssl; then
@@ -69,7 +75,7 @@ pkg_postinst() {
 	if use clamav; then
 		echo
 		ewarn "If you plan to use clamav daemon, you should make sure clamav user can read"
-		ewarn "/var/tmp/${PN} content. This can be accomplished by enabling AllowSupplementaryGroups"
-		ewarn "in /etc/clamd.conf and adding clamav user to the ${PN} group."
+		ewarn "/var/tmp/havp content. This can be accomplished by enabling AllowSupplementaryGroups"
+		ewarn "in /etc/clamd.conf and adding clamav user to the havp group."
 	fi
 }