commit: f0ac63de535b1fa54978114ecc07deb1c2c6c17c
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 19:10:26 2024 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 19:10:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ac63de
sys-apps/iproute2: Remove split-usr again
Was basing the 6.8.0 off the 6.6.0 ebuild, not the 6.6.0-r3.
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../{iproute2-6.8.0-r1.ebuild => iproute2-6.8.0-r2.ebuild} | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
rename to sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index bfc78c186a70..c5ab1aee142e 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.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"
@@ -192,6 +192,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
@@ -201,13 +202,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
