From 1fb0e75f3491145fa5f2631e3dac9ae14eb79981 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 4 Jun 2020 19:31:36 +0200 Subject: sys-apps/iproute2: Synced live ebuild Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Lars Wendler --- sys-apps/iproute2/iproute2-9999.ebuild | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sys-apps/iproute2/iproute2-9999.ebuild') diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 9e2e1f7f4e54..7dcb54c51f5b 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -70,12 +70,6 @@ src_prepare() { -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - include/namespace.h \ - man/man8/ip-netns.8 || die - # build against system headers rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die @@ -120,7 +114,7 @@ src_configure() { } src_compile() { - emake V=1 + emake V=1 NETNS_RUN_DIR=/run/netns } src_install() { @@ -158,5 +152,7 @@ src_install() { # bug 47482, arpd doesn't need to be in /sbin dodir /usr/bin mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die fi } -- cgit v1.2.3-18-g5258