Update sys-apps/iproute2-4.14.1-r2, sys-apps/iproute2-9999

4 files changed, 232 insertions, 16 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index f797c1e7..8ea41665 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -15,6 +15,7 @@ AUX iproute2-3.7.0-man7.patch 1350 SHA256 71653ab06c937de2c01370b39c16e5a9d22c1b
 AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf
 AUX iproute2-4.0.0-tc-show-buffer-overflow.patch 1717 SHA256 2ddb5ea744185f5ebff79961a054570b166ad1a5f3df0b91b59927d1b86c7aa3 SHA512 f5b507ce9d9a2cf4b86c0c2e2a18c5295226707df707eb229ec2f880b0fee64740a039fe5aa334c1dfc2d04faec4200cdb27dfaf631119a8705dd698f2767a77 WHIRLPOOL 801e25b3f6984b59d95eb494dfa63502e2c32551c8f5376ab6109a6bf5b9401f1b7bf6a0e0456dc68abb207d9505b5dbade675ea39e709e27a839357a431c444
 AUX iproute2-4.11.0-no-ipv6.patch 1360 SHA256 4fd3e61e00805a83a9874586738af1eed617c2845dd49254c7886e44c432de11 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577 WHIRLPOOL 46864c98b8cb79dd0f811d75271937c4cef9eb5eb4ddd9996a8ca510b030fc59fe2e39ce6666bc584f097a81c1d146af3550d20767bcf347e9315fa22e890667
+AUX iproute2-4.14.1-configure-nomagic.patch 7334 SHA256 27c8225ee3004cf3b386ed81110701f50b7ea23d6907119d2c947bbbd8dc8f54 SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6 WHIRLPOOL 838d2a1039fcd42b44ae467ff031e871b270587ac8ae669323d924425e77e992d3dd2aedbdd266d9c8843da07b30d5c801a18574c543021b2c82c7d17e9bfb3b
 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 SHA256 4086178e9853ee4aed44b3fce4de23f0544388ff08a5982ccd36509b7215d115 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 WHIRLPOOL 2cb34c5a1da81bdb62a5292e81ce1e3def497ae269d72b15ba0ce073aba00ab4872b6945f750e3fda7f26f6661c88f936d63a0edf41842e831f1c8234b01600b
 AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256 b352b11d22e922038adb2b1ae083b6e47b89744f94d6de732bb85abd9cfa80e6 SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 WHIRLPOOL 35faf6227ad1b4409b6742cb754b6570c25f65bd6a63e2237fd9613075827811bd1b9e86dd5d099b061e14906f752ef5aecea8ccbe95748d98f892d111a3a0b7
 AUX iproute2-4.5.0-no-iptables.patch 1022 SHA256 b6f69d8123e034d1be462d6672f8f59915f6e25b890c8d3068a1e0af658a85e1 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e WHIRLPOOL 42351420125199e5149d321d583fcc967ec253f1aa7f338757c38849e841c9c89f7f8861f36803a3a849a0454c0fdc605d50549eeebaf97c1aba0fe770e6cd4e
@@ -51,8 +52,8 @@ EBUILD iproute2-3.7.0.ebuild 3237 SHA256 f4276015a1daa78fd1868dc3e0f84da45b17909
 EBUILD iproute2-3.8.0.ebuild 3445 SHA256 f8dc6ef2491b6b3416566aa78c0b5e73f49fd6102d6373b5236de6a48b814cd3 SHA512 71496b0ed2f544168ae251ae4f95e54d4090358896683e880757bc9a99dd870be0c0f9b24f1fa3c98b69e04fc120cb99814672bb49d9a8694563f0d32f59101f WHIRLPOOL 643d11978285591fc67fc3362d6127b09b9d1e2ad29b67fb53dc329b159a58fc59873298165c74f335a43701382e4bd551f4c206567d444f0f34c2b8e39f65b8
 EBUILD iproute2-3.9.0.ebuild 3486 SHA256 73079adc7d4d0f9b1d2c0a0242da2e469652ad28f686048ff9800fbc7e50fb16 SHA512 9c2302ca5148f544a470b84ad8e59800776d57e2f59ced41e34c38a3a81a963b2d022b404ce4c6ef16eafe56768fb11812462fc299361762b35f0f3ece590417 WHIRLPOOL decfe2e5901bc9753d94844f58119b2aa2101e665a047be32157c433eeddeadea0655e5e1b7037083c6a959a327137f10121bcc65c3aedf861503d2103717408
 EBUILD iproute2-4.14.1-r1.ebuild 3831 SHA256 916d8e7b25dc0a4fca27b7e476d77b8c906398eb30cba9e12c00fda70606af14 SHA512 063418bfa7b075d198d055248d836c1f9f93454395fac0546fa9f853c71e89f7cdaadbbfdd7a39f0c1d44f071bf236af64200e90f3f3d4b4b74c50778ed5317e WHIRLPOOL 8d2b9a86dbd4fc0e230b3a4a455dc0b11051dd41a1e2197207ca5b652365622eecaf7a122792d124af62b6d585b2d68c586bb1e238306b2322a23678833c1031
-EBUILD iproute2-4.14.1-r2.ebuild 4006 SHA256 bd0068381adcb07d81d78e36a2c770132b819634a9eb385920b51e4900cbb29c SHA512 cb8a3d245b71d53985ae7710718970ab37b6c879e24c95d6c712b3c1c609d630ecb69544c4c7d5f58478fe49500a91182adcc35a943e0af80b37750454181bf0 WHIRLPOOL a96785cb06afdc669c2302a510ac8641c4089570a69e93b5d47d038e734faa864c3ac191a0b324eff91ecb00302cc35397ee74789188b52658ab6d2bf58ba75f
+EBUILD iproute2-4.14.1-r2.ebuild 4001 SHA256 69597be1afb89a9a55b44f9d0016a69e33004b06b5714ae1ee6f146d0d3e0819 SHA512 a06da5bc6c8bb211daa2bb60109eaf7dd73c4c6b2c1b9eacdc18880a464bce8234bbe80b7430971e5313f6d6fc0b10070fe8a7f056a964673ab9d98f820482df WHIRLPOOL 265be983aa21b0792370a4779aff6ff4c422e6c18df5e0785db7892f26a51c800729a938e7e043568d078119c31ae5ba9216638f51923daa5563bfe8936f2331
 EBUILD iproute2-4.3.0.ebuild 3698 SHA256 a8efa0d9fbf4d25da6f33f2807458e4fd16e333403c834e1c621b9339720d34f SHA512 093251001ba08325cf1a8544a009b00592e3ccfe190525fcda1ae5f0264a524656a2a1f31ff58320c4c1bb1b414f02c8fda5a29bcba7ab8614a94b1b595757c3 WHIRLPOOL be4bf5dccd4c6d5ab9ddaf75b9f363ae571dfed62e62eec71f8e24aecfbab095b36e7468741165c92bfe5129ae4ef130fb823c6a808a890bf96a059dc1b8f645
 EBUILD iproute2-4.4.0.ebuild 3776 SHA256 9a348a8d92874eb3cf0c26c6d7d92254f0ff7ef6d1a32244d9d6426dfbe5df52 SHA512 39a5e6c35eee5092973263b01aa46d71f23f84b2c744f2429217301aabe0c63cd6421452852920e08aae46cc31249946f2763763e25afc548d09123018512f16 WHIRLPOOL 8230f9a5a8415f43327d3ec860d50a5aa2d07c94a05234543f4d8aa59843132b2b0241679751d4cd00bcafdcd14483a7706d44a1306fde280e0a813ca9fd0740
 EBUILD iproute2-4.7.0.ebuild 3903 SHA256 fc9c19bf133515947c771ab656b75e1364b42b4be8dab9b1da1de7fabc45e541 SHA512 0ea50f93d48ae1c09f01b0625fb717ce43d2b46239fe29fae9934771e80bcc3916d72efd1acc175311eb55950fae857ffd9421516f78a5f781f2e3ba98909549 WHIRLPOOL 3f0291a96337647e36dcd3e4040490128f0ced1605ef5d57691461223cfec3efc4031862efa015099020d600e398798b023cdc2cc1dae3fdd1c47a0ab4446873
-EBUILD iproute2-9999.ebuild 3649 SHA256 953cbcd6793a02a858bb606c2aa8ae498fbd455f35c6c88855ef573800cd69ee SHA512 db1098396a76f5569d5ee8d4801d86c1bd668f16c0db82c29af2e074679851b957f2957056f67b61a1aafe6d129df341ae0caf78ba232051e32575007a10e57a WHIRLPOOL f2ec761b280e9ce0b4030c833ddb50a33d40e214ee501f9af6187fc731a5f1c9296b835e3c7b51a32276ff3420f89f4d453aa70e70be3d410d03bb030f695363
+EBUILD iproute2-9999.ebuild 4155 SHA256 0a998f44271ec9f1bd61b7b97422cc1e1c96f64b49b0c826ce256ac0f80df1b6 SHA512 5f4a115e7ff75c76e9857ec5602db780d650cde6d31d47241aee061c4f7742b1a9795ab62243294feca39f398424602d48652dcd84ab1e9ded4f77db76c9f206 WHIRLPOOL 55aaad2b4629af5f9674d302a913a0ddc6a55b74c1dcf826b4bba104144d5281bf819f727be96ec0e06ed82cd52bb1a993bdde00729b7473d8c4d1cd0cb84e5b
diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
new file mode 100644
index 00000000..919249b8
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
@@ -0,0 +1,196 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libelf & libmnl based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile
+--- iproute2-4.14.1.orig/bridge/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/bridge/Makefile	2018-01-07 14:24:23.350726423 -0800
+@@ -1,6 +1,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include
+--- iproute2-4.14.1.orig/config.include	1969-12-31 16:00:00.000000000 -0800
++++ iproute2-4.14.1/config.include	2018-01-07 14:25:34.406126921 -0800
+@@ -0,0 +1,22 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure
+--- iproute2-4.14.1.orig/configure	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/configure	2018-01-07 14:25:49.242419367 -0800
+@@ -223,7 +223,7 @@
+     then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -268,8 +268,8 @@
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -283,8 +283,8 @@
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -297,8 +297,8 @@
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -425,7 +425,3 @@
+ echo -n "docs:"
+ check_docs
+ echo
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile
+--- iproute2-4.14.1.orig/devlink/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/devlink/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile
+--- iproute2-4.14.1.orig/genl/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/genl/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,6 +1,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile
+--- iproute2-4.14.1.orig/ip/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/ip/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -14,6 +14,7 @@
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile
+--- iproute2-4.14.1.orig/lib/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/lib/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile
+--- iproute2-4.14.1.orig/misc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/misc/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -4,6 +4,7 @@
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile
+--- iproute2-4.14.1.orig/netem/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/netem/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile
+--- iproute2-4.14.1.orig/rdma/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/rdma/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile
+--- iproute2-4.14.1.orig/tc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/tc/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -3,6 +3,7 @@
+        emp_ematch.yacc.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile
+--- iproute2-4.14.1.orig/tipc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/tipc/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index a4c42ccf..b49e2585 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-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 2646639b..432b762f 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:= net-firewall/iptables-nftables ) )
 	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() {
@@ -60,9 +68,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
 }
 
@@ -78,11 +83,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 to create "config.mk" ...
+	econf
+
+	# ... then 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
@@ -90,10 +104,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