gentoo resync : 26.11.2017

2 files changed, 11 insertions, 9 deletions

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 8d8868541978..b89e5ef1cc49 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,7 +1,5 @@
-AUX binutils-config-5 12171 SHA256 0d69823943552d7c4fb02c9794b4bf37d611a281afa59d5d117c850523217fcf SHA512 a444f81455cfe366072cd600aebab5c66c871b7a1b3fb935a7600596fa18dc7a4a55d82b0c0a2b239b0c3ab6a488159d3c1fd6a7e1c9fd8de4096822dfb647ad WHIRLPOOL 88e70c7ccc813d1c8d7fdd37e549a752e0f0a9b3861aa1c5152fd17444885ef82dc66ee05370145c242f7be9fae9a708dc9e44ac270ead5427b2d3751d6023f5
-AUX binutils-config.8 2710 SHA256 029958bf9fe9c6d1382a9629b9483954b31ccc27f9367c906794bd3d15e5b23f SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455 WHIRLPOOL 15001789d2afbbd604dbdb3a6ffed0e7e862cfe02ffda386fbb81d4657549055f1b89c8d0392db291d3a4c0c099bdd9189287b536745143d3bd84d708df70736
-AUX binutils.eselect 810 SHA256 e579d3bffc645730f396ebc01d9f9f1043ee8db5edb1f41d5aeadeedcf6aa295 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 WHIRLPOOL 5ae5fd07213e2be381824aea237aa2cc47a987a2ee6508fcd8f18424f8e3de89be71f1de781240af45b98f7525048be2ab7cb60893384efbcde8f8a92a32c73a
-EBUILD binutils-config-5-r3.ebuild 1128 SHA256 a58becddce2133f82a3bc78780555e4f64cf56e85464fca948c9b9f3b9a05cd9 SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528 WHIRLPOOL 05f857b6c21cdeb5a63c9fa7ea2a970cf0c0902ef0aeafa9e5dd09467012cecbfb0bb19c180ef026e1b8d66e70cc955e912955186ffa0c1266f84478072daba1
-MISC ChangeLog 5909 SHA256 6619cf444460477472191b391f716defa10bd5b13770d0ab072cdeb2138c9501 SHA512 767a6e62445c1fd7eef0045ed61b2b4c49681a0c73938f1b01ad59ecc44752ae0104d3fb1f9a677feb38fb5b24ac7cbbda50dd4d6e70bf6b6a624a3ad0a2cb00 WHIRLPOOL 4f07bca52d3bdfda2325daaf2ad183be5544c179878b14eb2ad28b2766f7b9bb98b339e413ad6ac413ba2a99a8fcf71e2447fb714996cabb0229cc7fa3842561
-MISC ChangeLog-2015 12757 SHA256 996edd94d7f8b82e690fa028e8e729ba1aafff0e2e8dd2fa358718ee990546df SHA512 bf644ca23b2dcd20d8a7279377711d976211e91bf4c41f10638383dc1a3e2c215864e3328984f50f0d2137474a9d07dcd499eca16a8e2df757f54295a52b5ac3 WHIRLPOOL 5de7f1e57ca53bca17deef27b6a2c52b816d7df586fbbfc92304d8a518a2fd6ef31911f4b2012fb9b8b10210038fcfab05a3871a67545b7f4dfd6eab04c85c4e
-MISC metadata.xml 257 SHA256 fcb691c3299a07a5fe4f936baa5aa146b8aa3cb9491ba88fd12547cb540b02c2 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 WHIRLPOOL 62b62e3e5489b8983ddd7bfc6017411d5e02f9710763206baa84b826388c8685fe7bdc0bb6a76c029e73ae4c160e9af6c8544406dc70a203c7c3d65d4aa15400
+AUX binutils-config-5 12363 BLAKE2B f3459aafdb985357fd9aec342453493a06d37de9cbc1e20d3c2f39fb21cb433af836ff1512e18a6237cc69fbe44b3c096288bde82b8f0709f82f695db62c0a85 SHA512 a666b07ab45a54fbf869c1f5bdcb8767b393a4bbaef7dc0e1cbf2a1b70cbb0e9cbf6528617dc90428aa420aa6a6e86eb629738323b80ee77089de75bd885713c
+AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
+AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
+EBUILD binutils-config-5-r3.ebuild 1128 BLAKE2B 4ef1d4aa6cb85479909bd0c1c77847bec279de43629e468b9ba903e7972ff25039c69621f7d9f2947fb595ced20cdd7af4b1c3f3a56af2c75edeee1c365cecff SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528
+MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
index acb72b7e3435..e6c5fac00264 100755
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Format of /etc/env.d/binutils/:
@@ -145,13 +145,17 @@ switch_profile() {
 	cd "${ROOT}/${LIBPATH}" || exit 1
 	if [[ ${TARGET} == ${HOST} ]] ; then
 		dstlib=${EROOT}/usr/${HOST}/lib
+	elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then
+		# true for at least avr and msp targets
+		dstlib=${EROOT}/usr/${TARGET}/lib
 	else
 		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
 	fi
 	# When upgrading, we need to clean up ldscripts and libs.
 	# Don't symlink back in the libs -- the binutils-lib package handles
 	# these now.
-	# TODO: Stop requiring even the ldscripts symlink.
+	# TODO: Stop requiring even the ldscripts symlink, except
+	# we can't for bare-metal toolchains, so...  bug #147155
 	mkdir -p "${dstlib}"
 	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
 	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"