summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49747 -> 49747 bytes
-rw-r--r--sys-apps/iproute2/Manifest4
-rw-r--r--sys-apps/iproute2/iproute2-6.6.0-r3.ebuild (renamed from sys-apps/iproute2/iproute2-6.6.0-r2.ebuild)10
-rw-r--r--sys-apps/iproute2/iproute2-9999.ebuild12
4 files changed, 7 insertions, 19 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7d71602f3361..89e26cde0029 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0b7790cd671c..cc693262df54 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,7 +7,7 @@ AUX iproute2-6.6.0-makefile-use-usr-share-config.patch 1896 BLAKE2B a4fdb2cc8ca3
AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699cfd04692debff6b2b46dda442ff53cb9b913406c95e2df31e3f763dc22d5923e0eb387439feeac8d55751419c9f4553a89a476f9a80 SHA512 23f20035b0a0fe42695b560785820f31d005963ff4cad18f47b7a412836cd4327962244055b89b53794e41a92754fd3464a9ca1fd2cd767aad094a0c125a7d13
DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f SHA512 21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
EBUILD iproute2-6.6.0-r1.ebuild 5943 BLAKE2B 792d7e85714a943a6ffdf98385d230efa8cc0ef08f62d29aa65f6d775100bc92f69327ef4160f409810377e65a35caacc5b7ca5435f5a47a550e78f3873a3d21 SHA512 691bc5478481efd82b7316dabc6e6a44ebfaac6207ed3efe10bee81964c19f6020abe53e831649c31c5d5bbad26596809df28b5720aa23086c4e7ef56d96002b
-EBUILD iproute2-6.6.0-r2.ebuild 6059 BLAKE2B af4ea6140c99e2177c09607e8b22cd2948c4db3be26f088832f343d3c8ca41851617909121239a27ebef24ce99e0786d23a62fa83ada7bd849d494760fdc0b95 SHA512 be8ad7894ca1b700b57dcaab6d8f215c539bb967632e8f4700fdbfeb03cf13bad0350d22f2ebfd940157196f87415bd4cd8d02fb186e585addc6b8ff758df2e7
+EBUILD iproute2-6.6.0-r3.ebuild 5916 BLAKE2B b652413916cadbb735a8ba5320853954b2b5a539eaa4f2272999c3331c7050d71cd26a41efbfaf9b76309dd6a20a01e3589c58445f3f9ff153b107f61bec0111 SHA512 88031ceda6216003b00a88738fc356160330307a93434d89bfdb1b3a91e0faff11daaa983fbc409ce46afbd8e42a46b2ebacfdb97fa1d316a4d064d295391968
EBUILD iproute2-6.6.0.ebuild 5850 BLAKE2B 7353918970fd881ff7245a5aa7f31facffcda632164b7605262b0ead9374f2e316070b0e389c90b014cf1fb41731cd5831dc6d230da67081f7773a7ae14efb9f SHA512 9adbcf944d86e2f3340f7795e654f30b4d94b28a9dff2882c18f1658029aa07daccc956cfeccac8eb366fe7632149478cd18b5092c7cf3a2e7e568c6ec0c13d1
-EBUILD iproute2-9999.ebuild 5858 BLAKE2B 7fc198eb1184b1cc747ef3e46842feeb86624b1ba4609ecab7a50de95443df35608db8c883bb47c179db0ca1d9df194ebf8b2bca6fd4c1a4689b6a56b4e8056b SHA512 02e74d6fdded0e7211299eba40191ac86ae5cc273c50520a94cb76fea5a77ef2c02a27cdec952c4db27efa568396d7b67024d3b69ca64cbccb5c92a1a8986d2c
+EBUILD iproute2-9999.ebuild 5715 BLAKE2B 3e316ba65e03febaac79d5130f5fdabbeeec8277edac1ab804eeaa3d5aa677c43391d7ce284136fe013a5f9ce894c3596bd4a23e1cdc1eebe6b72e84037bf621 SHA512 ec9069c4719ecbcb7838bb126a7ada0f56261b289ba3bc9e7f80cc8d8804898ed219fd75afd3169ff21efbedd8c0f533da2c5ad9b751979f0b9ede57b2aca9c1
MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild b/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
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