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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E9DC158041 for ; Fri, 12 Apr 2024 17:22:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55A6AE29EA; Fri, 12 Apr 2024 17:22:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E65CE29EA for ; Fri, 12 Apr 2024 17:22:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 874E0343330 for ; Fri, 12 Apr 2024 17:22:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 246E916AB for ; Fri, 12 Apr 2024 17:22:16 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1712942532.097997d99f602be5a785130ed5aa1bd5afe705af.chutzpah@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: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 097997d99f602be5a785130ed5aa1bd5afe705af X-VCS-Branch: master Date: Fri, 12 Apr 2024 17:22:16 +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: 47df503d-d949-4075-902e-ae6beb095824 X-Archives-Hash: f2786a2835a1fe96b4ac4357b6a629b4 commit: 097997d99f602be5a785130ed5aa1bd5afe705af Author: Patrick McLean gentoo org> AuthorDate: Fri Apr 12 17:07:59 2024 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Apr 12 17:22:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097997d9 sys-apps/iproute2: Sync 9999 with 6.8.0 Signed-off-by: Patrick McLean gentoo.org> sys-apps/iproute2/iproute2-9999.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 0d61a15abbfe..f8e1ae63ceec 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux" +IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr" # Needs root RESTRICT="test" @@ -49,9 +49,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907 - "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727 + "${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727 "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch - "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727 + "${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727 ) src_prepare() { @@ -106,7 +106,7 @@ src_configure() { # run "configure" script first which will create "config.mk"... # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - edo ./configure --libbpf_force $(usex bpf on off) + edo ./configure --color=auto --libbpf_force $(usex bpf on off) # Remove the definitions made by configure and allow them to be overridden # by USE flags below. @@ -187,7 +187,6 @@ src_install() { dodir /bin mv "${ED}"/{s,}bin/ip || die # bug #330115 - mv "${ED}"/{s,}bin/ss || die # bug #547264 dolib.a lib/libnetlink.a insinto /usr/include @@ -197,6 +196,13 @@ src_install() { # https://bugs.gentoo.org/868321 mv "${ED}"/sbin/ifstat{,-iproute2} || die + if use split-usr ; then + # Can remove compatibility symlink in a year: 2023-05-28. + # bug #547264 + mv "${ED}"/sbin/ss "${ED}"/bin/ss || die + dosym -r /bin/ss /sbin/ss + fi + if use berkdb ; then keepdir /var/lib/arpd # bug #47482, arpd doesn't need to be in /sbin