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 8F246158041 for ; Fri, 12 Apr 2024 19:11:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 903DFE2A34; Fri, 12 Apr 2024 19:11:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AA75E2A34 for ; Fri, 12 Apr 2024 19:11:09 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 814CD343363 for ; Fri, 12 Apr 2024 19:11:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E83F3B27 for ; Fri, 12 Apr 2024 19:11:06 +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: <1712949026.f0ac63de535b1fa54978114ecc07deb1c2c6c17c.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-6.8.0-r1.ebuild sys-apps/iproute2/iproute2-6.8.0-r2.ebuild X-VCS-Directories: sys-apps/iproute2/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: f0ac63de535b1fa54978114ecc07deb1c2c6c17c X-VCS-Branch: master Date: Fri, 12 Apr 2024 19:11:06 +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: 9971aea8-2283-4736-a988-04dc8247e5f3 X-Archives-Hash: 8e712254fd1cba6c910ccfb02ef63aba commit: f0ac63de535b1fa54978114ecc07deb1c2c6c17c Author: Patrick McLean gentoo org> AuthorDate: Fri Apr 12 19:10:26 2024 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Apr 12 19:10:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ac63de sys-apps/iproute2: Remove split-usr again Was basing the 6.8.0 off the 6.6.0 ebuild, not the 6.6.0-r3. Signed-off-by: Patrick McLean gentoo.org> .../{iproute2-6.8.0-r1.ebuild => iproute2-6.8.0-r2.ebuild} | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild similarity index 95% rename from sys-apps/iproute2/iproute2-6.8.0-r1.ebuild rename to sys-apps/iproute2/iproute2-6.8.0-r2.ebuild index bfc78c186a70..c5ab1aee142e 100644 --- a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild +++ b/sys-apps/iproute2/iproute2-6.8.0-r2.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 split-usr" +IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux" # Needs root RESTRICT="test" @@ -192,6 +192,7 @@ 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 @@ -201,13 +202,6 @@ 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