Use new toolchain helpers for selecting the bfd linker #439082 by Ambroz Bizjak.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

8 files changed, 39 insertions, 115 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 89e1e34338a6..ee3f34b0b5a9 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.348 2015/03/14 18:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.349 2015/03/16 21:39:48 vapier Exp $
+
+  16 Mar 2015; Mike Frysinger <vapier@gentoo.org> grub-0.97-r14.ebuild,
+  grub-2.00_p5107-r2.ebuild, grub-2.02_beta2-r3.ebuild,
+  grub-2.02_beta2-r6.ebuild, grub-2.02_beta2-r7.ebuild, grub-9999-r1.ebuild:
+  Use new toolchain helpers for selecting the bfd linker #439082 by Ambroz
+  Bizjak.
 
   14 Mar 2015; Michał Górny <mgorny@gentoo.org> -grub-0.97-r12.ebuild,
   -grub-0.97-r13.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d8cc80b42963..8cfa4babefbd 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -18,30 +18,28 @@ DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41
 DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 SHA512 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649 WHIRLPOOL 0f083d66781cc4c3e554ebeda4e21843fa275ecf3e1908b4873fadfe37b7c88e8346a124656704bb1b29f89afee23d6301b4df0f19e788f454c60d47156fe78d
 DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f
 DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
-EBUILD grub-0.97-r14.ebuild 10017 SHA256 1bb2f98ec6541afd82aa16a1f05ffb0ba3ec8690ab2e6b47f1a0bbaa4737b5ab SHA512 fa1738c955553538d3cbb7c51877c788c03ab65eeda709d41c4f5889cbb851844630628307fe72c3802f695250166f15d740e34ef1a9c715e39154db4a871730 WHIRLPOOL 1c8cc944a009572b584df0f1690a99a137c9ba95851bf830a31b83fb1b8833b23dc5a067ba50f8fdb0f0e60a9226fbbfdc7e4da98793dfebd5d8f1aa5753955a
-EBUILD grub-2.00_p5107-r2.ebuild 8176 SHA256 dd465775321948d280745f53ec053bbde5adba0ac9d2455dbfee12276797c11b SHA512 d9f94d5b5cf3c098ef4a4dc5c80ecfe67b0e507a6b4e9b2e950c4ca586176ef23cc5e4ca877e5409ca05bfad014a27a5c76f239813ca19e9ef4f37361119ccfc WHIRLPOOL 22bd70e31bbfc2d24b89b4e2ffd14410c139b6fb909cbe29f335fe6b924daf926e42404dbf69f37e2f34a7cfc9519f42ae130f10e7b6c6b777a7b8897d5b045d
-EBUILD grub-2.02_beta2-r3.ebuild 8348 SHA256 c1750499c8b3b454371f8ab1ea74e8f31e4f8480aa5e10759a18cdb9fde932c3 SHA512 15999e0d6f6f60f91c4ee9c4eb69e2f30f7f64df8fcd812589b8cad9eb6c571187c2ff51bcf6b7d6882f70f99339010da2719ae4006bb9639a03cff6fadc03d0 WHIRLPOOL 897cc2f01a91bcc31db44d781aa81ba59188bd00a363a39baa4352715d29194abb34dbc656a77d9aa2568a279700cb39f4f9412381cb97fe8f77f9be76f789be
-EBUILD grub-2.02_beta2-r6.ebuild 8596 SHA256 a6d5a30153af46aa865e59e45c7ce5ac0e8105a94c9cbda57b8d1bc14ecbc042 SHA512 25d90bd657251203e4318befa7238d691303b6789af87fe6cdda168886f6b248e510a36f33244e6bc698accb911954ee6ea42d557bcb3124178b69fca7b12d3d WHIRLPOOL 9bc224bd350b928ae1471437070bef2ef145913188e64b658bf181d2f61e75065862aa2b61bb8175e4832eaedb2e06704f5d4ce2258f1edd3a2b8ff67ab093ca
-EBUILD grub-2.02_beta2-r7.ebuild 8675 SHA256 e89e3e0a37741d6fc5c8b7f488d92271982dec2e10ba14f48c2bae90563ed74b SHA512 b762737bc92087c5f35628e11560ae3a2c649ba444fe2d0c542f00d53ecaa7cad539bfe7b75d7997f7e270d65a5b55e2b9df4af21ca31d39131e6bae2fc3b724 WHIRLPOOL 75caf6c6f3f573be24df1ed271460334a7381f8fc036a361eeb905ce744662c6e4dfe7bc79f72e92d6b771271089aa311ad7629ac65c986d2ecff36ae7c58bc4
-EBUILD grub-9999-r1.ebuild 8381 SHA256 ae66bf957c923c95ac7281d4471a9d6e1c302b8c09d742f0fcb5539fd696553e SHA512 c61e23b5c4fd7095311202331a184f6ed95b15a346565b6cfae698836b7c412a56f56b2eb888daf9d7660ac8518b2e3dbd49871b5ceb7f6a13528f73a72a28a2 WHIRLPOOL 3229b8336458e980f8fced43a5ecc2b050fa2c96ede093e201122214e08faf3b2ec84c49459e08fa716d7c9b44c23071736a07664ded1d30cddaa90e7f15eb4c
-MISC ChangeLog 66563 SHA256 1e43b294ab70f223230a8452a38c25c3772208d18fc974fabd0175b33efa47ec SHA512 088e2668c93548a74d0d79b25dd60941829baa5b9e7befd05b206c4d59ec4f87165e0d53f91be19cb0cecbf1b6061408a4664affdf879e3122e67aa50da5b31a WHIRLPOOL d9004537470aba543c5679d749010683dee09ba124394bd857adffffba7caa4d3611e38a3eb6f571ca5750b52b39173f8cb6283078168bc1c1072007ff74a987
+EBUILD grub-0.97-r14.ebuild 9607 SHA256 caa3c3576ba47be94412023b1d6890ebf143c1f118ffa5526366bca09e3de13f SHA512 f8ddb971b37abdd2254071c663902101cc0d5049cef21341118ab57d203ba756476e1084b792d030bbb5e04251f28633a3e3c942623cb16148dd0970d6cd7e11 WHIRLPOOL 266080e1f8f4f6abce96d6bd3fc5727526a860bc571ca640b1a28dc5a3c0d963b734cd9cdbe010d1f3e03a40e4f5a986addf88cd9d13b68256a1ee1c7e9f8552
+EBUILD grub-2.00_p5107-r2.ebuild 7769 SHA256 af9c589a7dc763c9f34033fd03e6e38683b49444f4143cad35d2848032b5bd63 SHA512 8d6b391e1565b585ba2c920a7822c67103ac852fa6f83aa55b9615a3cd8769f3eb25e3d3904e79a71fb8c3dc00d09de8076de0700a3c2a21b6b734d5be61f124 WHIRLPOOL 798f9d122891b426b6e296c925571f1dbefc30390eb49b6691b97ef2344aefeee123e4e84b82d7dff409c20ebb83bb31e0373a5f286fc3bfe3a5c8959771333d
+EBUILD grub-2.02_beta2-r3.ebuild 7981 SHA256 dc53a397b3e2e930115ce7080ec6a233675b66b79befbb3fd66c67c2256a1294 SHA512 09f468c5f63936137f41d4d67e4c3127f81d5f14d9bf8a88018da8b84fb317d9bf87e4a19b87c17966d42038ce29d4d8c6c8985e7e14bf43175df99da956c887 WHIRLPOOL ee47d1eaff32aa05443d58b3ebc6b53e32f8357ee1d1c71c778aa33dbdca39ccbfa3998f43658fe8cdf5a3e8790c03cccfc284a7fe82f619369323086190e915
+EBUILD grub-2.02_beta2-r6.ebuild 8229 SHA256 21be5d0b3c6400e48e9bff30abafd7c08106b5045463b942f89e34e52cae0153 SHA512 0cb143aabee8d593108fdb78ce478a8cc5e79836a5f2a6bc9b7495a8e77370631d3dbf724e20791734bda806e905eb1fae4dfd1075d9f33172e1be202a5c8dfe WHIRLPOOL ee99fa27846bd0e728794db6b5de889cbbd12b5ffd89dfd3073a9328c81196f8e11f7e373847427bf49dce85cc77bb2a82a6063047cd95ee4328e4653320b0ac
+EBUILD grub-2.02_beta2-r7.ebuild 8308 SHA256 3e7f94eabc3efb15e73a2ce67090674aef19859501194070ade6a69189048b68 SHA512 910ceaa978d8669d2d94aa17b39307efd831d54eeb4043e235248f908d08ed6e68fba428515c2331344cf0cb4105d34e324efc3b334a86da486530644c252a43 WHIRLPOOL 7cd860ad6b805b602d1f12a7e50c9299fd41735bf9ac57f9c311b0519a8c5e2114917b11efccb22c329979f78c7b8aa489243065ac75c1be115c621a1b5824b1
+EBUILD grub-9999-r1.ebuild 8014 SHA256 71a552ee74fbd32864b9e297aaa49eec70239f56a52d6b662785d1e85a753ebd SHA512 8a2b045bff4bcca25796cbbff7b3438b769c74508703460ae8b6ebd7e398827d0db6b9c0f2cc6581a5dec92bd7928f3d4716cdbf35ea7affccf6763ae002d07e WHIRLPOOL be89e5f5f39c36e0cb345fddfb156cc2d80f98f00498ed5fe6b8595b9cc915e36c94764aea85f2183edb6be8b50420b808364c0a57a8e447d516af70c52947a4
+MISC ChangeLog 66854 SHA256 bed0516239c66f82fc0e1aeda087134303e4b2e49ecd4fa3eda3e608708c69f0 SHA512 77df6b37c079688114608cba8d97102f8f0ed61915ba0d4c8da73345d8fd35ce043d0a1d6887eda1bdc1a620ec2a9231160f44d2cdca5db099428b5bb68aab02 WHIRLPOOL cc621ea3cc9269d0c96c1f988802dfc5a59862441463af608b90e1d7fc07173e235356bd81282e0a0432d3273ff13536edfc7d0334a5779a58735295ecdcde36
 MISC metadata.xml 1099 SHA256 11bf295d5e9c29b235f08aee8426c0bed0d13e784242d9a0ed85a8785418c0fb SHA512 ed5ba243b98e32e0f4aa7bc7f116219add21bc2d4a60e38df6681cbdc9f4894507f6bc94d6092af777d5020c6a93ac6e8b5088e291b80b2a92294b4a8b69e121 WHIRLPOOL 07ac627189c56533d3484cd318610a18dde5cf732959fcbc405873a5146de96a49d8b29f6e2c2ec15fe62b561952361a4e0092aa17b744f761a500a40245c8fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVBHiCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTjYQAMUT2ecUVzoOjAF0oq3AkWBj
-D+zfI3ievsiB+tBVP6yb7an0m/cWJFZxlphWGFPNCq3leSo2BRHDQYZ7zt4taVNx
-SBJIK7waNEX4C7mINTZl1DW4mxeMlPBbwPEKh0Vu7fadzKzv78SL8jzjEFCzSfWr
-EJWTfmJaN6qOIvEfv68xI6jBkIK47z8OTWPwqnpR8kfI00YoReJ2+Ld8Vfp9A47W
-gLW07Gnh0fZ3wu4rouJtH1NjxaKwlDwMHPxXYyJwcGHNfWSs3GMTjOayVlkCxWIu
-0rbm1AsZxRwMW8zzdaxuCQ6qZUzgT1OR6ZX3a9Mlx1KcbyDh7GrjftfG0zNf8F16
-yejPbmjEcAIexsDag8iTKiLxJMYWzsZcWi8dT3tV0AjfIySV+NaSr8k3+ehfFPK0
-CRKSVYQVepHjbEnFNUYxfyXcGDnV21ANfT8+gJORKwWu+RwVBh65uz44LbrrjGky
-0dr7m/nXj/axrP5bV94Tpi4hYfIxtZyNMhlNWISu9CAnWBGqc6FjdtRsPYVMoKsg
-+wpzeTs3lFJjC1HoPAZpaie/Uba+dRDVTJoWBnya65rQmnxOr5ZCsvpWaDWXjiC2
-GxYHNs37ivGGFhqVP22A0vsgrICCovyjFc5kfjn3YktTq8Z0jkC4Yc1l9rrTZ4th
-6GB752xRI+wPHyZzrOjt
-=Q7cz
+iQIcBAEBCAAGBQJVB02nAAoJEPGu1DbS6WIAR7UP/0kVbCi6QHoLgFFwEV4I7oVY
+xIi4rS28V4SJLDZDec08DWAoOGcAYbPd2pPiBFTvcBaqIREDcFzOoDVN4A9OhEzS
+0z1SkOdjcTNpC/DJ/q7pSydm5aQe7BwJI/ErWHwXFnzIMrSgOrndJxn1mlEelaQ2
+tIfyhzNdDNmAMqm5wZf9Y8mbtG5+T0UlBWDbRmSt2aGAvhYLaJVZ5u3H/fQ0VjX3
+mw2xlOMMyq2oOzQVkgp4dbvjke7fohOJgIj6sNW1OgsK0opfzKWZA7j0hNk8Znb+
+PHLtwzc7gNriCOPb5NA2sH+kO9bTz1Xa+FOhQvEe1t6ZdpAh00ih8J9MhWML0sNf
+2dEhEHuAQTZ5QqE3pWJRdAYPLuVNqy/FBNb9kyIDuSg2vTqmuE6AUB4xzmGG5Y/H
+MHDEASgkfUBMOiZo2f3ATZEz6wFwOXOaLoq5ZVbEGFwXUOBZ93Da/7d3rEdp3ZvV
+wk4y+SDFtAp9QVdLUxvH3aa0EGSaRR07UnSoG9Pg0pKxqNf+BioZwFKVLz1Ui1Fq
+iqyLo9aIbSYVrlV+RyUa0Vm8qryHGYhJjOEQ5BX9dGfcNaO29eLHr8IhjAR1oWAw
++GrKrWCtxhh9O60iUgDubgm7SCJKenrCYgCthfHoyduBgrzzj6LODmA6ZASxi1HF
+WEl19b+Ld5YSV8DALAzi
+=fvEH
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r14.ebuild
index aeb2fb745a92..592d40059041 100644
--- a/sys-boot/grub/grub-0.97-r14.ebuild
+++ b/sys-boot/grub/grub-0.97-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.6 2015/02/16 18:06:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.7 2015/03/16 21:39:48 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -44,18 +44,6 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)\]/} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bugs 526348 , 466536
-		if ! test-flags-CC -fuse-ld=bfd &>/dev/null &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 pkg_setup() {
 	case $(tc-arch) in
 	amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
@@ -110,8 +98,7 @@ src_configure() {
 	# -fno-stack-protector detected by configure, removed from netboot's emake.
 	use custom-cflags || unset CFLAGS
 
-	# Force ld.bfd if we can set it, bug 466536
-	append-ldflags $(test-flags-CC -fuse-ld=bfd)
+	tc-ld-disable-gold #439082 #466536 #526348
 
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
diff --git a/sys-boot/grub/grub-2.00_p5107-r2.ebuild b/sys-boot/grub/grub-2.00_p5107-r2.ebuild
index b431523919c8..e94530f912da 100644
--- a/sys-boot/grub/grub-2.00_p5107-r2.ebuild
+++ b/sys-boot/grub/grub-2.00_p5107-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.9 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v 1.10 2015/03/16 21:39:48 vapier Exp $
 
 EAPI=5
 
@@ -136,18 +136,6 @@ QA_PRESTRIPPED="
 	usr/lib.*/grub/.*/kernel.img
 "
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 439082
-		if ! version_is_at_least 4.8 "$(gcc-version)" &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -233,10 +221,7 @@ src_configure() {
 	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 	use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static"
 
-	if version_is_at_least 4.8 "$(gcc-version)"; then
-		export TARGET_LDFLAGS+=" -fuse-ld=bfd"
-	fi
-
+	tc-ld-disable-gold #439082 #466536 #526348
 	tc-export CC NM OBJCOPY STRIP
 	export TARGET_CC=${TARGET_CC:-${CC}}
 	tc-export BUILD_CC # Bug 485592
diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
index d2ebee011097..b997b69dbfd3 100644
--- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v 1.5 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v 1.6 2015/03/16 21:39:48 vapier Exp $
 
 EAPI=5
 
@@ -134,18 +134,6 @@ QA_PRESTRIPPED="
 	usr/lib.*/grub/.*/kernel.img
 "
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 439082
-		if ! test-flags-CC -fuse-ld=bfd > /dev/null &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -248,8 +236,7 @@ src_configure() {
 
 	use static && HOST_LDFLAGS+=" -static"
 
-	export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+	tc-ld-disable-gold #439082 #466536 #526348
 	tc-export CC NM OBJCOPY STRIP
 	export TARGET_CC=${TARGET_CC:-${CC}}
 	tc-export BUILD_CC # Bug 485592
diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
index 9ac56094cca1..afa13e0ae04c 100644
--- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v 1.3 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v 1.4 2015/03/16 21:39:48 vapier Exp $
 
 EAPI=5
 
@@ -134,18 +134,6 @@ QA_PRESTRIPPED="
 	usr/lib.*/grub/.*/kernel.img
 "
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 439082
-		if ! test-flags-CC -fuse-ld=bfd > /dev/null &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -248,8 +236,7 @@ src_configure() {
 
 	use static && HOST_LDFLAGS+=" -static"
 
-	export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+	tc-ld-disable-gold #439082 #466536 #526348
 	tc-export CC NM OBJCOPY STRIP
 	export TARGET_CC=${TARGET_CC:-${CC}}
 	tc-export BUILD_CC # Bug 485592
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index f32ec279a855..93ec2a7117c7 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.6 2015/02/07 20:38:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.7 2015/03/16 21:39:48 vapier Exp $
 
 EAPI=5
 
@@ -141,18 +141,6 @@ QA_PRESTRIPPED="
 	usr/lib.*/grub/.*/kernel.img
 "
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 439082
-		if ! test-flags-CC -fuse-ld=bfd > /dev/null &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -256,8 +244,7 @@ src_configure() {
 
 	use static && HOST_LDFLAGS+=" -static"
 
-	export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+	tc-ld-disable-gold #439082 #466536 #526348
 	tc-export CC NM OBJCOPY STRIP
 	export TARGET_CC=${TARGET_CC:-${CC}}
 	tc-export BUILD_CC # Bug 485592
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index fa423673f107..7cece259f11c 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.29 2015/02/07 20:38:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.30 2015/03/16 21:39:48 vapier Exp $
 
 EAPI=5
 
@@ -143,18 +143,6 @@ QA_PRESTRIPPED="
 	usr/lib.*/grub/.*/kernel.img
 "
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 439082
-		if ! test-flags-CC -fuse-ld=bfd > /dev/null &&
-			$(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "GRUB does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
@@ -256,8 +244,7 @@ src_configure() {
 
 	use static && HOST_LDFLAGS+=" -static"
 
-	export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+	tc-ld-disable-gold #439082 #466536 #526348
 	tc-export CC NM OBJCOPY STRIP
 	export TARGET_CC=${TARGET_CC:-${CC}}
 	tc-export BUILD_CC # Bug 485592