gentoo resync : 03.02.2018

6 files changed, 42 insertions, 163 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5cf905147d1e..be9031beccbe 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -22,15 +22,14 @@ EBUILD iproute2-4.10.0.ebuild 3985 BLAKE2B 639a1748c37e42225bdece73320e11d4ffaae
 EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb84224986ffc7306f19eb3e967aae4b1945ca7deb68b70a2b675e07363b6d25f2f306d806cddb0cf1b9b3386d08c36c2a95 SHA512 fdc0d728f71d32767167184fbe998b3e8955a573c08064d00c22d34f966db7406b989ce03329fbcbe5182b54809cf788e91992bdf48a368ea54d84c5b62594aa
 EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897
 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039
-EBUILD iproute2-4.14.1-r1.ebuild 3917 BLAKE2B 122d9152b518fbb536fb9fe427d19c520cb928d863ffeec86a1dddba7f872c2402b3b06bcdf62acd10406c905c17246d046dab058b083be6664f627b0acd90ee SHA512 0ad8578638859289f8621a9811656808cc987bc12349e6d0b9d9ab0cd95cc38d2c547bef3bba6ab905f8527b2132aad1ca21ec1b526bc4edba95b5607b797eb2
-EBUILD iproute2-4.14.1-r2.ebuild 4097 BLAKE2B e97221d1703db06c06d8ae792a9c6cdd809c1e28d4dbbaa10f8b501db84788bd531cfd42972705fa84b4714c12c8f417bc0d61065e6443d9fbfbf65b7cdd7c3a SHA512 537e045806c5350b1eeeaed6547fffe38693e921cb079dd358b2fc296ffa096b8a7b63a81b6fda7ebd24e256e4b47ec2d7717f6418844bc3e39d92471db7a583
+EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.14.1-r4.ebuild 4305 BLAKE2B cee940c2a0e309cf9fd0c8d652410cc3acf32bd4abcee04055bde9cbfd38704734b3ca7b9ff92ac6f1ff7dd7b8036ac99221be3a9752bec7adcd5310534e49f8 SHA512 a8c6bdd2c21731bf54da7964aece0be7dd1e78948602f9f2534e1978fa783ad917f40f43eb62084046da1ce0ebaac6c840e7886cdcc44987e5b8225e06c40386
-EBUILD iproute2-4.15.0.ebuild 4234 BLAKE2B 641a73c50a369c16aaf8c43b79eea25ab42b434e3e1239f089db06cede5cbe6948d9bb6b68be1beb9b5ff81a694cec091e46b76084a81c403d646bccaead8f3b SHA512 bea43d1e95ba653f397eeb6ee6a2ed65eb78c55cc3c40a4ffc96ab96d9d677cbcb713a3388f8b8bed47230042d594713b5075a0ac7ce887d94b59b86c365eb29
+EBUILD iproute2-4.15.0.ebuild 4244 BLAKE2B e422c120a073b1df1246b316eb3d0bc22c0fe5925059b70b170ac5a45e2ac27b9bea7fceba09a1243598990db1535c09bc20f61a2aa0f17a0532226faa3a7003 SHA512 e8f7250b9a2ecd6b0c80c850599bc61f5f22d434a2699f29d712abc317970780e88e14c013498969723d5457f68493eab55b0f260ed5cfee06631ad29b5de9cc
 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
 EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
 EBUILD iproute2-4.6.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
 EBUILD iproute2-4.7.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
 EBUILD iproute2-4.8.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
 EBUILD iproute2-4.9.0.ebuild 3985 BLAKE2B 639a1748c37e42225bdece73320e11d4ffaaeeaa9487f015ff0d596ea94874be59be689757cdc100ca13f918fee43c5cbd0af301d361b919fed69ce1f58935a4 SHA512 e834c22bcca9a9c1822e536a1780c31de445e2a178eb65d685bfa03e67ea747efec4c93db704c89cb798a594f6291c7c67b1a819c193c46e7e44209be7a5a39a
-EBUILD iproute2-9999.ebuild 3735 BLAKE2B b92c4712fb9f07cb040399fd0044e1118a7774618c08b40177d5d5fc1f95489d80f3bb27701a5f9d5385118905e6382da71d64cf317d1c45a04f80266e2e7ae3 SHA512 626da9156bcbbbf5780a7dd63dadb77a2f99e786626a6dd823048c532ddef12ecae11f62a0fc4438a53c9a49565ba0be5e8b5d569d8d920ccdd09991644c933c
-MISC metadata.xml 489 BLAKE2B 6efcdc01a729d8b5b84fe4743749e91a5c86469244d9be69ee466861f54f79d9f74c43706037ba2a9526ea3722697068b2c6e139b5c3e610c816c39d29f8a93f SHA512 d12b7f4a1de17b21d10ac799e1fdb390a990224dfb0c2c0391b03df730bdbfd9d9e43a9f8458748e1a12ed3d607221bb1db5e160f4bdc663721e9a50dad370da
+EBUILD iproute2-9999.ebuild 4244 BLAKE2B e422c120a073b1df1246b316eb3d0bc22c0fe5925059b70b170ac5a45e2ac27b9bea7fceba09a1243598990db1535c09bc20f61a2aa0f17a0532226faa3a7003 SHA512 e8f7250b9a2ecd6b0c80c850599bc61f5f22d434a2699f29d712abc317970780e88e14c013498969723d5457f68493eab55b0f260ed5cfee06631ad29b5de9cc
+MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
deleted file mode 100644
index d165889df717..000000000000
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	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"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	!minimal? ( net-libs/libmnl virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-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
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #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
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex minimal n y)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	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 \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# 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
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index d58c246ac548..74637c72653d 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
@@ -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 s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
index f38e3db1ff8f..15efa9acf6c9 100644
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
@@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	!minimal? ( net-libs/libmnl virtual/libelf )
+	!minimal? ( net-libs/libmnl )
+	elf? ( virtual/libelf )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	berkdb? ( sys-libs/db:= )
 	atm? ( net-dialup/linux-atm )
@@ -101,7 +102,7 @@ src_configure() {
 	TC_CONFIG_IPSET := y
 	HAVE_BERKELEY_DB := $(usex berkdb y n)
 	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
 	HAVE_SELINUX  := $(usex selinux y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index d48d995c3cf5..15efa9acf6c9 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,24 +18,32 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
 
-RDEPEND="!net-misc/arpd
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	elf? ( virtual/libelf )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	berkdb? ( sys-libs/db:= )
 	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948
-DEPEND="${RDEPEND}
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
 	app-arch/xz-utils
 	iptables? ( virtual/pkgconfig )
 	>=sys-devel/bison-2.4
 	sys-devel/flex
-	>=sys-kernel/linux-headers-3.7
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722
 )
 
 src_prepare() {
@@ -66,9 +74,6 @@ src_prepare() {
 	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
 	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
 
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
 	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
 }
 
@@ -84,11 +89,20 @@ src_configure() {
 	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
 	popd >/dev/null
 
-	cat <<-EOF > Config
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
 	TC_CONFIG_ATM := $(usex atm y n)
 	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
 	# We've locked in recent enough kernel headers #549948
 	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
 	HAVE_SELINUX  := $(usex selinux y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
@@ -96,10 +110,15 @@ src_configure() {
 	EOF
 }
 
+src_compile() {
+	emake V=1
+}
+
 src_install() {
 	if use minimal ; then
 		into /
-		dosbin tc/tc ip/ip
+		dosbin tc/tc
+		dobin ip/ip
 		return 0
 	fi
 
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 2605d5fd7ce0..ad652efcf7e4 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
+	<flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
 	<flag name="iptables">include support for iptables filtering</flag>
 	<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
 </use>