Merge ghc and ghc-bin ebuilds.

Package-Manager: portage-2.1.2.9

5 files changed, 280 insertions, 158 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 8d15e1862a26..41c9192827c8 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.119 2007/04/06 16:26:05 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.120 2007/07/06 00:02:59 dcoutts Exp $
+
+  05 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> +files/10ghc,
+  ghc-6.6.ebuild:
+  Merge ghc and ghc-bin ebuilds. emerge ghc with USE="binary" to get a binary
+  version. The ghc-bin ebuild will not be used anymore. This ghc ebuild is
+  able to bootstrap without a separate ghc-bin ebuild by downloading a binary
+  version specially for the purpose.
 
   06 Apr 2007; Chris Parrott <cparrott@gentoo.org>
   +files/ghc-6.6-nothreadedrts.patch, ghc-6.6.ebuild:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index d32aa60cf124..234195c58dde 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 10ghc 40 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a SHA1 33486a4907e8140f4d919813df4ef4e6203d6b20 SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f
+MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
+RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a files/10ghc 40
+SHA256 86c80e876343456b1a1407365bfc2a441bf4c6ca23d3549d67bd800abd617e2f files/10ghc 40
 AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 files/depsort.py 1958
@@ -42,7 +49,12 @@ DIST ghc-6.2.2-src.tar.bz2 5406427 RMD160 7afa370c148f2b9c3d53d662da996f5d7c0528
 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
 DIST ghc-6.6-src.tar.bz2 4345587 RMD160 0d8d5cdde21e5ad86fba1023872be316316d14e7 SHA1 9876dbc46ef22684c2cc95e8dce49b2a1f47017e SHA256 79b2a29136d56c8120a526188297603304dc80d3093cda76fde939df7d4dcc7e
+DIST ghc-6.6-users_guide.tar.gz 255475 RMD160 ecbdff8f0501780641408204fe60946cde392c95 SHA1 13c8e0e5922a8598a7b8c0eb05dbef9c8e1b661c SHA256 7242a6ccf3df6f141f4e493f9dd37def9d036239b819aa5a5d6f3a58489799ef
+DIST ghc-bin-6.6-amd64.tbz2 26093530 RMD160 b44c90a8e3f99a462af0400d0d31c315833606bb SHA1 1bde6e886df681da8ff65529ca1fd288e1b768a0 SHA256 acde821d26abbd0838e5bcd41cbde0daf5a538fea7619e3f2bc6cbe491d4b387
+DIST ghc-bin-6.6-ppc.tbz2 34668445 RMD160 33f811104146dc8ef4d2839f71d39eb821128515 SHA1 b7ab12fe30ada669b7241bd604280674d94a8284 SHA256 f0bc5583396666da4f03f519cec9fc239e96ae06d5fdb5bd951de8dae1cb1d79
+DIST ghc-bin-6.6-x86.tbz2 24960612 RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b SHA1 4f51e60c73e1f256dc4954a2f3191415361436c5 SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72
 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
@@ -60,14 +72,18 @@ EBUILD ghc-6.4.2.ebuild 10933 RMD160 b67ba084a9ac90df327f855bdee9b3725423e938 SH
 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.ebuild 10340 RMD160 d947cbaa49df4d265d54316ec66268f878c2d093 SHA1 27ed38a2fe29c3dc857b8939f31170ecba30a721 SHA256 43464607c29b321a547cd3b09f0149c6e05b0020697162650441d6bed468108e
-MD5 185bf381701f8a9954be727da5b16045 ghc-6.6.ebuild 10340
-RMD160 d947cbaa49df4d265d54316ec66268f878c2d093 ghc-6.6.ebuild 10340
-SHA256 43464607c29b321a547cd3b09f0149c6e05b0020697162650441d6bed468108e ghc-6.6.ebuild 10340
-MISC ChangeLog 20582 RMD160 ec33baca0c53e3294b319ce5d2259b6efd378f49 SHA1 26a4f7fb650abace320696cdb278903cd7f8aad6 SHA256 02a300ee8315f5c2b2abc23da05f492a60508d2be8ca98b3534e45bf649dece4
-MD5 f44d5788f00d85cd989180f522835f60 ChangeLog 20582
-RMD160 ec33baca0c53e3294b319ce5d2259b6efd378f49 ChangeLog 20582
-SHA256 02a300ee8315f5c2b2abc23da05f492a60508d2be8ca98b3534e45bf649dece4 ChangeLog 20582
+EBUILD ghc-6.6.ebuild 12602 RMD160 87bc2a1cf21b2fe1939a21ae454278aa4379567f SHA1 79bd407b080726bcc6524cd829fe61205a4626bd SHA256 566aaab317ba261bebf67a783d5c8facb1612368b026a1a8fb65e91ea7bf1963
+MD5 ab51a5230ee63780aa1b8a8c42bb0c48 ghc-6.6.ebuild 12602
+RMD160 87bc2a1cf21b2fe1939a21ae454278aa4379567f ghc-6.6.ebuild 12602
+SHA256 566aaab317ba261bebf67a783d5c8facb1612368b026a1a8fb65e91ea7bf1963 ghc-6.6.ebuild 12602
+MISC .ChangeLog.swp 4096 RMD160 04a28922dd008b2a82bf0305c68df6e1cd8b750c SHA1 886701f3981c7c959ce6cadd37dea02a7087ddbd SHA256 848e6c2aa6b5eab8ea312c0f739e7eedf8c937127f4417a5754e271aac285a1a
+MD5 ad64a4df73e334707197a64a8dbe8786 .ChangeLog.swp 4096
+RMD160 04a28922dd008b2a82bf0305c68df6e1cd8b750c .ChangeLog.swp 4096
+SHA256 848e6c2aa6b5eab8ea312c0f739e7eedf8c937127f4417a5754e271aac285a1a .ChangeLog.swp 4096
+MISC ChangeLog 20932 RMD160 7e235a99c423598e6a1e3238df11715d652271c2 SHA1 d3747209ad6352219504f88457c8be98a471b345 SHA256 d79d17d1404ce2cc12662b6112b0966bea8863296a7375f88d8cdde31df850b4
+MD5 6912917b44b5b6a545f797e6f7e80bb3 ChangeLog 20932
+RMD160 7e235a99c423598e6a1e3238df11715d652271c2 ChangeLog 20932
+SHA256 d79d17d1404ce2cc12662b6112b0966bea8863296a7375f88d8cdde31df850b4 ChangeLog 20932
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -84,6 +100,13 @@ SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/di
 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
-MD5 2255c6442cd019753ca35bad1f71e78f files/digest-ghc-6.6 241
-RMD160 6d3e93d9851cfbf07c6e6df35e1b7adbf5c01903 files/digest-ghc-6.6 241
-SHA256 08a1beeb6d4f6f1f6c33e3db553861106f19cfc95d6c84ef410efdae2ae6bda6 files/digest-ghc-6.6 241
+MD5 9fda0ebf274ce6564a9ba348c950c4b2 files/digest-ghc-6.6 1503
+RMD160 b9848089e47fc25b736bd3d7c0a39cb660702ed6 files/digest-ghc-6.6 1503
+SHA256 4150515e9adee0e17b9da5589d12162bbd792e38cda8405aa60bec565e533693 files/digest-ghc-6.6 1503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGjYbVnUVyUObPUL4RAj7uAJ9/1/tEdsGGEr5TNFBT7e41MmAkXgCggmHV
+ZHsSsW7+68IL8vpfr45hwpI=
+=MK16
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/10ghc b/dev-lang/ghc/files/10ghc
new file mode 100644
index 000000000000..064cfb79d5bd
--- /dev/null
+++ b/dev-lang/ghc/files/10ghc
@@ -0,0 +1,2 @@
+PATH=/opt/ghc/bin
+ROOTPATH=/opt/ghc/bin
diff --git a/dev-lang/ghc/files/digest-ghc-6.6 b/dev-lang/ghc/files/digest-ghc-6.6
index d1bf3b8cdd1d..b58eda9cee62 100644
--- a/dev-lang/ghc/files/digest-ghc-6.6
+++ b/dev-lang/ghc/files/digest-ghc-6.6
@@ -1,3 +1,18 @@
+MD5 747af16f9e5bf7f5ef8af40f1a33c3a4 ghc-6.6-libraries.tar.gz 1221149
+RMD160 7c8a8cf26f43f4cbb31f4eee0682f85bf7143daf ghc-6.6-libraries.tar.gz 1221149
+SHA256 1df171a2d7996b1014c51353ef715010d682d6ff1115dbfa1fd68176dc923236 ghc-6.6-libraries.tar.gz 1221149
 MD5 2427a8d7d14f86e0878df6b54938acf7 ghc-6.6-src.tar.bz2 4345587
 RMD160 0d8d5cdde21e5ad86fba1023872be316316d14e7 ghc-6.6-src.tar.bz2 4345587
 SHA256 79b2a29136d56c8120a526188297603304dc80d3093cda76fde939df7d4dcc7e ghc-6.6-src.tar.bz2 4345587
+MD5 558f36f81d322316dd49909df6ffe70a ghc-6.6-users_guide.tar.gz 255475
+RMD160 ecbdff8f0501780641408204fe60946cde392c95 ghc-6.6-users_guide.tar.gz 255475
+SHA256 7242a6ccf3df6f141f4e493f9dd37def9d036239b819aa5a5d6f3a58489799ef ghc-6.6-users_guide.tar.gz 255475
+MD5 9aac2e2c31e7532b613b871fa9b95694 ghc-bin-6.6-amd64.tbz2 26093530
+RMD160 b44c90a8e3f99a462af0400d0d31c315833606bb ghc-bin-6.6-amd64.tbz2 26093530
+SHA256 acde821d26abbd0838e5bcd41cbde0daf5a538fea7619e3f2bc6cbe491d4b387 ghc-bin-6.6-amd64.tbz2 26093530
+MD5 fbd10ef5e4a5adcb635e1cd8ed288030 ghc-bin-6.6-ppc.tbz2 34668445
+RMD160 33f811104146dc8ef4d2839f71d39eb821128515 ghc-bin-6.6-ppc.tbz2 34668445
+SHA256 f0bc5583396666da4f03f519cec9fc239e96ae06d5fdb5bd951de8dae1cb1d79 ghc-bin-6.6-ppc.tbz2 34668445
+MD5 935c4d43fa82b220010fa593edfe97d0 ghc-bin-6.6-x86.tbz2 24960612
+RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b ghc-bin-6.6-x86.tbz2 24960612
+SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72 ghc-bin-6.6-x86.tbz2 24960612
diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index c0068714155e..a922c8d9f626 100644
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -1,18 +1,20 @@
 # 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.4 2007/06/26 01:49:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.5 2007/07/06 00:02:59 dcoutts 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
+# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
+# where ghc-bin was primarily used for bootstrapping purposes.
+# From now on, these two ebuilds have been combined, with the
+# binary USE flag used to determine whether or not the pre-built
+# binary package should be emerged or whether ghc should be compiled
+# from source.  If the latter, then the relevant ghc-bin for the
+# arch in question will be used in the working directory to compile
+# ghc from source.
 #
-# This solution has the advantage that the binary distribution
-# can be removed once an forall after the first succesful install
-# of ghc.
+# This solution has the advantage of allowing us to retain the one
+# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -38,14 +40,23 @@ MY_P="${PN}-${MY_PV}"
 EXTRA_SRC_URI="${MY_PV}"
 [[ -z "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="current/dist"
 
-SRC_URI="http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
+SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2 )
+		 doc? 	( binary? ( mirror://${P}-libraries.tar.gz
+						    mirror://${P}-users_guide.tar.gz ) )
+		 amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
+		 x86?	( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )
+		 ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
+#		 alpha?		( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
+#		 sparc?		( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )
 #	"test? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/ghc-testsuite-${MY_PV}.tar.gz )"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+KEYWORDS="~amd64 ~ppc ~x86"
+#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="binary doc ghcbootstrap"
 
+LOC="/opt/ghc" # location for installation of binary version
 S="${WORKDIR}/${MY_P}"
 
 PROVIDE="virtual/ghc"
@@ -54,32 +65,17 @@ RDEPEND="
 	>=sys-devel/gcc-2.95.3
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
-	>=sys-libs/readline-4.2"
+	=sys-libs/readline-5*"
 
-# ghc cannot usually be bootstrapped using later versions ...
 DEPEND="${RDEPEND}
-	<virtual/ghc-6.7
-	!>=virtual/ghc-6.7
-	doc? (  ~app-text/docbook-xml-dtd-4.2
+	doc? ( !binary? (
+			~app-text/docbook-xml-dtd-4.2
 			app-text/docbook-xsl-stylesheets
 			>=dev-libs/libxslt-1.1.2
-			>=dev-haskell/haddock-0.8 )"
+			>=dev-haskell/haddock-0.8 ) )"
 
 PDEPEND=">=dev-haskell/cabal-1.1.6.1"
 
-#pkg_setup() {
-	# 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
@@ -136,143 +132,209 @@ ghc_setup_cflags() {
 
 ghc_setup_wrapper() {
 	echo '#!/bin/sh'
-	echo "GHCBIN=\"$(ghc-libdir)/ghc-$1\";"
-	echo "TOPDIROPT=\"-B$(ghc-libdir)\";"
+	echo "GHCBIN=\"$1\";"
+	echo "TOPDIROPT=\"-B$(dirname $1)\";"
 	echo "GHC_CFLAGS=\"${GHC_CFLAGS}\";"
 	echo '# Mini-driver for GHC'
 	echo 'exec $GHCBIN $TOPDIROPT $GHC_CFLAGS ${1+"$@"}'
 }
 
+pkg_setup() {
+	if use ghcbootstrap && [[ -z $(type -P ghc) ]]; then
+		ewarn ""
+		ewarn "You requested bootstrapping,"
+		ewarn "but I could not find a ghc executable to bootstrap with"
+		ewarn ""
+		die "Could not find a ghc executable to bootstrap with"
+	fi
+}
+
 src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
 	base_src_unpack
 	ghc_setup_cflags
 
-	# Modify the ghc driver script to use GHC_CFLAGS
-	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/driver/ghc/Makefile"
-	echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/driver/ghc/Makefile"
-	sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/driver/ghc/ghc.sh"
+	if use binary; then
 
-	# If we're using the testsuite then move it to into the build tree
-#	use test && mv "${WORKDIR}/testsuite" "${S}/"
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${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"
+		if use doc; then
+			mkdir "${S}/usr/share/doc/${MY_P}/html"
+			mv "${WORKDIR}/libraries" "${S}/usr/share/doc/${MY_P}/html/"
+			mv "${WORKDIR}/users_guide" "${S}/usr/share/doc/${MY_P}/html/"
+		fi
 
-	# 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
+		# Setup the ghc wrapper script
+		GHCBIN="${LOC}/$(get_libdir)/$P/$P"
+		ghc_setup_wrapper "$GHCBIN" > "${S}/usr/bin/ghc-${PV}"
 
-	# Temporary patches that needs testing before being pushed upstream:
-	cd "${S}"
-	# Fix sparc split-objs linking problem
-	epatch "${FILESDIR}/ghc-6.5-norelax.patch"
+		# Relocate from /usr to /opt/ghc
+		sed -i -e "s|/usr|${LOC}|g" \
+			"${S}/usr/bin/ghci-${PV}" \
+			"${S}/usr/bin/ghc-pkg-${PV}" \
+			"${S}/usr/bin/hsc2hs" \
+			"${S}/usr/$(get_libdir)/ghc-${PV}/package.conf"
 
-	# Disable threaded runtime build to work around RTS bugs on sparc
-	epatch "${FILESDIR}/ghc-6.6-nothreadedrts.patch"
-}
+		sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+			"${S}/usr/bin/ghcprof"
 
-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
-
-	# If you need to do a quick build then enable this bit and add debug to IUSE
-	#if use debug; then
-	#	echo "SRC_HC_OPTS     = -H32m -O -fasm" >> mk/build.mk
-	#	echo "GhcLibHcOpts    =" >> mk/build.mk
-	#	echo "GhcLibWays      =" >> mk/build.mk
-	#	echo "SplitObjs       = NO" >> mk/build.mk
-	#fi
-
-	# 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
-
-	# 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
-		echo "GhcUnregisterised=YES" >> mk/build.mk
-		echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-		echo "GhcWithInterpreter=NO" >> mk/build.mk
-		echo "SplitObjs=NO" >> mk/build.mk
-		echo "GhcRTSWays := debug" >> mk/build.mk
-		echo "GhcNotThreaded=YES" >> mk/build.mk
-	fi
+		# Modify the ghc driver script to use GHC_CFLAGS
+		echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/driver/ghc/Makefile"
+		echo "GHC_CFLAGS = ${GHC_CFLAGS}"      >> "${S}/driver/ghc/Makefile"
+		sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/driver/ghc/ghc.sh"
 
-	# 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
+		# Create the setup wrapper
+		if use ghcbootstrap; then
+			# When we are bootstrapping, rely on the developer to have set a
+			# sane environment
+
+			echo -e '#!/bin/sh\nexec ghc $*' > "${T}/ghc.sh"
+		else
+			GHC_TOP="${WORKDIR}/usr/$(get_libdir)/${P}"
+			GHC_CFLAGS="" ghc_setup_wrapper "${GHC_TOP}/${P}" > "${T}/ghc.sh"
+
+			# Fix paths for workdir ghc
+			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
+				"${GHC_TOP}/package.conf"
+		fi
+
+		chmod +x "${T}/ghc.sh"
 
-	GHC_CFLAGS="" ghc_setup_wrapper $(ghc-version) > "${T}/ghc.sh"
-	chmod +x "${T}/ghc.sh"
+		# If we're using the testsuite then move it to into the build tree
+		#	use test && mv "${WORKDIR}/testsuite" "${S}/"
 
-	econf \
-		--with-ghc="${T}/ghc.sh" \
-		|| die "econf failed"
+		# 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"
 
-	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 ...
-	# TODO: is this still required ?
+		# 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}"
+		# 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"
+
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+
+		# 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
+
+		# If you need to do a quick build then enable this bit and add debug to IUSE
+		#if use debug; then
+		#	echo "SRC_HC_OPTS     = -H32m -O -fasm" >> mk/build.mk
+		#	echo "GhcLibHcOpts    =" >> mk/build.mk
+		#	echo "GhcLibWays      =" >> mk/build.mk
+		#	echo "SplitObjs       = NO" >> mk/build.mk
+		#fi
+
+		# 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
+
+		# 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
+		  echo "GhcUnregisterised=YES" >> mk/build.mk
+		  echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+		  echo "GhcWithInterpreter=NO" >> mk/build.mk
+		  echo "SplitObjs=NO" >> mk/build.mk
+		  echo "GhcRTSWays := debug" >> mk/build.mk
+		  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"
+
+		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 ...
+		# TODO: is this still required ?
+
+	fi # ! use binary
 }
 
 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
-	#TODO: is this still required?
-	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
-	# 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}"
-	dodoc README ANNOUNCE LICENSE VERSION
-
-	dosbin ${FILESDIR}/ghc-updater
+	if use binary; then
+	  mkdir "${D}/opt"
+	  mv "${S}/usr" "${D}/opt/ghc"
+
+	  doenvd "${FILESDIR}/10ghc"
+	else
+	  local insttarget
+
+	  insttarget="install"
+	  use doc && insttarget="${insttarget} install-docs"
+
+	  # the libdir0 setting is needed for amd64, and does not
+	  # harm for other arches
+	  #TODO: is this still required?
+	  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
+	  # 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}"
+	  dodoc README ANNOUNCE LICENSE VERSION
+
+	  dosbin ${FILESDIR}/ghc-updater
+	fi
 }
 
 pkg_postinst () {
@@ -283,10 +345,23 @@ pkg_postinst () {
 	elog "If you have dev-lang/ghc-bin installed, you might"
 	elog "want to unmerge it. It is no longer needed."
 	elog
+
+	if use binary; then
+		elog "The envirenment has been set to use the binary distribution of"
+		elog "GHC. In order to activate it please run:"
+		elog "   env-update && source /etc/profile"
+		elog "Otherwise this setting will become active the next time you login"
+	fi
+
 	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 "if you have switched between binary and source versions"
+	ewarn "of ghc, please run:"
+	if use binary; then
+		ewarn "      /opt/ghc/sbin/ghc-updater"
+	else
+		ewarn "      /usr/sbin/ghc-updater"
+	fi
 	ewarn "to re-merge all ghc-based Haskell libraries."
 }