Remove lots of cruft, like ghc-6.4.1, ia64 hacks. Make 6.2.2 work again.

Package-Manager: portage-2.1.2.9

16 files changed, 215 insertions, 930 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 667efd79fa5d..2331ce8a6a60 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.124 2007/07/08 16:21:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.125 2007/07/10 17:16:49 dcoutts Exp $
+
+  10 Jul 2007; Duncan Coutts <dcoutts@gentoo.org>
+  -files/ghc-6.2.hardened.patch, -files/ghc-6.4.1-configure.patch,
+  -files/ghc-6.4.1-gcc41.patch, -files/ghc-6.4.1-openal.patch,
+  files/ghc-6.5-norelax.patch, files/ghc-updater, ghc-6.2.2.ebuild,
+  -ghc-6.4.1-r2.ebuild, -ghc-6.4.1-r3.ebuild, ghc-6.4.2.ebuild,
+  ghc-6.6.ebuild, ghc-6.6.1.ebuild:
+  Remove ghc-6.4.1. Now that we have 6.4.2, we don't need an older version
+  on the 6.4.x branch. Remove old ia64 hacks that are no longer necessary.
+  Make the ghc-6.2.2 ebuild work again by taking many of the improvements
+  from the 6.4.2 ebuild.
+
+  09 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> ghc-6.6.1.ebuild:
+  Oops, alpha doesnt have a binary yet, so cant mark ~alpha yet.
 
   08 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> ghc-6.6.1.ebuild:
   Bump dep on cabal and no longer hide ghc's built-in cabal.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 8969f3a62268..da67a2a2f03f 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -9,22 +9,6 @@ AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900ab
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depsort.py 1958
 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d files/depsort.py 1958
-AUX ghc-6.2.hardened.patch 525 RMD160 499210730c5b7578f1fe371b9304db65b00f59cc SHA1 e3bd39bbb3d99ee90231171a255847e5734818f3 SHA256 ed4c94ceb8e4749bd4d37a1542f5958175f0972b93a7137c5541698007b93d26
-MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
-RMD160 499210730c5b7578f1fe371b9304db65b00f59cc files/ghc-6.2.hardened.patch 525
-SHA256 ed4c94ceb8e4749bd4d37a1542f5958175f0972b93a7137c5541698007b93d26 files/ghc-6.2.hardened.patch 525
-AUX ghc-6.4.1-configure.patch 2666 RMD160 26568ec35d05a3855ad8cf10593d15ccaedee847 SHA1 fa85ae68645d95f30e8052018fe1e82b763b9c25 SHA256 7519b2fa9a9faf4c3545ed471803f85bc102b2428eb9c53ea15ae457271d28b9
-MD5 e522470e9d323932951f9efdb3fbf7e8 files/ghc-6.4.1-configure.patch 2666
-RMD160 26568ec35d05a3855ad8cf10593d15ccaedee847 files/ghc-6.4.1-configure.patch 2666
-SHA256 7519b2fa9a9faf4c3545ed471803f85bc102b2428eb9c53ea15ae457271d28b9 files/ghc-6.4.1-configure.patch 2666
-AUX ghc-6.4.1-gcc41.patch 1449 RMD160 dacc32425df3af36a77763f9a22c809c134ba157 SHA1 9c36db4ebff43d648a746898a4c16bbd60f45abc SHA256 243304ce6b553c46113b7cf84db2077933af214dc92a8959ec0bef06e6fb49c1
-MD5 60b4661916823941a6e1f17e8c6eaf11 files/ghc-6.4.1-gcc41.patch 1449
-RMD160 dacc32425df3af36a77763f9a22c809c134ba157 files/ghc-6.4.1-gcc41.patch 1449
-SHA256 243304ce6b553c46113b7cf84db2077933af214dc92a8959ec0bef06e6fb49c1 files/ghc-6.4.1-gcc41.patch 1449
-AUX ghc-6.4.1-openal.patch 1270 RMD160 fa7b57dc78cc36c9d74e55bc4873e6efc321f353 SHA1 e4e11d6ec44738caa8544867304f32461a2a6df5 SHA256 fe6db1cf73571bca4af195321112985201e695cf67ed889cf626e5dc2b54b67e
-MD5 f55d9cead45de0979d9650dccde5e168 files/ghc-6.4.1-openal.patch 1270
-RMD160 fa7b57dc78cc36c9d74e55bc4873e6efc321f353 files/ghc-6.4.1-openal.patch 1270
-SHA256 fe6db1cf73571bca4af195321112985201e695cf67ed889cf626e5dc2b54b67e files/ghc-6.4.1-openal.patch 1270
 AUX ghc-6.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096ea8e SHA1 40d25c25a3cd6a228f3757b8e298fd8c72710544 SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44
 MD5 bb39f157030944685ae41d24622a2cb3 files/ghc-6.4.2-sparc32plus.patch 526
 RMD160 970d062362284659c2570394c8f9328d8096ea8e files/ghc-6.4.2-sparc32plus.patch 526
@@ -33,20 +17,19 @@ AUX ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1
 MD5 c42b26cfaf5469b236c345e1614370cc files/ghc-6.4.2-sparcmangler.patch 837
 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 files/ghc-6.4.2-sparcmangler.patch 837
 SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af files/ghc-6.4.2-sparcmangler.patch 837
-AUX ghc-6.5-norelax.patch 578 RMD160 f41d1b9f93cff339fac01660bfeed5d2aeb32757 SHA1 eaa20567d6c0176f92aadc9784141aeda5d65875 SHA256 fb1bdd958116b5b17b4233517c45bee243a9b4503b20469d23b3d716d2889cac
-MD5 406397414acecec0aa1eb548bac52099 files/ghc-6.5-norelax.patch 578
-RMD160 f41d1b9f93cff339fac01660bfeed5d2aeb32757 files/ghc-6.5-norelax.patch 578
-SHA256 fb1bdd958116b5b17b4233517c45bee243a9b4503b20469d23b3d716d2889cac files/ghc-6.5-norelax.patch 578
+AUX ghc-6.5-norelax.patch 615 RMD160 5f8d85a7caa10bc17bf53fe0f44ac07e819cf4f3 SHA1 c75eb55a0142af33a3dfc830e92224fbdbefb066 SHA256 db190b8f581059549c4a23a34db98cbfed0f3906cd017703993698376c569e01
+MD5 f2e6baefdb5bc76e27c654397a43cbd5 files/ghc-6.5-norelax.patch 615
+RMD160 5f8d85a7caa10bc17bf53fe0f44ac07e819cf4f3 files/ghc-6.5-norelax.patch 615
+SHA256 db190b8f581059549c4a23a34db98cbfed0f3906cd017703993698376c569e01 files/ghc-6.5-norelax.patch 615
 AUX ghc-6.6-nothreadedrts.patch 665 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d SHA1 8d0bc56096ebe781371dffa668de48a97173cd32 SHA256 bdfb000a70d97bb7341dda5a2ec48bb7f688532ade830eb2d73c7fa6ef1eead1
 MD5 ec4b234602e907111db61eb1193c719e files/ghc-6.6-nothreadedrts.patch 665
 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d files/ghc-6.6-nothreadedrts.patch 665
 SHA256 bdfb000a70d97bb7341dda5a2ec48bb7f688532ade830eb2d73c7fa6ef1eead1 files/ghc-6.6-nothreadedrts.patch 665
-AUX ghc-updater 9045 RMD160 b044a26add18464b583702f3cac667521c5eb06f SHA1 f5ccd2bf9f78f895368a1ff64ceddd5703f1d13b SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe
-MD5 e7ba0887c43fd8333a4d1bd92c184244 files/ghc-updater 9045
-RMD160 b044a26add18464b583702f3cac667521c5eb06f files/ghc-updater 9045
-SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe files/ghc-updater 9045
+AUX ghc-updater 9142 RMD160 1b99299d864e5dd73f082ffd3e2425a76e0dea15 SHA1 a24ba32e383d11b5aa5a1b01c28334c6cce947f3 SHA256 d9eb6ad3b64042e8882da8ff507f346f2c55a1d9d4daeaa2f3d696292d9c6185
+MD5 dec80d46e4510ebf0bba1771a6f63705 files/ghc-updater 9142
+RMD160 1b99299d864e5dd73f082ffd3e2425a76e0dea15 files/ghc-updater 9142
+SHA256 d9eb6ad3b64042e8882da8ff507f346f2c55a1d9d4daeaa2f3d696292d9c6185 files/ghc-updater 9142
 DIST ghc-6.2.2-src.tar.bz2 5406427 RMD160 7afa370c148f2b9c3d53d662da996f5d7c05282d SHA1 9ca5bfed02210d3731a76fab5e25a8c690067fde SHA256 a0fe7eb8d447f25fbc616cdbce2bb4e03961a884c2c37969d1e23588b588a852
-DIST ghc-6.4.1-src.tar.bz2 6826112 RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 SHA1 96a3e76249c52b88e870c1e919ced3481c571b94 SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36
 DIST ghc-6.4.2-alut.patch.gz 6670 RMD160 e6ab2a114f44f6f176a98c9cd6ab1e336662a958 SHA1 879000d18b11d1edc1a32cf720ed24bbc20e8981 SHA256 e116b385df3bb5a5feb92ce92a92bdb0f24115361aedb1bddc9a7e6ce682d8b9
 DIST ghc-6.4.2-src.tar.bz2 6954958 RMD160 19943eb2673e663973e64739cdf23720b6f36d38 SHA1 60bcea323f851caa84d49c7731b86164d5cefa42 SHA256 d517e52e0204a077c54cda11b67bf9b6ac3daa47ac7bccf1561afc7c572e6be0
 DIST ghc-6.6-libraries.tar.gz 1221149 RMD160 7c8a8cf26f43f4cbb31f4eee0682f85bf7143daf SHA1 5a407a2df32894a9b7a8e519edd2539f808b960e SHA256 1df171a2d7996b1014c51353ef715010d682d6ff1115dbfa1fd68176dc923236
@@ -61,34 +44,26 @@ DIST ghc-bin-6.6-x86.tbz2 24960612 RMD160 086a7784e616d0d789be8ceb3b3ba01832d343
 DIST ghc-bin-6.6.1-amd64.tbz2 27473156 RMD160 20359587c05ebead0e357d4c217e496f28ae6d5d SHA1 48ba2f6573cba5f76f1578de70defd9210545785 SHA256 f8e1795dd84f64eec0a15ca15cdb3ec08a164790ebe35b3ba2d9743e9dae3b16
 DIST ghc-bin-6.6.1-x86.tbz2 26134077 RMD160 fcc31115073c2c0c4be75dce0253cb9bca5e45d3 SHA1 2c6e4bfadbae714b2f8a5da8efbc43f8124e6f8d SHA256 17a9b7125ae52c7d20f177214919837c95f96d6d997d729e493a0b94bdb84d29
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
-EBUILD ghc-6.2.2.ebuild 5579 RMD160 7d2d85351bf715be42d5740a075c0e32e609ddfb SHA1 f80e7acfebff6c1a97f768ac06e8d0bd50f12ce3 SHA256 6e38511d0e299b7f8f0b996db894e852a9655814c93432335452522f2e638ce2
-MD5 b26bfdd8f2c1b38dae7cc82fa5037538 ghc-6.2.2.ebuild 5579
-RMD160 7d2d85351bf715be42d5740a075c0e32e609ddfb ghc-6.2.2.ebuild 5579
-SHA256 6e38511d0e299b7f8f0b996db894e852a9655814c93432335452522f2e638ce2 ghc-6.2.2.ebuild 5579
-EBUILD ghc-6.4.1-r2.ebuild 6675 RMD160 5c4073b2b2e1b9338eb0885515f41a9422c3b153 SHA1 0bc52d251d642398971538c9c2e362fbde0b0cd8 SHA256 72272ea099f2141ac81f93d8099402ca9edc5e69383a3812eee61e29dbeb0e65
-MD5 ce00e7c9f11cb005c7f092e084547270 ghc-6.4.1-r2.ebuild 6675
-RMD160 5c4073b2b2e1b9338eb0885515f41a9422c3b153 ghc-6.4.1-r2.ebuild 6675
-SHA256 72272ea099f2141ac81f93d8099402ca9edc5e69383a3812eee61e29dbeb0e65 ghc-6.4.1-r2.ebuild 6675
-EBUILD ghc-6.4.1-r3.ebuild 9877 RMD160 b2f7fe09c3d5e3864c5eab515087e8818f690e90 SHA1 e94265d942e018b86f905e07e6f3b19eba5ba73c SHA256 093377a4537244561ed5cafe11b1319f6f67a4dd941f35365d32118e3764912d
-MD5 fd0a9acc7c54c8ad23df69fa8dc2e44b ghc-6.4.1-r3.ebuild 9877
-RMD160 b2f7fe09c3d5e3864c5eab515087e8818f690e90 ghc-6.4.1-r3.ebuild 9877
-SHA256 093377a4537244561ed5cafe11b1319f6f67a4dd941f35365d32118e3764912d ghc-6.4.1-r3.ebuild 9877
-EBUILD ghc-6.4.2.ebuild 10933 RMD160 b67ba084a9ac90df327f855bdee9b3725423e938 SHA1 9175e1daa547e301c8e9a44de7319e951f5698fe SHA256 c689e94b6fdb59410aadfc7cf80ac5c4883791fb577e7370a266a721f9867a42
-MD5 ac3cc3e261445ecb6f28542b8896b590 ghc-6.4.2.ebuild 10933
-RMD160 b67ba084a9ac90df327f855bdee9b3725423e938 ghc-6.4.2.ebuild 10933
-SHA256 c689e94b6fdb59410aadfc7cf80ac5c4883791fb577e7370a266a721f9867a42 ghc-6.4.2.ebuild 10933
-EBUILD ghc-6.6.1.ebuild 12318 RMD160 72ab018fa9a3e319c7608a8d91e1345ac29459a3 SHA1 238c49754a005f5c927dcc756c1967acccb0de28 SHA256 01827345317ea8cccd2be1221006d402655706eab18aba245664a8222d393ad2
-MD5 20d0e1b946cb609271ba3a54fb72cd1a ghc-6.6.1.ebuild 12318
-RMD160 72ab018fa9a3e319c7608a8d91e1345ac29459a3 ghc-6.6.1.ebuild 12318
-SHA256 01827345317ea8cccd2be1221006d402655706eab18aba245664a8222d393ad2 ghc-6.6.1.ebuild 12318
-EBUILD ghc-6.6.ebuild 12626 RMD160 023e0b001a48e6ec24101026c98eb388282db62a SHA1 282a9e267641fea4977440ca4f20448d95f1e354 SHA256 d5c224b09dbcbd259de710e8105bca138f766efe294fffa3a14896bf6858abc2
-MD5 e1de91987880c80bfd28da0f9165c8da ghc-6.6.ebuild 12626
-RMD160 023e0b001a48e6ec24101026c98eb388282db62a ghc-6.6.ebuild 12626
-SHA256 d5c224b09dbcbd259de710e8105bca138f766efe294fffa3a14896bf6858abc2 ghc-6.6.ebuild 12626
-MISC ChangeLog 21495 RMD160 f9cafe4126b6cfc232bf3de16483a93e95cabf5f SHA1 d704fd4f06ab3e32000b774cd11f4c757f07bd31 SHA256 689ecf776384b3774f163b58c23a694ab8835f9ac8fdc5d8e5a63b579b958138
-MD5 97a87b28200c84797ea01c03a7263387 ChangeLog 21495
-RMD160 f9cafe4126b6cfc232bf3de16483a93e95cabf5f ChangeLog 21495
-SHA256 689ecf776384b3774f163b58c23a694ab8835f9ac8fdc5d8e5a63b579b958138 ChangeLog 21495
+EBUILD ghc-6.2.2.ebuild 7423 RMD160 9e9cd38764414d014ee58fd3d62d8cefd4f0b082 SHA1 da94dd3020fa1ba0b785b602f48b668c1bc26628 SHA256 72f4a16dda50bc3ef3a243237bf960a75ef0afef9aec58e2828f70b0978356fa
+MD5 04f4a4faedcae980873bbdb4c00b96af ghc-6.2.2.ebuild 7423
+RMD160 9e9cd38764414d014ee58fd3d62d8cefd4f0b082 ghc-6.2.2.ebuild 7423
+SHA256 72f4a16dda50bc3ef3a243237bf960a75ef0afef9aec58e2828f70b0978356fa ghc-6.2.2.ebuild 7423
+EBUILD ghc-6.4.2.ebuild 10084 RMD160 b8c3e0afbf1f46366f907e8438c3cc5c320c0b2a SHA1 bab21f4fece2b6f7a30da5413877636a5e2771d8 SHA256 61f62447737369dd0e55632d95889811aee7778798810e2d6fafd46b87581a27
+MD5 49151ed17fe40a3452319b3ac144aed6 ghc-6.4.2.ebuild 10084
+RMD160 b8c3e0afbf1f46366f907e8438c3cc5c320c0b2a ghc-6.4.2.ebuild 10084
+SHA256 61f62447737369dd0e55632d95889811aee7778798810e2d6fafd46b87581a27 ghc-6.4.2.ebuild 10084
+EBUILD ghc-6.6.1.ebuild 11270 RMD160 bed6e23e3777c57050e4f9a8325caa350d5893e0 SHA1 c41ec5976e5a7605c2089609b32cb9f15e721b56 SHA256 ecf5b2a62ad9f922baee82639d3c6772dd95a3103452dc2c7b329d3ec9f67d20
+MD5 27313f020c328298e9b52f15fbfbf77d ghc-6.6.1.ebuild 11270
+RMD160 bed6e23e3777c57050e4f9a8325caa350d5893e0 ghc-6.6.1.ebuild 11270
+SHA256 ecf5b2a62ad9f922baee82639d3c6772dd95a3103452dc2c7b329d3ec9f67d20 ghc-6.6.1.ebuild 11270
+EBUILD ghc-6.6.ebuild 11720 RMD160 7f1c5df08ad07d9d1f141f0de8b79b59e51c2c8a SHA1 cf15dd198858f9debd9953524ae4a402683b3dc0 SHA256 2a2cd111feb19caaf0d72bfe1dabe39396d9df61083c7edfbe44cb7c9babad20
+MD5 6266ba4cceae79830dfd3f61beee64ca ghc-6.6.ebuild 11720
+RMD160 7f1c5df08ad07d9d1f141f0de8b79b59e51c2c8a ghc-6.6.ebuild 11720
+SHA256 2a2cd111feb19caaf0d72bfe1dabe39396d9df61083c7edfbe44cb7c9babad20 ghc-6.6.ebuild 11720
+MISC ChangeLog 22227 RMD160 5024029915c383d3087ccfb6fb253b2518584bdb SHA1 0643240f36d423b8a8278c748b352cd8ce687bbc SHA256 8e7a96ffc90e0957bd0c2e51e8cda585d9d2dc5e269c4973f45600d53713c35e
+MD5 3d9443c7a6dad3f9f10542f242b0d37c ChangeLog 22227
+RMD160 5024029915c383d3087ccfb6fb253b2518584bdb ChangeLog 22227
+SHA256 8e7a96ffc90e0957bd0c2e51e8cda585d9d2dc5e269c4973f45600d53713c35e ChangeLog 22227
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -96,12 +71,6 @@ SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata
 MD5 e15aa904a6de695d1d97c70b426d2133 files/digest-ghc-6.2.2 247
 RMD160 08fa98200a54512a79a687475e4a65ccc0f4b28f files/digest-ghc-6.2.2 247
 SHA256 7fc3b897f80347476050b06f1749dfeaddb2c7d2c95dac7584c51588b29853b1 files/digest-ghc-6.2.2 247
-MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r2 247
-RMD160 3a660bda8203ea505f0ae443df45b679d80fe6f3 files/digest-ghc-6.4.1-r2 247
-SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/digest-ghc-6.4.1-r2 247
-MD5 67634d2dcbaa8444838580a45ac915d3 files/digest-ghc-6.4.1-r3 247
-RMD160 3a660bda8203ea505f0ae443df45b679d80fe6f3 files/digest-ghc-6.4.1-r3 247
-SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/digest-ghc-6.4.1-r3 247
 MD5 e0d5838a93fd2efddbb7b3ad9bc2cf1b files/digest-ghc-6.4.2 753
 RMD160 0d029ce257de088bf011643c75a1eb52796d3802 files/digest-ghc-6.4.2 753
 SHA256 84f4b6adad832de57cc219499590df79b6be7ac5c96ec975e15aa37370269d40 files/digest-ghc-6.4.2 753
@@ -114,7 +83,7 @@ SHA256 8b741f3cf9b8a6a4d2ceb4d46316a3d3ba7bcbeba77c60ba6ee9748c063c2ac0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGkQ9HnUVyUObPUL4RAmoaAJ4l4n19e3N2NEELA/lfkQhWKY5z4ACfTnzD
-9HRw9CvdMg4KEZrK+TN3Pf0=
-=eAKx
+iD8DBQFGk78vnUVyUObPUL4RAvrxAJ4pRskP5K2CsnwLYWIJBVfRMUquXwCfU9Uy
++CxWEjKMMoJN+OC2OcM8uZA=
+=sPHh
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1-r2 b/dev-lang/ghc/files/digest-ghc-6.4.1-r2
deleted file mode 100644
index 47c2c92a66b4..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.4.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
-RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 ghc-6.4.1-src.tar.bz2 6826112
-SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1-r3 b/dev-lang/ghc/files/digest-ghc-6.4.1-r3
deleted file mode 100644
index 47c2c92a66b4..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.4.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
-RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 ghc-6.4.1-src.tar.bz2 6826112
-SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/files/ghc-6.2.hardened.patch b/dev-lang/ghc/files/ghc-6.2.hardened.patch
deleted file mode 100644
index 706fe33b6e8e..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.hardened.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ghc/ghc.sh.orig	2004-09-25 20:07:56.256016992 +0200
-+++ ghc/ghc.sh	2004-09-25 20:09:51.779454760 +0200
-@@ -1,2 +1,3 @@
-+#!/bin/bash
- # Mini-driver for GHC
--exec $GHCBIN $TOPDIROPT ${1+"$@"}
-+exec ${GHCBIN} ${TOPDIROPT} @GHC_CFLAGS@ ${1+"$@"}
---- ghci/ghci.sh.orig	2004-09-25 20:08:07.860252880 +0200
-+++ ghci/ghci.sh	2004-09-25 20:09:45.880351560 +0200
-@@ -1,2 +1,3 @@
-+#!/bin/bash
- # Mini-driver for GHCi
--exec $GHCBIN $TOPDIROPT --interactive ${1+"$@"}
-+exec ${GHCBIN} ${TOPDIROPT} @GHC_CFLAGS@ --interactive ${1+"$@"}
diff --git a/dev-lang/ghc/files/ghc-6.4.1-configure.patch b/dev-lang/ghc/files/ghc-6.4.1-configure.patch
deleted file mode 100644
index adacb6a70e4f..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-configure.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urwpN ghc-6.4.1/libraries/HGL/aclocal.m4 ghc-6.4.1.patched/libraries/HGL/aclocal.m4
---- ghc-6.4.1/libraries/HGL/aclocal.m4	2004-11-23 08:35:13.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/HGL/aclocal.m4	2006-02-11 02:07:47.000000000 -0400
-@@ -1,2 +1,13 @@
- # Empty file to avoid a dependency on automake: autoreconf calls aclocal to
- # generate a temporary aclocal.m4t when no aclocal.m4 is present.
-+
-+# FP_ARG_HGL
-+# -------------
-+AC_DEFUN([FP_ARG_HGL],
-+[AC_ARG_ENABLE([hgl],
-+  [AC_HELP_STRING([--enable-hgl],
-+    [build HGL.
-+     (default=autodetect)])],
-+  [enable_hgl=$enableval],
-+  [enable_hgl=yes])
-+])# FP_ARG_HGL
-diff -urwpN ghc-6.4.1/libraries/HGL/configure.ac ghc-6.4.1.patched/libraries/HGL/configure.ac
---- ghc-6.4.1/libraries/HGL/configure.ac	2005-05-08 08:19:45.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/HGL/configure.ac	2006-02-11 02:07:47.000000000 -0400
-@@ -1,5 +1,10 @@
- AC_INIT([Haskell Graphics Library], [3.1], [libraries@haskell.org], [HGL])
- 
-+FP_ARG_HGL
-+
-+if test "$enable_hgl" = no; then
-+  HGL_BUILD_PACKAGE=no
-+else
- # Safety check: Ensure that we are in the correct source directory.
- AC_CONFIG_SRCDIR([Graphics/HGL.hs])
- 
-@@ -28,6 +33,7 @@ else
-   HGL_BUILD_PACKAGE=yes
-   PLATFORM=X11
- fi
-+fi
- AC_SUBST([HGL_BUILD_PACKAGE])
- AC_SUBST([PLATFORM])
-
-diff -urwpN ghc-6.4.1/libraries/X11/aclocal.m4 ghc-6.4.1.patched/libraries/X11/aclocal.m4
---- ghc-6.4.1/libraries/X11/aclocal.m4	2004-11-23 08:35:18.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/X11/aclocal.m4	2006-02-11 02:07:38.000000000 -0400
-@@ -1,2 +1,13 @@
- # Empty file to avoid a dependency on automake: autoreconf calls aclocal to
- # generate a temporary aclocal.m4t when no aclocal.m4 is present.
-+
-+# FP_ARG_X11
-+# -------------
-+AC_DEFUN([FP_ARG_X11],
-+[AC_ARG_ENABLE([x11],
-+  [AC_HELP_STRING([--enable-x11],
-+    [build a Haskell binding for X11.
-+     (default=autodetect)])],
-+  [enable_x11=$enableval],
-+  [enable_x11=yes])
-+])# FP_ARG_X11
-diff -urwpN ghc-6.4.1/libraries/X11/configure.ac ghc-6.4.1.patched/libraries/X11/configure.ac
---- ghc-6.4.1/libraries/X11/configure.ac	2005-05-08 08:19:28.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/X11/configure.ac	2006-02-11 02:07:38.000000000 -0400
-@@ -1,5 +1,11 @@
- AC_INIT([Haskell X11 package], [1.1], [libraries@haskell.org], [X11])
- 
-+FP_ARG_X11
-+
-+if test "$enable_x11" = no; then
-+  X11_BUILD_PACKAGE=no
-+  BUILD_PACKAGE_BOOL=False
-+else
- # Safety check: Ensure that we are in the correct source directory.
- AC_CONFIG_SRCDIR([include/HsXlib.h])
- 
-@@ -24,6 +30,7 @@ else
-   X11_BUILD_PACKAGE=yes
-   BUILD_PACKAGE_BOOL=True
- fi
-+fi
- AC_SUBST([X11_BUILD_PACKAGE])
- AC_SUBST([BUILD_PACKAGE_BOOL])
diff --git a/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch b/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch
deleted file mode 100644
index d9e77abb8921..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urwpN ghc-6.4.1/ghc/rts/StgCRun.c ghc-6.4.1.patched/ghc/rts/StgCRun.c
---- ghc-6.4.1/ghc/rts/StgCRun.c	2005-03-30 04:01:48.000000000 -0600
-+++ ghc-6.4.1.patched/ghc/rts/StgCRun.c	2006-03-21 17:13:22.000000000 -0600
-@@ -179,7 +179,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg
- 
- extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-     __asm__ volatile (
- 	/*
-@@ -604,7 +604,7 @@ static void StgRunIsImplementedInAssembl
- // *) The Link Register is saved to a different offset in the caller's stack frame
- //    (Linux: 4(r1), Darwin 8(r1))
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
- 	__asm__ volatile (
- 		"\t.globl StgRun\n"
-@@ -683,7 +683,7 @@ static void StgRunIsImplementedInAssembl
- #ifdef linux_HOST_OS
- extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-         // r0 volatile
- 	// r1 stack pointer
-@@ -833,7 +833,7 @@ static void StgRunIsImplementedInAssembl
- #define LOCALS 31
- #endif
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-     __asm__ volatile(
- 		".global StgRun\n"
diff --git a/dev-lang/ghc/files/ghc-6.4.1-openal.patch b/dev-lang/ghc/files/ghc-6.4.1-openal.patch
deleted file mode 100644
index 44a71d336ede..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-openal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urwpN ghc-6.4.1-orig/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs ghc-6.4.1/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs
---- ghc-6.4.1-orig/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs	2006-02-11 22:28:57.000000000 +0100
-+++ ghc-6.4.1/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs	2006-02-11 22:31:39.000000000 +0100
-@@ -66,10 +66,10 @@ foreign import CALLCONV unsafe "alcCreat
- -- | Destroys the given context.
- 
- destroyContext :: Context -> IO ()
--destroyContext = ignore . alcDestroyContext
-+destroyContext = alcDestroyContext
- 
- foreign import CALLCONV unsafe "alcDestroyContext"
--   alcDestroyContext :: Context -> IO ALCenum
-+   alcDestroyContext :: Context -> IO ()
- 
- --------------------------------------------------------------------------------
- 
-@@ -102,10 +102,10 @@ foreign import CALLCONV unsafe "alcMakeC
- -- | Performs processing on a synced context, nop on an asynchronous context.
- 
- processContext :: Context -> IO ()
--processContext = ignore . alcProcessContext
-+processContext = alcProcessContext
- 
- foreign import CALLCONV unsafe "alcProcessContext"
--   alcProcessContext :: Context -> IO Context
-+   alcProcessContext :: Context -> IO ()
- 
- -- | Suspends processing on an asynchronous context. This is a legal nop on a
- -- synced context.
diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch
index d4dc386c97c5..c11612df9d94 100644
--- a/dev-lang/ghc/files/ghc-6.5-norelax.patch
+++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch
@@ -1,12 +1,14 @@
 diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/DriverPipeline.hs
 --- old-ghc-1/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
 +++ new-ghc/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
-@@ -1014,6 +1014,8 @@
+@@ -1014,6 +1014,10 @@
  	let ld_r args = SysTools.runLink dflags ([ 
  				SysTools.Option "-nostdlib",
  				SysTools.Option "-nodefaultlibs",
++ #ifdef sparc_TARGET_ARCH
 +				-- options '--relax' and '-r' are incompatible
 +				SysTools.Option "-mno-relax",
++ #endif
  				SysTools.Option "-Wl,-r", 
  				SysTools.Option ld_x_flag, 
  				SysTools.Option "-o", 
diff --git a/dev-lang/ghc/files/ghc-updater b/dev-lang/ghc/files/ghc-updater
index 32e3343c88ca..d12b841f3358 100755
--- a/dev-lang/ghc/files/ghc-updater
+++ b/dev-lang/ghc/files/ghc-updater
@@ -23,6 +23,9 @@
 
 shopt -s nullglob
 
+# fix the PATH to include the dirs where portage installs ghc
+PATH="/usr/bin:/opt/ghc/bin:${PATH}"
+
 NEW_GHC_VER=$(ghc --version | sed 's:^.*version ::')
 NEW_GHC_LIBDIR=$(ghc --print-libdir)
 
@@ -310,7 +313,7 @@ if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
       echo
    fi
    
-   elog "Python update completed with errors."
+   elog "GHC update completed with errors."
    elog "Masked Packages:"
    for x in ${PKGS_MASKED}; do
    		elog $x
diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index 664d93199b03..43c21dd0331f 100644
--- a/dev-lang/ghc/ghc-6.2.2.ebuild
+++ b/dev-lang/ghc/ghc-6.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.21 2007/06/26 01:49:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.22 2007/07/10 17:16:49 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -14,9 +14,19 @@
 # can be removed once an forall after the first succesful install
 # of ghc.
 
-inherit base flag-o-matic eutils ghc-package
-
-IUSE="doc tetex opengl"
+# Note to users of hardened gcc-3.x:
+#
+# If you emerge ghc with hardened gcc it should work fine (because we
+# turn off the hardened features that would otherwise break ghc).
+# However, emerging ghc while using a vanilla gcc and then switching to
+# hardened gcc (using gcc-config) will leave you with a broken ghc. To
+# fix it you would need to either switch back to vanilla gcc or re-emerge
+# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
+# you switch to gcc-4.x that this will also break ghc and you'll need to
+# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
+# gcc-3.x and 4.x with no problems.
+
+inherit base eutils flag-o-matic toolchain-funcs ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -25,145 +35,163 @@ SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-# removed amd64, because there's no binary to bootstrap from
-KEYWORDS="x86 ppc -alpha -amd64 sparc"
-
+KEYWORDS="-* ppc sparc x86"
+IUSE="doc opengl"
 
 PROVIDE="virtual/ghc"
-# FIXME: Add USE support for parallel haskell (requires PVM)
-#	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="<virtual/ghc-6.3
-	!>=virtual/ghc-6.4
-	>=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/make-3.79.1
-	>=sys-apps/sed-3.02.80
-	>=sys-devel/flex-2.5.4a
-	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		>=dev-haskell/haddock-0.6-r2
-		tetex? ( virtual/tetex
-			>=app-text/jadetex-3.12 ) )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
 
-RDEPEND="virtual/libc
+RDEPEND="
 	>=sys-devel/gcc-2.95.3
+	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
 	>=sys-libs/readline-4.2
-	opengl? ( virtual/opengl virtual/glu virtual/glut )"
+	opengl? ( virtual/opengl
+			  virtual/glu virtual/glut )"
 
-SUPPORTED_CFLAGS=""
+# ghc cannot usually be bootstrapped using later versions ...
+DEPEND="${RDEPEND}
+	<virtual/ghc-6.3
+	!>=virtual/ghc-6.4
+	doc? (  ~app-text/docbook-sgml-dtd-3.1
+			>=app-text/docbook-dsssl-stylesheets-1.64
+			>=app-text/openjade-1.3.1
+			>=app-text/sgml-common-0.6.3
+			>=dev-haskell/haddock-0.6-r2 )"
 
-# Setup supported CFLAGS.
-check_cflags() {
-	OLD_CFLAGS="${CFLAGS}"
-	CFLAGS="$1"
-	strip-unsupported-flags
-	SUPPORTED_CFLAGS="${SUPPORTED_CFLAGS} ${CFLAGS}"
-	CFLAGS="${OLD_CFLAGS}"
+pkg_setup() {
+	if test $(gcc-major-version) -gt 3; then
+		eerror "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
+		eerror "You can either use gcc-config to switch to gcc-3.x"
+		eerror "or you emerge '>=dev-lang/ghc-6.4' or later."
+		die "ghc-6.2.2 does not work with gcc-4.x, only 3.x or older"
+	fi
 }
 
-setup_cflags() {
-	check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
+append-ghc-cflags() {
+	local flag compile assemble link
+	for flag in $*; do
+		case ${flag} in
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
+				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
+				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
+		esac
+	done
 }
 
-pkg_setup() {
-	if ! has_version virtual/ghc; then
-		eerror "This ebuild needs a version of GHC to bootstrap from."
-		eerror "Please emerge dev-lang/ghc-bin to get a binary version."
-		eerror "You can either use the binary version directly or emerge"
-		eerror "dev-lang/ghc afterwards."
-		die "virtual/ghc version required to build"
-	fi
+ghc_setup_cflags() {
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -fPIC
+
+	GHC_CFLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Debugging flags don't help either. You can't debug Haskell code
+			# at the C source level and the mangler discards the debug info.
+			-g*) ;;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	# hardened-gcc needs to be disabled, because the mangler doesn't accept
+	# its output.
+	gcc-specs-pie && append-ghc-cflags compile link	-nopie
+	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
+}
+
+ghc_setup_wrapper() {
+	echo '#!/bin/sh'
+	echo "GHCBIN=\"$(ghc-libdir)/ghc-$1\";"
+	echo "TOPDIROPT=\"-B$(ghc-libdir)\";"
+	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
+	echo '# Mini-driver for GHC'
+	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
 }
 
 src_unpack() {
 	base_src_unpack
+	ghc_setup_cflags
+
+	# Modify the ghc driver script to use GHC_CFLAGS
+	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
+	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
+	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
 
-	# hardened-gcc needs to be disabled, because the
-	# mangler doesn't accept its output; yes, the 6.2 version
-	# should do ...
-	cd ${S}/ghc
-	pushd driver
-	setup_cflags
-
-	epatch ${FILESDIR}/${PN}-6.2.hardened.patch
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghc/ghc.sh
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghci/ghci.sh
-	popd
+	# Patch to fix a mis-compilation in the rts due to strict aliasing,
+	# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
+	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
+
+	# Don't strip binaries on install. See QA warnings in bug #140369.
+	sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' ${S}/mk/config.mk.in
 }
 
 src_compile() {
-	local myconf
-	if use opengl; then
-		myconf="--enable-hopengl"
-	fi
+	# initialize build.mk
+	echo '# Gentoo changes' > mk/build.mk
+
+	# We also need to use the GHC_CFLAGS flags when building ghc itself
+	echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
+	echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
 
-	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
-	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	# (this is still necessary, even though we have the patch, because
-	# we might be bootstrapping from a version that didn't have the
-	# patch included)
-	setup_cflags
-	echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
-	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS// -/ -optc-}" >> mk/build.mk
+	# determine what to do with documentation
+	if use doc; then
+		echo SGMLDocWays="html" >> mk/build.mk
+	else
+		echo SGMLDocWays="" >> mk/build.mk
+		# needed to prevent haddock from being called
+		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
+	fi
 
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
+	# circumvent a very strange bug that seems related with ghc producing too much
+	# output while being filtered through tee (e.g. due to portage logging)
+	# reported as bug #111183
+	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
 	# Required for some architectures, because they don't support ghc fully ...
-	use ppc || use amd64 || use sparc && echo "SplitObjs=NO" >> mk/build.mk
-	use amd64 && echo "GhcUnregisterised=YES" >> mk/build.mk
-	use amd64 || use sparc && echo "GhcWithInterpreter=NO" >> mk/build.mk
+	use ppc || use sparc && echo "SplitObjs=NO" >> mk/build.mk
+	use sparc && echo "GhcWithInterpreter=NO" >> mk/build.mk
+
+	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
+	chmod +x "${T}/ghc.sh"
 
 	# unset SGML_CATALOG_FILES because documentation installation
 	# breaks otherwise ...
-	# (--enable-threaded-rts is no longer needed)
 	SGML_CATALOG_FILES="" econf \
-		${myconf} || die "econf failed"
-
-	# the build does not seem to work all that
-	# well with parallel make
-	emake -j1 || die "make failed"
+		--with-ghc="${T}/ghc.sh" \
+		$(use_enable opengl hopengl) \
+		|| die "econf failed"
 
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		emake -j1 html || die "make html failed"
-		if use tetex; then
-			emake -j1 ps || die "make ps failed"
-		fi
-	fi
+	# ghc-6.2.x build system does not support parallel make
+	emake -j1 datadir="/usr/share/doc/${PF}" || die "make failed"
+	# the explicit datadir is required to make the haddock entries
+	# in the package.conf file point to the right place ...
 
 }
 
 src_install () {
-	local mydoc
 	local insttarget
 
 	insttarget="install"
-
-	# determine what to do with documentation
-	if use doc; then
-		mydoc="html"
-		insttarget="${insttarget} install-docs"
-		if use tetex; then
-			mydoc="${mydoc} ps"
-		fi
-	else
-		mydoc=""
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
+	use doc && insttarget="${insttarget} install-docs"
 
 	# the libdir0 setting is needed for amd64, and does not
 	# harm for other arches
@@ -176,13 +204,14 @@ src_install () {
 		|| die "make ${insttarget} failed"
 
 	#need to remove ${D} from ghcprof script
-	cd ${D}/usr/bin
+	# TODO: does this actually work?
+	cd "${D}/usr/bin"
 	mv ghcprof ghcprof-orig
 	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
 	chmod a+x ghcprof
 	rm -f ghcprof-orig
 
-	cd ${S}/ghc
+	cd "${S}/ghc"
 	dodoc README ANNOUNCE LICENSE VERSION
 
 	dosbin ${FILESDIR}/ghc-updater
@@ -193,8 +222,10 @@ pkg_postinst () {
 	elog "If you have dev-lang/ghc-bin installed, you might"
 	elog "want to unmerge it. It is no longer needed."
 	elog
-	ewarn "If you upgrade from another ghc version, please run"
-	ewarn "/usr/sbin/ghc-updater to re-merge all ghc-based"
-	ewarn "Haskell libraries."
+	ewarn "IMPORTANT:"
+	ewarn "If you have upgraded from another version of ghc or"
+	ewarn "if you have switched from ghc-bin to ghc, please run:"
+	ewarn "	/usr/sbin/ghc-updater"
+	ewarn "to re-merge all ghc-based Haskell libraries."
 }
 
diff --git a/dev-lang/ghc/ghc-6.4.1-r2.ebuild b/dev-lang/ghc/ghc-6.4.1-r2.ebuild
deleted file mode 100644
index e7a24925a39b..000000000000
--- a/dev-lang/ghc/ghc-6.4.1-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.16 2007/06/26 01:49:10 mr_bones_ Exp $
-
-# Brief explanation of the bootstrap logic:
-#
-# ghc requires ghc-bin to bootstrap.
-# Therefore,
-# (1) both ghc-bin and ghc provide virtual/ghc
-# (2) virtual/ghc *must* default to ghc-bin
-# (3) ghc depends on virtual/ghc
-#
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
-
-inherit base eutils autotools ghc-package check-reqs
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-# discover if this is a snapshot release
-IS_SNAPSHOT="${PV%%*pre*}" # zero if snapshot
-MY_PV="${PV/_pre/.}"
-MY_P="${PN}-${MY_PV}"
-EXTRA_SRC_URI="${MY_PV}"
-[[ -z "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc X opengl openal"
-#java use flag disabled because of bug #106992
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/ghc"
-
-RDEPEND="
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )
-	opengl? ( virtual/opengl virtual/glu virtual/glut )
-	openal? ( media-libs/openal )"
-
-# ghc cannot usually be bootstrapped using later versions ...
-DEPEND="${RDEPEND}
-	<virtual/ghc-6.5
-	!>=virtual/ghc-6.6
-	doc? (  ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2
-		>=dev-haskell/haddock-0.6-r2 )"
-# removed: java? ( >=dev-java/fop-0.20.5 )
-
-PDEPEND=">=dev-haskell/cabal-1.1.3"
-
-# hardened-gcc needs to be disabled, because the mangler doesn't accept
-# its output.
-GHC_CFLAGS="-optc-nopie -optl-nopie -optc-fno-stack-protector"
-
-# We also add -opta-Wa,--noexecstack to get ghc to generate .o files with
-# non-exectable stack. This it a hack until ghc does it itself properly.
-GHC_CFLAGS="${GHC_CFLAGS} -opta-Wa,--noexecstack"
-
-# Portage's resolution of virtuals fails on virtual/ghc in some Portage releases,
-# the following function causes the build to fail with an informative error message
-# in such a case.
-# pkg_setup() {
-# 	if ! has_version virtual/ghc; then
-# 		eerror "This ebuild needs a version of GHC to bootstrap from."
-# 		eerror "Please emerge dev-lang/ghc-bin to get a binary version."
-# 		eerror "You can either use the binary version directly or emerge"
-# 		eerror "dev-lang/ghc afterwards."
-# 		die "virtual/ghc version required to build"
-# 	fi
-# }
-
-src_unpack() {
-	base_src_unpack
-
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-6.4.1-configure.patch"
-	epatch "${FILESDIR}/${PN}-6.4.1-openal.patch"
-
-	# Modify the ghc driver script to use GHC_CFLAGS
-	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
-	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
-	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
-
-	# Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
-	sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk"
-}
-
-src_compile() {
-	# initialize build.mk
-	echo '# Gentoo changes' > mk/build.mk
-
-	# We also need to use the GHC_CFLAGS flags when building ghc itself
-	echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-	echo "SRC_CC_OPTS+=-Wa,--noexecstack" >> mk/build.mk
-
-	# determine what to do with documentation
-	local mydoc
-	if use doc; then
-		mydoc="html"
-#		if use java; then
-#			mydoc="${mydoc} ps"
-#		fi
-	else
-		mydoc=""
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-	echo XMLDocWays="${mydoc}" >> mk/build.mk
-
-	# circumvent a very strange bug that seems related with ghc producing too much
-	# output while being filtered through tee (e.g. due to portage logging)
-	# reported as bug #111183
-	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
-
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	# Required for some architectures, because they don't support ghc fully ...
-	use alpha || use hppa || use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
-	use alpha || use hppa && echo "GhcUnregisterised=YES" >> mk/build.mk
-
-	# The SplitObjs feature doesn't work on several arches and it makes
-	# 'ar' take loads of RAM:
-	CHECKREQS_MEMORY="200"
-	if use alpha || use hppa || use ppc64; then
-		echo "SplitObjs=NO" >> mk/build.mk
-	elif ! check_reqs_conditional; then
-		elog "Turning off ghc's 'Split Objs' feature because this machine"
-		elog "does not have enough RAM for it. This will have the effect"
-		elog "of making binaries produced by ghc considerably larger."
-		echo "SplitObjs=NO" >> mk/build.mk
-	fi
-
-	# we've patched some configure.ac files do allow us to enable/disable the
-	# X11 and HGL packages, so we need to autoreconf.
-	eautoreconf
-
-	econf \
-		$(use_enable opengl opengl) \
-		$(use_enable opengl glut) \
-		$(use_enable openal openal) \
-		$(use_enable X x11) \
-		$(use_enable X hgl) \
-		|| die "econf failed"
-
-	# the build does not seem to work all that
-	# well with parallel make
-	emake -j1 all datadir="/usr/share/doc/${PF}" || die "make failed"
-	# the explicit datadir is required to make the haddock entries
-	# in the package.conf file point to the right place ...
-
-}
-
-src_install () {
-	local insttarget
-
-	insttarget="install"
-	use doc && insttarget="${insttarget} install-docs"
-
-	# the libdir0 setting is needed for amd64, and does not
-	# harm for other arches
-	emake -j1 ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" \
-		libdir0="${D}/usr/$(get_libdir)" \
-		|| die "make ${insttarget} failed"
-
-	#need to remove ${D} from ghcprof script
-	cd "${D}/usr/bin"
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd "${S}/ghc"
-	dodoc README ANNOUNCE LICENSE VERSION
-
-	dosbin ${FILESDIR}/ghc-updater
-}
-
-pkg_postinst () {
-	ebegin "Unregistering ghc's built-in cabal "
-	$(ghc-getghcpkg) unregister Cabal > /dev/null
-	eend $?
-	ghc-reregister
-	elog "If you have dev-lang/ghc-bin installed, you might"
-	elog "want to unmerge it. It is no longer needed."
-	elog
-	ewarn "IMPORTANT:"
-	ewarn "If you have upgraded from another version of ghc or"
-	ewarn "if you have switched from ghc-bin to ghc, please run:"
-	ewarn "	/usr/sbin/ghc-updater"
-	ewarn "to re-merge all ghc-based Haskell libraries."
-}
-
diff --git a/dev-lang/ghc/ghc-6.4.1-r3.ebuild b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
deleted file mode 100644
index c60cde1ee898..000000000000
--- a/dev-lang/ghc/ghc-6.4.1-r3.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.12 2007/06/26 01:49:10 mr_bones_ Exp $
-
-# Brief explanation of the bootstrap logic:
-#
-# ghc requires ghc-bin to bootstrap.
-# Therefore,
-# (1) both ghc-bin and ghc provide virtual/ghc
-# (2) virtual/ghc *must* default to ghc-bin
-# (3) ghc depends on virtual/ghc
-#
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
-
-# Note to users of hardened gcc-3.x:
-#
-# If you emerge ghc with hardened gcc it should work fine (because we
-# turn off the hardened features that would otherwise break ghc).
-# However, emerging ghc while using a vanilla gcc and then switching to
-# hardened gcc (using gcc-config) will leave you with a broken ghc. To
-# fix it you would need to either switch back to vanilla gcc or re-emerge
-# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
-# you switch to gcc-4.x that this will also break ghc and you'll need to
-# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
-# gcc-3.x and 4.x with no problems.
-
-inherit base eutils flag-o-matic toolchain-funcs autotools ghc-package check-reqs
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-# discover if this is a snapshot release
-IS_SNAPSHOT="${PV%%*pre*}" # zero if snapshot
-MY_PV="${PV/_pre/.}"
-MY_P="${PN}-${MY_PV}"
-EXTRA_SRC_URI="${MY_PV}"
-[[ -z "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc X opengl openal"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/ghc"
-
-RDEPEND="
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )
-	opengl? ( virtual/opengl
-			  virtual/glu virtual/glut
-			  openal? ( media-libs/openal ) )"
-
-# ghc cannot usually be bootstrapped using later versions ...
-DEPEND="${RDEPEND}
-	<virtual/ghc-6.5
-	!>=virtual/ghc-6.6
-	doc? (  ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets
-			>=dev-libs/libxslt-1.1.2
-			>=dev-haskell/haddock-0.6-r2 )"
-
-PDEPEND=">=dev-haskell/cabal-1.1.3"
-
-pkg_setup() {
-	if use openal && ! use opengl; then
-		ewarn "The OpenAL bindings require the OpenGL bindings, however"
-		ewarn "USE=\"-opengl\" so the OpenAL bindings will not be built."
-		ewarn "To build the OpenAL bindings emerge with USE=\"openal opengl\""
-	fi
-
-	# Portage's resolution of virtuals fails on virtual/ghc in some Portage
-	# releases, the following function causes the build to fail with an
-	# informative error message in such a case.
-	#if ! has_version virtual/ghc; then
-	#	eerror "This ebuild needs a version of GHC to bootstrap from."
-	#	eerror "Please emerge dev-lang/ghc-bin to get a binary version."
-	#	eerror "You can either use the binary version directly or emerge"
-	#	eerror "dev-lang/ghc afterwards."
-	#	die "virtual/ghc version required to build"
-	#fi
-}
-
-append-ghc-cflags() {
-	local flag compile assemble link
-	for flag in $*; do
-		case ${flag} in
-			compile)	compile="yes";;
-			assemble)	assemble="yes";;
-			link)		link="yes";;
-			*)
-				[[ ${compile}  ]] && GHC_CFLAGS="${GHC_CFLAGS} -optc${flag}"
-				[[ ${assemble} ]] && GHC_CFLAGS="${GHC_CFLAGS} -opta${flag}"
-				[[ ${link}     ]] && GHC_CFLAGS="${GHC_CFLAGS} -optl${flag}";;
-		esac
-	done
-}
-
-ghc_setup_cflags() {
-	# We need to be very careful with the CFLAGS we ask ghc to pass through to
-	# gcc. There are plenty of flags which will make gcc produce output that
-	# breaks ghc in various ways. The main ones we want to pass through are
-	# -mcpu / -march flags. These are important for arches like alpha & sparc.
-	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -fPIC
-
-	GHC_CFLAGS=""
-	for flag in ${CFLAGS}; do
-		case ${flag} in
-
-			# Ignore extra optimisation (ghc passes -O to gcc anyway)
-			# -O2 and above break on too many systems
-			-O*) ;;
-
-			# Arch and ABI flags are what we're really after
-			-m*) append-ghc-cflags compile assemble ${flag};;
-
-			# Debugging flags don't help either. You can't debug Haskell code
-			# at the C source level and the mangler discards the debug info.
-			-g*) ;;
-
-			# Ignore all other flags, including all -f* flags
-		esac
-	done
-
-	# hardened-gcc needs to be disabled, because the mangler doesn't accept
-	# its output.
-	gcc-specs-pie && append-ghc-cflags compile link	-nopie
-	gcc-specs-ssp && append-ghc-cflags compile		-fno-stack-protector
-
-	# We also add -Wa,--noexecstack to get ghc to generate .o files with
-	# non-exectable stack. This it a hack until ghc does it itself properly.
-	append-ghc-cflags assemble		"-Wa,--noexecstack"
-}
-
-ghc_setup_wrapper() {
-	echo '#!/bin/sh'
-	echo "GHCBIN=\"$(ghc-libdir)/ghc-$1\";"
-	echo "TOPDIROPT=\"-B$(ghc-libdir)\";"
-	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
-	echo '# Mini-driver for GHC'
-	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
-}
-
-src_unpack() {
-	base_src_unpack
-	ghc_setup_cflags
-
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-6.4.1-configure.patch"
-	epatch "${FILESDIR}/${PN}-6.4.1-openal.patch"
-	epatch "${FILESDIR}/${PN}-6.4.1-gcc41.patch"
-	epatch "${FILESDIR}/${PN}-6.4.2-sparc32plus.patch"
-
-	# Modify the ghc driver script to use GHC_CFLAGS
-	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"
-	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/ghc/driver/ghc/Makefile"
-	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh"
-
-	# Patch to fix parallel make
-	sed -i 's/mkDerivedConstants.c : $(H_CONFIG)/mkDerivedConstants.c :	$(H_CONFIG) $(H_PLATFORM)/' "${S}/ghc/includes/Makefile"
-
-	# Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2)
-	sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk"
-
-	# Patch to fix a mis-compilation in the rts due to strict aliasing,
-	# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
-	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
-}
-
-src_compile() {
-	# initialize build.mk
-	echo '# Gentoo changes' > mk/build.mk
-
-	# We also need to use the GHC_CFLAGS flags when building ghc itself
-	echo "SRC_HC_OPTS+=${GHC_CFLAGS}" >> mk/build.mk
-	echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
-
-	# determine what to do with documentation
-	if use doc; then
-		echo XMLDocWays="html" >> mk/build.mk
-	else
-		echo XMLDocWays="" >> mk/build.mk
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-
-	# circumvent a very strange bug that seems related with ghc producing too much
-	# output while being filtered through tee (e.g. due to portage logging)
-	# reported as bug #111183
-	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
-
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	# Required for some architectures, because they don't support ghc fully ...
-	use alpha || use hppa || use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
-	use alpha || use hppa && echo "GhcUnregisterised=YES" >> mk/build.mk
-
-	# On the other hand some arches do support some ghc features even though
-	# they're off by default
-	use ia64 && echo "GhcWithInterpreter=YES" >> mk/build.mk
-
-	# The SplitObjs feature doesn't work on several arches and it makes
-	# 'ar' take loads of RAM:
-	CHECKREQS_MEMORY="200"
-	if use alpha || use hppa || use ppc64; then
-		echo "SplitObjs=NO" >> mk/build.mk
-	elif ! check_reqs_conditional; then
-		elog "Turning off ghc's 'Split Objs' feature because this machine"
-		elog "does not have enough RAM for it. This will have the effect"
-		elog "of making binaries produced by ghc considerably larger."
-		echo "SplitObjs=NO" >> mk/build.mk
-	fi
-
-	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
-	chmod +x "${T}/ghc.sh"
-
-	# we've patched some configure.ac files do allow us to enable/disable the
-	# X11 and HGL packages, so we need to autoreconf.
-	eautoreconf
-
-	econf \
-		--with-ghc="${T}/ghc.sh" \
-		$(use_enable opengl opengl) \
-		$(use_enable opengl glut) \
-		$(use openal && use opengl \
-			&& echo --enable-openal \
-			|| echo --disable-openal) \
-		$(use_enable X x11) \
-		$(use_enable X hgl) \
-		|| die "econf failed"
-
-	emake all datadir="/usr/share/doc/${PF}" || die "make failed"
-	# the explicit datadir is required to make the haddock entries
-	# in the package.conf file point to the right place ...
-
-}
-
-src_install () {
-	local insttarget
-
-	insttarget="install"
-	use doc && insttarget="${insttarget} install-docs"
-
-	# the libdir0 setting is needed for amd64, and does not
-	# harm for other arches
-	emake -j1 ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" \
-		libdir0="${D}/usr/$(get_libdir)" \
-		|| die "make ${insttarget} failed"
-
-	#need to remove ${D} from ghcprof script
-	cd "${D}/usr/bin"
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd "${S}/ghc"
-	dodoc README ANNOUNCE LICENSE VERSION
-
-	dosbin ${FILESDIR}/ghc-updater
-}
-
-pkg_postinst () {
-	ebegin "Unregistering ghc's built-in cabal "
-	$(ghc-getghcpkg) unregister Cabal > /dev/null
-	eend $?
-	ghc-reregister
-	elog "If you have dev-lang/ghc-bin installed, you might"
-	elog "want to unmerge it. It is no longer needed."
-	elog
-	ewarn "IMPORTANT:"
-	ewarn "If you have upgraded from another version of ghc or"
-	ewarn "if you have switched from ghc-bin to ghc, please run:"
-	ewarn "	/usr/sbin/ghc-updater"
-	ewarn "to re-merge all ghc-based Haskell libraries."
-}
-
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index bbc918a229a2..379e5c662d9c 100644
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.18 2007/03/29 15:00:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.19 2007/07/10 17:16:49 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -53,6 +53,7 @@ PROVIDE="virtual/ghc"
 
 RDEPEND="
 	>=sys-devel/gcc-2.95.3
+	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
 	>=sys-libs/readline-4.2
@@ -171,11 +172,6 @@ src_unpack() {
 	# If we're using the testsuite then move it to into the build tree
 	use test && mv "${WORKDIR}/testsuite" "${S}/"
 
-	# This is a hack for ia64. We can persuade ghc to avoid mangler errors
-	# if we turn down the optimisations in one problematic module.
-	use ia64 && sed -i -e 's/OPTIONS_GHC/OPTIONS_GHC -O0 -optc-O/' \
-		"${S}/libraries/base/GHC/Float.lhs"
-
 	# Patch to fix a mis-compilation in the rts due to strict aliasing,
 	# should be fixed upstream for 6.4.3 and 6.6. Fixes bug #135651.
 	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
@@ -215,25 +211,11 @@ src_compile() {
 	# reported as bug #111183
 	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	# Some arches do support some ghc features even though they're off by default
-	use ia64 && echo "GhcWithInterpreter=YES" >> mk/build.mk
-
 	# And some arches used to work ok, but bork with recent gcc versions
 	# See bug #145466 for ppc64.
-	use ppc64 && echo "GhcUnregisterised=YES" >> mk/build.mk
-
-	# The SplitObjs feature makes 'ar'/'ranlib' take loads of RAM:
-	CHECKREQS_MEMORY="200"
-	if ! check_reqs_conditional; then
-		elog "Turning off ghc's 'Split Objs' feature because this machine"
-		elog "does not have enough RAM for it. This will have the effect"
-		elog "of making binaries produced by ghc considerably larger."
-		echo "SplitObjs=NO" >> mk/build.mk
+	if use ia64 || use ppc64; then
+		echo "GhcUnregisterised=YES" >> mk/build.mk
+		echo "GhcRTSWays := debug" >> mk/build.mk
 	fi
 
 	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
diff --git a/dev-lang/ghc/ghc-6.6.1.ebuild b/dev-lang/ghc/ghc-6.6.1.ebuild
index 546bccae2d63..45a480e371d7 100644
--- a/dev-lang/ghc/ghc-6.6.1.ebuild
+++ b/dev-lang/ghc/ghc-6.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.2 2007/07/08 16:21:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.3 2007/07/10 17:16:49 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs ghc-package check-reqs
+inherit base eutils flag-o-matic toolchain-funcs ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -50,7 +50,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 #KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="binary doc ghcbootstrap"
 
@@ -61,6 +61,7 @@ PROVIDE="virtual/ghc"
 
 RDEPEND="
 	>=sys-devel/gcc-2.95.3
+	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
 	=sys-libs/readline-5*"
@@ -200,21 +201,13 @@ src_unpack() {
 		# If we're using the testsuite then move it to into the build tree
 		#	use test && mv "${WORKDIR}/testsuite" "${S}/"
 
-		# This is a hack for ia64. We can persuade ghc to avoid mangler errors
-		# if we turn down the optimisations in one problematic module.
-		use ia64 && sed -i -e 's/OPTIONS_GHC/OPTIONS_GHC -O0 -optc-O/' \
-			"${S}/libraries/base/GHC/Float.lhs"
-
 		# Don't strip binaries on install. See QA warnings in bug #140369.
 		sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' ${S}/mk/config.mk.in
 
 		# Temporary patches that needs testing before being pushed upstream:
-#		cd "${S}"
+		cd "${S}"
 		# Fix sparc split-objs linking problem
-#		epatch "${FILESDIR}/ghc-6.5-norelax.patch"
-
-		# Disable threaded runtime build to work around RTS bugs on sparc
-#		epatch "${FILESDIR}/ghc-6.6-nothreadedrts.patch"
+		epatch "${FILESDIR}/ghc-6.5-norelax.patch"
 
 	fi
 }
@@ -251,17 +244,9 @@ src_compile() {
 		# reported as bug #111183
 		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
-		# force the config variable ArSupportsInput to be unset;
-		# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-		# incorrectly by the configure script
-		echo "ArSupportsInput:=" >> mk/build.mk
-
-		# Some arches do support some ghc features even though they're off by default
-		use ia64 && echo "GhcWithInterpreter=YES" >> mk/build.mk
-
-		# Workaround for threaded RTS bugs on sparc in ghc-6.6
-		# This is rather draconian, hopefully upstream fixes this soon.
-		if use sparc; then
+		# GHC build system knows to build unregisterised on alpha and hppa,
+		# but we have to tell it to build unregisterised on some other arches
+		if use ppc64 || use sparc; then
 		  echo "GhcUnregisterised=YES" >> mk/build.mk
 		  echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
 		  echo "GhcWithInterpreter=NO" >> mk/build.mk
@@ -270,15 +255,6 @@ src_compile() {
 		  echo "GhcNotThreaded=YES" >> mk/build.mk
 		fi
 
-		# The SplitObjs feature makes 'ar'/'ranlib' take loads of RAM:
-		CHECKREQS_MEMORY="200"
-		if ! check_reqs_conditional; then
-		  elog "Turning off ghc's 'Split Objs' feature because this machine"
-		  elog "does not have enough RAM for it. This will have the effect"
-		  elog "of making binaries produced by ghc considerably larger."
-		  echo "SplitObjs=NO" >> mk/build.mk
-		fi
-
 		econf \
 		  --with-ghc="${T}/ghc.sh" \
 		  || die "econf failed"
diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index 43bdc015bfa6..c6176ae2e0bb 100644
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.7 2007/07/06 11:37:31 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.8 2007/07/10 17:16:49 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -28,7 +28,7 @@
 # re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
 # gcc-3.x and 4.x with no problems.
 
-inherit base eutils flag-o-matic toolchain-funcs ghc-package check-reqs
+inherit base eutils flag-o-matic toolchain-funcs ghc-package
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -63,6 +63,7 @@ PROVIDE="virtual/ghc"
 
 RDEPEND="
 	>=sys-devel/gcc-2.95.3
+	>=sys-devel/binutils-2.17
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
 	=sys-libs/readline-5*"
@@ -208,11 +209,6 @@ src_unpack() {
 		# If we're using the testsuite then move it to into the build tree
 		#	use test && mv "${WORKDIR}/testsuite" "${S}/"
 
-		# This is a hack for ia64. We can persuade ghc to avoid mangler errors
-		# if we turn down the optimisations in one problematic module.
-		use ia64 && sed -i -e 's/OPTIONS_GHC/OPTIONS_GHC -O0 -optc-O/' \
-			"${S}/libraries/base/GHC/Float.lhs"
-
 		# Don't strip binaries on install. See QA warnings in bug #140369.
 		sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' ${S}/mk/config.mk.in
 
@@ -259,17 +255,9 @@ src_compile() {
 		# reported as bug #111183
 		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
-		# force the config variable ArSupportsInput to be unset;
-		# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-		# incorrectly by the configure script
-		echo "ArSupportsInput:=" >> mk/build.mk
-
-		# Some arches do support some ghc features even though they're off by default
-		use ia64 && echo "GhcWithInterpreter=YES" >> mk/build.mk
-
-		# Workaround for threaded RTS bugs on sparc in ghc-6.6
-		# This is rather draconian, hopefully upstream fixes this soon.
-		if use sparc; then
+		# GHC build system knows to build unregisterised on alpha and hppa,
+		# but we have to tell it to build unregisterised on some other arches
+		if use ia64 || use ppc64 || use sparc; then
 		  echo "GhcUnregisterised=YES" >> mk/build.mk
 		  echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
 		  echo "GhcWithInterpreter=NO" >> mk/build.mk
@@ -278,15 +266,6 @@ src_compile() {
 		  echo "GhcNotThreaded=YES" >> mk/build.mk
 		fi
 
-		# The SplitObjs feature makes 'ar'/'ranlib' take loads of RAM:
-		CHECKREQS_MEMORY="200"
-		if ! check_reqs_conditional; then
-		  elog "Turning off ghc's 'Split Objs' feature because this machine"
-		  elog "does not have enough RAM for it. This will have the effect"
-		  elog "of making binaries produced by ghc considerably larger."
-		  echo "SplitObjs=NO" >> mk/build.mk
-		fi
-
 		econf \
 		  --with-ghc="${T}/ghc.sh" \
 		  || die "econf failed"