[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

[Mike Gilbert]

commit:     4cd0fbd620b0f3210d047a5139bef8e866331c8f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 15:46:10 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 15:46:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd0fbd6

net-misc/iputils: rework fcaps logic

Closes: https://bugs.gentoo.org/872380
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/iputils/iputils-99999999.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 6e435f7605da..7f3760b7d4f5 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -110,6 +110,10 @@ src_test() {
 src_install() {
 	meson_src_install
 
+	FILECAPS=( cap_net_raw usr/bin/ping )
+	use arping && FILECAPS+=( usr/bin/arping )
+	use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
 	dosym ping /usr/bin/ping4
 	dosym ping /usr/bin/ping6
 
@@ -159,15 +163,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	fcaps_pkg_postinst
+
 	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
 		ewarn "This upstream version (>= 20211215) drops two tools:"
 		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
 		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
 		ewarn "Please install one of the listed alternatives if needed!"
 	fi
-
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
 }