gentoo resync : 15.12.2019

13 files changed, 81 insertions, 83 deletions

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 20abe3c9c7a3..b708524ef9c7 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -41,16 +41,16 @@ DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
 DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
-EBUILD binutils-apple-3.2.6.ebuild 7045 BLAKE2B 0d4ecf82f94d4f5535f9e284e14fabab71aa7b22cf143af6b34e848b8f86003775a8621b7643d3696a8128d20a2761100dcd86c8f4f3d3d879acc722f9a10500 SHA512 bdfd09e4171ca227cc9f2e012be79df9ed358306662c35b1d043e557d9dc4b3de47779350b3e7e37335c346312238db47189c74947a56515a85c27d521568d2a
-EBUILD binutils-apple-3.2.ebuild 5960 BLAKE2B b095de2357934565412385d2dfb2dde82ae5676b492a9547793288b8b3333a6be4c53d7f9755c8923af84cb259186511b18b9d1cb88407e42f4929713e798f58 SHA512 d6e36569763260d8f6a14ed0ecf7fd6a82830698124ce916bb2f4116802c9aaaf30d8eb99bf1be70eaaf61d73ffa82a21f6a4c3e3fd5d4e8ee0a1415da2c7f27
-EBUILD binutils-apple-4.3-r2.ebuild 10288 BLAKE2B 0adae8b255451d11ea984c2b2a8b3707a90d434078ba5e57ad4429a21ee0ae83a87e195a896d32a3fa7a3cce2a6841069b80b60845b1321873d918e6dad09111 SHA512 4bc67e66ac627e062b5255943d32c31637ce232aa0677eda688d20d9b547834a2f278dbbf87337c896d6d8ee39fb5ff343feaf8dc0bfdedbda228f8ee7b0a52b
-EBUILD binutils-apple-5.1-r1.ebuild 12184 BLAKE2B 8c8b278f746191b77f7c9bbe19c53a714c63978731a68d0fb1dfbadfc0aaa279c6fdd39230e35748589f65285b147ada0922bbcd4cb71919330aab6162111b8c SHA512 6d3525f8ce9a4902cbf8b62bfe8b63af0296153769aafd5689edbf2f8879497edc67ab25f9fae1f9546c04375f08030a4fb7b8b010e74b1236ae2525e19364ac
-EBUILD binutils-apple-6.1-r1.ebuild 12258 BLAKE2B d86b5096990fa8b56ee1e9b09423a706b8ed8ecf86e634faa23f0bdad0c11322a542ca5c5e02aecbc425c974f64b44c361a623eb928570954b1328e0fddb5e51 SHA512 12068923ee646491f6ff5bc9ab2a5cd02e102d76e484a12b7cd253e267949c07328fa2b72b071d2f71b2a34a3bba9455b15de92652a3c906746da4a62a68e0e6
-EBUILD binutils-apple-6.3-r2.ebuild 12276 BLAKE2B 922d465186288a988a9244aaaf991db881660fd2c9b44ee7853486e80f102740ec12823dce2e313dfd56fc8bdfc1cbff9193f1d478851c4c6b9a0fed276d233b SHA512 6bf46d3c9b4f60a8e7cc3518e6f0e6925d2008838c4d455f6f723aca28bfc80ec8c15c38c5a512c50b439179b94d3873e48b9ae006a7e8514f93dd6df3bd4ede
-EBUILD binutils-apple-7.0-r1.ebuild 11952 BLAKE2B 8bce6a51fac7c3d568f6c30e0f6454888234555e8c7404bb7b262606d7c51229421c83797eded2f262c2345dbf54e386d91d1e4586a79ecb436f2aa2865b2e04 SHA512 be677927f6b2e4280936ffec90f93dcec76cca9fb2e88011db2c0b764d322f19a5036c898acf2c6e91a1168b25e62252b56c01d77775826bf15e8a0bf542e2d2
-EBUILD binutils-apple-7.1-r1.ebuild 11952 BLAKE2B 2a626c2e6081954cc0aafc8beb224a498ad328dca4919cdeb59800d491a76fc810fdf0c0214eb46e7b8eb21ea1b8a5789202505f84365f04a3228e04d399fea3 SHA512 21bcab913bc16e970bb380c82cc15dbc742473a68ecf83bba22320ef79dc1d684244e680de0b1cf33fe857c4d6e356de9604df702cb1eec2b261ae9c17293f7d
-EBUILD binutils-apple-7.2-r1.ebuild 12024 BLAKE2B 9a8888e7f6df8f28b6e580cd7849a7222b1e6841bdfedec6fa6d23b721546671abc83059c3483f1a5c2588182546f0d1af9faee70805d1258b2952059943814b SHA512 4a044388002635aedd7e9d987549f2a8ded996db877295e28033594dd3eabb42f90b5c74042c19943181180b9e3504b39ffaa111b14d4fee80b5f13f3544d857
-EBUILD binutils-apple-7.3.1.ebuild 13236 BLAKE2B 0659a9739a542fbc9df783e17579056d0910eaf8f09fcc6d9de905f8b5ff832d45b3cb5bd1247392724376206d93e8190a295217424c0bb972fcdc5c4197cb9c SHA512 2b07f398f52fe85ef107efa4dab9f78feba5e6686e27b7a96d268be641641cf26dbc1540facad4de007f15f85a50de3bdb5075d60979312e064668db51db95d2
-EBUILD binutils-apple-8.1.ebuild 10421 BLAKE2B ae5ac54f54734bdbb75e7ddc8b85fea7801cb0eacd074c6df53dab1adeb4dcb1dbeaf3a69f8d332fb9a4df1c9c40345299a5e9e4c95c31b18744cfd2b2269181 SHA512 c56d11eb5730ba5f3053bddf7d31264e3623c8bdc647adcf490e30a2e668d57654728f78b21d1bea16380d53462759ca57898195f36a676d0632b89d43004340
-EBUILD binutils-apple-8.2.1-r1.ebuild 11448 BLAKE2B 5704b902429780dd645a81b2cfa4454b279132f0de99850bad30424464a861d29c8d00cbd6daf86b933ee5cba4fa79a835431575d3e439312d597bd8dcdf6c10 SHA512 90ae060f543df5f5954179ea7a5a112392b9a38ed2b439d41b00ba6d2867ea0e207b58333e6eba8bed019ef8c8547725046f5df5516cb19764235edbeb6b5bd6
+EBUILD binutils-apple-3.2.6.ebuild 6937 BLAKE2B 649bdbc5433d05db4fca58b4cb95538fae8654ac0c91c95915f172a92a4fa61724e57876b0a9ecfb09d1942060b0298da3af5577033bb8a860807d6a7fcdba08 SHA512 617d78b58688d9f4900d65bd49f90c21c64d62de48bcc42e63ed9a5f2468e29e5dba84e17799eb2fbffa064ce5b0087fbdf5669000b0dc6a2eb30388d585f123
+EBUILD binutils-apple-3.2.ebuild 5855 BLAKE2B e709686ef502a5d015b8559b2102e45daa586b66f9e6ef60026baca48baaef4d2dee0e3ed757146d9842676de074827fdfd23dced29e631d75e22e1ed6668103 SHA512 76fa7523601c37302012453208284ff0ce5f2efd6442a2df54c8b73e86d427ea8c1d6a8fb4045b0987cff1232b0b7f93f9319a68fb553e7fad04f6046b8b14c9
+EBUILD binutils-apple-4.3-r2.ebuild 10207 BLAKE2B 8d115224cf5fc41ba2d77fcd9effc8c86e28d18ffdd97defdf9d3739136682dfd02de84ce14e429f3ebe45ec614152ebb8a574ebab6ad6f14e23dba07e3742d3 SHA512 8aa25ac3326aa24bf501201fcd8c07c98d71c8d2bda8aeafacf854318b40b101b2acc112a4d81817269908294904b1ba466fd4eb48e162f65caa8f800be77a76
+EBUILD binutils-apple-5.1-r1.ebuild 12103 BLAKE2B b01ad672d7aa2e473458f87631def8179481cad1391a353693839966b94be8e340144d72f1660bb8b45a48895b4583ff4f2f26657fa9aeb4f735a9087c0cca28 SHA512 a6fab818f451f0e1eb845f98e548aec7e089c879d5e9c543bdb7683cba16078f3ccabb7967e98d9b6c9e8bd79b0c9233c11bafbd96a69e628ebbc875e9f50957
+EBUILD binutils-apple-6.1-r1.ebuild 12177 BLAKE2B 9df959ff5bae06392acd30e5dded62c1831cf1e3bdf2434aacf599961834449e2456458ae52ff5996769a38def8c2015d8cbf77fb031f39dc856ff14d7a61723 SHA512 a27980c8b5362491fded65df6fdc35684049261794b4a996eacee63c9ba92f80b26274de351b639b4a5eb2536515ab5962158ba11b833458445ab64362986215
+EBUILD binutils-apple-6.3-r2.ebuild 12195 BLAKE2B 1aee908d1269368deeb1095faa36d6527a703d8958917ca62ad2b530f4ec6e60117e72cd99f68f989d83fe305fa7bdba370ce5fc2f8e063bf2aaa1bac92fd34e SHA512 098d4b94ab31d7f72f28bf4c911036cdcac9534a5ff1f5d4ed16d7af0eb84945e5d01b676bee326aa13e0f8a37538110800305a23afbb80189a6087c69caa3f7
+EBUILD binutils-apple-7.0-r1.ebuild 11871 BLAKE2B edce88bdcbb869fec564245f861d0f1ca6898d0fc939f8b17000cd88b3b9b4710ccc54101487b5bec5ecd923297d143f1a21a47d9d71bc9d0a6977efb13d21f5 SHA512 6a33926bfaaa7daf42b2be85f0667b91f1390c4bcc7a3053a5af078dc06bc2f06e4c34a6929fa2275e254a8926b028bf6e438f120d35ccfaec30a87abea87e43
+EBUILD binutils-apple-7.1-r1.ebuild 11871 BLAKE2B cb2c16ec3f922e2b5613a7a5dd2624542d0b867966e9fe558730324b344b2e3c28ca95f66f98736c9f8065ca1aa3459282f37bb8cf95dc39af08c23c53962cae SHA512 20db903dac989e61dee78187ff033399515301a99dd554522b6925b436cee8095d126f4221726027fb5d142ecdf77799f8dfeb973e3c699864c5b7ad56c275f4
+EBUILD binutils-apple-7.2-r1.ebuild 11943 BLAKE2B 675e352ea19134540d25f7d71c027b9abf74f87804d0d0738c751025286f45da2026dc08eef36cf1370b620e352837ddf2fa88832e0a0fac2ab58b1f47f8ed6a SHA512 63572e3c110f3911762012bab6185082a3fb65c47ce7f20199f954fc672f5aefd049148e3020c5a91c22b08efb61b541a8c318f4a21c28ecaeb48acf8fd37128
+EBUILD binutils-apple-7.3.1.ebuild 13155 BLAKE2B c436339d7c06e06e0f4dbeddabc0eecb699588f18d877cc47f555b1f1ccc749c19836e508b45f024564d2e23b2a2ae694bda53d97d07f8bfffb0a03023bbafec SHA512 c111e2eee6cf3803ff3a10e3f83fcdfecb9207803c208100c0610c0a2200263e140c1f76db85e3947aad81aa9fd1a9ba9e4d7a5a616a1003c8057961f3ef90ac
+EBUILD binutils-apple-8.1.ebuild 10340 BLAKE2B 4410c9bb7642e2ccc84224724cbba2a942f32bbc9386043613c271c9e8f93c2b9177868f3b784b84f1393a23dba62ed23e5d404d8578cead0ab6ede5af75a094 SHA512 27014523cfce9f79cc151626e6954b54c9fa73806d67ebb98197157f3edea2ccc24b57c311f67c91360cf59082a69df9c37fd0340d3c0005b0fe04733a7ffcaa
+EBUILD binutils-apple-8.2.1-r1.ebuild 11367 BLAKE2B 572af74e5a95f6c120152fc7627ac1a2634a8537ed28400c827d683cbc7447bbdd83d873678ab2e459770a1c515d43c759b0471fb3ee531d5a5c203dcccbd774 SHA512 9a49baeda4f83da08eebcaa8497e1149b490b3bb7a49d32106a3f4ab1b770d7ed0e499c8ae670ebb83f671bc20d97a8e61e924a736e408e469a4146b58418e80
 MISC metadata.xml 684 BLAKE2B 5cd10b7a5817bb4fe8b94ffbfa422e43c0f50c2d7d6db881ab82b4741f24548560fb07c6f4b1bf8164ee80ec7052147f7f5158640e4c9fa94b950871148491f2 SHA512 e588cb802b2b22ee656b9dcf45d9d372a3b306fa3574a7d859e2df9032eeeab63219a9d9b69249a5a67733dff4c484da17621f00d2b0775935f2cfa5a6f91977
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
index 6636b170fc58..fe828d3b1644 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
@@ -158,8 +158,8 @@ compile_ld64() {
 	[[ ${CHOST} == *-apple-darwin8 ]] && \
 		append-flags -isystem "${S}"/${CCTOOLS}/include/
 	local myincs="-Iinclude -Iabstraction -Ild"
-	emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" \
-		|| die "emake failed for ld64"
+	emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}"
+
 	use test && emake build_test
 }
 
@@ -171,13 +171,12 @@ compile_cctools() {
 		EFITOOLS= \
 		COMMON_SUBDIRS='libstuff ar misc otool' \
 		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
+		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
index e60586c9425b..4ccf5b257b9c 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
@@ -134,7 +134,7 @@ compile_ld64() {
 	# but not on tiger.
 	[[ ${CHOST} == *-apple-darwin8 ]] && \
 		append-flags -isystem "${S}"/${CCTOOLS}/include/
-	emake || die "emake failed for ld64"
+	emake
 	use test && emake build_test
 }
 
@@ -146,13 +146,12 @@ compile_cctools() {
 		EFITOOLS= \
 		COMMON_SUBDIRS='libstuff ar misc otool' \
 		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
+		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index b22d2eadae76..b3cf69bdae49 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -24,6 +24,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-devel/binutils-config
 	lto? ( sys-devel/llvm:* )"
@@ -212,8 +213,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -231,15 +232,14 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		-j1 \
-		|| die "emake failed for the cctools"
+		-j1
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		|| die "emake failed for as"
+		OFLAG="${CCTOOLS_OFLAG}"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 8054c9ae0d53..73ec964cbefc 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -23,6 +23,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-devel/binutils-config
 	lto? ( sys-devel/llvm:* )
@@ -252,8 +253,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -277,16 +278,15 @@ compile_cctools() {
 		OFLAG="${CCTOOLS_OFLAG}" \
 		CXXLIB="${CXXLIB}" \
 		DSYMUTIL=": disabled: dsymutil" \
-		-j1 \
-		|| die "emake failed for the cctools"
+		-j1
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index 8d7aa6d2cf36..041d9a329ada 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -24,6 +24,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-devel/binutils-config
 	lto? ( sys-devel/llvm:* )
@@ -253,8 +254,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -278,16 +279,15 @@ compile_cctools() {
 		OFLAG="${CCTOOLS_OFLAG}" \
 		CXXLIB="${CXXLIB}" \
 		DSYMUTIL=": disabled: dsymutil" \
-		-j1 \
-		|| die "emake failed for the cctools"
+		-j1
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
index c84b2b5c8f2d..b3af64fe16d6 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
@@ -25,6 +25,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-devel/binutils-config
 	lto? ( sys-devel/llvm:* )
@@ -254,8 +255,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -279,16 +280,15 @@ compile_cctools() {
 		OFLAG="${CCTOOLS_OFLAG}" \
 		CXXLIB="${CXXLIB}" \
 		DSYMUTIL=": disabled: dsymutil" \
-		-j1 \
-		|| die "emake failed for the cctools"
+		-j1
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index 6082903fa5af..7607b1e4624c 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -26,6 +26,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massivley uses
 # C++11 language fatures. *But additionally* the as driver now defaults to
@@ -239,8 +240,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -262,16 +263,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index 98eccefbd990..46382b1d6785 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -26,6 +26,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massivley uses
 # C++11 language fatures. *But additionally* the as driver now defaults to
@@ -239,8 +240,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -262,16 +263,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index ac2ac3a6ec47..e7e593598c92 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -27,6 +27,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massivley uses
 # C++11 language fatures. *But additionally* the as driver now defaults to
@@ -240,8 +241,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -263,16 +264,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index b903419b7ccf..9497b6024a8e 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -28,6 +28,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massively uses
 # C++11 language features. *But additionally* the as driver now defaults to
@@ -247,8 +248,8 @@ compile_ld64() {
 	einfo "building ${LD64}"
 	cd "${S}"/${LD64}/src
 	emake \
-		LTO=${ENABLE_LTO} \
-		|| die "emake failed for ld64"
+		LTO=${ENABLE_LTO}
+
 	use test && emake build_test
 }
 
@@ -270,16 +271,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
index 0658f9816910..945873754651 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
@@ -24,6 +24,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos ~x86-macos"
 IUSE="lto tapi classic test"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massively uses
 # C++11 language features. *But additionally* the as driver now defaults to
@@ -181,8 +182,8 @@ compile_ld64() {
 	cd "${S}"/${LD64}/src
 	emake \
 		LTO=${ENABLE_LTO} \
-		TAPI=$(use tapi && echo 1 || echo 0) \
-		|| die "emake failed for ld64"
+		TAPI=$(use tapi && echo 1 || echo 0)
+
 	use test && emake build_test
 }
 
@@ -204,16 +205,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index 7df83c36da89..f7a37367f25f 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -23,6 +23,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos ~x86-macos"
 IUSE="lto tapi classic test"
+RESTRICT="!test? ( test )"
 
 # ld64 can now only be compiled using llvm and libc++ since it massively uses
 # C++11 language features. *But additionally* the as driver now defaults to
@@ -200,8 +201,8 @@ compile_ld64() {
 		LTO_INCDIR=${LLVM_INCDIR} \
 		LTO_LIBDIR=${LLVM_LIBDIR} \
 		TAPI=$(use tapi && echo 1 || echo 0) \
-		TAPI_LIBDIR="${EPREFIX}"/usr/lib \
-		|| die "emake failed for ld64"
+		TAPI_LIBDIR="${EPREFIX}"/usr/lib
+
 	use test && emake build_test
 }
 
@@ -222,16 +223,15 @@ compile_cctools() {
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for the cctools"
+		DSYMUTIL=": disabled: dsymutil"
+
 	cd "${S}"/${CCTOOLS}/as
 	emake \
 		BUILD_OBSOLETE_ARCH= \
 		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
 		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
 		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		|| die "emake failed for as"
+		DSYMUTIL=": disabled: dsymutil"
 }
 
 src_compile() {