gentoo resync : 25.12.2017

7 files changed, 8 insertions, 6 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a6b762efeef6..1033ddd1e447 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 7df5fc2c21d0..d14997d389ee 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -3,5 +3,5 @@ DIST bin86-0.16.20-fix_lilo_build.patch 3488 BLAKE2B 1a0f4240156ab36579e2e49fbfb
 DIST bin86-0.16.20.tar.gz 154107 BLAKE2B f51a189fed52713d5cdccc880596aea9f6a5dd4a8eb6eabf2ad2600a5da520b3ec765b512261bc6ffe33ce0c9d23c5491c8c34481795d24dcec2c91e04fc5d22 SHA512 c567ad5f9241d9ed768410f988266d4ff952fd4767d033552b100a2643db69ee9d4b5929a1b40c3018db7037b0efc7b47db84fa1f561bc39f01e640b1a3bacfc
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
 EBUILD bin86-0.16.20-r2.ebuild 971 BLAKE2B dd694d0bdf99ba6f9711cf3edd98ad6ff3b66b32cdbd9d2b6221098c34a45526de6b1a7a2755b810e99cf58c5bd4a4c3cb988fb20309577ae32e4bec82c0201a SHA512 efbfee52390cef1e5e0d7146897153c62bc8c9b5887b0f040bccdcd468d33ce472c7df5e63ba731830a0fc6b8caf07a105c53db24de7cb02bbb3e1fba6bc42d7
-EBUILD bin86-0.16.21.ebuild 808 BLAKE2B c5718453de6377c8a6a5e966f68de8bbcf287ab7769d6f22ce6f3bee75ae84aedd53549bff0657b2be3f7c1ca7468a172fba7ccdf6333105e4b65519bec77f6e SHA512 48171ada6e9587321565216d3b89a23e0327c0175421b29334900d0ca863155d71efd51c193e9fcfed7ebbe38712858462dc4ad99a7b5b32f94180bce3c0293a
+EBUILD bin86-0.16.21.ebuild 875 BLAKE2B 127b25d1212b1d78e2ac7f5cecb7b15fb7883b6986b6467710788a37199d516f9ef9fa7387885eb191c67cce3c645699a5c2ddd9a58a3217f40e1ebaf37dd72c SHA512 3aa240eba74f60da7f66163e30d552a316969c1ed82cd4d7e1b473322bddc57996264685ea30fca329f083c2d68af28ca8eef8f49b391c2d88088364f8fdf2a7
 MISC metadata.xml 479 BLAKE2B b05ad19dac9e88d9714a0a5b176187b8c3b3c7514f73b8a1a5d8f1498c02900546e9ad3aa04edc4c6a1b9d07035e8ab0a8bd66c853aa27babf302bd8ae92ea18 SHA512 89e8c96a44e57ccae73c66141904a99e0128587fd62acc8b2d3e860636ab05396e9842c80152ab27860850a7582dd4097fefb465e0d0a86761b96614d8c0992d
diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
index 3c587b03ca5e..189d5bc75ed8 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
+	use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
 	sed -i \
 		-e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \
 		-e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \
@@ -23,6 +24,7 @@ src_prepare() {
 		-e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
 		Makefile || die
 	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
+	eapply_user
 	tc-export CC
 }
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 87e5b8bc846d..e899c617f146 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -14,6 +14,6 @@ EBUILD binutils-2.25.1-r1.ebuild 292 BLAKE2B 58cca7cd2e70891e48c8584f22a565fa7cb
 EBUILD binutils-2.26.1.ebuild 292 BLAKE2B c7f4d10819d40799f39b2b8425f061d995b25c76d6f3744139432a18765981438b09a0f6be06b483eeb96cbc3f8f8f8d79056806b7d2df1038531e3a40182208 SHA512 0b27ea4b0f4653b80502f0d3519be3f0cfd8644e18eb52b5a1aa8bf5ebfae3b7a8dfd8242800185cb20611be9014d625c93658f24b4561432c39a3b9e3c2d564
 EBUILD binutils-2.27-r1.ebuild 305 BLAKE2B 8df34ec1e3550bf81b69cce2b0520b206d02d3d77d652ab787cb1fef32d910ddded25b8c6098e6406586cace96d70d9d77198ffd13ca167c39a25953dac09ec8 SHA512 a8f2a1594d97092195cb9d59b3ab7783eb777df6a175fa4361b92b4d8d415920b2e383174732f26a780dc1d4844eae1412654fb07eeeea6fb01399ad9e8ca17a
 EBUILD binutils-2.28.1.ebuild 296 BLAKE2B b2664d411b30f63ed4aec46c55a3367a3983aeafb3772ebd059f71536f8098be5f2474af2feb02e3b49ae76c83f4d386d7435434219ca1afbbc6d0d21c1f94e8 SHA512 3f8eeced53288d9ee9ead1f8a3807967973cf81e118162aff157702e07eb959ce2d5cbb14eb86918ed0987939d8b6a73e697e2be7f4c838987bcd61b10256182
-EBUILD binutils-2.29.1-r1.ebuild 345 BLAKE2B db4b803946bfe7a51d4221942b425398112e2ae5e04e7b23736a191b8705503a8bf3c59a66e099ee8be5187de9b96f36216fe3787cd8168cc8eb10958f1d7327 SHA512 7b91483c01b451e8c237280acdf8a56c15988c804597d540111a51267f924bd6376c28846fb620d385b6edeba58d51c69e076ab2550be209686aa5cd093954dd
+EBUILD binutils-2.29.1-r1.ebuild 344 BLAKE2B 8e506c0287fa8a531baf147ac5c3a10e3ba97cd809f788e99ed8f94784313f0ad18eb9248dcfe3fda9f4d4030e38d36e237b749d3a03782fd85d27ad1a4ed7ff SHA512 369cfa9e1841549b94517c2ba8b0f1f90c93d45e518aeac371dc446e348e5bcc09106ec75426a1568cdd2223c056a06a5a16a9f43558828a471d3c787e0e769c
 EBUILD binutils-9999.ebuild 10904 BLAKE2B dfefd6ae8b6687361c0841fab4304bdffad9d9d66da68eee270c0c3a0c7bffdc417dd4a3197702ec115a2bbdc44b655f550c7b7957133221b1c5c1c235817812 SHA512 d2b929b494eabd09bd7c22dade89a7a88300e16df1af916705f31b9c9384a9f8bec248b3c0b545e1a3d7a7ddf30f3425be478010ede84dee1ff6e01bcfaaab3f
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.29.1-r1.ebuild b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
index c9e6035404f1..493897801862 100644
--- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
@@ -7,6 +7,6 @@ PATCHVER="3"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
 
 PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" )
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a02b4050847f..df81d11fdb4a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -84,6 +84,6 @@ EBUILD gcc-4.7.4.ebuild 1291 BLAKE2B 39405e76d16669987e1b5da75416cc65c54829f7572
 EBUILD gcc-4.8.5.ebuild 1401 BLAKE2B bb8e4fa2c9f919a7954cd78863223e653bc14924456d07ca3e993ef3ed3b8ea036a42a6f347ebd77c8ec00ba88fde1276aab6397314ed77cba4a4f3836db2a80 SHA512 d0a47534b4e2e35ad3296c87887307f3446421f4cdcb2d2aa9c3a3b5570af6c1597101e61a486994135577f1f693bb4db4ef91ec639ee6f274b843600029667c
 EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 48679b12acbc9c4aa0db5451e36c156e351cae29f1978c82d53fdf926d2d98e77c43138ac3ca57c08af60255bccb7f1b360fe344617970282b1568438c10f558 SHA512 ad95c792c32ef356b3943bbcc4a1f16ba3e891e5f11ce872287d620d6d57aa44a8941c1e4c11a1fcdc10f4faf21f02cd513c6a36d210bebb7c5207a9f05d7b32
 EBUILD gcc-5.4.0-r3.ebuild 1278 BLAKE2B 43319867893e4666f48c37567d2c912a56084e7f292303f73fd74adcb8e886f67086f0acd86c1bcc5e033865225a9ced6f98b036677df41eb206fe5f676526f7 SHA512 0b51d9a3a8795b06c3b1f0096969413d73fb5b88dee9ae85ac499b1ba0dad77a066f740ab8873bad9a8ad1c3795af446dec9faa0c67d236f65958937b61583c6
-EBUILD gcc-6.4.0.ebuild 528 BLAKE2B d207c04a344b532dead0a0be152d1cf1b4c91dd93e4a974eac006f942758e32b120184c576f832702aa2b3ed8d57a67a620a92a623ba0138817de41e237bfd18 SHA512 a393dd98cb261d07df3c231c9737546e907d5898136bbd02165bfe9bb103365cfb4265f3676dfd4c9373ed74501cedc702e9f3d9f6cf839cb29c3e9163876577
+EBUILD gcc-6.4.0.ebuild 527 BLAKE2B 4d663fbea8169b0583374c0ec493b672aa8710641f5bf67fc5495861cfbd424b7cf32e7a3ab94cc9a790d5b8c93790a8835d8d2230c9ce8743683ff15d487a6f SHA512 5f0b4c8adf0e8a0c7a8d99ccad3dc3773ed9a07308d3def3c915b1328b8526d4097777ac3e3098c919a4f1779bb2d0d5335d6dd9a501a6c30357e58f094bcae7
 EBUILD gcc-7.2.0.ebuild 558 BLAKE2B 64f93aa345b418bd324c5962a0edee943d0d07499702a3468021a15b63915ff1486a0f2d07ea7f1ba0899556d4fec4fc0b51abea662d8e5299fc7b5989a9fbd5 SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b
 MISC metadata.xml 2520 BLAKE2B a0b5788500fdb6eb7c6d88def963dba88b67e4f0cb4a5ca0def3a25600601d9f5b339a2f48759ee7e2cdb7d46269d0b5d9a9f468e15f5977c6c0a2214f89226c SHA512 ffb6644c39848805fdc8571747be210a3057a6189e9007c6a0371d5448fc37d45615d4293fff0ddcf599c6369146b5a54bbbb091d250548a486456ed89806128
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index bd2145f54e1c..193cad4d62b6 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}