gentoo resync : 24.02.2018

3 files changed, 13 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 25c5bd931da8..9b6df1b87356 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -3,6 +3,7 @@ AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10
 AUX freebsd-lib-11.0-bsdxml2expat.patch 1103 BLAKE2B 7dd06eca9f528b2cbd7741c6f977b3580eb6231395be376d0bcdbcc767d9ff9bb585eb2579d65e6ad851eb68c77ccb71af95e8aeef58fa2a757f559c07c7f79f SHA512 a0e9d99ff47ce813a98a5c1fd3605dd757ceb6c4f68e3784f1b48192c9f0966cbf1c769387a808ae4511f004b00242fc47f7fd3a2971e371de587cac6827533e
 AUX freebsd-lib-11.0-libproc-libcxx.patch 350 BLAKE2B 0b0a9886567b9c81c8159266eba2f5957d81b90b816e76b21cd2a5c90e9eeb008acda1f7d2338167d20ee8a4b57e45ddd92ab978dd472e0752bbc8c055332240 SHA512 c9ace882ac2fb2a077839a02a4307ce7df1dd0699cef081e6a99f12f9c2b443e4a4e4f85415a59d208859442dc665d7b9cae22de8d61f80ab8a5875d423c5795
 AUX freebsd-lib-11.0-workaround.patch 295 BLAKE2B 3e0fa9e7c981caeb11c75e5c7ccfef597a6129c0ea098f2d6945aac4439cfc9f937463b989078f4148e995efeee28cfc81de77e8a1acd7da9a3d913c5dfe82e5 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a
+AUX freebsd-lib-11.1-elf-nhdr.patch 287 BLAKE2B 76f5c3b448ceb62b67eb5973201e59b61dc1fa5e3f06d3cec28377b803421f99c207f93d9b1d3963a3b6a3dbfa1132bab1637ea5b1986cad9f85db7b2ae786a7 SHA512 24adf537a277e5bb10e3701cdf37bf9be69b8fe57b88b947b04a57bdcd8e26f67e912ea812eccc8ba88df71076a9c4edeec7f709808d5835b44c210e905784c5
 AUX freebsd-lib-11.1-liblink.patch 4233 BLAKE2B e088abc8f738475e09793cf59cb41257e2143a8daf7dbbdeb81190aec95e6d15b800862033353e556d87f757be43693e6b0895a6900fd58fff580ef8e6f1279a SHA512 23a875fa84685c7a98ddb08b1bcf831613239a6079c1711362bbbd19f27b67e61eb203bafc48c9ad06b9344258005e4d04756d4f8caba7c9545f3f86dcb52830
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 BLAKE2B df851549b6978ab7b59585fbaec7c3bcea19f8eb6b1a2882343618c21ef2533fb8a56f9c8a362b7c188c97e5d0091b02288a457fe114b8e2e6dbe4b69bfad62d SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec
 AUX freebsd-lib-6.0-pmc.patch 338 BLAKE2B 8c587f716fba0237e114af0c1860493c2aff046447f4469ba813a67e44779caa58f5b45108dc12634b7303401725006bed3b254459993972894a242737bb08bf SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327
@@ -40,6 +41,6 @@ DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-lib-11.1.ebuild 21712 BLAKE2B e9d77514b6c9e1460dbf2f2c57a595c3d1c1b0a5617293e59b7d9a05b8b07a82b1514711915a9ffd49c6512421fc09c4b1c7516709cfb09f3cc1724cd9c4c8a2 SHA512 6906d49aa12d36ef13e713929d21d7d77b91c4c2ef0e0a1e9096514e6400566471f67e90d70a16c0e490755ff742cb449daa20052e57af767fcaf23c30fc757f
+EBUILD freebsd-lib-11.1-r1.ebuild 21760 BLAKE2B 832e326a1d0610a57c6ada4c656f34f84d1b2bc0186328ce9122a800dbf2cc5ed701b2319ea32a762dab8089c396a166bbe6791d825a683a8fb22c3f13dba6bc SHA512 b99e3a42d48d1971a5a1429d0ec0ded0c60f7ef99ca52a072b93c8e55e12bd7eb54500816ca2c3ef30e06a4c915649f00ffbed5b82e9897cdcd9c9efaba38218
 EBUILD freebsd-lib-9.1-r11.ebuild 18765 BLAKE2B 87d24b46d75ebc562cfabbb86011dbeba01c5a0cdbf60b1b0211b8baa11b34194cb8798873faee80b790d508c02df6bec0717d11be10d53e607eb03f79f5d030 SHA512 612088ffd0f9c166fcc85fb13a04dbb92a9d08bb427417844f9f731f405660ac153c15a92888a20af466fbdcd38355362e9710089a29937eb6539ac8c4e23e62
 MISC metadata.xml 500 BLAKE2B b1e29ff9a6046d5f757c2eba85d20a8941d1f295be8dc9d3c02515193bc879020cd7760830b8a5cbaebbd9e691623dee6413f50dd321b09b28e108ca5ad99e9f SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch
new file mode 100644
index 000000000000..a00df5f66f12
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch
@@ -0,0 +1,10 @@
+--- a/sys/sys/elf_common.h	2018/01/18 20:45:41	328136
++++ b/sys/sys/elf_common.h	2018/01/18 21:19:57	328137
+@@ -51,6 +51,7 @@
+ 	u_int32_t	n_descsz;	/* Length of descriptor. */
+ 	u_int32_t	n_type;		/* Type of this note. */
+ } Elf_Note;
++typedef Elf_Note Elf_Nhdr;
+ 
+ /*
+  * Option kinds.
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
index 61bfeb3924f8..e28f2420c1f1 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
@@ -174,6 +174,7 @@ src_prepare() {
 	# patches "${WORKDIR}/include"
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-11.1-elf-nhdr.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die