gentoo auto-resync : 25:09:2024 - 01:25:44

14 files changed, 264 insertions, 14 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 041ff4191e2f..7355191537f3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 87ff857eaa1c..0d87b032e3b2 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -5,6 +5,6 @@ AUX gptfdisk-1.0.9-musl-1.2.4.patch 819 BLAKE2B 79fde3617e158c1a43ac257e412e2c69
 AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60
 DIST gptfdisk-1.0.10.tar.gz 220787 BLAKE2B 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a SHA512 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
-EBUILD gptfdisk-1.0.10-r1.ebuild 1369 BLAKE2B fab52a345185193c9562aca19f92e7b1e2249e1c11f2f7c51d4cbd92978eb33a49692cbd4d9abd99df7faefb1e230fa61d243d5f6f44ae53d35f59213b084061 SHA512 4bc1a7df698daefaa4cb755f72b8456a86cd69515978da62c33d063389e7cca3f0a09925cbefe2b7c1021ae6432e22c2a6f51092cba0fe206cd0d7d598b6b674
+EBUILD gptfdisk-1.0.10-r1.ebuild 1368 BLAKE2B bc7943c793a705e854a738049dca03bc29405119e09dadd78add6582472e1b3ebf73919fb977d5f025c2f571a7e7e5a39f35453923f06746f44a910b8a641598 SHA512 672f24d7cb295615eba3cbda4be72eb24a184df842110e1b000c22847d84911a4f199e8a021ab5c4ef73a0906e15ffbcb780f8221c635fdaeedf92f3c16f34af
 EBUILD gptfdisk-1.0.9-r3.ebuild 1453 BLAKE2B 3343d443abc30ce203818975d7ecbd1930acce288e13d4cdc40e55811658e8fbaecdfaaa07c01f35783ed7c273a204928880083f3f0defe41f86f5624100b90e SHA512 9f491efd4146c4aee1b76dbae6eacb218d958ac1145f412c27b91d7d54757c62da4d41aedc50c8e438124a5f71fdbba513834ce90295eb7277e31e957de26b84
 MISC metadata.xml 246 BLAKE2B 3d41e700d98c6016b343a1f59506759ecb12c7e262b16db795bf4fb1f428dc6c6e8f5a5b0b85ecd5ab4b5ea2344e6e202a40057ad614593c3337308689437f4b SHA512 8364da10362a3a706d6afaa5cf13a3ffbe393e8dd538cb11892ef3f46d888f911cfe8685fcb1225aebf522f81adbace01e2169ac8914e7e3a26a5183ceb7208b
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
index 5c9629d30559..5513136c8d9c 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7ab84f9f7477..3b64e6f695e9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,6 +1,7 @@
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 AUX iproute2-6.10.0-musl-1.patch 1243 BLAKE2B 66853640dec036026b4c9dce0e1ecd3278492a5ebda55a36e2098404ffab12e4606f796c6fa00765a6cc37dbbb87fd42c841b442561a85397491bde7181cef86 SHA512 b89ade7182ef09ac3bd99fdfc15c36ebf1911941d9f967f88d62738a646795998d17082147a649a32d390a015465d2e8fe7cbbc8dfdd4d5d5bd9d54be67ce9a3
 AUX iproute2-6.10.0-musl-2.patch 1452 BLAKE2B b20f3a0769379339651a9c781b5a53e41f0678ad1493878ec0523698e86dd9f702a527cc3c09a5c9607309e750a19798346ee5f3ddf580739bd6d949f05ce671 SHA512 1958e1d4ee92092d169d87de8a8983aaf656b78b4f0ba7188b449768250457ad4f2266876d0077f39d9c0dc27e2531c4a76f6b13f44095c614d88ec7c1e0c302
+AUX iproute2-6.11.0-musl-fixes.patch 763 BLAKE2B c7cf3f2c47152636b4560a84ffcaf7eb7b1dc205f188a9c4e84c2caf9e091fc1bb69909dfe62ac011e374d72fcae617ccd707d2c50113663c91870b921e91598 SHA512 ed5d30fb3637e7ee1a2ff3cd3180f80f0aa578ac383e86ae0d35a6bfc733e87174eae8603aade7f32573d200258f3baa52b35e81ef43a7daad887522f0d8b522
 AUX iproute2-6.4.0-disable-libbsd-fallback.patch 843 BLAKE2B b7b27ce8ee0f7961932cfdba071e4062688dd4ae0cd4aad742f3fdc66fd76a70dd0eea97e59efa7d94a8dd3713bcb0b2aae72c46853a3c7be50acf50af7538e6 SHA512 0610d4fc282575c6c78d02362492dda9ae79de24a4024c64a7cfa8138b94f11ea4dd50fcd741475992dfb88861e672f96854111d23bd690a8949adbbf5378970
 AUX iproute2-6.5.0-configure-nomagic-nolibbsd.patch 6966 BLAKE2B bc2da6f561ebd10aa40438b9bfd9d6b25db2edee844ff31e7e8726b3b3a282db7e7bd1ee3955642608a03d9d11b900e4fb26b35f0bec7f07d844337424f2da8a SHA512 84ab38bebb1687ba743a1d4ed5eafc484b02b6ba96e8650b988a30456c9b936718dee7640ef97cecc07565b7e0ddcc7cad5002961b3ff0cfcefddd87eb64d067
 AUX iproute2-6.5.0-mtu.patch 1719 BLAKE2B ef2dc2f3ce23432464b778584c53b3a204a05e7dac1d87969563d89b94bbcd04ff080f21d9809e43f75751b63b49ea506e0ae8191a6170b9c76dae043f861621 SHA512 4057309aaa53e97fa8ed0a410e42e4cf1f70e20a278a299b49261ef00ad8050bfad903e1a91b123a7c99e041732e23088274a8b79c0b2290482acf9735fd8cc1
@@ -17,11 +18,12 @@ DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
 EBUILD iproute2-6.10.0.ebuild 6012 BLAKE2B f467ff5d31c3574c838dadc1e881f74d9703e6019ab068d0a9091fc330e3dc20022fe2173735b3e576c53484cb58c1f639c58c2dcb0c8d69a3a9e6f0b821bd2f SHA512 a213cedbd8184d2f99acfb3d76b3cbb890281446b5aecdd9d73be6db2cf9c4590574798e00f115ac643345c34f6a396c2c35b2afd4dfdaa9336fb5140cfaafde
+EBUILD iproute2-6.11.0-r1.ebuild 6061 BLAKE2B c5911049a3c6d939ea1765c7844c1900a9ffb1b059e3ec6b9fd892421e6489b8d6579196238d09981e9323416411040ad84ce0d5358bbb952c25aad6a8826b3b SHA512 e95e6f9c1adc9671e648b43cc9602fe93794c036ea5f8c8ccccdf22ed5381be5bc38165316d8d07160c4823a53ba7072590d9fe11e440b46a488b2065e8251a7
 EBUILD iproute2-6.11.0.ebuild 6018 BLAKE2B df1906f4a87a8d5cea3630393faedf8b6e086e8a679b90a81e576bdc0f145005d3cafb27e3ed154968963b126d16d043e03070d395227ac8d96b89aea18a8482 SHA512 2384eeb4b71201f2ed4c378ad7a20c3ec9659fe1ce53b25f8276f185b3ee6f1ddad1f3ed91acb49bcd65880fcd843b9e2e5b2e28f716a87247f9a237bc2806ca
 EBUILD iproute2-6.6.0-r1.ebuild 5999 BLAKE2B 9cbd67178215e76aeba681b6e3f03f5227606d3d267b97d7a3ea958ff34c2665e0490e18bfc5733c027fe00e1112c7840e3078dad0f227d50202ab9d0570d3e8 SHA512 e89982f8f99b6288d816cf4303cf86ae634f48fc772f543eae6189f88517aa748e141bc594e37469bb8e5e2a1c878df3c36ed7ffb6f193cc48d38758b8ca0a4a
 EBUILD iproute2-6.6.0-r3.ebuild 5964 BLAKE2B 9b320266330abe11e474c9b14042bd6ded1f1c29c60cf0383bf3b486d60c1b04fa00c5bb9fb400cce63e437daf1954e1170d8b91c7dc8666c9cb9f4e25f9f718 SHA512 9a7fdfa63120d27e23b878b509c84e1c2aec96416475a1e49b80255bd0a5f20e4fd7ef506370316294dc1c1849b8dab446f660ddafef316033f9ba349ccdfaf3
 EBUILD iproute2-6.6.0.ebuild 5906 BLAKE2B 7294a3867a2ece9c5184cdd2d2268b828f867b40f56bf8e7b415696ca955c48b38c14883ab7582b85bc0984a4786605ff5f52b7ffc8f3aeae759bd3b11f47faa SHA512 7f08d99c733083ad1210b0c86d6b3184ba3e3899dafe099c408207906178e2caae3faacf5672f29ecff233be20f3bed9343eebe69b354423749b305c2043095e
 EBUILD iproute2-6.8.0-r2.ebuild 6004 BLAKE2B ca9e1eb347e4c3bde3d04bb0e0a1be9b08ebddabff0605ff3a494d48b3e2efd72e7a4da1059314cf1d9cf29c51094102353a34c09065084b072dbdb8c7f69037 SHA512 62ee1d358b3b279436a31e41d4ee4c8afbd41a0073249f0764a3e3558abb3bda4a059b32da42ba3c6f507b81b335718a3c2539f80615ae3dcad5527704e87b9b
 EBUILD iproute2-6.9.0.ebuild 5961 BLAKE2B 3d0ac07598de171cb5e717bfd7ff6501ac05635021e6c622e78fb43ec4c1bafd1b6ff189fb8329c112b0401898c9c401446135642bbc2470104dd1c957162051 SHA512 3b3625ff6835532c9c665727f775eb02c92b3aa71d00393b286466f9f993704b864c13a5c786f8c6e30849f5a87ef75468680263922bd7a3fbbc1f279c179fcb
-EBUILD iproute2-9999.ebuild 6018 BLAKE2B df1906f4a87a8d5cea3630393faedf8b6e086e8a679b90a81e576bdc0f145005d3cafb27e3ed154968963b126d16d043e03070d395227ac8d96b89aea18a8482 SHA512 2384eeb4b71201f2ed4c378ad7a20c3ec9659fe1ce53b25f8276f185b3ee6f1ddad1f3ed91acb49bcd65880fcd843b9e2e5b2e28f716a87247f9a237bc2806ca
+EBUILD iproute2-9999.ebuild 6002 BLAKE2B 1a8e642b5f45cd810244fa3c3cd8aea6dc8cb6006e16062f325130fdff275c267860c008ddfce6d028a10a24cb039b1cd7b60a22837b46b0102d7fce6076a265 SHA512 956d0c2d917d8e698eb118b4d68aa1c8cdbc1c2488407697406d68ffb484cfb459741a516cb5d5d058b5aec79acbae8fbe9bb5f659f916836e16da925cfd33ce
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch b/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch
new file mode 100644
index 000000000000..cc1370a3a6af
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch
@@ -0,0 +1,35 @@
+From https://bugs.gentoo.org/939811
+From: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- a/bridge/mst.c
++++ b/bridge/mst.c
+@@ -4,8 +4,6 @@
+  */
+ 
+ #include <stdio.h>
+-#include <linux/if_bridge.h>
+-#include <net/if.h>
+ 
+ #include "libnetlink.h"
+ #include "json_print.h"
+@@ -13,6 +11,9 @@
+ 
+ #include "br_common.h"
+ 
++#include <linux/if_bridge.h>
++#include <net/if.h>
++
+ #define MST_ID_LEN 9
+ 
+ #define __stringify_1(x...) #x
+--- a/include/json_print.h
++++ b/include/json_print.h
+@@ -11,6 +11,8 @@
+ #include "json_writer.h"
+ #include "color.h"
+ 
++struct timeval;
++
+ #define _IS_JSON_CONTEXT(type) (is_json_context() && (type & PRINT_JSON || type & PRINT_ANY))
+ #define _IS_FP_CONTEXT(type)   (!is_json_context() && (type & PRINT_FP || type & PRINT_ANY))
+ 
diff --git a/sys-apps/iproute2/iproute2-6.11.0-r1.ebuild b/sys-apps/iproute2/iproute2-6.11.0-r1.ebuild
new file mode 100644
index 000000000000..c5c0744b82f8
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.11.0-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables minimal nfs selinux"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( >=dev-libs/libbpf-0.6:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	nfs? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-musl-1.patch # bug #936234
+	"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
+	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
+	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+	"${FILESDIR}"/${PN}-6.11.0-musl-fixes.patch # bug #939811
+)
+
+src_prepare() {
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed -i 's@echo -n@printf@' configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Build against system headers
+	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
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+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 || die
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
+	popd >/dev/null || die
+
+	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
+	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+	# https://bugs.gentoo.org/929233
+	append-ldflags ${CFLAGS}
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	edo ./configure --color=auto --libbpf_force $(usex bpf on off)
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
+
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
+	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, bug #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, bug #144265, bug #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		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 # bug #330115
+	mv "${ED}"/{s,}bin/ss || die # bug #547264
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	# Collides with net-analyzer/ifstat
+	# https://bugs.gentoo.org/868321
+	mv "${ED}"/sbin/ifstat{,-iproute2} || 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
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 26b79a0d0847..e650e4f2e1ca 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -24,7 +24,6 @@ RESTRICT="test"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
-	!net-misc/arpd
 	!minimal? ( net-libs/libmnl:= )
 	atm? ( net-dialup/linux-atm )
 	berkdb? ( sys-libs/db:= )
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 29bee1b1d2ca..08f58d5acf5a 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -3,6 +3,6 @@ DIST man-pages-6.06.tar.sign 833 BLAKE2B 7198f7a024731fcaeb97c131ff02611cefc60cf
 DIST man-pages-6.06.tar.xz 2166012 BLAKE2B 49c022204f8ce82fafd6f34a590a310beb6618d884290123a755efd38a71c974aa2e49d729655fcf82df0b96db8f782c1b2eac5174b319b6a383740e715fa11a SHA512 c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-6.05.01.ebuild 3579 BLAKE2B 32a094672db701fff2484826852b678386518d03d08b48d23f3ef5b10b1f33317ade59cb4cbcd7f6ce8ead78cc02822fcbeda55e6c5f79317fcab76345eacaec SHA512 f9c2b94b12e6da4ca6f12ad8e317bc600a6f7ed510223e9ced39a7f80607aed35cd3cc3e764dd953a7edb7e58f86691f1fb292905bef4326aa97a24fb1d7a736
-EBUILD man-pages-6.06.ebuild 4303 BLAKE2B 6d02edd529325a72bb572f0f7430eab81c7d52da0c1be6202434265a6153962f4ec1d76af0b914b2523bdced52651eb6f3f4399be42c3aa828b16cbbe99ca094 SHA512 64c2723b94e97c9806dcae954427f96cd9a17190db99ed998d4d98e32732e85a29698df15dce8ef07a7a39f56f11b3c0c4731b040b531a83fec1af1f912466b4
-EBUILD man-pages-9999.ebuild 4311 BLAKE2B 2fa1865d731f3bb744118bd5f14285c8f26aeae1d6f3804429e2be9bc89f81732c0a9ae124616f26acf54a75fb1c12459414b3c49c58266e8a2594a44773ebf2 SHA512 c9e873523b44a0ffb32a10644ed6861536e886a4e3c1518a028bf2e7fe562caa01d7b008f0476b3dd6ca2d1f59b30017a7a9fbe178b6abac523a50cd5aaac785
+EBUILD man-pages-6.06.ebuild 4306 BLAKE2B e72815cece4648fa08706e41be599f29ba9db82be5ccc6e9fb94dda006583f1acc85a40eb4f6737f1fc7df75f4c48cbfdaf873efd38dd077e733477256ea0455 SHA512 df990f926949ce477141ed39075122eb09ed8064584802405434d0358281193d2f3afe33b070dd41845855d709729a53a9c89d0ac16467b07904fa951cac5ca1
+EBUILD man-pages-9999.ebuild 4314 BLAKE2B 8859044765d9c67a703932517b4692de56e155890c86e1c1018343b36d8c9bc7139f07a8c70d9bd18d9bf1ff81b28d513afa1dc6236f37d3f92f3bc46128e1d0 SHA512 a041fd143d89b9d07c85cd353a78502ed7c1b7f45f6e5d5780a75d2d88664b1006e5b3132d718fb5dfb9f766f2259d9015de20983d0f76cd4aa780c8abb61c83
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.06.ebuild b/sys-apps/man-pages/man-pages-6.06.ebuild
index b6ca71aa68d4..b7adda947d05 100644
--- a/sys-apps/man-pages/man-pages-6.06.ebuild
+++ b/sys-apps/man-pages/man-pages-6.06.ebuild
@@ -98,7 +98,7 @@ src_unpack() {
 		# Upstream sign the decompressed .tar
 		einfo "Unpacking ${P}.tar.xz ..."
 		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -xf -))
 		assert "Unpack failed"
 
 		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index da0221acf2f1..3650f5532a8d 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -98,7 +98,7 @@ src_unpack() {
 		# Upstream sign the decompressed .tar
 		einfo "Unpacking ${P}.tar.xz ..."
 		verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -x))
+			< <(xz -cd "${DISTDIR}"/${P}.tar.xz | tee >(tar -xf -))
 		assert "Unpack failed"
 
 		unpack man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 175a6660d62b..1d168e3052d3 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -22,7 +22,7 @@ DIST util-linux-2.40.2.tar.xz 8854820 BLAKE2B 8306d651f27db6665e91a937c9f1970938
 EBUILD util-linux-2.39.3-r2.ebuild 10866 BLAKE2B 75df6fd95fd0efb1a157ff51011d15bdc07be7e3576c2ed5bbd710535b2fdcb96a1157248a2a4edd4fab62e33147566e0ea65470659e8338d332bfcbdce4b838 SHA512 48f0b5e960a4723419e648a26394dfd2ad2e4c212903d35719edcbf77a61f85dbc79e40b6cca1eff4b7cc2ea646ce790040ec66eeb5b822cb2b00a33d77a4153
 EBUILD util-linux-2.39.3-r7.ebuild 11225 BLAKE2B a65ff6677233ab57f23688acd48a65c1940886aa7a2cb584de8cb898c924db5908f432714d4339a1b15abf64fd443839f8d61b02a6f0b02e53e275f5b6372691 SHA512 028d61d839e9562a773c973fc54318d7fd58fda10a3edf88219286700eeb8338ae4f66f3aa0b8c74a1ae1473512d32a50ede1711409f65a383ea32202bdbda3b
 EBUILD util-linux-2.39.4-r1.ebuild 11160 BLAKE2B bc2e3fd37f3cf2a7cb728666e9996a027df9eab27beff5975948cdd91b8c488769eebf00ce5bc2d3f361e95ba1171880c7c850813ff4c31414cc10ccae64bdde SHA512 74cf58736321942628a1ee8cbb5d125e02657cd08215a77b4bcb9439a3faf7a54f51c3cffc8c2da59d57ad40e171289b7f06d55ccf473ab5d0ea2b4e436c5aa5
-EBUILD util-linux-2.40.1-r3.ebuild 11194 BLAKE2B acf509aaad6e731d1f2b68070b5cd3376535a4b2c91da8a102a302586edaa5937ea663451815f7c38bd1bfb3a0c097f80d53ea384e2db2c89715591c0988fc7f SHA512 0740433ffda33140bccc53c360dd1ab31e600e5946bd1ca5b9efaf53fe221c70000a8f493b26a28a9e6cc4cabac9325cc3cb2a3f67074649f2b901968bd70198
-EBUILD util-linux-2.40.2.ebuild 11845 BLAKE2B f1a6f15f6cefeff885f03a931e773899c1f262def888e2bc453dbbfd4972955a15f6bbcfda61db0b9c3c6d9e4c253caf0c8f43b82b3d7455d22d0a4c29201cb9 SHA512 b3bbe90563ef41c753e61136b81f8277303d8452e4f82f437727c1ab95e0d5cf16791c8320e3b00e1af2e6ce47f06c964fd8057822825c198711f6c35ca88fe1
-EBUILD util-linux-9999.ebuild 11845 BLAKE2B f1a6f15f6cefeff885f03a931e773899c1f262def888e2bc453dbbfd4972955a15f6bbcfda61db0b9c3c6d9e4c253caf0c8f43b82b3d7455d22d0a4c29201cb9 SHA512 b3bbe90563ef41c753e61136b81f8277303d8452e4f82f437727c1ab95e0d5cf16791c8320e3b00e1af2e6ce47f06c964fd8057822825c198711f6c35ca88fe1
+EBUILD util-linux-2.40.1-r3.ebuild 11197 BLAKE2B 1de613c4379450857b216dca06ce69fa06aec615b14b70f45e2427409995c449f59883ac17d7b44e7da00051a0dc40723207cd6c8796282d00aa2f1e2b7aec3e SHA512 6a4a11fe2ee3d7ce4b4f0073f1825e3ba81ab56398cd25b63871cc7a2d0f0bef64364d66fe84229efdb3663bb0504214e84d713fb97f25dfc066a9cd3c4d4588
+EBUILD util-linux-2.40.2.ebuild 11848 BLAKE2B 9582a14a5db640367d89a91b6b06c926262c0ed31c7477718ded47e85130e4a73cec878423c2e5c22c0b812c48f4692f9780454d27ae6846fc52443a5dee6bf1 SHA512 bc0e77aa83123a3673dab428218e55dd184d3da340acdbdc5f2e33642c9e3b1433442431b24798c976b16d70c7eaf54345dea1222562b3a10da4eefed0ea9935
+EBUILD util-linux-9999.ebuild 11848 BLAKE2B 9582a14a5db640367d89a91b6b06c926262c0ed31c7477718ded47e85130e4a73cec878423c2e5c22c0b812c48f4692f9780454d27ae6846fc52443a5dee6bf1 SHA512 bc0e77aa83123a3673dab428218e55dd184d3da340acdbdc5f2e33642c9e3b1433442431b24798c976b16d70c7eaf54345dea1222562b3a10da4eefed0ea9935
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index 77bcfca431db..25192bc4ddb2 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -119,7 +119,7 @@ src_unpack() {
 	if use verify-sig; then
 		einfo "Unpacking ${MY_P}.tar.xz ..."
 		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
 		assert "Unpack failed"
 	else
 		default
diff --git a/sys-apps/util-linux/util-linux-2.40.2.ebuild b/sys-apps/util-linux/util-linux-2.40.2.ebuild
index 763811e1da0d..c7517aac4cf1 100644
--- a/sys-apps/util-linux/util-linux-2.40.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.2.ebuild
@@ -119,7 +119,7 @@ src_unpack() {
 	if use verify-sig; then
 		einfo "Unpacking ${MY_P}.tar.xz ..."
 		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
 		assert "Unpack failed"
 	else
 		default
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 763811e1da0d..c7517aac4cf1 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -119,7 +119,7 @@ src_unpack() {
 	if use verify-sig; then
 		einfo "Unpacking ${MY_P}.tar.xz ..."
 		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
 		assert "Unpack failed"
 	else
 		default