From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6FA90138334 for ; Tue, 19 Mar 2019 20:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FC6AE0887; Tue, 19 Mar 2019 20:41:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F3D3EE0887 for ; Tue, 19 Mar 2019 20:41:23 +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 4730F335D0E for ; Tue, 19 Mar 2019 20:41:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9D344E3 for ; Tue, 19 Mar 2019 20:41:17 +0000 (UTC) From: "Lars Wendler" 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" Message-ID: <1553028071.61e97277f40a30dabeb87baaa0e320827eacc36f.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: 61e97277f40a30dabeb87baaa0e320827eacc36f X-VCS-Branch: master Date: Tue, 19 Mar 2019 20:41:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7ecf6cf-81a4-4f22-830b-b21507b34bce X-Archives-Hash: 22f3acddd30b7ade70f5eb6e983df90a commit: 61e97277f40a30dabeb87baaa0e320827eacc36f Author: Lars Wendler gentoo org> AuthorDate: Tue Mar 19 20:32:10 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Mar 19 20:41:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e97277 sys-apps/iproute2: Synced live ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/iproute2/iproute2-9999.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index f9527624933..c6720ff8aed 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,11 +18,12 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm caps berkdb elf +iptables ipv6 minimal selinux" +IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" !net-misc/arpd + dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) @@ -39,18 +40,19 @@ DEPEND=" >=sys-devel/bison-2.4 sys-devel/flex >=sys-kernel/linux-headers-3.16 + virtual/pkgconfig elibc_glibc? ( >=sys-libs/glibc-2.7 ) " PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 ) src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 ) fi @@ -61,7 +63,6 @@ src_prepare() { -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ Makefile || die @@ -72,10 +73,12 @@ src_prepare() { man/man8/ip-netns.8 || die # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi } src_configure() { @@ -146,7 +149,7 @@ src_install() { sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die if use berkdb ; then - dodir /var/lib/arpd + 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