gentoo resync : 16.06.2019

3 files changed, 35 insertions, 1 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index bdf3c9182145..122b92732c41 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,6 +4,7 @@ AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e1671
 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
 AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
+AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
@@ -15,6 +16,6 @@ EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 4901efc39bb2dfa1b6bb100dd0166b7e40
 EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B dd66602187e934c6624dca792e055ff00f335fd052f2d2846c8369db4a3fd4cdc7a7cab77a50d11305831dc70217297f059a1ca456a8626d612813f8812ac262 SHA512 e39cb5832b545fc6ebc58bad755f000e7e5969aff4eacc123ada7602c44282bb136462482bd56b89aad24d6c00de81d555d97a62eb4d8d00e1358c82b6bb3978
 EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B 628a1567d00b724e2596865f54b6aa01fb1731b37b0c3d25220a3fe55d58271734a78a03f70196d991010a0fb0c8b25105fee34123b53301f495376d7f2d8d27 SHA512 31e49b08b2db47d7ac675140d761abe469c4b679ae2c3a9dee54a16f4c1400ee09fc24d0380374e81e0db0f1778cfcbd4807be4bc9a39f7998aa7e312f2a4de0
 EBUILD iproute2-5.0.0.ebuild 4352 BLAKE2B e3dea0581dc026282b8222751c178051e9b58dbe70887d3b709608b19941294afc6c720d25cffa763b8293cf31924029f6fea99013745c14998e6d5d9431f715 SHA512 7d967eb53cc0a05fc7a341a0c62150c39fbe7cdf7780ddd10441365f0c7ede15c508242aa6c5da451758b71f8d64c9afc9250f667675e32c09f369e61ba9d75c
-EBUILD iproute2-5.1.0.ebuild 4272 BLAKE2B 80001911770e432d9a603ba4626e544e9ae5b417ffa52a7033e178b0fb7d836e5c52f46220889e236f0dace23e5dffb1716e2e193ad3e02428584413ba75bb3f SHA512 9b44b8f9dd6ef6a8d2ee6db92ba359e2895710ce1a8491a2f7ac099504eb5f44e1f7cd4a813e39948632c48a713d83230fbdc3321ef0b7b3a52c7219e0668df9
+EBUILD iproute2-5.1.0.ebuild 4317 BLAKE2B bb2e521f2186d87fd740d9ebdc5a1ca107eea739c00b606de308fa60ff183163aec782a3fdc1a3666642b43d36f8ec4836a7133fb4a4907cb3c8aed2f8f79193 SHA512 3109ff8309215f1801eeb49bb73b079f28d2ef73634188123a7e06169cc13154f0eeefcb88f8abcc3c56e3ed7482f362eab71fad4bfe1eb5e255244f83d55a1b
 EBUILD iproute2-9999.ebuild 4272 BLAKE2B 80001911770e432d9a603ba4626e544e9ae5b417ffa52a7033e178b0fb7d836e5c52f46220889e236f0dace23e5dffb1716e2e193ad3e02428584413ba75bb3f SHA512 9b44b8f9dd6ef6a8d2ee6db92ba359e2895710ce1a8491a2f7ac099504eb5f44e1f7cd4a813e39948632c48a713d83230fbdc3321ef0b7b3a52c7219e0668df9
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
new file mode 100644
index 000000000000..e704f65c113f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
@@ -0,0 +1,32 @@
+From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Tue, 11 Jun 2019 01:48:01 -0500
+Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever,
+ but removing it breaks glibc's userspace header, which includes kernel.h
+ instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical
+ mistake. on musl, including any header that uses kernel.h directly or
+ indirectly plus sys/sysinfo.h will produce a compile error due to
+ redefinition of struct sysinfo. so for now, only include it on glibc in order
+ not to break their headers.
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ include/uapi/linux/kernel.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index d99ffa1..f917115 100644
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
+ #ifndef _LINUX_KERNEL_H
+ #define _LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+-- 
+2.22.0
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.1.0.ebuild
index 5db7d040eeee..f2771e5b49e4 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.1.0.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
 )
 
 src_prepare() {