Re-enable alut package and add hack for ia64

Package-Manager: portage-2.1_pre10-r5

4 files changed, 63 insertions, 36 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 7e75984e3385..84f252a5bfbe 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.100 2006/05/07 15:09:42 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.101 2006/05/12 15:44:52 dcoutts Exp $
+
+  12 May 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/ghc-6.4.2-alut.patch, ghc-6.4.2.ebuild:
+  Re-enable alut package and add hack for ia64
 
   05 May 2006; Chris Parrott <cparrott@gentoo.org> ghc-6.4.2.ebuild:
   Temporarily disabled openal USE flag, pending fix to openal bindings.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index db7394bba76d..8343fef3866f 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -27,6 +27,7 @@ RMD160 b044a26add18464b583702f3cac667521c5eb06f files/ghc-updater 9045
 SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe files/ghc-updater 9045
 DIST ghc-6.2.2-src.tar.bz2 5406427 RMD160 7afa370c148f2b9c3d53d662da996f5d7c05282d SHA256 a0fe7eb8d447f25fbc616cdbce2bb4e03961a884c2c37969d1e23588b588a852 size 5406427
 DIST ghc-6.4.1-src.tar.bz2 6826112 RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36 size 6826112
+DIST ghc-6.4.2-alut.patch.gz 6670 RMD160 e6ab2a114f44f6f176a98c9cd6ab1e336662a958 SHA256 e116b385df3bb5a5feb92ce92a92bdb0f24115361aedb1bddc9a7e6ce682d8b9 size 6670
 DIST ghc-6.4.2-src.tar.bz2 6954958 RMD160 19943eb2673e663973e64739cdf23720b6f36d38 SHA256 d517e52e0204a077c54cda11b67bf9b6ac3daa47ac7bccf1561afc7c572e6be0 size 6954958
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12 size 1181389
 EBUILD ghc-6.2.2.ebuild 5582 RMD160 b028ea26d634687c73fd8d688f6088d253230f33 SHA1 b296fb988351075bf517dfce85650291f94ab115 SHA256 4473941a958beec2da286f5823b62def6737504cd0524a4dcd6aa777847ccd1d size 5582
@@ -41,14 +42,14 @@ EBUILD ghc-6.4.1-r3.ebuild 8280 RMD160 2bfbba2f8ca37e0a508d1825238f301aec2bdd48
 MD5 a6786ac9e892f6cc9a6d578fbcec428b ghc-6.4.1-r3.ebuild 8280
 RMD160 2bfbba2f8ca37e0a508d1825238f301aec2bdd48 ghc-6.4.1-r3.ebuild 8280
 SHA256 3c6ec6cdc58a93284de150c1ca78791a8d0b8ca61613bcd96388336d03ed5268 ghc-6.4.1-r3.ebuild 8280
-EBUILD ghc-6.4.2.ebuild 8622 RMD160 ee64a8160a751eb5e9a20f9b7f2069d92cf1417d SHA1 89ead2b5be6e36466c2453fa00486941901a15cd SHA256 832082715b0200342463869d718e6387dcb8006238293f9c36c925346df05257 size 8622
-MD5 a2ccb83f04ab4af70318bcb7834f91c8 ghc-6.4.2.ebuild 8622
-RMD160 ee64a8160a751eb5e9a20f9b7f2069d92cf1417d ghc-6.4.2.ebuild 8622
-SHA256 832082715b0200342463869d718e6387dcb8006238293f9c36c925346df05257 ghc-6.4.2.ebuild 8622
-MISC ChangeLog 17493 RMD160 25c4bbf6419796070d80ef0690ae5b4cd4714cae SHA1 ab0a30e565fb551e07424b9f92b39ef4c3428b6e SHA256 2e34106c8cdc94dc9a74d2f497ff36253f03dc609c06957257a8f8964509c12d size 17493
-MD5 ea3c16357667f58ead68ac614e2a5060 ChangeLog 17493
-RMD160 25c4bbf6419796070d80ef0690ae5b4cd4714cae ChangeLog 17493
-SHA256 2e34106c8cdc94dc9a74d2f497ff36253f03dc609c06957257a8f8964509c12d ChangeLog 17493
+EBUILD ghc-6.4.2.ebuild 9246 RMD160 fdc29d485da9a53ba5b63e29266cf27dd518ca91 SHA1 c612b3eb1a9fe9d206213ff046f6fe96401262c4 SHA256 f47224d3bc6d7ee17aa3fa0ebac5d61f24fbfe224c807730e485e8b27911ee4a size 9246
+MD5 d519ec4eda24ea1cf3a638b5282a99d7 ghc-6.4.2.ebuild 9246
+RMD160 fdc29d485da9a53ba5b63e29266cf27dd518ca91 ghc-6.4.2.ebuild 9246
+SHA256 f47224d3bc6d7ee17aa3fa0ebac5d61f24fbfe224c807730e485e8b27911ee4a ghc-6.4.2.ebuild 9246
+MISC ChangeLog 17639 RMD160 9eba010756a0aec49b9528287dc9229c412b452d SHA1 6b7e964007aeb39e4c9701c66c83787abfcbec06 SHA256 4d319f7ffcc30f81ea782c839f3dc4298044149405c4612813931a9de3a99345 size 17639
+MD5 66457759c117a4b7ab68db85b7ee23e1 ChangeLog 17639
+RMD160 9eba010756a0aec49b9528287dc9229c412b452d ChangeLog 17639
+SHA256 4d319f7ffcc30f81ea782c839f3dc4298044149405c4612813931a9de3a99345 ChangeLog 17639
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 size 223
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -62,13 +63,13 @@ SHA256 a41a1e0c73f8f3696c3701a3bfa63cf735842fb627fab403eaf63a5a207a4d04 files/di
 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 516998a2a2a7c4ddd804b259431ff603 files/digest-ghc-6.4.2 509
-RMD160 c36d96978994b3351d398d8ae48f163591a46472 files/digest-ghc-6.4.2 509
-SHA256 8c2856adf89c493ccb0fc05d22489c4033e4a95188fce8e10df45a4cfeacb1e3 files/digest-ghc-6.4.2 509
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEXg3EWHsWKhfMgAkRAhciAJ9DSxGhkSBXpchHJjJv4rNOezGbIwCfSU5k
-DIRIJELZSawPVR4xBiXp5D4=
-=ANvc
+iD8DBQFEZK1JnUVyUObPUL4RAi0yAJ9HQzrRaQ/TcS7pdvIBj8AiZzyM6gCcDIQV
+baWoG5lW6IEVt+JGWlQIQf8=
+=mc7H
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.2 b/dev-lang/ghc/files/digest-ghc-6.4.2
index 2a258e9747fc..535bdc990220 100644
--- a/dev-lang/ghc/files/digest-ghc-6.4.2
+++ b/dev-lang/ghc/files/digest-ghc-6.4.2
@@ -1,3 +1,6 @@
+MD5 2719f349e10f883963ffe4b1537106b6 ghc-6.4.2-alut.patch.gz 6670
+RMD160 e6ab2a114f44f6f176a98c9cd6ab1e336662a958 ghc-6.4.2-alut.patch.gz 6670
+SHA256 e116b385df3bb5a5feb92ce92a92bdb0f24115361aedb1bddc9a7e6ce682d8b9 ghc-6.4.2-alut.patch.gz 6670
 MD5 a394bf14e94c3bca5507d568fcc03375 ghc-6.4.2-src.tar.bz2 6954958
 RMD160 19943eb2673e663973e64739cdf23720b6f36d38 ghc-6.4.2-src.tar.bz2 6954958
 SHA256 d517e52e0204a077c54cda11b67bf9b6ac3daa47ac7bccf1561afc7c572e6be0 ghc-6.4.2-src.tar.bz2 6954958
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 3a3c6819e9a6..1f7ef122588e 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-2006 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.3 2006/05/07 15:09:42 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.4 2006/05/12 15:44:52 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -27,25 +27,27 @@ 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
-		test? ( http://haskell.org/ghc/dist/ghc-testsuite-${MY_PV}.tar.gz )"
+		test? ( http://haskell.org/ghc/dist/ghc-testsuite-${MY_PV}.tar.gz )
+		mirror://gentoo/${P}-alut.patch.gz"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="test doc X opengl"  # openal temporarily disabled pending fix
+IUSE="test doc X opengl openal"
 
 S="${WORKDIR}/${MY_P}"
 
 PROVIDE="virtual/ghc"
 
-# openal temporarily disabled pending fix
 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 )"
+	opengl? ( virtual/opengl
+			  virtual/glu virtual/glut
+			  openal? ( media-libs/openal ) )"
 
 # ghc cannot usually be bootstrapped using later versions ...
 DEPEND="${RDEPEND}
@@ -58,18 +60,24 @@ DEPEND="${RDEPEND}
 
 PDEPEND=">=dev-haskell/cabal-1.1.4"
 
-# 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
-# }
+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
@@ -129,6 +137,9 @@ src_unpack() {
 	base_src_unpack
 	ghc_setup_cflags
 
+	cd ${S}
+	epatch "${WORKDIR}/${P}-alut.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"
@@ -136,6 +147,11 @@ 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"
 }
 
 src_compile() {
@@ -186,12 +202,15 @@ src_compile() {
 		echo "SplitObjs=NO" >> mk/build.mk
 	fi
 
-	# openal temporarily disabled pending fix
+	# We've patched some configure.ac files to fix the OpenAL/ALUT bindings.
+	# So we need to autoreconf.
+	eautoreconf
+
 	econf \
 		$(use_enable opengl opengl) \
 		$(use_enable opengl glut) \
-		--disable-openal \
-		--disable-alut \
+		$(use_enable openal openal) \
+		$(use_enable openal alut) \
 		$(use_enable X x11) \
 		$(use_enable X hgl) \
 		|| die "econf failed"