From: Robin H. Johnson <robbat2@gentoo.org>
Date: Fri, 17 Apr 2020 19:39:33 +0000 (-0700)
Subject: sys-apps/iproute2: QAfix emptydir /var/lib/arpd (take 2)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8533ec2bf691a3b11fafbd20a05aaa417c306f01;p=gentoo.git

sys-apps/iproute2: QAfix emptydir /var/lib/arpd (take 2)

Also cleanup parent directories as much as possible.

Closes: https://bugs.gentoo.org/647032
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild b/sys-apps/iproute2/iproute2-5.6.0.ebuild
index 7670dd448c2e..622ac0d68948 100644
--- a/sys-apps/iproute2/iproute2-5.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.6.0.ebuild
@@ -159,6 +159,6 @@ src_install() {
 		dodir /usr/bin
 		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
 	elif [[ -d "${ED}"/var/lib/arpd ]]; then
-		rmdir "${ED}"/var/lib/arpd || die
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
 	fi
 }