Use new toolchain helpers for selecting the bfd linker.

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

3 files changed, 29 insertions, 32 deletions

diff --git a/sys-firmware/sgabios/ChangeLog b/sys-firmware/sgabios/ChangeLog
index 0e6496ed6cb4..d56779a5f7a7 100644
--- a/sys-firmware/sgabios/ChangeLog
+++ b/sys-firmware/sgabios/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-firmware/sgabios
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/ChangeLog,v 1.5 2014/04/30 21:07:36 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/ChangeLog,v 1.6 2015/03/16 21:17:16 vapier Exp $
+
+  16 Mar 2015; Mike Frysinger <vapier@gentoo.org> sgabios-0.1_pre8.ebuild:
+  Use new toolchain helpers for selecting the bfd linker.
 
   30 Apr 2014; Mike Frysinger <vapier@gentoo.org> sgabios-0.1_pre8.ebuild:
   Add epatch_user support #487100 by Hristo Venev.
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index 6676ef81cb0c..1bf3be45f05b 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 AUX sgabios-0.1_pre8-makefile.patch 395 SHA256 d618fc84175cd31c8f8dc7887ad448455e4a404af272b242fac4013235b657cc SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566 WHIRLPOOL 056f71911a94e90781bf677b8a06903a45a94cf708d743169b2974ba4472220c9875685faa387c20831a9827984b188287de812ca032ff395c33373de9736786
 DIST sgabios-0.1_pre8-bins.tar.xz 2704 SHA256 f982ec467790432f6be662bd58b51e78f80184229ecab5f23d4c0ea2419c1b9d SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d WHIRLPOOL 7b30b6a40f7b8d5b03482179f48c23910283e45f8eaac538533b5d24289d1ada6d0e6e5ecac3260e46dedc2a1e325fa096b3ae505b96fd1716e98f80be0d209e
 DIST sgabios-0.1_pre8.tar.xz 27200 SHA256 d6f01fe343828c3323c45c000b5a2f906f1c3aa6f788ca8b31669b4a05a3d31d SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e WHIRLPOOL de12b91a0304d6465186b9959d873061205bb055823408c84370a7563b46acd7cc955eab6e8b78a54d928bbb65281a9236e4c434fc5df707c5fffc160e311bd2
-EBUILD sgabios-0.1_pre8.ebuild 1135 SHA256 2f5fb3b2f7c04a7d2dcc6d325807543ef7ccd8ed494608a645e70f4b74516aa7 SHA512 5635f1f3ec837e60631b70d7e932457fce4e7b2bbacb00191b8269243d213588b65c8b09a61052e775c20530d1c358b16009fc851f1742c96db7b2d3ec46d46a WHIRLPOOL 7adee4ed5742c227f8c0ffa01fb53b9cc2baf2164e7c4dc3b17df197a329657c1aa99df9e7a3ca9838a54dd9d0ce0d77d4e06b3b3b167f6004e1ead724016020
-MISC ChangeLog 1119 SHA256 16be44c4b0cb19074f05fb19becfbe228c7eaf8442f572b7004af60598e7ab8b SHA512 8172c4cbef0a123880d74a7ad0f5759f078e8c0f6e71ceb1351d5184f6ba6309923e758435961291d5e937d86edbe742654bff7fbcfa8d0d7425c83099ad1c02 WHIRLPOOL a904d1087809977a914475c4a3c4ededb73baca80124abe47910cfeba5641417739855202ad9558d36ff947b94b2ddec3f2500a4e478ae6b1025c5527dc92c29
+EBUILD sgabios-0.1_pre8.ebuild 986 SHA256 a6bd76bc3dec0264440817a2135558eac33c239e2352181a179c8ccff736c50a SHA512 2903458475110d6c135bc462dfb667b3949e683cc5c61c0904f5c4de8028508b3f891ed8032d9ab2faad367acb75ab6123342f99dcb1cc04dcb50b454e3fb768 WHIRLPOOL 4e6f82fae303bf48039e572bb75471b013ebeb2e13f47673c8b3f98aa483884c06384f695e71a15359cea8025b8da5332b9393ae3935e3578484d6157b34db3e
+MISC ChangeLog 1253 SHA256 e8aff94b1f84b913b3c6b03e167917d74ea7110aeff5d61b30477ffe61adf6c1 SHA512 d121cd074cf23897137c89dc09bd2d07581b4b46506c6431f7e57395eacde7a0d08ac03e0681d4e90dd4622f6887c3db26caabdaa3b1e29312d26ece707fd945 WHIRLPOOL 2c2c4391f729a80148ed72668be095a3302f27fa6619b9d9d1b2b46ea7c935f1005d168ec70a1091288db1ac2aacec2f8046d4d697d983f5d616d91c1d6172d7
 MISC metadata.xml 253 SHA256 c9ca6980b185e0d86b42303a98572fd62ea4e18a796679b1583a4990bb40da7d SHA512 e313f627ded525c99fc31aeed49d1a59b532a7c108239f2f680c053cfe536c67a29d630171b900adbfbd04fb6230148b3a82d5f62a6b9c937caf6cb1ed9beefa WHIRLPOOL 7c1e1f886ef70ed91d2879fe9d1a67ada183f96b3ae6c3869acdcbce0f8677566f16e18a2cdfe7472432fd5e5649b6b68046db1b9633736e4b182c91196b472f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTYWYdAAoJEPGu1DbS6WIAUVUP/RMS+hK4d/Zt8UtvhqtA0qvH
-ZnB4PwWlT4oHUlNvlU5CXVncVkdhabWdQrYqEVKL2czTnUNAlfTKhHi+qfBY6YkZ
-3hOrqGDECRLVSQDXsBwnN3hfHhnQDEVfI2PbChBwIQk7o59h+++7l23OUk68BzNE
-2vDrAG7vzON57FWbBs8UIvjRoc+itwMPiMFBQcoc4gniXo4Hq7hroANa23XFVQ6m
-aCxDMBHkz7GRLMN8AZCHIUM6JzP9VVm0lYq6fsNgJXqxJ6ql6kAEUltkOONsiyLu
-CHoOEsTCRwdpISRwSw/dyAJ4VSRHSYxoEz/aVH+ecu/NmpnyzB5Nq9nJAdVAJuzI
-LcGNRH8TATR0qqba5zkArSpEdgR4x41bMuyD+AUjhyesTT1iLTiYuh38DLY0E/1V
-lybgC/KvCNPKnX1Oxk823WhBVb4p3NtIJzjh79Iy+pTrKyTSmj9cn58mOYPp8Tsy
-GoSunscDxeh6KCOMUQvRCjTxntG3D5m7LA508/i0O0cVVBjR7mDDDjvxwUGF3wG/
-dwgY5TI6ggPaiHhaXwxVtceNP+otahNuCgFj0MIXiGYAH3L+Co7QlnG8THSJ7P4S
-Arz0fZWqumcCRmZ8dYlVwwvxsTqvBWczRsEA187DVBMKdp1R8f4YRJ3vUKvWat3y
-uCkAlhxVdnjlgxOrgT1D
-=vPtp
+iQIcBAEBCAAGBQJVB0heAAoJEPGu1DbS6WIA3OEP/3WFFzKdEMV4YPROxc41lwjQ
+OKHj9rnTS6wMdYOsUmiOMzlJX10Zbi+VwJqXtezGsdml9ktH934Qju6a+0zByNaC
+0tXrQHIt0nr8n/QRL1k1kzmK29vC5EMBo5X7DWLdIuqllGf0n5pHibqUaBNZB2d6
+BiwgbAi080l4LpfOsyDJ60n6uCisO/8YZEgPQjyV/1IvH0Vf5GJKAWk8Zi6srSL0
+KbOpWj4WuHzEJTuWcCRx8CX/v+eAdk7UqXnGrnafSgXTc0vr/zrx16cG4N48slpC
+posysAU7fmdN9PTKy6fGZZm6OwwHV6a1cLcBCdHscgw70RFdlbpjUKicY07S+p0J
+alqyHmx0IEuUbvA+DQSEoskkeQ+qaSNgZLzUQlMqcgG7mPElVmGsDxtaT2/kxqqP
+kDLaPtCZWaJSxCmf0D4t6tMdBE/lx34gCaNnzJC5+5sHmhGu2EW3cx6VyyjjRFHV
+0ND0KFyptpcQy+GumgN6IqFwYI04qcBIxsNcJqoLw6s3at+6S297d2E3JkY6jfE0
+2EkhWsT+tdb8TstPtO3PKoJMCqhlf8Qr18wC8rXXfbbUxgaVK6kNj9rxrBIxPsp6
+D4c6qLdOJCt2yB3g+ZFY6yoY0pvkxPz5QIhGCS++AGHLahNqZ49G/fWGOadbGrO0
+K6fw2XgnTr9zR/an73iG
+=ZvQl
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
index 7b24612f0bf9..fa57261bf177 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild,v 1.5 2014/04/30 21:07:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild,v 1.6 2015/03/16 21:17:16 vapier Exp $
 
 EAPI=4
 
@@ -17,16 +17,6 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	local myld=$(tc-getLD)
-
-	${myld} -v | grep -q "GNU gold" && \
-	ewarn "gold linker unable to handle 16-bit code using ld.bfd. bug #438058"
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
 	epatch_user
@@ -34,8 +24,12 @@ src_prepare() {
 
 src_compile() {
 	if use amd64 || use x86 ; then
-		emake CC=$(tc-getCC) LD="$(tc-getLD).bfd" AR=$(tc-getAR) \
-			OBJCOPY=$(tc-getOBJCOPY)
+		tc-ld-disable-gold
+		emake \
+			CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" \
+			AR="$(tc-getAR)" \
+			OBJCOPY="$(tc-getOBJCOPY)"
 	fi
 }