From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1089212-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EA9C138334 for <garchives@archives.gentoo.org>; Sat, 11 May 2019 09:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D735DE0877; Sat, 11 May 2019 09:30:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4AD5E0877 for <gentoo-commits@lists.gentoo.org>; Sat, 11 May 2019 09:30:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED91434403A for <gentoo-commits@lists.gentoo.org>; Sat, 11 May 2019 09:30:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6341D5E3 for <gentoo-commits@lists.gentoo.org>; Sat, 11 May 2019 09:30:56 +0000 (UTC) From: "Lars Wendler" <polynomial-c@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org> Message-ID: <1557567052.6c754c994189dc259324c3b6aa8f0e8a1deb4464.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/iproute2/iproute2-9999.ebuild X-VCS-Directories: sys-apps/iproute2/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6c754c994189dc259324c3b6aa8f0e8a1deb4464 X-VCS-Branch: master Date: Sat, 11 May 2019 09:30:56 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17b05d4e-55c4-469d-9af1-9eeec6c1bfd6 X-Archives-Hash: de53c9385610bd176e2f0b2dda1aac32 commit: 6c754c994189dc259324c3b6aa8f0e8a1deb4464 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat May 11 09:30:36 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat May 11 09:30:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c754c99 sys-apps/iproute2: Synced live ebuild Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/iproute2/iproute2-9999.ebuild | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index d5befeb1ccf..8f2fdbfb7d9 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs flag-o-matic multilib @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -32,11 +32,12 @@ RDEPEND=" atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) " -# We require newer linux-headers for ipset support #549948 and some defines #553876 DEPEND=" ${RDEPEND} +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +BDEPEND=" app-arch/xz-utils - iptables? ( virtual/pkgconfig ) >=sys-devel/bison-2.4 sys-devel/flex >=sys-kernel/linux-headers-3.16 @@ -129,16 +130,16 @@ src_install() { emake \ DESTDIR="${D}" \ - LIBDIR="${EPREFIX%/}"/$(get_libdir) \ - SBINDIR="${EPREFIX%/}"/sbin \ - CONFDIR="${EPREFIX%/}"/etc/iproute2 \ - DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX%/}"/usr/share/man \ - ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ install dodir /bin - mv "${ED%/}"/{s,}bin/ip || die #330115 + mv "${ED}"/{s,}bin/ip || die #330115 dolib.a lib/libnetlink.a insinto /usr/include @@ -146,12 +147,12 @@ src_install() { # This local header pulls in a lot of linux headers it # doesn't directly need. Delete this header that requires # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die if use berkdb ; then keepdir /var/lib/arpd # bug 47482, arpd doesn't need to be in /sbin dodir /usr/bin - mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die fi }