| 1 |
commit: 6c754c994189dc259324c3b6aa8f0e8a1deb4464 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 11 09:30:36 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 11 09:30:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c754c99 |
| 7 |
|
| 8 |
sys-apps/iproute2: Synced live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/iproute2/iproute2-9999.ebuild | 27 ++++++++++++++------------- |
| 14 |
1 file changed, 14 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild |
| 17 |
index d5befeb1ccf..8f2fdbfb7d9 100644 |
| 18 |
--- a/sys-apps/iproute2/iproute2-9999.ebuild |
| 19 |
+++ b/sys-apps/iproute2/iproute2-9999.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2019 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
inherit toolchain-funcs flag-o-matic multilib |
| 28 |
|
| 29 |
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 30 |
inherit git-r3 |
| 31 |
else |
| 32 |
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
| 33 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 34 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
| 35 |
fi |
| 36 |
|
| 37 |
DESCRIPTION="kernel routing and traffic control utilities" |
| 38 |
@@ -32,11 +32,12 @@ RDEPEND=" |
| 39 |
atm? ( net-dialup/linux-atm ) |
| 40 |
selinux? ( sys-libs/libselinux ) |
| 41 |
" |
| 42 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
| 43 |
DEPEND=" |
| 44 |
${RDEPEND} |
| 45 |
+" |
| 46 |
+# We require newer linux-headers for ipset support #549948 and some defines #553876 |
| 47 |
+BDEPEND=" |
| 48 |
app-arch/xz-utils |
| 49 |
- iptables? ( virtual/pkgconfig ) |
| 50 |
>=sys-devel/bison-2.4 |
| 51 |
sys-devel/flex |
| 52 |
>=sys-kernel/linux-headers-3.16 |
| 53 |
@@ -129,16 +130,16 @@ src_install() { |
| 54 |
|
| 55 |
emake \ |
| 56 |
DESTDIR="${D}" \ |
| 57 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
| 58 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
| 59 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
| 60 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
| 61 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
| 62 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
| 63 |
+ LIBDIR="${EPREFIX}"/$(get_libdir) \ |
| 64 |
+ SBINDIR="${EPREFIX}"/sbin \ |
| 65 |
+ CONFDIR="${EPREFIX}"/etc/iproute2 \ |
| 66 |
+ DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ |
| 67 |
+ MANDIR="${EPREFIX}"/usr/share/man \ |
| 68 |
+ ARPDDIR="${EPREFIX}"/var/lib/arpd \ |
| 69 |
install |
| 70 |
|
| 71 |
dodir /bin |
| 72 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
| 73 |
+ mv "${ED}"/{s,}bin/ip || die #330115 |
| 74 |
|
| 75 |
dolib.a lib/libnetlink.a |
| 76 |
insinto /usr/include |
| 77 |
@@ -146,12 +147,12 @@ src_install() { |
| 78 |
# This local header pulls in a lot of linux headers it |
| 79 |
# doesn't directly need. Delete this header that requires |
| 80 |
# linux-headers-3.8 until that goes stable. #467716 |
| 81 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
| 82 |
+ sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die |
| 83 |
|
| 84 |
if use berkdb ; then |
| 85 |
keepdir /var/lib/arpd |
| 86 |
# bug 47482, arpd doesn't need to be in /sbin |
| 87 |
dodir /usr/bin |
| 88 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
| 89 |
+ mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die |
| 90 |
fi |
| 91 |
} |
Archives