Drop support for ghc and darcs.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

11 files changed, 52 insertions, 66 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 66532e433c05..e22e59e3e4f8 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.179 2010/06/17 20:47:56 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.180 2010/07/01 20:27:50 jer Exp $
+
+  01 Jul 2010; Jeroen Roovers <jer@gentoo.org> ghc-6.4.2.ebuild,
+  ghc-6.6.ebuild, ghc-6.6.1.ebuild, ghc-6.8.2.ebuild, ghc-6.8.2-r1.ebuild,
+  ghc-6.10.4.ebuild, ghc-6.10.4-r1.ebuild, ghc-6.12.1.ebuild,
+  ghc-6.12.3.ebuild:
+  Drop support for ghc and darcs.
 
   17 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org> ghc-6.12.3.ebuild:
   Change SRC_URI to use ghc-bins from the mirroring system for ghc 6.12.3.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 176bb1831c0a..d2e5f0cd87e1 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10ghc 40 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a SHA1 33486a4907e8140f4d919813df4ef4e6203d6b20 SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f
 AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX ghc-6.10.2-readline.patch 8612 RMD160 cf3c1539a55225439c7f16c698e622c5f6f0cd47 SHA1 82318ea6285fc9dd3ed31a023e0a349a4950473c SHA256 9be6fe23aed177c6dd16fcea4eb9ba39406ee365cb923b33d084dec451005464
@@ -49,7 +46,6 @@ DIST ghc-bin-6.2.2-r1-sparc.tbz2 16189582 RMD160 0ba8ff87c91abcd43988c21df8537ee
 DIST ghc-bin-6.2.2-r1-x86.tbz2 14561932 RMD160 b8e6a08b269257689efdc95d698a9e2b86c6d3e3 SHA1 71da573a12385b69a872fb39edeb7b06f1db38b2 SHA256 24a4ea7fe9b8ba58f84e0d68012158e70972a1caacd482d6c84905bda4502f63
 DIST ghc-bin-6.4.2-alpha.tbz2 30930863 RMD160 f53968b2b9329dd4ffb15dfb64c3e7748e7fcfc2 SHA1 2915deac0a915d9c317d8781a3179041daa235c9 SHA256 8668d6b4d28a6567fb17665d41784c61576cabf6d80cf47c8b66d1f3f4178a3b
 DIST ghc-bin-6.4.2-amd64.tbz2 18554509 RMD160 f4b9ee0041d2a005a1d2d98290dc89eb120c5939 SHA1 d134942591fdfb17bd1b8e010220ea1086e85aca SHA256 8466a5f017a09d5bee2bd4f28cb0fa690cd2bf0f6c9fedd892624c7f1096d214
-DIST ghc-bin-6.4.2-hppa.tbz2 33914952 RMD160 c20d9a783abcfdda1a69b63e941c9f5c1fd587a0 SHA1 99a83e7c3bf5a6e7dec450ddd8a565d39803921d SHA256 6c036e313b4d67ab4940e62a3719589c5e94591ac8fe96ed595796876dd4bd88
 DIST ghc-bin-6.4.2-ia64.tbz2 28944776 RMD160 85f9a3f09e9f319cea0c8a253fdb03885ff7f13e SHA1 8124cb8b39c6e11c8373dfb0289c337617bc8f11 SHA256 7ac02b0277bbbc92aea4de150404ebf5b12445db197b08573446cad901638f12
 DIST ghc-bin-6.4.2-ppc.tbz2 22994932 RMD160 3ee3b26a1b98ceb085a2ca12e9e9e791c245ba86 SHA1 747ee3f204389c68e7c66d20ce2d535e2992ab20 SHA256 1239845ddaafe0bbfe8e24a13a6a7a7ba4462f313227e28d47beb644e876979c
 DIST ghc-bin-6.4.2-ppc64.tbz2 28817831 RMD160 98f4e0800233d0b75c519be26b77fd2455fa167d SHA1 d216e5c03d7cce7e3a109b754cde6c85596c4d68 SHA256 788a4c4e5730afd921bfe2c84c894b4190422a5d9e6d18d135de92976446d40a
@@ -63,14 +59,12 @@ DIST ghc-bin-6.6-sparc.tbz2 30576579 RMD160 0392fc6529f48f34a009dc9d4cd51da68db0
 DIST ghc-bin-6.6-x86.tbz2 24960612 RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b SHA1 4f51e60c73e1f256dc4954a2f3191415361436c5 SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72
 DIST ghc-bin-6.6.1-alpha.tbz2 36740906 RMD160 88d15d55fc6837d57b83be2dab285a3cf23b0e87 SHA1 e019fcb7cf7dbb6069a994e34696945ed6e1f49c SHA256 9637e4c1d1957ef8f0584d9e88278f1dca9db0d13b121f9ebe40a64716a652dd
 DIST ghc-bin-6.6.1-amd64.tbz2 27473156 RMD160 20359587c05ebead0e357d4c217e496f28ae6d5d SHA1 48ba2f6573cba5f76f1578de70defd9210545785 SHA256 f8e1795dd84f64eec0a15ca15cdb3ec08a164790ebe35b3ba2d9743e9dae3b16
-DIST ghc-bin-6.6.1-hppa.tbz2 46904941 RMD160 3107f2023f2bd26f50a3843f1fbf71a4d8db854d SHA1 ee3fbd1fe7c00774fca6949afe7cb7d6ca355fad SHA256 9d1aaf6865542a84d6c79c9a8bfb8ccfc73fb016c3ef6bae3b1b35bf6e8fb723
 DIST ghc-bin-6.6.1-ia64.tbz2 31173460 RMD160 9370becd46a3446c658072a5c7a83c656b98bcff SHA1 9343e15f6fd3b1b0a4b81481426b5d02187e073e SHA256 5d0110dd4d84519e7e84e37af8b7a2b13f62ae40fd75112f96b177d9e17f6946
 DIST ghc-bin-6.6.1-ppc.tbz2 36241311 RMD160 af8fbaa06d9a13337612b44b2131ee3a95a7aa0c SHA1 142c53de642514f8eaac84ab22db5b79374cd6b3 SHA256 55dd1464ce9b7385437052a7240c85299c879aec2795b12e2169482af52e686f
 DIST ghc-bin-6.6.1-sparc.tbz2 31791719 RMD160 5cfd2aebfc1aae1c4fbb7bd39c6fd9715ad041cd SHA1 868a811b9cb00ab1c82e7353a0a35f5918e38944 SHA256 ecfd0dd250390d5e0a1a32e5be0bfac70f73e98d1a946641bd8be23c91e47706
 DIST ghc-bin-6.6.1-x86.tbz2 26134077 RMD160 fcc31115073c2c0c4be75dce0253cb9bca5e45d3 SHA1 2c6e4bfadbae714b2f8a5da8efbc43f8124e6f8d SHA256 17a9b7125ae52c7d20f177214919837c95f96d6d997d729e493a0b94bdb84d29
 DIST ghc-bin-6.8.2-alpha.tbz2 47983125 RMD160 4313112d5ab24f4120913bf8ffae46ffa37c1ee2 SHA1 7e2aa64d8e8494ba1e84be4549232253d302a205 SHA256 cd9c3b6a938b76dada2d34b33c0346b29dd645f0e7e597eda9c33d3aa7b2f756
 DIST ghc-bin-6.8.2-amd64.tbz2 31838398 RMD160 6e35229a2d4506dfec6ae732199d5f1cd79c91ef SHA1 9283ba39b9443c91035d8bdbd93278af98bc279d SHA256 d4510773b96afc3b89e6820fd4d0de3ebad34bbee0c200542bd1ad917b97020e
-DIST ghc-bin-6.8.2-hppa.tbz2 63658207 RMD160 9753bcef20a805ab27b3f4eae9cacc4493d0d4d6 SHA1 7f7f57b36bf895c78e35e0ff350e8fe223f32d3b SHA256 979b75550cbb45283766a7185adeb83fd338d26b5af82f08ac8f3d1963f312f3
 DIST ghc-bin-6.8.2-ia64.tbz2 46889108 RMD160 e7320de4c96e6c34e218d8574f1ab985541bb46f SHA1 c386b1f57644e0d3aa5a871a0b47de0d16e3f51e SHA256 f928e0b974988d4f68f3beae6c78f94187bbe5a0ebda35ffc50a1a01a634c2ad
 DIST ghc-bin-6.8.2-ppc.tbz2 41056145 RMD160 07347fb88b7cc94860f17201b7706963a2b23967 SHA1 168d4a763198e055700af747178cd033c362634e SHA256 62b089dd30523bdb10ff1474e1326ddb0cc3628a8499e789675cef1a77e4cb87
 DIST ghc-bin-6.8.2-sparc.tbz2 47563989 RMD160 7acbb0284ab02e501d28ef520c451b8022440b63 SHA1 5c76ce09b8a440396e94ce42b8ed7e92f988a748 SHA256 b9c391858ccc63137197445541966dd01427f549ef5d45e4359a588613821c4e
@@ -78,22 +72,15 @@ DIST ghc-bin-6.8.2-x86.tbz2 30872949 RMD160 ce2f9f6fe88440ba3574d85c219e96210d35
 DIST ghc-bundled-readline-5.2_p13-amd64.tbz2 976677 RMD160 f0543aa3f404d45aad4360cc07b777c3aaafc5fb SHA1 1737eae6fe00c4924577e6eb8fa5d2c7eb0b24ca SHA256 f67250899590a551278695bcb7f143c5a6423ea47e5e6966615072cc0f9b51f0
 DIST ghc-bundled-readline-5.2_p13-x86.tbz2 940742 RMD160 5f9470a99047f004bd0917c62253bff9b663c9a5 SHA1 f5463a8929d2ba792b91085f78d6763cb50ef14e SHA256 bb9766235ed0d6e3c2f3ffe1625ecbe8e4d2e0254f7060e845be3a404835cd2a
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
-EBUILD ghc-6.10.4-r1.ebuild 12080 RMD160 0db1c429f5ea776027b65f38ad7a5dd0ec86ddb1 SHA1 abe324c4c3b15fb2c88874269b9e0acb99f588da SHA256 8f6edcda42d9883f5bedfca8a0c7ad259669919e12c09c1778712421f54498ff
-EBUILD ghc-6.10.4.ebuild 11015 RMD160 f736ea1117fb62db038f1d4b3370ee36d803c32f SHA1 71f35920921887e010d7a83156a75f0c56372207 SHA256 2a97d8c63a6868c4756cad8d644ab96dd8a9fa6a233cfbcb59e83af0b6f9e601
-EBUILD ghc-6.12.1.ebuild 11691 RMD160 f0e9f7a6d443edeee971359acf5da14f7e3ecf73 SHA1 007c1e3577b633e8315cadc7b9df60dfbfaf170a SHA256 2e8f914d1ad969c99edab9d221b9afc1910996e7277101f38727c0f1e8effb2e
-EBUILD ghc-6.12.3.ebuild 12762 RMD160 2f43221984266b786ad8cd9592b825d013f04c73 SHA1 cab220e641dffd3aa3a2ff152c6ec7d9aba57d18 SHA256 d3120b26316a47a80974c3729f283719f408ef6bd71d8753a593144927c6bd4d
+EBUILD ghc-6.10.4-r1.ebuild 11969 RMD160 04931d573a984ebf4404a8306204de9c0ee5205b SHA1 38a0cf9acc3f6cab85a3369da3c6f4560f145bdd SHA256 6c5740afa76d6216318034341bbd279f20a2cf5994def75b6dc2d4e80ef2bed5
+EBUILD ghc-6.10.4.ebuild 10904 RMD160 b06e09b013b58f81a858d2c0a9002644c3bca91a SHA1 8efebdc5f6af3853e6e733fe6dc73392c21d41d7 SHA256 3c849a3e1eadd7565e8e40e220b09b7b16f2227810b9b3bc3abc92f6e7ecb67d
+EBUILD ghc-6.12.1.ebuild 11580 RMD160 f46eb36df08807fd5fb3d2e57eafde0f426c39f2 SHA1 479a43cd181f40cff1419f946e61294a0830302b SHA256 263225b989efd251dd660eefbeff6ca34c1464dc30610d329e6218f68104b2c1
+EBUILD ghc-6.12.3.ebuild 12651 RMD160 90a35f631958361ddcace9c69102231442f708b3 SHA1 b297adb26fd5597c69f864ff9f2f43ddabdc960e SHA256 0d9317882a1221480414dcee83da3f251a936671777d0d530449b0d205577a13
 EBUILD ghc-6.2.2.ebuild 10387 RMD160 3f30eb547a048ae8a911831d6b6ac04528f7bbcf SHA1 c08282a3a2e60cfb8f742fbb8607ae1819ca3be8 SHA256 201ce669c29ee075e24f03e9abd0510aa172e000e240fadcf89c096004789935
-EBUILD ghc-6.4.2.ebuild 13550 RMD160 54b1dc7fe619e62e168c42ef0135c6554c893834 SHA1 17e5ccc5479c5e387b45379960dd60d5ddbe8774 SHA256 650cc001ea76d20fe6d9deed696491a158ba1144cbb4930b501984c1bc8ab494
-EBUILD ghc-6.6.1.ebuild 12209 RMD160 0a2aa3e717ebff9c59ae96595352c0ab6d84ef40 SHA1 508ebe61208000f77f0968660b208211aaa805ec SHA256 329dae717e3764a6dd7583a2a296582202e3ce31f3b4fc7567b60dd514e02880
-EBUILD ghc-6.6.ebuild 10777 RMD160 141e86d9cf0525a8aff69b9a70ab1522b078ec62 SHA1 c432175362c80acbea221137d50467c8f065985b SHA256 28e0f78ed977d31ee301c726fd0be830b161c8830e6344d55d4c51113c50acb1
-EBUILD ghc-6.8.2-r1.ebuild 8952 RMD160 5c4832a7ca6dc41d217c0d5ebb677afd2ae5b174 SHA1 0b321957d4f9ddccf1614a6c5d901649125c6a8e SHA256 8699169558e85a23675058d9b70a0017c3207b6637db6f352b389e076cbe5baf
-EBUILD ghc-6.8.2.ebuild 9063 RMD160 d2842f4e26583fa1befecc0ad01a54983830a48a SHA1 8d52f906227815f0049d1403c302415bbd828c20 SHA256 c5ac2c32efce96ac677851ed85d6c0504a5bbbbaaba63ef383225795ab126bba
-MISC ChangeLog 31410 RMD160 5fed9303690b46e802a4a696a832d4b3d3c22bd8 SHA1 64ff2a11885c3b7ccc0fd404c072ac12bc7c7816 SHA256 4fdfa58600796f5a6f91d406119e536b894bfdeb26e42b2c76709f7df1747b82
+EBUILD ghc-6.4.2.ebuild 13488 RMD160 6aee6876535e79ac3cb3ab8ee3ed8718dd87eb14 SHA1 cff66990f5645f19f58c9dba239a723c1fa03cac SHA256 662fadc150d79ef9d666f76153278ce9a76ebef6f64b5d82a13a53d2c41c8ba5
+EBUILD ghc-6.6.1.ebuild 12113 RMD160 e0913733eb047f13f78bdec1fa202a5c312c2526 SHA1 dd10dda46adae7dadefda6fe5140002d521688f1 SHA256 14e013e3348c8d962776b2ecab2ce6b4a2b1ff0cfbbb007811dfc529df30ca55
+EBUILD ghc-6.6.ebuild 10758 RMD160 bbed00228fd200da1a2eab05b1ceafaaf3e50610 SHA1 d6766e84f761637444950ae0ffdfdba9e5aa6c65 SHA256 3939b0a97602cc8ff2227a6afb9aa785cfd11bbb64ec30849f20b0ba0cd2eb29
+EBUILD ghc-6.8.2-r1.ebuild 8929 RMD160 850372ce4198549dd1b9e3cbc7c8d430ba2b1cb5 SHA1 aa4eaaeebe6195deebc9ddb8db7d69d9eac036d0 SHA256 5ea452a3773b3cacd87ff6a04aa547cec7a9654c57580b9c0de2430a27e479f5
+EBUILD ghc-6.8.2.ebuild 8981 RMD160 85a32ec3ec9ebc1f2651c2a3aa86e374999dca87 SHA1 d01d8503d7668465b5f5d6151145297239e96c76 SHA256 57f147cd2177a1a279d406a0a93f4fac9c7b2c631fe91ab57b3903513de53da7
+MISC ChangeLog 31663 RMD160 82a9782fd1bcbb3c3ddd8d6dde8c17f170916993 SHA1 edfe692c001513b626b966f86bf8b407e574da5c SHA256 b868c3498623f1d92108284060adfba923fccf9b313dc2485b21438829b346c7
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwaigYACgkQ1n/CYbXjntInYQCfS1w9SHxXGEuWyDPkz+RSZsrp
-Z/UAnjDL8k/1UqDN+xYmc9WKgL06j/b/
-=/0Xf
------END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.10.4-r1.ebuild b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
index d9a939f54a84..f16e2d423e25 100644
--- a/dev-lang/ghc/ghc-6.10.4-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.4 2010/06/12 20:34:32 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.5 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -48,7 +48,6 @@ arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
 
 #arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
 #arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
 #arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
@@ -231,10 +230,10 @@ src_compile() {
 		# portage logging) reported as bug #111183
 		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
 		# ppc64: EvilMangler currently does not understand some TOCs
-		if use alpha || use hppa || use ppc64; then
+		if use alpha || use ppc64; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.10.4.ebuild b/dev-lang/ghc/ghc-6.10.4.ebuild
index 6044da439881..492f299062e6 100644
--- a/dev-lang/ghc/ghc-6.10.4.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4.ebuild,v 1.4 2009/09/16 06:50:28 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4.ebuild,v 1.5 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -47,7 +47,6 @@ arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64
 
 #arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
 #arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
 #arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
@@ -57,7 +56,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 IUSE="binary doc ghcbootstrap"
 
 RDEPEND="
@@ -217,10 +216,10 @@ src_compile() {
 		# portage logging) reported as bug #111183
 		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
 		# ppc64: EvilMangler currently does not understand some TOCs
-		if use alpha || use hppa || use ppc64; then
+		if use alpha || use ppc64; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.12.1.ebuild b/dev-lang/ghc/ghc-6.12.1.ebuild
index 22eb24cd5a77..9629e3d8b706 100644
--- a/dev-lang/ghc/ghc-6.12.1.ebuild
+++ b/dev-lang/ghc/ghc-6.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.1.ebuild,v 1.3 2010/06/16 19:18:04 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.1.ebuild,v 1.4 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -48,7 +48,6 @@ arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
 
 #arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
 #arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
 #arch_binaries="$arch_binaries x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
@@ -232,10 +231,10 @@ src_compile() {
 		# portage logging) reported as bug #111183
 		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
 		# ppc64: EvilMangler currently does not understand some TOCs
-		if use alpha || use hppa || use ppc64; then
+		if use alpha || use ppc64; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild
index f0be6a3b7ee8..c5d5c2152482 100644
--- a/dev-lang/ghc/ghc-6.12.3.ebuild
+++ b/dev-lang/ghc/ghc-6.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.2 2010/06/17 20:47:56 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.3 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -42,7 +42,6 @@ arch_binaries="$arch_binaries ppc64? ( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2
 
 #arch_binaries="$arch_binaries alpha?   ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries amd64?   ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries hppa?    ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )"
 #arch_binaries="$arch_binaries ia64?    ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries sparc?   ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )"
 #arch_binaries="$arch_binaries x86?     ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
@@ -239,10 +238,10 @@ src_compile() {
 		# portage logging) reported as bug #111183
 		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
 		# ppc64: EvilMangler currently does not understand some TOCs
-		if use alpha || use hppa || use ppc64; then
+		if use alpha || use ppc64; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 41223149db0c..05dc7f4a1062 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-2008 Gentoo Foundation
+# Copyright 1999-2010 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.27 2008/01/26 19:53:25 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.28 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -42,7 +42,6 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 				  mirror://gentoo/${P}-users_guide.tar.gz )
 		 alpha?	( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
 		 amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
-		 hppa?	( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )
 		 ia64?	( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )
 		 ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )
 		 ppc64?	( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )
@@ -54,7 +53,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="binary doc ghcbootstrap test X opengl openal"
 
 LOC="/opt/ghc" # location for installation of binary version
diff --git a/dev-lang/ghc/ghc-6.6.1.ebuild b/dev-lang/ghc/ghc-6.6.1.ebuild
index 36ce21da41fc..4873ccd573d4 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-2010 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.18 2010/06/17 20:16:17 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.19 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -40,7 +40,6 @@ EXTRA_SRC_URI="${MY_PV}"
 SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2 )
 		 alpha? ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
 		 amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
-		 hppa?	( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )
 		 ia64?	( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )
 		 ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )
 		 sparc?	( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )
@@ -48,7 +47,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE="binary doc ghcbootstrap"
 
 LOC="/opt/ghc" # location for installation of binary version
@@ -244,13 +243,13 @@ src_compile() {
 		# reported as bug #111183
 		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
-		if use alpha || use hppa || use ppc64 || use sparc; then
+		if use alpha || use ppc64 || use sparc; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 		fi
-		if use alpha || use hppa || use ppc64 || use sparc; then
+		if use alpha || use ppc64 || use sparc; then
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
 			echo "SplitObjs=NO" >> mk/build.mk
 			echo "GhcRTSWays := debug" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index c032c79a2b4f..64a370ccbee5 100644
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.15 2008/01/26 19:53:25 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.16 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -49,7 +49,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+#KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="binary doc ghcbootstrap"
 
 LOC="/opt/ghc" # location for installation of binary version
@@ -225,7 +225,7 @@ src_compile() {
 		# reported as bug #111183
 		echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# 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
diff --git a/dev-lang/ghc/ghc-6.8.2-r1.ebuild b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
index 035bc11909a6..69fd56cbf92c 100644
--- a/dev-lang/ghc/ghc-6.8.2-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2-r1.ebuild,v 1.2 2009/09/10 09:01:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2-r1.ebuild,v 1.3 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -197,9 +197,9 @@ src_compile() {
 	# portage logging) reported as bug #111183
 	echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-	# GHC build system knows to build unregisterised on alpha and hppa,
+	# GHC build system knows to build unregisterised on alpha,
 	# but we have to tell it to build unregisterised on some arches
-	if use alpha || use hppa || use ia64 || use ppc64 || use sparc; then
+	if use alpha || use ia64 || use ppc64 || use sparc; then
 		echo "GhcUnregisterised=YES" >> mk/build.mk
 		echo "GhcWithInterpreter=NO" >> mk/build.mk
 		echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
diff --git a/dev-lang/ghc/ghc-6.8.2.ebuild b/dev-lang/ghc/ghc-6.8.2.ebuild
index 6a80477dcd48..71a5ec225eb2 100644
--- a/dev-lang/ghc/ghc-6.8.2.ebuild
+++ b/dev-lang/ghc/ghc-6.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2.ebuild,v 1.13 2009/08/02 11:01:42 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.8.2.ebuild,v 1.14 2010/07/01 20:27:50 jer Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -41,7 +41,6 @@ EXTRA_SRC_URI="${PV}"
 SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz2 )
 	alpha? ( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
 	amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
-	hppa?	( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 )
 	ia64?	( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 )
 	ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )
 	sparc?	( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )
@@ -49,7 +48,7 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 IUSE="binary doc ghcbootstrap"
 
 RDEPEND="
@@ -192,9 +191,9 @@ src_compile() {
 		# portage logging) reported as bug #111183
 		echo "SRC_HC_OPTS+=-w" >> mk/build.mk
 
-		# GHC build system knows to build unregisterised on alpha and hppa,
+		# GHC build system knows to build unregisterised on alpha,
 		# but we have to tell it to build unregisterised on some arches
-		if use alpha || use hppa || use ia64 || use ppc64 || use sparc; then
+		if use alpha || use ia64 || use ppc64 || use sparc; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 			echo "GhcWithNativeCodeGen=NO" >> mk/build.mk