gentoo resync : 07.10.2018

4 files changed, 6 insertions, 18 deletions

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d15cd7927782..1a29018fa883 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -26,8 +26,8 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r2.ebuild 11851 BLAKE2B 877f1e096972b66f9cde62f23f5dd1d2bd1098d27a01eecadf667f5b1792271e50a4697908492bd9c2d3c0d688de1245cda86cd566c142d1fba4fb0265819d1d SHA512 2f257fc05336b0e2cb45bc48185df2f0d226683b81d2fe835f856fdda9843f2b32f3267d6d5b9d29fe3dcf61d827aa846acea59d705ada30ac2d9b69772cf92a
 EBUILD binutils-2.30-r3.ebuild 11864 BLAKE2B 18001b8d905368b565e15ab852cb0e18a3354cfc31db5f3799b0d84ab837dabc50a7e0bb2656622c972fb46525b8007fe641f4ef76e837006791ecca9aa46131 SHA512 ddeedc8aa8c1a72ea16855c15e4660e5db335b8d50e45444233c755928eb9138168819e7ea9998759e71dd6582b296445679333363e0f5abe62788d17417999f
-EBUILD binutils-2.30-r4.ebuild 12036 BLAKE2B 480736e14e65fead7eb154fb3c67fe049847fd20192bb5ad604516d4c968eb1d126774cd010fd56ef38ceee9c70806cd5c7670227936e9d27dcebbbb474ac8d0 SHA512 cd65dc9d505a05e6f2c39b76301fcf9c595157dd1eb552528c7e164822b617bae3b1dcbb2dc6fda663d46c5ad22a6bfd9e423d6bab817bcb2864c25613735e70
-EBUILD binutils-2.31.1-r1.ebuild 12240 BLAKE2B 59f44d949374f60d2de8c9cb83f86d1d2eb08025bfceb2694c37096c325126c7cd30b9ca4ed6e2b1aff7e1be60b0a9bd7015af652ffe16ec278dc99f35be74a6 SHA512 697ce2034a119fb8c46f97271c7c8f3064326f3ae7d65645982fd4def4921cc67edd1d662e76868b6da320c962e632d3f81c091d86f7b2fb00b1ffca3db7482c
+EBUILD binutils-2.30-r4.ebuild 12031 BLAKE2B c7a34d2f9807b0bddcc5836af75f33b1fa396f3972b4c2fa8d09f97eb694203e22a773e23177497f807c0be14dca1b1b8e11ea9837ee442a037462a04505800e SHA512 8dc6c9aced9face3b6259d35190ef4b15020432aa522b8529cd40ffe14564f4e611e9bf3e2151c3dc2300dd2f323ffb098bf1ef8b84d69ec4e783a10729f269d
+EBUILD binutils-2.31.1-r1.ebuild 11982 BLAKE2B 87ec050dd2a1d568d40743cb2ee121246307af8f681ca7a21e0799b1b8c136427c0d1aa5040b7d67fcf4fe085d08887ea4cadc3d256c56e75cebca90cf183f74 SHA512 105f266b196eca929c5511ae8fbf7a80e74f641c8ffd790ecd36bd2e828eab5580941073f6de2cfaf834d3c7678e8023a847c001cc170d07ceb3ff590dd7b7c1
 EBUILD binutils-2.31.1.ebuild 12062 BLAKE2B d733159c07280791ed54a721f3ea517b490899c0faaa7ac34ca1f7dcf7f2ac658a547dd41b0414f141c8d8dec74925d9bca7500859dc51bda4c0d3c8d6670d8a SHA512 b39036aaa8a9d53f0b7d12f6884ed3f2a414f0a6d8c9198d4fe4387a755d409441ddfb7d64368ffd39bb76ae69442365bef4c1929c648feb355b92d3bfddee2a
-EBUILD binutils-9999.ebuild 12145 BLAKE2B a4bd604a814411f51d56ee246f334a850a04e0aeaf5278b755341d206bf943ed4d04fad4ee51087cab7d1cfa8667eb6335a40e4fb584c93fd090eaded1e6a56a SHA512 a4cea7dfec33a68ce8e2e054a0039b0fd41a1e94587d4fe553e6fb861269d990de3c8db2005b3babd4bf780d757f04094fe91254249428a03940dc3ed06f0d99
+EBUILD binutils-9999.ebuild 11887 BLAKE2B 22f26d379bf519b20672f745913d559ed8a0d5098bf7b721b5fd52718de791e46edb7a2b1f3748676dbeffda68d4c2ab36a993d05b8282d136be13e746175b53 SHA512 de5c353d38df1f386d95383f0a782e6220a279ebd4c44894042a2a92e418271371ea4e7e4d070996e6507599209ad0f89f458822b38c8c45b989894ec715b6c8
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
index 3689025ad45b..9c417b75742d 100644
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r4.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 		;;
 esac
 SLOT="${BVER}"
-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"
 
 #
 # The Gentoo patchset
diff --git a/sys-devel/binutils/binutils-2.31.1-r1.ebuild b/sys-devel/binutils/binutils-2.31.1-r1.ebuild
index d7752af4f3ff..180506d1f3ec 100644
--- a/sys-devel/binutils/binutils-2.31.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -79,12 +79,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
 
 MY_BUILDDIR=${WORKDIR}/build
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 93dcbdf26b08..52df1648f4f1 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -79,12 +79,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
-if is_cross ; then
-	# The build assumes the host has libiberty and such when cross-compiling
-	# its build tools.  We should probably make binutils itself build a local
-	# copy to use, but until then, be lazy.
-	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
-fi
 
 MY_BUILDDIR=${WORKDIR}/build