From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1444866-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 7FE7C158094
for <garchives@archives.gentoo.org>; Sat, 8 Oct 2022 21:04:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C668EE08EB;
Sat, 8 Oct 2022 21:04:44 +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 AF334E08EB
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Oct 2022 21:04:44 +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 D794534113D
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Oct 2022 21:04:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CA195EC
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Oct 2022 21:04:42 +0000 (UTC)
From: "Mike Gilbert" <floppym@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, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1665262937.e9573614298a332abbdbec4eb7de90788a89c60c.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/iproute2/iproute2-5.19.0-r2.ebuild sys-apps/iproute2/iproute2-5.19.0-r3.ebuild sys-apps/iproute2/iproute2-9999.ebuild
X-VCS-Directories: sys-apps/iproute2/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: e9573614298a332abbdbec4eb7de90788a89c60c
X-VCS-Branch: master
Date: Sat, 8 Oct 2022 21:04:42 +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: 4a69c00c-01a4-4ea9-91b7-52cdee6f9119
X-Archives-Hash: 383c21571de54a8f7aa1df2ecbd639f2
commit: e9573614298a332abbdbec4eb7de90788a89c60c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 21:02:17 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 21:02:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9573614
sys-apps/iproute2: rename ifstat command
Avoids a file collision with net-analyzer/ifstat.
Closes: https://bugs.gentoo.org/868321
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../iproute2/{iproute2-5.19.0-r2.ebuild => iproute2-5.19.0-r3.ebuild} | 4 ++++
sys-apps/iproute2/iproute2-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
similarity index 98%
rename from sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
rename to sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
index f0a6ca796fa7..a201d0f68938 100644
--- a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
@@ -195,6 +195,10 @@ src_install() {
insinto /usr/include
doins include/libnetlink.h
+ # Collides with net-analyzer/ifstat
+ # 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
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 8aaa6cc859d8..46297152d6c6 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -193,6 +193,10 @@ src_install() {
insinto /usr/include
doins include/libnetlink.h
+ # Collides with net-analyzer/ifstat
+ # 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