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
