Add ghc-6.6 back since it has binaries for alpha, ppc and sparc that we do not have yet for 6.6.1

(Portage version: 2.1.2.9)

3 files changed, 353 insertions, 1 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 9c6504a0b730..5e3797ea7624 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.129 2007/07/25 17:49:45 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.130 2007/07/25 18:30:23 dcoutts Exp $
+
+  25 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> +ghc-6.6.ebuild:
+  Add ghc-6.6 back since it has binaries for alpha, ppc and sparc that we do
+  not have yet for 6.6.1.
 
   25 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> -ghc-6.6.ebuild,
   ghc-6.6.1.ebuild:
diff --git a/dev-lang/ghc/files/digest-ghc-6.6 b/dev-lang/ghc/files/digest-ghc-6.6
new file mode 100644
index 000000000000..8f00b7efb6fd
--- /dev/null
+++ b/dev-lang/ghc/files/digest-ghc-6.6
@@ -0,0 +1,24 @@
+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 0c97822252e94de3c3a8d588cebbcdcf ghc-bin-6.6-alpha.tbz2 35338275
+RMD160 82b7dca5f3c8b89e7e395da95d596197eca92888 ghc-bin-6.6-alpha.tbz2 35338275
+SHA256 3a8e6cacccdb95313a22b8a8c27ecc0311ef83380f303a286f1d8ab216aa4f5d ghc-bin-6.6-alpha.tbz2 35338275
+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 b5063ed3f244f7816cdc43eea0626d53 ghc-bin-6.6-sparc.tbz2 30576579
+RMD160 0392fc6529f48f34a009dc9d4cd51da68db072eb ghc-bin-6.6-sparc.tbz2 30576579
+SHA256 7588d5adc444cf82dfeaa336b4bd6ccf6dbc4621f929ad664ae6742836229503 ghc-bin-6.6-sparc.tbz2 30576579
+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
new file mode 100644
index 000000000000..e875c0308654
--- /dev/null
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -0,0 +1,324 @@
+# 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.11 2007/07/25 18:30:23 dcoutts Exp $
+
+# Brief explanation of the bootstrap logic:
+#
+# 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 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:
+#
+# 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/"
+
+# 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="current/dist"
+
+SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2 )
+		 doc? 	( mirror://gentoo/${P}-libraries.tar.gz
+				  mirror://gentoo/${P}-users_guide.tar.gz )
+		 alpha?	( mirror://gentoo/ghc-bin-${PV}-alpha.tbz2 )
+		 amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 )
+		 ppc?	( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )
+		 sparc?	( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 )
+		 x86?	( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~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"
+
+RDEPEND="
+	!dev-lang/ghc-bin
+	>=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*"
+
+DEPEND="${RDEPEND}"
+# In the ghcbootstrap case we rely on the developer having
+# >=ghc-5.04.3 on their $PATH already
+
+PDEPEND=">=dev-haskell/cabal-1.1.6.1"
+
+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"
+}
+
+pkg_setup() {
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages for"
+		ewarn "use with the ghc ebuild's USE=\"binary\" feature."
+		use binary && \
+			die "USE=\"ghcbootstrap binary\" is not a valid combination."
+		use doc && \
+			die "USE=\"ghcbootstrap doc\" is not a valid combination"
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc 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
+
+	if use binary; then
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+
+		# Relocate from /usr to /opt/ghc
+		sed -i -e "s|/usr|${LOC}|g" \
+			"${S}/usr/bin/ghc-${PV}" \
+			"${S}/usr/bin/ghci-${PV}" \
+			"${S}/usr/bin/ghc-pkg-${PV}" \
+			"${S}/usr/bin/hsc2hs" \
+			"${S}/usr/$(get_libdir)/${P}/package.conf" \
+			|| die "Relocating ghc from /usr to /opt/ghc failed"
+
+		sed -i -e "s|/usr/$(get_libdir)|${LOC}/$(get_libdir)|" \
+			"${S}/usr/bin/ghcprof"
+
+	else
+
+		# 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 ghcbootstrap; then
+			# Relocate from /usr to ${WORKDIR}/usr
+			sed -i -e "s|/usr|${WORKDIR}/usr|g" \
+				"${WORKDIR}/usr/bin/ghc-${PV}" \
+				"${WORKDIR}/usr/bin/ghci-${PV}" \
+				"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
+				"${WORKDIR}/usr/bin/hsc2hs" \
+				"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf" \
+				|| die "Relocating ghc from /usr to workdir failed"
+		fi
+
+		# If we're using the testsuite then move it to into the build tree
+		#	use test && mv "${WORKDIR}/testsuite" "${S}/"
+
+		# 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
+
+		# We can't depend on haddock so we never build docs
+		# and we rely on pre-built ones instead
+		echo XMLDocWays="" >> mk/build.mk
+		# needed to prevent haddock from being called
+		echo NO_HADDOCK_DOCS=YES >> 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
+
+		# 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
+			echo "SplitObjs=NO" >> mk/build.mk
+			echo "GhcRTSWays := debug" >> mk/build.mk
+			echo "GhcNotThreaded=YES" >> mk/build.mk
+		fi
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		use ghcbootstrap || \
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+
+		econf || die "econf failed"
+
+		emake all datadir="/usr/share/doc/${P}" || die "make failed"
+		# the explicit datadir is required to make the haddock entries
+		# in the package.conf file point to the right place ...
+
+	fi # ! use binary
+}
+
+src_install() {
+	if use binary; then
+		mkdir "${D}/opt"
+		mv "${S}/usr" "${D}/opt/ghc"
+
+		doenvd "${FILESDIR}/10ghc"
+	else
+
+		# the libdir0 setting is needed for amd64, and does not
+		# harm for other arches
+		#TODO: are any of these overrides still required? isn't econf enough?
+		emake -j1 install \
+			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 install failed"
+
+		cd "${S}"
+		dodoc README ANNOUNCE LICENSE VERSION
+
+		dosbin ${FILESDIR}/ghc-updater
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}/libraries/"* \
+			|| die "installing library docs failed"
+		dohtml -r "${WORKDIR}/users_guide/"* \
+			|| die "installing user guide failed"
+	fi
+}
+
+pkg_postinst() {
+	ebegin "Hiding ghc's built-in cabal "
+	$(ghc-getghcpkg) hide 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
+
+	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 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."
+}
+
+pkg_prerm() {
+	# Delete the GHC package database
+	use binary && GHC_PREFIX="${ROOT}opt/ghc" || GHC_PREFIX="${ROOT}usr"
+	GHC_PKG_DB="${GHC_PREFIX}/$(get_libdir)/${P}/package.conf"
+	rm -f ${GHC_PKG_DB} ${GHC_PKG_DB}.old
+}