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
