From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1585975-garchives=archives.gentoo.org@lists.gentoo.org>
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 9428515803E
for <garchives@archives.gentoo.org>; Mon, 1 Jan 2024 01:51:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3C7882BC038;
Mon, 1 Jan 2024 01:51:15 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 159602BC038
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 01:51:15 +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 023E333D3C2
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 01:51:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3809A1300
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 01:51:12 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1704073861.735edc3bf64c10afba704da20a3af056d7ad73ba.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-6.6.0-r2.ebuild sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
X-VCS-Directories: sys-apps/iproute2/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 735edc3bf64c10afba704da20a3af056d7ad73ba
X-VCS-Branch: master
Date: Mon, 1 Jan 2024 01:51:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7accc95e-142e-491a-9178-11c9bc53b074
X-Archives-Hash: 77a4890de8454344fcbee8c9a06cde52
commit: 735edc3bf64c10afba704da20a3af056d7ad73ba
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 1 01:42:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 01:51:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735edc3b
sys-apps/iproute2: drop old compat symlink and USE=split-usr hack
As promised in the ebuild comments, we can now remove the compatibility
symlink from /sbin -> /bin.
While we are at it, don't do the move conditional on split-usr. Arguably
only the symlink should have been conditionalized on this way back
when... we already move another binary too in the same way, but without
any conditional.
Bug: https://bugs.gentoo.org/547264
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{iproute2-6.6.0-r2.ebuild => iproute2-6.6.0-r3.ebuild} | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
rename to sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 796a1c1367b1..5254f12bbe45 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.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"
@@ -190,6 +190,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
@@ -199,13 +200,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