gentoo resync : 04.01.2018

17 files changed, 293 insertions, 53 deletions

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 70e154affbda..0aad57f63ae4 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,3 +1,5 @@
+DIST binutils-apple-LP64-patches-1.tar.bz2 10235 BLAKE2B 3352170bcfe73c574217597233ca58c7d6ebeedf9dfe9da1399953dfe1a0c87fc26e9ba8864620ddd67c6f38e48aeb6950737637605f0b860eb4a0d246f3aff7 SHA512 5632d4033c39e47de3ec275d02100ed53408a63122fe722c26dda1b02275c397524b113e51e1334d3235fc7f0a3bb8e53d4ccc1c2e40f24c6129282846da22e1
+DIST binutils-apple-patches-3.2-r0.tar.bz2 4137 BLAKE2B 9cd7afbba5337cb9c395556b2691e4acd73ee323d643da4335f6465ccc29b06f889d01fb42c7778576607bfdb859e2df38d3ebf82d4bf7f0971079da6985f237 SHA512 5381a93d61c39993cdb294ecb238016e26cdfe283fae553f75ddc6662812709301d5208c770ac0992d1dfab92e4802c660e6fb4336ad891335ab716d3b042805
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
 DIST binutils-apple-patches-5.1-r2.tar.bz2 51642 BLAKE2B 1b44020a05e0a91cfe569273f1e3dc65afaeac4bcdb80a626bdcc1f30cf8fbba6cc7bb522ece93126d4035b2d309defefd17fe0cee5bcaadcc58c4fa0feb4827 SHA512 37ba0dcae6c10b54a07c6208f6893ab80b0de1bd1c2f677902f707c8290629f7671a481e256b57a18bf304b95e41e4d59519bc1c88f15de488c0ef7e142f5cd8
 DIST binutils-apple-patches-6.1-r1.tar.bz2 42189 BLAKE2B 8505acaff6343b2f4dffe9c1dd78e360762f0ad78d39fbc0227265ed8b6768dba62c1a7d6784ca685934942e1a211c70275474001b066e3292c579fa0aa2f356 SHA512 be8ee5af5c8c9f9228cf6980f032aa101058ac1a414bec89401dbc4ff32ea96d6ebf96b7b79285fa1e7b4037a9ed68b285dbe59ff8e3d3e62bfc0145199e72f3
@@ -9,6 +11,7 @@ DIST binutils-apple-patches-7.3-r0.tar.bz2 44576 BLAKE2B a9f23fe66f9b3e25b8975c9
 DIST binutils-apple-patches-7.3-r1.tar.bz2 44737 BLAKE2B 4ac5d3b50c04b1ab71dc1c266db8b44e9d34f12bcc8a53966232cb5a6999b2662f9891367a2e7f8ea4f0f014b19594c1adf8dd945a18419980bca729c1de302e SHA512 ce4b3a725e19cb632b0c101a32488ce09a8bb89aed08339d5518d834cb68c525b2e0c8b66564a945c077915e92cc6be3f7028c5baacb870b3ca9b9422b4fb0da
 DIST binutils-apple-patches-8.2-r0.tar.bz2 5771 BLAKE2B b562ea4dd9214bc66695dbdb2452c88b1885ae1e36904516ea664157cbf0b54421d80cd0df792fcc431a3e0b98e804488c651b3fa29b368445450d0d13a1502c SHA512 92d04396630a31b752a24845c27fe8da2e37eb176117c9b31193e8f48af7ade707cda4060289b848965310afd05b2f121c740b0e5baa56b79c5481273a88c84e
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
+DIST cctools-750.tar.gz 1947953 BLAKE2B c2c6176daaeac0ca407c13c19ce15a84be639510d95c15bca654ba3415fe64a136a0155bcd3c8a34696c35cfe6989f1177a486cc71acc157b42d7c706b23fb29 SHA512 e2e152a9fb7db47c60fe450e1fc92c6866ab89682c7fdc594b97e419ce93ea1353654bd4419bf3df99d119f554aa0f32993dc645dd7c4680840cd01b7dce2f67
 DIST cctools-822.tar.gz 2024412 BLAKE2B 6b58499a9dfc2a1b166ff428f1e263cd44e03c50cdc8f6e467cfee93bc2dc2a9c81bf7626479dce195b152f04217e2d3a427afac45484cba4c5f2bdfbb7e46f9 SHA512 8b02cc837d5e0520f35da445f25ba86b5042d5caa27b49a599e829ed89428cf78dbd1831bcf6c18301f941fbfb31ac2114e248041d98008a466e1574f4fe1586
 DIST cctools-855.tar.gz 1699635 BLAKE2B 4d98cf2bbced6894083dc2733a35cf9a4c47f71172fe98265a8f047218cc90276085919129553e3a1ea0658416eebf3b7cf0908bd32ac1a224480554257999ee SHA512 50f5d015ce807aa5ca274dd2deea810b8b375110e60b5e334ca4b2170526b738ea5f86a5436caebbdb748badc3b89601d0f450f5b867d8393c89e336a3db4b3f
 DIST cctools-862.tar.gz 1702345 BLAKE2B de84058aa78824562b0eabf93a29badaba0908a7140336a281a6ea46a9b09d893433a908c299e8de866a76e0eeb98b730570958fc8fac559ccc6e35f5138b121 SHA512 faa401c1dc55bfb9cd2a9a9cc7bc9d473ee63b019607967c8b0da325514d6a1f7b1f52404370bcc018e86d30d75a4b01183f49b793f577110663efe43871360a
@@ -35,21 +38,23 @@ DIST ld64-264.3.101.tar.gz 681491 BLAKE2B d924b8865924d7d2b55886221c0e8c6ed0b50c
 DIST ld64-264.3.102.tar.gz 681509 BLAKE2B 4a0699ec761bd145b8034c8577ce9f843c9384fee5486855565d1d89858a445492d66aca2798a6e9c1bb4f59328680c05bcf1cd024d917c063e74d3549073ce0 SHA512 ec221de3624dcce3db694ec2d7b05f3c939cd1ba79c97437ba9f2d4e5d9c37369bb5df82cc37bc158bf5c4e2128cc2b96ca1a7477f98538850092bffa4601da0
 DIST ld64-274.1.tar.gz 670493 BLAKE2B 00ab46b09f29c6143c5066ffb0a12017fb2268a5f205c41851a95bc38443aa5494ce81b793a6668bcd3a8abb0ba4215f0da372c413ae52e4ca1e437ad370f8e0 SHA512 ef5d6802f759e09aa2dfab7eb84e9cd2a57b28da3f150833cf1a922c395dd696e501b1bcb10385cbe995f4945fc6c99c2d2d8c50c42f369186bdc1ac3e30ad99
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
+DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a328a74ebc988908b1655138873b69bfb0c19b284f0aedb678e99de3866d4f13460cb3427985704093dca37a SHA512 b5ffaffc43e74f22688fecd9fb3023a59160cf051f9412f34e6b0acf1c4f9d43ba641e199d8d6b1c6cf3bbbbf117645988fd879ded1fec8be056b6941fe79999
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
 DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
-EBUILD binutils-apple-4.3-r2.ebuild 10300 BLAKE2B f02d40e6d894d971b060ab5f925577e726dd323f3a30ed7225d2bcdf308c589aead8b0e64044e789210ca7f85807e015fa944264e7a0f35db29da4a5d9eafdbf SHA512 7709d446c90b3c7dd3131c952249b85817b65613182ba47411a41213951e46dd080c2559e552bdb386f388bcc2306b333963c6489cab8fc24248eb5b7c95ef74
-EBUILD binutils-apple-5.1-r1.ebuild 12194 BLAKE2B 865e2a588bac071164a7a0f57cbe48166b8a50ecc7bea6e83658027cc254ab2edfaf661d0c6878f6ed45208336726a6ce3997d89628f4da8bef35639d2d2b711 SHA512 d50b50c71822bb9d341790318133ddaf6d5342be77dd3649c1af1cd4d9c223e119fad46b87ef0465d2ebf3e768e5b4c6425b73100b94d78f0595fcf2ea4c7240
-EBUILD binutils-apple-6.1-r1.ebuild 12268 BLAKE2B 1add025593f872d02ae2b89d23210dd0bf9eb1e314a978a96d5c38768b5094ba92d94eedbe4c5a83bb794d01165d95edc08e43ba259cb7c20de26d905414b69f SHA512 1b6ab3f9ec1892b73ceab616b0ccc6de778ce008989bb28864943bad416dd8fa8654b01e7613cc35852df616a999f04acda4cfe3e6945ae021a9df8454894a8b
-EBUILD binutils-apple-6.3-r1.ebuild 11973 BLAKE2B daac202f8cffa7539cb88d3ae5ba42715d23134672ad42b254b94604c3f7e5a3de3b389b17bb846817495051dab3126f165fb9c983b7a67c3c32fc8a1ba08596 SHA512 1b47c66c969d91372f1e919c091548e7f3b2dae8de97afb2fc86b0e49cf5091ac935fbbebb264a362e351e3497f6816d51b046557c8530620aeba89a72872ddb
-EBUILD binutils-apple-7.0-r1.ebuild 11966 BLAKE2B 43172e08a0eb1deec7058eecf74f335c036141d1a5d5cf8153eaefe0d01ec8dad70fe274a3c6f4446476d1f20ddd34d3536aceeaffc4c21fefe2ce6aed5ec9e9 SHA512 48e7cf9eef8228e6c7968c4d82c5bf6aab3591f4920481a1704a9979d1210b0993ae54d9877c0c1fc7c4a4bfb92854feaa0a42f485bc55e4b0aea3b47c694f71
-EBUILD binutils-apple-7.0.ebuild 12071 BLAKE2B 6239a8aeeb1fa068551aa8a290521bf61dce6ce47fedaddc33391ef649f35c026d8a519c0e9591cd54b607247230f49c995196d5bce540bc8296a171b5601ca5 SHA512 e0c106f0972211f33500e5de2ba0cb48bc0119a4cf581c146ca5e7453d2ecc0102c5a1c82a835555ea87179c9eafd3d82aa078e91338a2364d0fb8c70dbb07c2
-EBUILD binutils-apple-7.1-r1.ebuild 11966 BLAKE2B 405ca28d5c4f2deb1dad8426824cdbae52507c8cfaae68a727383766b7c5afdfa11897d20d93a2d755f29a208f14494a371065028c75b0f245277f99b6ebe8cd SHA512 bc66d390a90d5ab79b80d7e3416816595e2be783dc2b597ea378b77137d2d1958f2292c755e2f2895cfb73c86118f4a200497c8e4b17a71aac66628fcae6937e
-EBUILD binutils-apple-7.1.ebuild 12071 BLAKE2B 9762eab3b287b537adf4715b78ea29bfa6125fcf9c33e4b6607cacc8fe1bf82915a5bf3ae1f4b1857c951c96fc4a014efd21b36295e2717d4bee1314077bb5ba SHA512 9f78728988f1c002751790bd4228d3540d56e1998a18b610cba0ec2a1af197f18df3ccd630ccdafb3be5ae4bed938219e420a15576b61af50d3d500ad1c9ad68
-EBUILD binutils-apple-7.2-r1.ebuild 12038 BLAKE2B e336d567573d7415f35e743a707d61cf82d451641708731ebfc38e397bc8d1e116c566d20df956f9a0b5219e7637dd14c628a20260101ab271c7905799b34882 SHA512 f45fa298c8bf1c3fdd208db195e97331f8f3e84b3d675f450a812563a96dfb49de6b369ab75e393b6ce43e9ba8d4dd47a9d860ee9dc722ed591b41e63dc1ce0a
-EBUILD binutils-apple-7.2.ebuild 12071 BLAKE2B a087e402865d31f693541c97b1d6754e410dbc0e07a6f2e862d1752c3cfb83f87e8e383ef16267dd1e4973b4d48521b0ff959c553939f46d17df595def9f30e8 SHA512 c73b4a136143bdb379e762575af1c1db057527b6d2fe05bf1e971297b0057a04fa7e75bc0fe4629030046a9d28ef1a7a664101800318704768d3038117aca219
-EBUILD binutils-apple-7.3.1.ebuild 13250 BLAKE2B ea152eaecaf778e06b0c64e5eafe1e35e296a2658d877e2bf42a0642b5f2fadfe665dabe37bd0bcffbb98156f5d47b07c840f4d24f46f317e8843a39a8dcb342 SHA512 8fd675d434a9522b3d2a0bca532ce788070ee3dc828eb0bdcb03e4d33391864846996d0c7d4432f52aae946ac0cabdd44edf9dc6ce9913aefc95ca01a2c04fd3
-EBUILD binutils-apple-7.3.ebuild 12902 BLAKE2B 02ad445c4b354fdcd3435416ad19b9f0c855de1f04c31e93771d5dcc3ef604977771e4a606b718c908d332c5792eacfc976dc63a046b3628c0fdd5b223518c2b SHA512 12dfdbf609eba1d7225cd5dbbcbe18d0355d438f94cddf7616bb21a60d780cff2a13df678784ea97c3631948d6a73c1453cc59e069e4fd6e9bcfae598ee1bb87
-EBUILD binutils-apple-8.1.ebuild 10435 BLAKE2B 5a98eb64c21ed3a9bd2bac06ba0b41cfb62aeb246b810d7678fb3af3160f5f4d6df431805b461e9e10ba3eab7f0662643433fc6a8487b7ac253dd9cf559d3ce8 SHA512 f27d9a19b2fd903cb888d64e481400d48919745c4f9b40953cd4188de25fe5d9f338735dfcfa5fc4b9d5bf20662425aa3a0f4a3b2c2de04f8faba0af5d1c044b
-EBUILD binutils-apple-8.2.1-r1.ebuild 11460 BLAKE2B 79b74e601b5b8465e0d1e9919cce0d485d360af563d9d41cd793db78ac9b0a6ee22dec7fb30975df76e3b61b36ef37fd1233dbc1e794096c401e382b58db3087 SHA512 9c4a71e8230fa241908662e65d6dbf6e906f888a5d80f6c288587d3496080215ac3679d52034254aea1fc06b31b7d618fac6dd29b6018d22c770132fd9953a8c
-EBUILD binutils-apple-8.2.1.ebuild 10435 BLAKE2B a93d9108e2b39ac26147a21dacc57e01f1c8eaee11f130c0278901a87025d03fcadc65e1d82837384bac87d3070030f494979ed0e2f3ba499dff0908a7f40d65 SHA512 92b8176fb8ad383833a25c6b49e57a8bd41b3a9615fb4bd84d32ce1a00f269410f6e2306b2664f713f4ec399288d383a9e5358718257fce2da6574652f41ab0d
+EBUILD binutils-apple-3.2.ebuild 5886 BLAKE2B c0b0a03ebb27b384f86cd85bf6c0ad0c572c62bad2ceb6d3f1acab9d846b5831491d2b0a1e9b804ebdb19c3e23dcd8f54d12ac295937227ad8a7042aee0e34e6 SHA512 7c05c3070e108bf58427daf26e7e2c709babc8c1393f48bef4a590bf323cbbdac7637e1543797796a12f40bba5ca7587d131003ef6dc05d4252998be704782c5
+EBUILD binutils-apple-4.3-r2.ebuild 10304 BLAKE2B 851d53617c780d5c472c693fbc8651cf7d976d071a1a47cce0ce867898d9cd38be3e221426717eb12da1f77fa41926c5fab7a09112f3b350c54313255879a510 SHA512 4efbb4a108d1e8bd67360cff47bc0a5aa36af7fb84ff42bafd0ffbb1e97337939454b05e46345ca25ca2d0243fad825e07a0a6d8356bdc7a193f101cc1b52335
+EBUILD binutils-apple-5.1-r1.ebuild 12200 BLAKE2B 18430125ede7c5b78ff0d371f2738159904c60a94ebe2b0ea60cff711af0c256526eb947b950fd8ec63753e8d417d6a8011b23995cd7d277603cdf688dc41786 SHA512 22277d1c8b67ac500cea2afed290cb61f9ce5d42a1b16eeaad33c5bd6014ea75d85870bf179968db619998ccb73b2374f4ce9fb6c721edf3f035c6239ee2667a
+EBUILD binutils-apple-6.1-r1.ebuild 12274 BLAKE2B b87b0d76d2f8e63b594abaa70a0814e27dac81be77adb39d33d50b98820111fd87aeddf74e271889e608c733ab0b1dd192883d84bf613ca141717c2877591d35 SHA512 137ecc2c62f9c75a7efa5679b77e0c1b53f7754fd7b62b4e889f40079212fb3e3ad716fc6b1afd399920592fc05784f446612ad3f5bed6396d37ac2ecf67a3b4
+EBUILD binutils-apple-6.3-r1.ebuild 11979 BLAKE2B 5f7ff009dab528ec410bc994edb6497237492270558194739a199ae260a6b04f3bd8579874b56efe8dc0580f3c65c2abd10a9baacc55acea4dc86fd8d54e6349 SHA512 494027affde8f647f254c10e37a9adcfcedaa22c7a6cc313668d154715ae2650d6cbafc0310fdbaf480051f8cca4cf0a37855c77321ebafcf9fa55ad547c1ba5
+EBUILD binutils-apple-7.0-r1.ebuild 11968 BLAKE2B 3d870676eeb7c76a4f9bc74dbc005b64301e3ba7dba9693311568786544583830f9486f47f8a031787f306a78b4a5e16ff96f6684214dc8e92d77b948940bfb1 SHA512 c93795ae16998995c14efa20b3402fd5eee01b9f5b27f34f392601f0a4031a4ccb9107564dbeca82d6cf76a999c55656bbefbcf7c50e21a161c7cda42370af76
+EBUILD binutils-apple-7.0.ebuild 12073 BLAKE2B fd546a63fdb10b1720b8cb3093a7572b1c060eae9660e78545392b5512925e6239a51802997b797dee386bd859be03cfac018d41792877ddb40dc5b295dc9e50 SHA512 7b09c2625a3e0e457dbcad752a4b1b034ff78bd02e54042f44c258122a325cb7739e8b763caf741104f393c94031e824405c4e107b2756a2b27ebf0ba2f1cf0a
+EBUILD binutils-apple-7.1-r1.ebuild 11968 BLAKE2B b39b4e9871159fbee6e73509e0bc0ae3c2685eaa7b75631db0990bdea46273e896e26e6734b650af79c5f0b69b44f32f3d9a317950cb18ebb32d6bf308aba20a SHA512 f1c7f2794763af25469c3ac02dcd76d680300301c681c16b7b90ea7abd5bf946a093d5dcdffe032c0c548e8ad8c26123cddf0ce258f6875378dc85b6995a07de
+EBUILD binutils-apple-7.1.ebuild 12073 BLAKE2B 1cd6c1f24612c77a21faab5f4e59cf3dbfbaacfb05b0c3d3ff5f4c803b6a0b419e2b6f448e49e57d57d8609a24b78abebb9eeb8e3aaaba54cf75527db519a66e SHA512 5772e02328faa86817f8cc20e38ac7911ef47196067de61250e1ed2694b23bc5b59295cc07ad1dfb460505970c911398fae47eb03053ad4811a663dadbb52324
+EBUILD binutils-apple-7.2-r1.ebuild 12040 BLAKE2B c1c89cf88106ba6e8bb4ea664d5a80cabb6a1db68a6489dd90dbb29017b492e28e1a2ee7da1c5326e6f3805f819648a4ec2cab99dc328447daf96c8bd7ba8862 SHA512 ba57c7d40229c1b16336c05b46e3bb02166518b330eb20b3fbb96947d4f60edb304559d0470ea4ac39d5c615d9d65fbf94fc0fa0afd868be06db23e3d1cba1f8
+EBUILD binutils-apple-7.2.ebuild 12073 BLAKE2B eccd301e8e65a90adbda77493ca4a2a161166d6e1671078ac7ddd88964b4ffa48600fbde65b408a6608c7f19c202bb96ab6b0023614b3ea867202945b386c980 SHA512 b63edde3520cd389389fa36ae62380ab1f8b7bf147992bec953c3659fbcd0e1cd7d938fbe63e1de04f62a33a52696ef0e484f8ab989040d651da250351c1ba17
+EBUILD binutils-apple-7.3.1.ebuild 13252 BLAKE2B bdd8b989fb18c54c136b8074557861abb8f00b5c4582d84f83a836a99aefd0c5a8649a800e3d9619de920b7aa0076c3ab7079fc86508a6e9ccb91e64b4389f88 SHA512 ea5092df995588863c7211ddeb9c7c5f1b97656320f4c44b3c6a7e40d0d6f420e05576a8b60720dfc1a41aa94292b07f4cd8d98678410b7533ac73ea5c618ace
+EBUILD binutils-apple-7.3.ebuild 12904 BLAKE2B 818a0f6b8bb2ce5a52afef1b83e9e51f6335b9b051cf47f542cce5b62ca55309a35408a13f1b76cdbef3259f68db42853d32679affed77f4ea1654aab2b8f39f SHA512 f20c7186a56b178e1542d672bc8a544fef62e6a88ede224579d94c09963f8d99e8ee618881af5eb68d51d40372cd28596c9fc0ee7fb5b04e073adfae2da26e98
+EBUILD binutils-apple-8.1.ebuild 10437 BLAKE2B 3adba8f475a847b95cddf32bbf939f9848aaf71040063f5147e4e78b23bc8602eaa0669cfb13a383f563e038802c42cca657a98f0029a33f138e1007e81e31fb SHA512 77ef913cb5a0d2e98017208256e700996a0b92bb3760ff4ee330ad5844fb31ed7b46bda5b56e9d5ce5fbda56249d51c44ebe74f63cabb22f19781aaa25bbc143
+EBUILD binutils-apple-8.2.1-r1.ebuild 11464 BLAKE2B ec5cc8825e534443f8acb3ea6b8f3326dde156afd88c09a111b90a0168f562c88396eb0cd653b6499136971301d53be2b3fd24e76ba59bf8f7eaf42688a44d8c SHA512 4aa424554279b8f8800df1c952f1854970eb831f4ec9aaf98b262f068106b87c661f764be76cd720f337f89c6bb309db17eb3ea4f3628b239ca514552e71d9c4
+EBUILD binutils-apple-8.2.1.ebuild 10437 BLAKE2B 3b8a7458d7f9e7ac022f451c76d64d877b788cbe725c229ae14b39e51459caee2649ec9bf2553be0813e1a97ceef777302a5b9503e735ebae6af66442fb41f6a SHA512 5dfc4c9bae9343a13bce6508a06ddca2dd3abb0248e9aeaee4453acefabdd12c899bfa07cf4b99ea7f23ae29b05d077d35129425b583d3eeeb21084a62687827
 MISC metadata.xml 684 BLAKE2B 5cd10b7a5817bb4fe8b94ffbfa422e43c0f50c2d7d6db881ab82b4741f24548560fb07c6f4b1bf8164ee80ec7052147f7f5158640e4c9fa94b950871148491f2 SHA512 e588cb802b2b22ee656b9dcf45d9d372a3b306fa3574a7d859e2df9032eeeab63219a9d9b69249a5a67733dff4c484da17621f00d2b0775935f2cfa5a6f91977
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
new file mode 100644
index 000000000000..9469e8bf164b
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="test" # the test suite will test what's installed.
+
+# LD64=ld64-95.2.12 # can't compile this one, missing libunwind/* includes
+# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
+LD64=ld64-85.2.1 # from 3.1.2
+CCTOOLS=cctools-750
+LP64PATCHES=binutils-apple-LP64-patches-1
+
+DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2"
+HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
+SRC_URI="https://opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
+	https://opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${LP64PATCHES}.tar.bz2
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-3.2-r0.tar.bz2"
+
+LICENSE="APSL-2"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="sys-devel/binutils-config"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/perl-5.8.8 )"
+
+SLOT="3"
+
+S=${WORKDIR}
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+prepare_ld64() {
+	cd "${S}"/${LD64}/src
+	cp "${WORKDIR}"/Makefile . || die
+
+	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
+	sed -i \
+		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
+		ObjectDump.cpp || die
+	echo '#undef LTO_SUPPORT' > configure.h
+	echo '' > linker_opts
+	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
+
+	# clean up test suite
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	local c
+
+	# we don't have llvm
+	((++c)); rm -rf llvm-integration;
+
+	# we don't have dtrace
+	((++c)); rm -rf dtrace-static-probes-coalescing;
+	((++c)); rm -rf dtrace-static-probes;
+
+	# a file is missing
+	((++c)); rm -rf eh-coalescing-r
+
+	# we don't do universal binaries
+	((++c)); rm -rf blank-stubs;
+
+	# looks like a problem with apple's result-filter.pl
+	((++c)); rm -rf implicit-common3;
+	((++c)); rm -rf order_file-ans;
+
+	# TODO no idea what goes wrong here
+	((++c)); rm -rf dwarf-debug-notes;
+
+	elog "Deleted $c tests that were bound to fail"
+}
+
+src_prepare() {
+	prepare_ld64
+
+	cd "${S}"/${CCTOOLS}
+	epatch "${WORKDIR}"/${PN}-3.1.1-as.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-as-dir.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-ranlib.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-libtool-ranlib.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-nmedit.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-no-headers.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-no-oss-dir.patch
+	epatch "${WORKDIR}"/${P}-armv7-defines.patch
+
+	cd "${S}"/${LD64}
+	epatch "${WORKDIR}"/${PN}-3.1.1-testsuite.patch
+	epatch "${WORKDIR}"/LP64/ld64/*.patch
+
+	cd "${S}"
+	ebegin "cleaning Makefiles from unwanted CFLAGS"
+	find . -name "Makefile" -print0 | xargs -0 sed \
+		-i \
+		-e 's/ -g / /g' \
+		-e 's/^OFLAG =.*$/OFLAG =/' \
+		-e 's/install -c -s/install/g'
+	eend $?
+
+	# -pg is used and the two are incompatible
+	filter-flags -fomit-frame-pointer
+
+	eapply_user
+}
+
+src_configure() {
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+}
+
+compile_ld64() {
+	cd "${S}"/${LD64}/src
+	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
+	# but not on tiger.
+	[[ ${CHOST} == *-apple-darwin8 ]] && \
+		append-flags -isystem "${S}"/${CCTOOLS}/include/
+	emake || die "emake failed for ld64"
+	use test && emake build_test
+}
+
+compile_cctools() {
+	cd "${S}"/${CCTOOLS}
+	emake \
+		LTO= \
+		TRIE= \
+		EFITOOLS= \
+		COMMON_SUBDIRS='libstuff ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		|| die "emake failed for the cctools"
+	cd "${S}"/${CCTOOLS}/as
+	emake \
+		BUILD_OBSOLETE_ARCH= \
+		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
+		|| die "emake failed for as"
+}
+
+src_compile() {
+	tc-export CC CXX
+	compile_cctools
+	compile_ld64
+}
+
+install_ld64() {
+	exeinto ${BINPATH}
+	doexe "${S}"/${LD64}/src/{ld64,rebase}
+	dosym ld64 ${BINPATH}/ld
+	insinto ${DATAPATH}/man/man1
+	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
+}
+
+install_cctools() {
+	cd "${S}"/${CCTOOLS}
+	emake install_all_but_headers \
+		EFITOOLS= \
+		COMMON_SUBDIRS='ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		DSTROOT=\"${D}\" \
+		BINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
+	cd "${S}"/${CCTOOLS}/as
+	emake install \
+		BUILD_OBSOLETE_ARCH= \
+		DSTROOT=\"${D}\" \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
+
+	cd "${ED}"${BINPATH}
+	insinto ${DATAPATH}/man/man1
+	local skips manpage
+	# ar brings an up-to-date manpage with it
+	skips=( ar )
+	for bin in *; do
+		for skip in ${skips[@]}; do
+			if [[ ${bin} == ${skip} ]]; then
+				continue 2;
+			fi
+		done
+		manpage=${S}/${CCTOOLS}/man/${bin}.1
+		if [[ -f "${manpage}" ]]; then
+			doins "${manpage}"
+		fi
+	done
+	insinto ${DATAPATH}/man/man5
+	doins "${S}"/${CCTOOLS}/man/*.5
+}
+
+src_test() {
+	einfo "Running unit tests"
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	# need host arch, since GNU arch doesn't do what Apple's does
+	tc-export CC CXX
+	perl ../bin/make-recursive.pl \
+		ARCH="$(/usr/bin/arch)" \
+		RELEASEDIR="${S}"/${LD64}/src \
+		| perl ../bin/result-filter.pl
+}
+
+src_install() {
+	install_ld64
+	install_cctools
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-${PV}
+}
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 5131c4f35b99..021608d46827 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,10 +26,10 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test multitarget"
 
 RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )"
+	lto? ( sys-devel/llvm:* )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
 
 SLOT="4"
 
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 507c8b54be16..4920826c0166 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,12 +25,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
+	lto? ( sys-devel/llvm:* )
 	libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-	libcxx? ( sys-devel/llvm )"
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+	libcxx? ( sys-devel/llvm:* )"
 
 SLOT="5"
 
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 984b31319824..bd3202442311 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,12 +26,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
+	lto? ( sys-devel/llvm:* )
 	libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-	libcxx? ( sys-devel/llvm )"
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+	libcxx? ( sys-devel/llvm:* )"
 
 SLOT="6"
 
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
index 371c6a2b6c6b..5835b8852a09 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,12 +27,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lto test libcxx multitarget"
 
 RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
+	lto? ( sys-devel/llvm:* )
 	libcxx? ( sys-libs/libcxx )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
-	libcxx? ( sys-devel/llvm )"
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+	libcxx? ( sys-devel/llvm:* )"
 
 SLOT="6"
 
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 2eab5e95aabf..039399257b2a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index c81eb3fe54e0..805b4d51e50a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	app-arch/xar
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
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 6b57a7444fd8..6ee67d9bd04f 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 9dfebf05d008..ed6be55fb9a3 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	app-arch/xar
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
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 e5de0f0f7867..8cae70ffc663 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,7 +34,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index 0f608625bcae..4f76f80df25a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
 # indirectly makes xar a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	app-arch/xar
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
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 e56d422a78c8..1fc16db7730a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index 26f629c41ee5..853dba37052f 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
 # -Wa,-Q but since it's default we make llvm a static runtime dependency.
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
index d5ad6ab38a98..32405f72fca1 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
 	tapi? ( sys-libs/tapi )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
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 bf8351a7b24b..781aff39edf2 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,7 +31,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
 	tapi? ( sys-libs/tapi )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
@@ -200,7 +200,7 @@ compile_ld64() {
 		LTO_INCDIR=${LLVM_INCDIR} \
 		LTO_LIBDIR=${LLVM_LIBDIR} \
 		TAPI=$(use tapi && echo 1 || echo 0) \
-		TAPI_LIBDIR=${EPREFIX}/usr/lib \
+		TAPI_LIBDIR="${EPREFIX}"/usr/lib \
 		|| die "emake failed for ld64"
 	use test && emake build_test
 }
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
index 9cf67823890a..11fae8119966 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
 RDEPEND="sys-devel/binutils-config
 	lto? ( app-arch/xar )
 	tapi? ( sys-libs/tapi )
-	sys-devel/llvm
+	sys-devel/llvm:*
 	sys-libs/libcxx"
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"