Cleanup old versions

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

12 files changed, 15 insertions, 1848 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 2d851f11016d..cd8c3e228d56 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.31 2012/03/05 11:47:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.32 2012/06/12 17:34:33 grobian Exp $
+
+  12 Jun 2012; Fabian Groffen <grobian@gentoo.org> -binutils-apple-3.1.1.ebuild,
+  -binutils-apple-3.2-r1.ebuild, -binutils-apple-3.2.2.ebuild,
+  -binutils-apple-3.2.3-r1.ebuild, -binutils-apple-3.2.3-r2.ebuild,
+  -binutils-apple-3.2.ebuild, -binutils-apple-4.1.ebuild,
+  -files/binutils-apple-3.2-armv7-defines.patch,
+  -files/binutils-apple-3.2-ld64-Makefile,
+  -files/binutils-apple-3.2.3-as-dir.patch:
+  Cleanup old versions
 
   05 Mar 2012; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.3.ebuild:
   Remove PowerPC tweaks, Apple removed entire PowerPC support from ld in
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index aa0d053296e5..89d23bb92267 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -12,10 +12,7 @@ AUX binutils-apple-3.1.1-no-oss-dir.patch 654 RMD160 29d59f2759936a9ae43b9db04dc
 AUX binutils-apple-3.1.1-ranlib.patch 2108 RMD160 f7e501cf5aa1bf53e8171d77a1c0946566672c6c SHA1 3e6e43b5e55c3877361c19123263d0f12b0d7aa2 SHA256 bb30d92834c4b1e9faf98fe529ab4624b26e2a26aecee256ed6f1b588ed00129
 AUX binutils-apple-3.1.1-testsuite.patch 3951 RMD160 60763dc51f0bc28b8df43ae8b794af4a473a1598 SHA1 36405e9a154dbc053a8c20af7df6f10f45711cca SHA256 7fdaaf23d642bea0817e664925a4f362cec8f1ce7fdf81fc70f246956ab9a4d3
 AUX binutils-apple-3.1.2-as-Makefile.patch 308 RMD160 043f9f5fc0eeedd7c1f61520ba39d943b827e573 SHA1 dfe1c9d8078aeb28f20737610fc71487fb4f23ae SHA256 032256cbc31d7097f1af351b5ec6aebc7663c715bbc44efa131e54081ec28d8b
-AUX binutils-apple-3.2-armv7-defines.patch 321 RMD160 f6aa6230d53de02c1c60e127bec188e748502157 SHA1 4f83bf45ee90d727e83a326d1218786bff4b80a8 SHA256 1c7fb1938bc8d906af861ff4cc430ebee860162d0de28ca4ebb57d67ff62074f
-AUX binutils-apple-3.2-ld64-Makefile 760 RMD160 da9f2930915d75d51bab3a58417a3ddc59a24bc4 SHA1 f4e0735ed11f3b277d88cf5300efab9e4ac03dda SHA256 990d24770f2e9ef985ad0f8d9f56c0fb1a0798b102418d29810918447a5ec92e
 AUX binutils-apple-3.2.2-as.patch 2777 RMD160 b94adf36e78c3b43998a063c035979195296ac86 SHA1 eb1be8fbaee452aaa97dd78d2ef7b6eb46eb1274 SHA256 99692bb424bd21d6772c5a81239ecb5babc3b6d6f18a8c7a43e424acb92676d4
-AUX binutils-apple-3.2.3-as-dir.patch 1532 RMD160 501c32713235aa7301abca9e6282be277bda415d SHA1 67d2d059562edb55802a8f08485dbc4c0dafb377 SHA256 f2362bf0b6a8dcb0fb533e4db6ab238c6864bd0794051a8331cfef2ea2c57807
 AUX binutils-apple-3.2.3-ranlib.patch 2866 RMD160 3e9c64eea5676b872cbf60268ecb479a7142124d SHA1 bc91dc48fbdb8f076912641b8726c01dfb91c693 SHA256 f14e19ab699a15b7c167cddd56de22a88863599b1ea01c53fd8476aa64697245
 AUX binutils-apple-4.0-as-dir.patch 1458 RMD160 b409d3cc62cdeb5a66af2c0939423066c288c07d SHA1 abcfbee6b4470786aa4e3aa30b951c3277a52c4b SHA256 b33439299340b311ef606e11427a7ded25b75e1d35791bb50d7815f4f87b6abc
 AUX binutils-apple-4.0-as.patch 2738 RMD160 f7601fc41f373f8e7ef122d059dd04ca42d400af SHA1 fb5f02cf3ead339c0e1723f89e996615f3c15d2f SHA256 b068f2a8bff9fb8f7dd92eb64c9587c9517ef51e682211f81b57e69b7e25fdef
@@ -32,49 +29,29 @@ AUX ld64-128.2-Makefile 1479 RMD160 5bdca17641c4d60fb68202015ac42e3193de9f1d SHA
 AUX ld64-95.2.12-Makefile 728 RMD160 56104bcb07a3845b11cf9034f1051c0ceebf681d SHA1 7549a604ea69ad1ad93b92511a70634033cdbab8 SHA256 3e1181c3dc7aaa8cb5d02cc00fc0f760d052bb2714883833a5aaa2fa3105f88d
 AUX ld64-95.2.12-darwin8-no-mlong-branch-warning.patch 620 RMD160 cf17f65dda73393a921896b8844493b237dc3307 SHA1 b834e98d61a9ecd70aa99b89b5575a8e32b5b2f7 SHA256 ca0455c78e77f84e7d15e6edf19085b0729a12baf29a89455af84e947f201b1d
 AUX libunwind-30-Makefile 580 RMD160 2f4d35afd951e6f4543c16ac23eb9a669abfb906 SHA1 11e1d46fb95f87819b0877ceff0ee743fbc8eb82 SHA256 eb080881fc223a326fd08ac65da05c4d939a553a95ca978794caeeafa7780a0e
-DIST binutils-apple-3.2-unwind-patches-2.tar.xz 23888 RMD160 2d677f7a3f74aaec20f1e999283dd023d1873b54 SHA1 e1b74657fa3f3a0cf479bf7e03d8aceb2295a985 SHA256 2859c3545c467f516bac0704ff97a8d18766d91faa28dfad1dcc07bfbd03919d
-DIST binutils-apple-3.2-unwind-patches-3.tar.xz 23908 RMD160 087a2fdb12b6e4bc23379ebee6f5c6ddc1aabc04 SHA1 9fb923c01056e3ce48b8a85799555335993871b3 SHA256 b3082b464cf8fdc4b1f8fd2a73b5b7580c524cdde09869b82b770e62168b6939
 DIST binutils-apple-3.2-unwind-patches-5.tar.xz 26924 RMD160 462614cf36d5fd67630126e28592d106367cca72 SHA1 30d4155ee643a3dbd0d4bb5f79a6de307d4f1a29 SHA256 65a3b979df5c2033ac34e830d8a77b92b436b6d5707483c619c90a1c2ea46428
-DIST binutils-apple-LP64-patches-1.tar.bz2 10235 RMD160 754e956a9b8b9ecdf1bde5115bad0eb85545292e SHA1 e863f222e2f3eb5134de661987c7e5b58abaa710 SHA256 a107459f3914d57524e51ec4cb5e800f6715d40003514c79add0b5b4521cf809
 DIST cctools-698.1.tar.gz 2318018 RMD160 898c7b46869d4989c115420912fdd8d96ae923d3 SHA1 11cb788151365fb365f7bf4a9083c3fcc6fa88f7 SHA256 383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-DIST cctools-698.tar.gz 2318613 RMD160 6e044c684936172d048e0790d087bb96e47ecb20 SHA1 9016e64d064b99e16ad71c79f2337dd0fc281b1b SHA256 c7a02ebab31fb3ecc18299e85620913ea3729750114d01a50f6e404ff405dc71
-DIST cctools-750.tar.gz 1947953 RMD160 4b4074a93d071fc56f5b9ebd972c6a175bb9904e SHA1 20dd28b6e41e6ca367a6f457f6b465a0e4fbae3c SHA256 188855640da114e37e4ddd4824ff6cdc1ea89dfb6c90a23905c9ca315342f356
-DIST cctools-773.tar.gz 1962238 RMD160 3ea1b348c878efebc1d1ba9d50a89840c272aafd SHA1 762318baef6f4efca75a066d8265e0cddee267e1 SHA256 293729884921bc9c05fcbe8ef9c2b1166a7ff92cfd5bdb30349b483e78464f98
-DIST cctools-782.tar.gz 1981521 RMD160 5b50b75ff7825a97fa4f095d135a6372ce787c10 SHA1 1ed1e38564fc00dc2825382ca5c856403b5eeba3 SHA256 fdf0f60adfab24dd87af9e91c364743e006a241d297ee3cbba7b628fda6d7a9c
 DIST cctools-795.tar.gz 1993795 RMD160 0932fa5a96b81e50528211abfec01a9b66790485 SHA1 e4b67b6dac2173a519a57c92ef7be5bf3013417f SHA256 7fab7044b648e92a9fefd493a1bb6daa4246f24c5838d8b5c913a446e6bbd2ef
-DIST cctools-806.tar.gz 2004935 RMD160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 SHA1 e4f9a7ee0eef930e81d50b6b7300b8ddc1c7b341 SHA256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
 DIST cctools-809.tar.gz 2014410 RMD160 f433124035ac0ef403bdc6edec087bdedd0b4375 SHA1 b7bff424c86420866543379effb5b70d4404b95b SHA256 03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
 DIST cctools-822.tar.gz 2024412 RMD160 1caf207acbf421cdc975926a392fc75dc1d2594c SHA1 bd04447522aa69c1f71ab01811ac46dca23b92b7 SHA256 dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
 DIST dyld-195.5.tar.gz 411615 RMD160 7f36612730f7fde53359314b899efe493378a086 SHA1 97b68163281a3ec82ab2e2a777bea08511c95976 SHA256 2cf0484c87cf79b606b351a7055a247dae84093ae92c747a74e0cde2c8c8f83c
 DIST dyld-195.6.tar.gz 412518 RMD160 440c49f641e45a7bce459aaea2c4fe0dd0385351 SHA1 1fb2d94f2902975e572d2a0b22d8bd1d1a1ac6d8 SHA256 69296e9b4192bdac778ea899fffc18b02be62b51b5e8474b4cf85ae5f2b08aa4
-DIST ld64-123.2.1.tar.gz 452872 RMD160 8ebca37c8e6b5fa02c43afe419bef12ca8330898 SHA1 0664f9dc2f7e3532444ccaeee118728b2be7fbbf SHA256 8d9d92288375f81ca2c91b74ed1d4206a5bbcbd463ccec1e85decdcdc2f0ca1a
 DIST ld64-127.2.tar.gz 496975 RMD160 8ee709341549a1944732daef6ebab7ef1acfcc6e SHA1 df51258a75e4c5f0df185b99f74f7232d310f45e SHA256 97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
 DIST ld64-128.2.tar.gz 494361 RMD160 0da68b89669233d7b6cc6ebdb92482e191bc9051 SHA1 b908f84a6914de04923e0ab1c7e6eead2e24154c SHA256 96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
 DIST ld64-85.2.1.tar.gz 598524 RMD160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 SHA1 31a7debf4c407c32b8bd1a51a4b4a7ae68dc8b85 SHA256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
-DIST ld64-85.2.2.tar.gz 298144 RMD160 f7f897666a072e07f1888beca5b22fdd75fa1b61 SHA1 33c655bd7cbfecd70807dbde428615fb0947f31b SHA256 01ab6f6f1ce91203722c5cd56666ffa81da0eafe8beee1490a383811d56d86aa
-DIST ld64-95.2.12.tar.gz 401104 RMD160 35de89aa1d31d100bd952829df4316e640c03cb4 SHA1 eea384a5ed3b5a994cc24e076c74ad20e6f8b68a SHA256 5a5ea02bd81d74f4f773403bebe34950acf4830fb7fee0d466305276f869097c
-DIST ld64-97.14.tar.gz 421074 RMD160 5116cc587a7761d06e1da93019362705510c3d7b SHA1 a21da97f574a121ef29b8a1bfc7a7c74692a0152 SHA256 bfc46df452fc60d9befcefabac8db444d963407af4e3a060a01e394d5ee8d2b4
 DIST ld64-97.17.tar.gz 421947 RMD160 d52df7d7f741c8bedd29cbac73dbb9db992b4795 SHA1 7c1d816c2fec02e558f4a528d16d8161f0e379b5 SHA256 02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089
-DIST ld64-97.2.tar.gz 415630 RMD160 e5557db2809627a9a0771c949b42e15c23eb65ba SHA1 3db816678f96db0dc1936af0ceb5c58b049648d6 SHA256 3a94376586656192e16a09c7b82e2a70f0a441fc8cb2ccf8a835a050e82866da
 DIST libunwind-30.tar.gz 82811 RMD160 3e288379a63a78b566df7d185b0677f214b37e56 SHA1 e779fbe8a58e6cfb76798c8e9b2373a9ddc9b2eb SHA256 6ac97d18cc2b05e6de1269bf5af03b81948bd2200dae827527f3dc618b82bd41
 DIST libunwind-llvm-115426.tar.bz2 74622 RMD160 fa69073d23e71c1a5977b3cf4b5b086190079716 SHA1 4a0b371da27361f62380250d2c4a176d939554c4 SHA256 e77a42c04eda5e3db61fc8b5bc98a55c6a015a9b02a74aab0f35d551fc38272f
-EBUILD binutils-apple-3.1.1.ebuild 5157 RMD160 692fc010932d7ddbf51b3fd63f1f79742cdfcff3 SHA1 5c82eb1ce460f94cc4328327ad5c141463a3953a SHA256 c8f9904789faea57409863af02683e6eae36377925fcf4e7a9dd44dab9c7e6ac
 EBUILD binutils-apple-3.1.2.ebuild 5288 RMD160 bbe9a2371e5e1e66b0c9fa2f4ca600bb2474d234 SHA1 5d21c2ac4c555ec8d997efe9d5ae0233b2fa17cb SHA256 0818f10ee517368085e4bacfd53f25ab81115f05b480fb716c6b70b7ebc59bdd
-EBUILD binutils-apple-3.2-r1.ebuild 6228 RMD160 fdd810e43d987bebc9c938beb12ac204667f0cbe SHA1 489c9b0f50541e29f6dc60de68aa3ee21c1c538b SHA256 26c29b4bf9584053e42a6a3d197afc0a21f95413bf6bccf86cb21f4e08c3bcaa
-EBUILD binutils-apple-3.2.2.ebuild 6202 RMD160 73621094f924415c7669361fde13cc9911ccd56c SHA1 fade93e2da454f2c1f5f9166fbdfbd186efee932 SHA256 c26d98fd40daf363671147acfa554992310b3cda657242a880f2c026f05dac5f
-EBUILD binutils-apple-3.2.3-r1.ebuild 6521 RMD160 6bd22707129894fc03f8949c79c1b02adb471680 SHA1 f1b1ef2114135646591c0d566bc0b69063f5e8c3 SHA256 bf10cfbacb2e16227ffba16e0509df7ed678aba1aebedee621ac12b6d5491ddb
-EBUILD binutils-apple-3.2.3-r2.ebuild 6669 RMD160 8a32c0be4ec8a6e8c89f5c2155fb172ebc4565e4 SHA1 9c495edc134edf36478897a7950510e7b57f92fe SHA256 17b6d484e33a20939d00a6bf496fe6aefa2920d21c4fbb6bbf359e853f754f7f
 EBUILD binutils-apple-3.2.6.ebuild 6670 RMD160 1a7df67ed733c1a22aca1414e7a2b3f1c1597d9c SHA1 6e5b37a6c5c63c87999f5dd67526cfd8936f44e8 SHA256 241af9c47b9165234672ee61466d4ba21af689cec6ab5e7f606d1f60355b30b8
-EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-EBUILD binutils-apple-4.1.ebuild 7849 RMD160 abfce6b785e701c4f0ed35266af5c4e12403d386 SHA1 9fa50c02c9b2207a5bab89102e375bf6652fc951 SHA256 dc09e922f313e71791aaf0508a4a78d2772f7e0dc99330b97da3921f0dad1abc
 EBUILD binutils-apple-4.2.ebuild 8742 RMD160 20362574d6f27230c0eaad6fe76cca272526645d SHA1 75881b49e728b3ef8aab474f352f732fc7632e16 SHA256 84d20c94a8e7718cda58c89309aeb189d466df13cf2120cc446515f09ef55fa8
 EBUILD binutils-apple-4.3.ebuild 8435 RMD160 fb90f17abb6a66466b7785d9691e0dd272581ef1 SHA1 e6f60e8658bf0d288fa30e02730d14fdc7e94691 SHA256 512d36311be0e6573ce36fce42ae5453494420193de91b103d5f6b5104ffaffc
-MISC ChangeLog 9976 RMD160 d2a825a05f75fe901ef13c4a1e79d283635a5f28 SHA1 c34909a2281320abf00ca98243528da66fca93c5 SHA256 d4052aa97e7e94ebfb589689e14d9e4ade83a5d4fcfa67e31900ca6a4828e65e
+MISC ChangeLog 10406 RMD160 32241a22380a29f5131a2d66127e2bd5323e6eb5 SHA1 3cfdd9c81303377ed54f15bd72966b7bf71dd9a9 SHA256 c7ef054e0167ffa9617baaab6a789a0c06768bcbc9284fd241f0cdf8028fb188
 MISC metadata.xml 250 RMD160 1d572689c02f6408ad8dfcfc955f8dfb7ec3a201 SHA1 dbd7759df5303c9dd998023753a3361206bad1e2 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk9Up8sACgkQX3X2B8XHTolQAgCgpINzNpZZ94f/bA5dSZsZQTWW
-a0EAniAqS6GUDJJk8bBin8kflG3QjMij
-=2Bv+
+iEYEARECAAYFAk/Xfa8ACgkQX3X2B8XHTolqjwCfcPsayfYugr5ZUVB/pWs828m+
+bhwAn0O5wvOc9cfRsQJBehzP7DwwocS0
+=yn+F
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild
deleted file mode 100644
index b777dfee4c2c..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild,v 1.3 2010/03/21 19:33:06 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test mirror" # the test suite will test what's installed.
-
-LD64=ld64-85.2.2
-CCTOOLS=cctools-698
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.1.1"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-DEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-RDEPEND="${DEPEND}"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-prepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/Makefile .
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64}\\n\""
-	sed -i \
-		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
-		ObjectDump.cpp
-	echo '#undef LTO_SUPPORT' > configure.h
-	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}"
-
-	epatch "${FILESDIR}"/${P}-as.patch
-	epatch "${FILESDIR}"/${P}-as-dir.patch
-	epatch "${FILESDIR}"/${P}-ranlib.patch
-	epatch "${FILESDIR}"/${P}-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${P}-nmedit.patch
-	epatch "${FILESDIR}"/${P}-no-efi-man.patch
-	epatch "${FILESDIR}"/${P}-no-headers.patch
-	epatch "${FILESDIR}"/${P}-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-testsuite.patch
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-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
-	use test && emake build_test
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		RC_CFLAGS="${CFLAGS}"
-	cd "${S}"/${CCTOOLS}/as
-	# the errors can be ignored
-	emake -k \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-}
-
-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' \
-		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}
-
-	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() {
-	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-3.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
deleted file mode 100644
index 1f916b2556b3..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild,v 1.4 2010/05/02 14:37:45 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-LD64=ld64-95.2.12
-CCTOOLS=cctools-750
-UNWIND=binutils-apple-3.2-unwind-patches-2
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.1.1-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-armv7-defines.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/${LD64}-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == *-darwin10 ]] && \
-		epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/${LD64}-darwin8-no-mlong-branch-warning.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	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;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	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
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-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 AR
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	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}
-
-	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-3.2.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild
deleted file mode 100644
index d564ff155a42..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild,v 1.1 2010/05/18 10:42:10 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.2
-CCTOOLS=cctools-773
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-3
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == *-darwin10 ]] && \
-		epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	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;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	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
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-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 AR
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	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}
-
-	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-3.2.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild
deleted file mode 100644
index d6c86ab14de9..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild,v 1.2 2010/08/16 07:39:37 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.14
-CCTOOLS=cctools-782
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die
-	cp other/prune_trie.h include/mach-o/ || die
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-	sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	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;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	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
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	# LTO does not exist on older Macs
-	if [[ ${CHOST##-darwin} -ge 10 ]] ; then
-		append-libs LTO
-		append-flags -DLTO_SUPPORT
-	else
-		append-flags -ULTO_SUPPORT
-	fi
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		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 AR
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	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}
-
-	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-3.2.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild
deleted file mode 100644
index b8b2ed567062..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild,v 1.1 2010/11/18 19:37:05 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.14
-CCTOOLS=cctools-782
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-	cp other/prune_trie.h include/mach-o/ || die
-	# use our own copy of lto.h, which doesn't require llvm build-env
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-	if use !lto ; then
-		sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-	fi
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	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;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	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
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	if use lto ; then
-		append-flags -DLTO_SUPPORT
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
-		append-libs LTO
-	else
-		append-flags -ULTO_SUPPORT
-	fi
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= LTO= \
-		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() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	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= LTO= \
-		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}
-
-	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-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
deleted file mode 100644
index dce382dbe163..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.6 2010/03/21 19:33:06 grobian Exp $
-
-EAPI="3"
-
-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="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${LP64PATCHES}.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-DEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-RDEPEND="${DEPEND}"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-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
-
-S=${WORKDIR}
-
-prepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/Makefile .
-
-	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 "${FILESDIR}"/${PN}-3.1.1-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-armv7-defines.patch
-
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${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
-}
-
-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}
-
-	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.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
deleted file mode 100644
index 3809d3ef0420..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.6 2011/11/05 16:37:23 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-123.2.1
-CCTOOLS=cctools-806
-LIBUNWIND=libunwind-30
-DYLD=dyld-195.5
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz
-	http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-4"
-else
-	SLOT="4"
-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
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${LIBUNWIND}/src
-	cp "${FILESDIR}"/${LIBUNWIND}-Makefile Makefile
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/${LD64%.1}-Makefile Makefile
-	epatch "${FILESDIR}"/${LD64}-lto.patch
-
-	ln -s ../../${CCTOOLS}/include
-	cp other/prune_trie.h include/mach-o/ || die
-	# use our own copy of lto.h, which doesn't require llvm build-env
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/ld64-97.14-llvm-lto.h include/llvm-c/lto.h || die
-	# make libunwind sources known
-	ln -s ../../${LIBUNWIND}/src libunwind || die
-	cp ../../${LIBUNWIND}/include/*.h include/ || die
-	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
-		{
-			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
-			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
-		} > include/Availability.h
-	fi
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${FILESDIR}"/${LD64%.1}-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${FILESDIR}"/${LD64%.1}-darwin8-no-mlong-branch-warning.patch
-		sed -i -e '/#include <mach-o\/loader.h>/a\#include <mach/i386/thread_status.h>' \
-			ld/HeaderAndLoadCommands.hpp || die
-	fi
-	if use !lto ; then
-		sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-4.0-as.patch
-	epatch "${FILESDIR}"/${PN}-4.0-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-#	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	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;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	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
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	if use lto ; then
-		append-flags -DLTO_SUPPORT
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
-		append-libs LTO
-		LTO=1
-	else
-		append-flags -ULTO_SUPPORT
-		LTO=0
-	fi
-	append-flags -DNDEBUG
-	append-flags -I${WORKDIR}/libunwind/include
-}
-
-compile_libunwind() {
-	# not used, just for testing, and possible use in the future
-	einfo "building ${LIBUNWIND}"
-	cd "${S}"/${LIBUNWIND}/src
-	emake DYLDINCS=-I../../${DYLD}/include || die
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake \
-		LTO=${LTO} \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} -I../../${DYLD}/include" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= LTO= \
-		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() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	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= LTO= \
-		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/files/binutils-apple-3.2-armv7-defines.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch
deleted file mode 100644
index d89a0c19f2c6..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cctools/include/mach/machine.h
-+++ cctools/include/mach/machine.h
-@@ -306,6 +306,7 @@
- #define CPU_SUBTYPE_ARM_V6		((cpu_subtype_t) 6)
- #define CPU_SUBTYPE_ARM_V5TEJ		((cpu_subtype_t) 7)
- #define CPU_SUBTYPE_ARM_XSCALE		((cpu_subtype_t) 8)
-+#define CPU_SUBTYPE_ARM_V7			((cpu_subtype_t) 9)
- 
- /*
-  *	MC88000 subtypes
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile b/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile
deleted file mode 100644
index 976299a1d430..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-AR = ar
-CXX = g++
-INCS = -Iinclude -Isrc/abstraction -Isrc/ld
-CXXFLAGS = $(INCS)
-LDFLAGS = 
-
-all: machocheck rebase unwinddump dyldinfo ObjectDump ld
-
-libprunetrie.a: src/other/PruneTrie.o src/other/prune_trie.h
-	$(AR) -r -c libprunetrie.a src/other/PruneTrie.o
-
-ld: libprunetrie.a src/ld/ld.o src/ld/Options.o src/ld/debugline.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-rebase: src/other/rebase.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-dyldinfo: src/other/dyldinfo.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-unwinddump: src/other/unwinddump.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-ObjectDump: src/other/ObjectDump.o src/ld/debugline.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-machocheck: src/other/machochecker.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
deleted file mode 100644
index a13ace81b550..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-handles the libexecdir for as and other fixes
-
---- cctools-698/as/driver.c
-+++ cctools-698/as/driver.c
-@@ -27,6 +27,9 @@
- char **envp)
- {
-     const char *LIB =
-+#ifdef ASLIBEXECDIR
-+      ASLIBEXECDIR;
-+#else
- #if defined(__OPENSTEP__) || defined(__HERA__) || \
-     defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__)
- 		    "/usr/libexec/";
-@@ -40,6 +42,7 @@
- #else
- 		    "/usr/local/libexec/gcc/darwin/";
- #endif
-+#endif
-     const char *AS = "/as";
- 
-     int i;
-@@ -170,7 +170,11 @@
- 	    }
- 
- 	}
-+#ifndef ASLIBEXECDIR
-	as = makestr(prefix, LIB, arch_name, AS, NULL);
-+#else
-+	as = makestr(LIB, arch_name, AS, NULL);
-+#endif
- 
- 	/*
- 	 * If this assembler exist try to run it else print an error message.
-@@ -182,6 +182,10 @@
- 	    else
- 		exit(1);
- 	}
-+#ifdef ASLIBEXECDIR
-+    as_local = "";
-+	{
-+#else
- 	as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL);
- 	if(access(as_local, F_OK) == 0){
- 	    argv[0] = as_local;
-@@ -193,6 +198,7 @@
- 		exit(1);
- 	}
- 	else{
-+#endif
- 	    printf("%s: assembler (%s or %s) for architecture %s not "
- 		   "installed\n", progname, as, as_local, arch_name);
- 	    arch_flags = get_arch_flags();
-@@ -183,6 +190,7 @@
- 		    printf("%s for architecture %s\n", as, arch_flags[i].name);
- 		    count++;
- 		}
-+#ifndef ASLIBEXECDIR
- 		else{
- 		    as_local = makestr(LOCALLIB, arch_flags[i].name, AS, NULL);
- 		    if(access(as_local, F_OK) == 0){
-@@ -193,6 +201,7 @@
- 			count++;
- 		    }
- 		}
-+#endif
- 	    }
- 	    if(count == 0)
- 		printf("%s: no assemblers installed\n", progname);