gentoo resync : 13.06.2020

4 files changed, 11 insertions, 19 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index fa1dde7fb8d9..4c3122c921fd 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,12 +8,12 @@ AUX iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 2579 BLAKE2B 86e81152b51a256606
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
-DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
 DIST iproute2-5.6.0.tar.xz 754812 BLAKE2B 5232c206052dcbc489284cb5a4169bf2555f9bdf7c122e23be07f7a5a18e0c828f5b4f3bb4afb6d33919919d211c67a20626ad10556e4ae41f90619d6eed445f SHA512 e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c
+DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
 EBUILD iproute2-4.19.0-r1.ebuild 4372 BLAKE2B 3ee6b85303fea1bb9cc680022001baba11e7e557d4ab40e3f5da24ced78311da9ef650fffa9cc318de056cf01aa272ce6c32a64ef52de0f9361dd2f28e840dfd SHA512 bd17caa6b2f4f5068fc23e8a60a856c4af42290d61eae9560638a58271fe10d05b69e189db72a6249697e2a4f7a9eadecc629252fb34193516ebc81627637c43
 EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B 9ce5e16fd42e39f9539a0ebeb5b626ad10f8b814414039b35c424fef64b3434fbddd37d0e11f9021cd90967f14b2c1bcdbf96b18f64d15915b7cb943ea86f7aa SHA512 f81aad4109e869d1628d8425bc09bc7c285463719dc600a89f4ce5dd855fe38715349d80aebb0011190bc003fccad8744a345826e8789a0f3e6e7f584409a997
-EBUILD iproute2-5.4.0.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
-EBUILD iproute2-5.5.0.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
+EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea
 EBUILD iproute2-5.6.0.ebuild 4540 BLAKE2B 5a56182135bb0e83de820d889b40b7c0ba12a6c3b3c783c871d50b0fa98dcacdfaacb9e6345fb79ea788e026838086e4aa940a8ec1ac560ed4bc3451b237cae6 SHA512 ba67ace9de9fe1d6d2cae65161dfabc77942896a4ec5f7a600342cfd7479c909aee13526efdf2edfb4648ebfa02d98df8b6d04b6e0361c44f8ca432293ee7242
-EBUILD iproute2-9999.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
+EBUILD iproute2-5.7.0.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
+EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
index 9e2e1f7f4e54..f568584fdff2 100644
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.5.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index 9e2e1f7f4e54..7dcb54c51f5b 100644
--- a/sys-apps/iproute2/iproute2-5.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -70,12 +70,6 @@ src_prepare() {
 		-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 || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
 	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
@@ -120,7 +114,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake V=1
+	emake V=1 NETNS_RUN_DIR=/run/netns
 }
 
 src_install() {
@@ -158,5 +152,7 @@ src_install() {
 		# 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 9e2e1f7f4e54..7dcb54c51f5b 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -70,12 +70,6 @@ src_prepare() {
 		-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 || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
 	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
@@ -120,7 +114,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake V=1
+	emake V=1 NETNS_RUN_DIR=/run/netns
 }
 
 src_install() {
@@ -158,5 +152,7 @@ src_install() {
 		# 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
 }