commit:     02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 01:51:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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

Reply via email to