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 DDED315803E for ; Mon, 1 Jan 2024 01:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 199982BC027; Mon, 1 Jan 2024 01:52:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 CC4F02BC027 for ; Mon, 1 Jan 2024 01:52:06 +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 0563833B864 for ; Mon, 1 Jan 2024 01:52:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FE971300 for ; Mon, 1 Jan 2024 01:52:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704073916.02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3 X-VCS-Branch: master Date: Mon, 1 Jan 2024 01:52:04 +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: 30ad40aa-b136-498b-bbd9-32407ba2dcd3 X-Archives-Hash: 8ec7590a417b4f6991263501ba0b65de commit: 02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3 Author: Sam James gentoo org> AuthorDate: Mon Jan 1 01:51:56 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 1 01:51:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ba1ab2 sys-apps/iproute2: sync live Signed-off-by: Sam James gentoo.org> sys-apps/iproute2/iproute2-9999.ebuild | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index d61eddc9d7ae..c57d9bd65cfd 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" @@ -187,6 +187,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 @@ -196,13 +197,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