gentoo resync : 18.05.2019

4 files changed, 7 insertions, 9 deletions

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 8c5083620b19..49511a82532a 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -24,8 +24,8 @@ EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9a
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
-EBUILD binutils-2.31.1-r4.ebuild 12418 BLAKE2B 8cd63300b2426039ec2eb9c131d7e95f5e05e40f0a43acbddd4018437b85aa38cef9f33f38105df4c254fd04cea346cab6d4c1cb076afd4f715a0b6e3486c203 SHA512 9ef9ece69897e4ca8c97a7e4a527839fe363c4fbfc051836796db6859d09f503ef394ae7d07d853e94b78773fc0f7f86e15962a28ddb00113a98f3e240ec0fb8
-EBUILD binutils-2.31.1-r6.ebuild 12430 BLAKE2B 5d83e6ce35cac17cc0951e1679d320a7a43ed325bc2141d6cf93ab7be100d2340625725e8dff85192835a2179085ce34e7b50e65abf013541cfd8ef2c7713583 SHA512 25be5404df5a5d993b50de23e3fedf683e1c1db40e836a2f8295bc3f9750466d2f51db1ea0ded67f7c7ee97caf5b683121dcbbbbafa92838bddd3a05191efd31
+EBUILD binutils-2.31.1-r4.ebuild 12417 BLAKE2B 231dfce3382481c41146d8bdc8ff8324f80d7a777271ffbc64679f7f79a2ef0b9725c5c1b4afe4d38941eb86509de37fefb8f7310fea9cd9fa7c327b8f46becc SHA512 1aed7cde3e567afe660bdacab256cac8271dfa2532c3b67deda9085c5432aa8431ba85a1bdf9befed878fe5852c2b70554bfbcd01b8e3464e255c63cc8d2cb0f
+EBUILD binutils-2.31.1-r6.ebuild 12420 BLAKE2B 6cd61e8713e78b3ec03d845af0654ea852695a85dc8097fcf7d5d47140bcf89da3b5aac465f449ac5082344e7bdb55b38291f4f9fe3a9caa40f8ee3e9649ccab SHA512 0d0893ddb8318404331b77bc2a4780ec8ba3c64d0dedb400098b96ca8dbc62ca1f9eb8eb419145a82b4ac16afae9eab670a7f7f6323cf3bb8781f8c84a062c05
 EBUILD binutils-2.32-r1.ebuild 12531 BLAKE2B 30e863362b5822da021aa0d382ad0f4ad3c3e22e304957faeae7cb51cbe2066bbcd2a9e2e0fb2f24856cbc44db7cbfe4ec5821a23f1e2f69a4b3c33b703022e5 SHA512 fc4487b1b947bf838075015607906e0aa50a44c2a759fe6724044f10492b206954e161f2e15dae07a3dd8b746d3864fb32fd354a9ef473ca1561666f2c4f53bb
-EBUILD binutils-9999.ebuild 12242 BLAKE2B 1a3e243ad0cbbc696117e1fee0ffb47c87260433391f0a0c8f51cec2886253c5a0340aa33b0a88412ccbb52b0433f712d0abe7230d9c85e19e362088fad2a4bf SHA512 488f1fe7cdfa1f88de45a88b9b5a8ef06ce7436a32f2c33d4688bacc086c5766bc03b310989db8fdc49a203586ad8766e28817443767284f2a40d35a9918c57f
+EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.31.1-r4.ebuild b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
index 7f24fd4fd6ad..1d7e1c1cbf9b 100644
--- a/sys-devel/binutils/binutils-2.31.1-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		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"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
index 98700705d019..20031cc0fba2 100644
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		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"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 80a41f81b29a..ac40bd24d645 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -8,10 +8,8 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-# USE="+cxx" is a transitional flag until llvm migrates to new flags:
-#    bug #677888
-IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here:
 # PATCH_VER          - the patchset version