| 1 |
commit: 8111b84225d14541580393b3f92f19990a4ab111 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 28 03:06:41 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 28 03:06:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8111b842 |
| 7 |
|
| 8 |
sys-apps/iproute2: sync live |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/iproute2/iproute2-9999.ebuild | 13 +++++++------ |
| 13 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild |
| 16 |
index d7b7a0f564af..b2d044b4661d 100644 |
| 17 |
--- a/sys-apps/iproute2/iproute2-9999.ebuild |
| 18 |
+++ b/sys-apps/iproute2/iproute2-9999.ebuild |
| 19 |
@@ -3,7 +3,7 @@ |
| 20 |
|
| 21 |
EAPI=7 |
| 22 |
|
| 23 |
-inherit edo toolchain-funcs |
| 24 |
+inherit eapi8-dosym edo toolchain-funcs |
| 25 |
|
| 26 |
if [[ ${PV} == 9999 ]] ; then |
| 27 |
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
| 28 |
@@ -58,7 +58,7 @@ src_prepare() { |
| 29 |
|
| 30 |
# Fix version if necessary |
| 31 |
local versionfile="include/version.h" |
| 32 |
- if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then |
| 33 |
+ if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then |
| 34 |
einfo "Fixing version string" |
| 35 |
sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ |
| 36 |
-i ${versionfile} || die |
| 37 |
@@ -157,10 +157,11 @@ src_install() { |
| 38 |
dolib.a lib/libnetlink.a |
| 39 |
insinto /usr/include |
| 40 |
doins include/libnetlink.h |
| 41 |
- # This local header pulls in a lot of linux headers it |
| 42 |
- # doesn't directly need. Delete this header that requires |
| 43 |
- # linux-headers-3.8 until that goes stable. # bug #467716 |
| 44 |
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
| 45 |
+ |
| 46 |
+ # Can remove compatibility symlink in a year: 2023-05-28. |
| 47 |
+ # bug #547264 |
| 48 |
+ mv "${ED}"/sbin/ss "${ED}"/bin/ss || die |
| 49 |
+ dosym8 -r /bin/ss /sbin/ss |
| 50 |
|
| 51 |
if use berkdb ; then |
| 52 |
keepdir /var/lib/arpd |
Archives