gentoo auto-resync : 27:06:2023 - 07:34:25

7 files changed, 225 insertions, 4 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 719bd6cef83d..051e7f813e39 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index ddc10d671f55..1bac4a56e471 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,7 +1,7 @@
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
-EBUILD apparmor-utils-3.0.10-r1.ebuild 2072 BLAKE2B 67c6e628bcd39fe3fa62b49faa94d301c9c9db6e59762500dbca9d810dd240773d1a7a91fb1302539ed7688a90f2b4fce7e1fe2469499c08ab30cdcaa0085498 SHA512 7fba774f41e340752002d65322cb67da6cf6a69a2b06d0548646c49fa9df54b18daadd9dc5503e6ba48f1dcb85ab8633b7f09bba217dd5b44d182afc4aa67474
+EBUILD apparmor-utils-3.0.10-r1.ebuild 2071 BLAKE2B 305795c0609196ec06b306eaad4b1acfdb93304b03c5e293e5b46c3b022755b2e2a1dcae6a57196359881d7d47084afce3a6779199060a6fa820f7ba38a78825 SHA512 3b212904cb4c7456f888e821c50beb585fdc7e2cda6d8b74ea11044d29151c43cc2a8e6906455397fb2352976d7c40ce9b3e09d162855c1b7a07616595a80024
 EBUILD apparmor-utils-3.0.8.ebuild 2277 BLAKE2B a8e87dbc8ca4ec8091d6a01e88c88bd01e8261c6783449526257b58d0559608db9d2674712e20cc5dda20cf956259e515a890a7dcde72ac9a40282c9d2b5c30e SHA512 8a93dbbf151e24554a40c7bd6dfa9041c5ebaf5e924f77b30c9f7d7f8a4a78300827a2942b0a548c98bd0662d5ec4251fe4dd82ed443eaa392c55a83677763c0
 EBUILD apparmor-utils-3.1.4-r1.ebuild 2072 BLAKE2B 67c6e628bcd39fe3fa62b49faa94d301c9c9db6e59762500dbca9d810dd240773d1a7a91fb1302539ed7688a90f2b4fce7e1fe2469499c08ab30cdcaa0085498 SHA512 7fba774f41e340752002d65322cb67da6cf6a69a2b06d0548646c49fa9df54b18daadd9dc5503e6ba48f1dcb85ab8633b7f09bba217dd5b44d182afc4aa67474
 MISC metadata.xml 499 BLAKE2B ae7166545eb4d691cb446ee37d1e0e251c02f7f19f57bf9d4f31f55e78c707226767e0721e167a32acfb164e65d2203efcd3e54571693066cc03a98d5125425d SHA512 54421c54122fcfa7b849a8e08359d546dc1084a694b1123793d7c6cb6fa21e3e44e93d71a719da4ae0c3ad1ce85a0d53a28e0531654d79cf856db11f03621b8b
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
index 702656d7f4f3..ee99e0d382c7 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 042fea350a56..9e9b2bccb4c2 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -8,7 +8,7 @@ AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f3
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
-EBUILD apparmor-3.0.10.ebuild 1866 BLAKE2B e2504cf60150d113cffe2b3efb39286eeeaf5f2be443f3f61fb856d85f4b9528a44f422440b1fc2b446d9b081c36809733f2e8ce9cb4b203f6d5ba690f44b7ce SHA512 2408877e9f9a7236bf91de8fbf06cadd3305b590c121e79d8db6ab2b85ae2e23a710572f4fd1de78bfa6f729411ef3db6950813e0bd702794c1da8143a4f9a0b
+EBUILD apparmor-3.0.10.ebuild 1865 BLAKE2B 36aca72d569f7f2a8e7d47fa860a57e7e8ae14cd9adae358bb67b98c419427f23bc0f49bebe96a925b4c89c8b1bb24c594c5fcfd01167cd03645da54a3d14e2d SHA512 83c969e47084d21c185a9fd6f47cb0c3d0980761c5b5a34692cfe6e46078c90bfcbca4b38a7c8bf8ea1d9da6df24fae8230d2908f269cbe7b8e2586e8e91e1b4
 EBUILD apparmor-3.0.8.ebuild 1864 BLAKE2B 87d721fb980e7325e1398d3f28fdcaa190ce58903ce9b8c602d83775ecb2977efc46ce3102b4d5f3a0fa8e48ac34cc1370abdf58b431728a2dad8a41ac659cf3 SHA512 dd2a4b866eb50d9c4162b452448ce408611225f8d4e03b0ef6e3d26614e5915953ea246a52a38bf8d5ae048b199f05e149dc6f4501d5a51df630a6299bc09f8b
 EBUILD apparmor-3.1.4.ebuild 1866 BLAKE2B e2504cf60150d113cffe2b3efb39286eeeaf5f2be443f3f61fb856d85f4b9528a44f422440b1fc2b446d9b081c36809733f2e8ce9cb4b203f6d5ba690f44b7ce SHA512 2408877e9f9a7236bf91de8fbf06cadd3305b590c121e79d8db6ab2b85ae2e23a710572f4fd1de78bfa6f729411ef3db6950813e0bd702794c1da8143a4f9a0b
 MISC metadata.xml 561 BLAKE2B ecf6168d52a5439c66d279f085c81e17d2b1ca364253ef330f2a0cb014c4e8e6b49e8fca22a56918eb823e178c7ce59990102b97ca6e79bdfee00c1978f0f404 SHA512 5097e76d16e7970d666f3e548b70e1b15c4cfab12d8ab0ea60dae1cf0fa8d8e6a4cd4da55fa4c87ba4ee7ffb0089df8ef0f5dbac568bd1aebfd485193848de9e
diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 3c6676d4ab63..724fe1e0d6cb 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="doc"
 
 # Was restricted previously b/c needs apparmor support in kernel
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 38a4b16504da..47073ce85f9e 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,10 +9,12 @@ DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 1cfb9b5a7892dec2b35e0eadbd957083e95fdc
 DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163 SHA512 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28
 DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986 SHA512 b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151
 DIST iproute2-6.3.0.tar.xz 914700 BLAKE2B a7b48c59c8a30f56ca810136f4d9f681fe38359999c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7 SHA512 aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf
+DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd SHA512 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-6.0.0.ebuild 5943 BLAKE2B d85a48405ed9359c187e770afdd7583f54c3905ee5b58488a604369957333a79c9d0f3c3964436116e5799ad9d8e7ade1ad51c02d89cb10983b9d5f11d015297 SHA512 6df97340ce887a0f9a1319c5a4458872cf8157c3131cb8dd27027fd18867571a6b80267974c1c0009996e4fd8fa6431434d5ae61ab2fc0b0c988ba3668c7f84e
 EBUILD iproute2-6.1.0-r1.ebuild 6000 BLAKE2B 49f03ac76621e34f65217bfbed93815d72914a081dda6598b1ce789dff8cf3f19697b199dde9a9e235738ef35b0cfcbdef04ba4652d3022dee49cd32b7f11a66 SHA512 d8a3fadd4a4ac3a1539f1b6c0e74320b321114ea3ddba75111606362f49412e04b6ca578cfc0f07d2fbc460d2639a1bbe8727c08e65cf103f29c552dc93b3bc5
 EBUILD iproute2-6.2.0-r1.ebuild 5955 BLAKE2B fc3cf5a97c950bb2a6c52d358e3e69d9b20a48c395185003aaf41ebe6f116d29603a1cbf44c149ccca285897d0db22fb47ec85b99a136ca606fdc51c637085ee SHA512 758771a80b246ec00a63288623875f9c37ced74d6082155b1be9035b2a97a2743fbd465e6c7bfeb038db3ac51c3194180a598f95dc9ea7f236dbad1eb729dada
 EBUILD iproute2-6.3.0.ebuild 5955 BLAKE2B fc3cf5a97c950bb2a6c52d358e3e69d9b20a48c395185003aaf41ebe6f116d29603a1cbf44c149ccca285897d0db22fb47ec85b99a136ca606fdc51c637085ee SHA512 758771a80b246ec00a63288623875f9c37ced74d6082155b1be9035b2a97a2743fbd465e6c7bfeb038db3ac51c3194180a598f95dc9ea7f236dbad1eb729dada
+EBUILD iproute2-6.4.0.ebuild 5917 BLAKE2B 94aed4f31adafd97264cfff533d8164644c3a362af86d764bdb60cdee7592470f22d285d65f573370dfecc9ff50dab4be75cffe02bb23c1176dcd1679ed93c99 SHA512 27c66c945209631bd48462179dec3993b9b5bdbbd5b98a11d7668adc652baf10e153ce91b26d2f1d73a29efd2ac266c0cb87b0390ff8da153d22cb0ae13e89a2
 EBUILD iproute2-9999.ebuild 5963 BLAKE2B 7ba37fa4579eaea479d365ec7d1f964e238335403e0f6eb4042f56dbdac2d0151249a53d5e95ade07f66d75e9a9801dcde755c8009f463c959f08da59446858d SHA512 a17546ddc1d04498e42d2d34e698f5844a978684f8f1475272e98030d9d5ac5d5069e84831f43b6576185da37b017ca08306e621117ac453c5d1e415929d8986
 MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525
diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild b/sys-apps/iproute2/iproute2-6.4.0.ebuild
new file mode 100644
index 000000000000..5281e47ca76a
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+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 ~ia64 ~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 libbsd minimal nfs selinux split-usr"
+# Needs root
+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:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	libbsd? ( dev-libs/libbsd )
+	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
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+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 "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			-i ${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i 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
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	edo ./configure --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
+
+	if ! use libbsd ; then
+		sed -i -e '/HAVE_LIBBSD/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)
+	HAVE_LIBBSD   := $(usex libbsd y n)
+	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
+
+	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 split-usr ; then
+		# Can remove compatibility symlink in a year: 2023-05-28.
+		# bug #547264
+		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+		dosym -r /bin/ss /sbin/ss
+	fi
+
+	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
+}