Add dev-lang/ghc-6.8.2-r1. Fixed version wrt bug #259867.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 297 insertions, 3 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 272ff4b4e12e..d8963c12b6d3 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/ghc
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.158 2008/10/04 10:15:33 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.159 2009/04/17 16:27:48 kolmodin Exp $
+
+*ghc-6.8.2-r1 (17 Apr 2009)
+
+  17 Apr 2009; Lennart Kolmodin <kolmodin@gentoo.org> +ghc-6.8.2-r1.ebuild:
+  Add a restricted version of ghc 6.8.2 (-r1), but that can handle
+  >=sys-libs/readline-6. Previous ghc versions depends on =readline-5, which
+  gives problems now that readline-6 is in the tree. To allow other readline
+  versions we have bundled a precompiled readline-5 package, making the ghc
+  bootstrap process work. Thus, this also forced us to remove the USE=binary
+  flag. See bug #259867.
 
   04 Oct 2008; Raúl Porcel <armin76@gentoo.org> ghc-6.8.2.ebuild:
   alpha/ia64 stable
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index c7ab9199c516..37ac79b315dd 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,3 +1,6 @@
+-----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.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096ea8e SHA1 40d25c25a3cd6a228f3757b8e298fd8c72710544 SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44
@@ -48,11 +51,21 @@ DIST ghc-bin-6.8.2-hppa.tbz2 63658207 RMD160 9753bcef20a805ab27b3f4eae9cacc4493d
 DIST ghc-bin-6.8.2-ia64.tbz2 46889108 RMD160 e7320de4c96e6c34e218d8574f1ab985541bb46f SHA1 c386b1f57644e0d3aa5a871a0b47de0d16e3f51e SHA256 f928e0b974988d4f68f3beae6c78f94187bbe5a0ebda35ffc50a1a01a634c2ad
 DIST ghc-bin-6.8.2-sparc.tbz2 47563989 RMD160 7acbb0284ab02e501d28ef520c451b8022440b63 SHA1 5c76ce09b8a440396e94ce42b8ed7e92f988a748 SHA256 b9c391858ccc63137197445541966dd01427f549ef5d45e4359a588613821c4e
 DIST ghc-bin-6.8.2-x86.tbz2 30872949 RMD160 ce2f9f6fe88440ba3574d85c219e96210d35128a SHA1 17fa4fc07e12655d4599761986386c18c0ee23a1 SHA256 3c7e22dd18e622b6c9c802584cb5556b0afa7186f0df78d420d008b8c4f59fed
+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.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 12238 RMD160 389782acd6d8ae37e6ffd72fb71667f3c1f04ccb SHA1 8c90cfaa9c7460e8ba9ead1650c76af24cdaa506 SHA256 1e673609fa84ecd8b89159760e7d80351d912e2acbcdb6b3dee1c58f160a5109
 EBUILD ghc-6.6.ebuild 10777 RMD160 141e86d9cf0525a8aff69b9a70ab1522b078ec62 SHA1 c432175362c80acbea221137d50467c8f065985b SHA256 28e0f78ed977d31ee301c726fd0be830b161c8830e6344d55d4c51113c50acb1
+EBUILD ghc-6.8.2-r1.ebuild 8957 RMD160 528b0c499a7e6482316c59cacd61e1a5c984bfd4 SHA1 4a0ab01193cfc938de6ea41f62d979330da001b4 SHA256 4f51fc9df8ae0d9506094e71c4d8576eade93a832110393587dcc15c34ca0053
 EBUILD ghc-6.8.2.ebuild 9336 RMD160 782353205f54e256d0d71307e8b4d670a4eb1102 SHA1 eed1952ca256d9968bcefaa6d6805870d1ce2562 SHA256 326debb87b5055a73cbff6e2f983bf6a6081393540cc8f8531a0dbada5e3d013
-MISC ChangeLog 26572 RMD160 93e02de5c0ce74950711d3302466438adc052b63 SHA1 001c99fc946fe30b924636aa61869bd5a99e6a8c SHA256 a83d51135af6e08df4d95d07f96ace0d9b46deb0779f38611cb1e82e365f3fa5
+MISC ChangeLog 27078 RMD160 30b90f67c03906184d6c75fb8195f64802dc5fa9 SHA1 6ad343c2f15206dcdc50cbb34447d8d90e191b09 SHA256 1672822ca143d3e73b499259f0608f0ffc20fe0a07f75a2a58568286fa80ad7a
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknorhcACgkQ1n/CYbXjntJMsQCfXlB8NTSxbX2pIh7hUftK6aVY
+4y0AoJ2notCFjUFxZuF7qv9BcsFadUVW
+=1OCe
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.8.2-r1.ebuild b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
new file mode 100644
index 000000000000..0a00194d1aa8
--- /dev/null
+++ b/dev-lang/ghc/ghc-6.8.2-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2009 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.1 2009/04/17 16:27:48 kolmodin 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 bash-completion eutils flag-o-matic toolchain-funcs ghc-package versionator
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# discover if this is a snapshot release
+IS_SNAPSHOT="$(get_version_component_range 4)" # non-empty if snapshot
+EXTRA_SRC_URI="${PV}"
+[[ "${IS_SNAPSHOT}" ]] && EXTRA_SRC_URI="stable/dist"
+
+# by using a bundled precompiled readline library we can use the bundled ghc
+# binary to bootstrap, even if it was linked with libreadline-5 and the user has
+# upgraded to libreadline-6.
+READLINE_PV="5.2_p13"
+READLINE_P="readline-${READLINE_PV}"
+
+SRC_URI="http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${P}-src.tar.bz2
+	amd64?	( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2
+			  http://haskell.org/~kolmodin/ghc-bundled-${READLINE_P}-amd64.tbz2 )
+	x86?	( mirror://gentoo/ghc-bin-${PV}-x86.tbz2
+			  http://haskell.org/~kolmodin/ghc-bundled-${READLINE_P}-x86.tbz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ghcbootstrap"
+
+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}
+	ghcbootstrap? (	doc? (	~app-text/docbook-xml-dtd-4.2
+							app-text/docbook-xsl-stylesheets
+							>=dev-libs/libxslt-1.1.2
+							>=dev-haskell/haddock-0.8 ) )"
+# In the ghcbootstrap case we rely on the developer having
+# >=ghc-5.04.3 on their $PATH already
+
+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."
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	fi
+}
+
+src_unpack() {
+	base_src_unpack
+	ghc_setup_cflags
+
+	# Modify the ghc driver script to use GHC_CFLAGS
+	sed -i -e "s|\$\$TOPDIROPT|\$\$TOPDIROPT ${GHC_CFLAGS}|" \
+		"${S}/driver/ghc/Makefile"
+
+	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
+}
+
+src_compile() {
+	# find where the .so for readline-5 lives
+	# could either be /lib or /lib64
+	for lib_path in lib{,64} ; do
+		if [[ -e "${WORKDIR}/${lib_path}/libreadline.so" ]]; then
+			# make sure ghc will find readline
+			export LD_LIBRARY_PATH="${WORKDIR}/${lib_path}:${LD_LIBRARY_PATH}"
+			export FOUND_READLINE=yes
+		fi
+	done
+
+	if [[ -z "${FOUND_READLINE}" ]]; then
+		die "Could not locate bundled libreadline.so"
+	else
+		einfo "Found readline: ${LD_LIBRARY_PATH}"
+	fi
+
+	# initialize build.mk
+	echo '# Gentoo changes' > mk/build.mk
+
+	# Put docs into the right place, ie /usr/share/doc/ghc-${PV}
+	echo "docdir = /usr/share/doc/${P}" >> mk/build.mk
+	echo "htmldir = /usr/share/doc/${P}" >> 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
+
+	# We can't depend on haddock except when bootstrapping when we
+	# must build docs and include them into the binary .tbz2 package
+	if use ghcbootstrap && use doc; then
+		echo XMLDocWays="html" >> mk/build.mk
+		echo HADDOCK_DOCS=YES >> mk/build.mk
+	else
+		echo XMLDocWays="" >> 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+=-w" >> 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 arches
+	if use alpha || use hppa || 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
+		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
+	if ! use ghcbootstrap; then
+		export PATH="${WORKDIR}/usr/bin:${PATH}"
+	fi
+
+	econf || die "econf failed"
+
+	emake all || die "make failed"
+}
+
+src_install() {
+	local insttarget="install"
+
+	# We only built docs if we were bootstrapping, otherwise
+	# we copy them out of the unpacked binary .tbz2
+	if use doc; then
+		if use ghcbootstrap; then
+			insttarget="${insttarget} install-docs"
+		else
+			mkdir -p "${D}/usr/share/doc"
+			mv "${WORKDIR}/usr/share/doc/${P}" "${D}/usr/share/doc" \
+				|| die "failed to copy docs"
+		fi
+	fi
+
+	emake -j1 ${insttarget} \
+		DESTDIR="${D}" \
+		|| die "make ${insttarget} failed"
+
+	dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
+
+	dosbin "${FILESDIR}/ghc-updater"
+
+	dobashcompletion "${FILESDIR}/ghc-bash-completion"
+
+	cp -p "${D}/usr/$(get_libdir)/${P}/package.conf"{,.shipped} \
+		|| die "failed to copy package.conf"
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	ewarn "IMPORTANT:"
+	ewarn "If you have upgraded from another version of ghc, please run:"
+	ewarn "      /usr/sbin/ghc-updater"
+	ewarn "to re-merge all ghc-based Haskell libraries."
+
+	bash-completion_pkg_postinst
+}
+
+pkg_prerm() {
+	# Overwrite the (potentially) modified package.conf with a copy of the
+	# original one, so that it will be removed during uninstall.
+
+	PKG="${ROOT}/usr/$(get_libdir)/${P}/package.conf"
+
+	cp -p "${PKG}"{.shipped,}
+
+	[[ -f ${PKG}.old ]] && rm "${PKG}.old"
+}