Add sparc and ppc binaries. Also fix some var quoting QA warnings.

(Portage version: 2.1.3.16)

6 files changed, 33 insertions, 17 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 2a2c6af4ccca..0ea7614ed83f 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.138 2007/10/23 16:37:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.139 2007/11/05 02:18:21 dcoutts Exp $
+
+  05 Nov 2007; Duncan Coutts <dcoutts@gentoo.org> ghc-6.6.1.ebuild:
+  Add sparc and ppc binaries. Also fix some var quoting QA warnings.
 
   23 Oct 2007; Christian Faulhammer <opfer@gentoo.org> ghc-6.6.1.ebuild:
   stable x86, bug 196616
diff --git a/dev-lang/ghc/files/digest-ghc-6.6.1 b/dev-lang/ghc/files/digest-ghc-6.6.1
index 659823abb2a6..daf6720ebaa1 100644
--- a/dev-lang/ghc/files/digest-ghc-6.6.1
+++ b/dev-lang/ghc/files/digest-ghc-6.6.1
@@ -10,6 +10,12 @@ SHA256 9d1aaf6865542a84d6c79c9a8bfb8ccfc73fb016c3ef6bae3b1b35bf6e8fb723 ghc-bin-
 MD5 278cdde21204e290e0bf23e528ad1913 ghc-bin-6.6.1-ia64.tbz2 31173460
 RMD160 9370becd46a3446c658072a5c7a83c656b98bcff ghc-bin-6.6.1-ia64.tbz2 31173460
 SHA256 5d0110dd4d84519e7e84e37af8b7a2b13f62ae40fd75112f96b177d9e17f6946 ghc-bin-6.6.1-ia64.tbz2 31173460
+MD5 52118a11ebbdd509c177dde7e6d19d6e ghc-bin-6.6.1-ppc.tbz2 36241311
+RMD160 af8fbaa06d9a13337612b44b2131ee3a95a7aa0c ghc-bin-6.6.1-ppc.tbz2 36241311
+SHA256 55dd1464ce9b7385437052a7240c85299c879aec2795b12e2169482af52e686f ghc-bin-6.6.1-ppc.tbz2 36241311
+MD5 46394eccae184bf1139c8d09f13d4161 ghc-bin-6.6.1-sparc.tbz2 31791719
+RMD160 5cfd2aebfc1aae1c4fbb7bd39c6fd9715ad041cd ghc-bin-6.6.1-sparc.tbz2 31791719
+SHA256 ecfd0dd250390d5e0a1a32e5be0bfac70f73e98d1a946641bd8be23c91e47706 ghc-bin-6.6.1-sparc.tbz2 31791719
 MD5 a9acda44759225f67ee38e54c8ecdfb1 ghc-bin-6.6.1-x86.tbz2 26134077
 RMD160 fcc31115073c2c0c4be75dce0253cb9bca5e45d3 ghc-bin-6.6.1-x86.tbz2 26134077
 SHA256 17a9b7125ae52c7d20f177214919837c95f96d6d997d729e493a0b94bdb84d29 ghc-bin-6.6.1-x86.tbz2 26134077
diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index eccbf1805ebe..fa8bedac8ada 100644
--- a/dev-lang/ghc/ghc-6.2.2.ebuild
+++ b/dev-lang/ghc/ghc-6.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.2.ebuild,v 1.23 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.24 2007/11/05 02:18:21 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -141,7 +141,7 @@ src_unpack() {
 	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
 
 	# 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
+	sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
 }
 
 src_compile() {
@@ -214,7 +214,7 @@ src_install () {
 	cd "${S}/ghc"
 	dodoc README ANNOUNCE LICENSE VERSION
 
-	dosbin ${FILESDIR}/ghc-updater
+	dosbin "${FILESDIR}/ghc-updater"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 67f7dd08b2b3..8b29141f47f9 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-2007 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.21 2007/07/22 08:58:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.22 2007/11/05 02:18:21 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -159,7 +159,7 @@ src_unpack() {
 	base_src_unpack
 	ghc_setup_cflags
 
-	cd ${S}
+	cd "${S}"
 	epatch "${WORKDIR}/${P}-alut.patch"
 	epatch "${FILESDIR}/${P}-sparc32plus.patch"
 	epatch "${FILESDIR}/${P}-sparcmangler.patch"
@@ -177,7 +177,7 @@ src_unpack() {
 	echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile"
 
 	# 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
+	sed -i -e 's/SRC_INSTALL_BIN_OPTS	+= -s//' "${S}/mk/config.mk.in"
 }
 
 src_compile() {
@@ -269,7 +269,7 @@ src_install () {
 	cd "${S}/ghc"
 	dodoc README ANNOUNCE LICENSE VERSION
 
-	dosbin ${FILESDIR}/ghc-updater
+	dosbin "${FILESDIR}/ghc-updater"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc/ghc-6.6.1.ebuild b/dev-lang/ghc/ghc-6.6.1.ebuild
index b84c6b7df4a6..0bd7a2d0e1bb 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-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.1.ebuild,v 1.10 2007/10/23 16:37:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.11 2007/11/05 02:18:21 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -44,12 +44,13 @@ SRC_URI="!binary? ( http://haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar
 		 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 )
 		 x86?	( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 x86"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="binary doc ghcbootstrap"
 
 LOC="/opt/ghc" # location for installation of binary version
@@ -142,6 +143,12 @@ pkg_setup() {
 			die "USE=\"ghcbootstrap binary\" is not a valid combination."
 		[[ -z $(type -P ghc) ]] && \
 			die "Could not find a ghc to bootstrap with."
+	elif use alpha || use ppc64; then
+		eerror "No binary .tbz2 package available yet for these arches:"
+		eerror "  alpha, ppc64"
+		eerror "Please try emerging with USE=ghcbootstrap and report build"
+		eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+		die "No binary available for this arch yet, USE=ghcbootstrap"
 	fi
 
 	set_config
@@ -199,7 +206,7 @@ src_unpack() {
 		#	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
+		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}"
@@ -244,7 +251,7 @@ src_compile() {
 
 		# 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 ppc64; then
+		if use alpha || use hppa || use ppc64 || use sparc; then
 			echo "GhcUnregisterised=YES" >> mk/build.mk
 			echo "GhcWithInterpreter=NO" >> mk/build.mk
 		fi
@@ -318,7 +325,7 @@ src_install() {
 		cd "${S}"
 		dodoc README ANNOUNCE LICENSE VERSION
 
-		dosbin ${FILESDIR}/ghc-updater
+		dosbin "${FILESDIR}/ghc-updater"
 
 		dobashcompletion "${FILESDIR}/ghc-bash-completion"
 
diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index 8d73bbfa2d7c..53f8d8bf6d8b 100644
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2007/08/08 15:57:56 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.13 2007/11/05 02:18:21 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -188,7 +188,7 @@ src_unpack() {
 		#	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
+		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}"
@@ -281,7 +281,7 @@ src_install() {
 		cd "${S}"
 		dodoc README ANNOUNCE LICENSE VERSION
 
-		dosbin ${FILESDIR}/ghc-updater
+		dosbin "${FILESDIR}/ghc-updater"
 	fi
 
 	if use doc; then