From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B30901382C5 for ; Thu, 4 Jun 2020 17:45:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1482E0819; Thu, 4 Jun 2020 17:45:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6E55E0819 for ; Thu, 4 Jun 2020 17:45:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47F2234F001 for ; Thu, 4 Jun 2020 17:45:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91A50282 for ; Thu, 4 Jun 2020 17:45:30 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1591291896.1fb0e75f3491145fa5f2631e3dac9ae14eb79981.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/iproute2/iproute2-9999.ebuild X-VCS-Directories: sys-apps/iproute2/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1fb0e75f3491145fa5f2631e3dac9ae14eb79981 X-VCS-Branch: master Date: Thu, 4 Jun 2020 17:45:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e029ed4-8df2-4e1f-b878-d31384e4c391 X-Archives-Hash: 47afb7fefc1dd32697a67afcad31a359 commit: 1fb0e75f3491145fa5f2631e3dac9ae14eb79981 Author: Lars Wendler gentoo org> AuthorDate: Thu Jun 4 17:31:36 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jun 4 17:31:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb0e75f sys-apps/iproute2: Synced live ebuild Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> sys-apps/iproute2/iproute2-9999.ebuild | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 9e2e1f7f4e5..7dcb54c51f5 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 }