New upstream version. Add postgres USE flag. Also try to limit memory use during build. Fix the build system's erroneous deps, linker flags and use of c2hs.

(Portage version: 2.1_pre4-r1)

4 files changed, 143 insertions, 16 deletions

diff --git a/dev-haskell/wash/ChangeLog b/dev-haskell/wash/ChangeLog
index 4efd8aef010c..254e0b4ff999 100644
--- a/dev-haskell/wash/ChangeLog
+++ b/dev-haskell/wash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/wash
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.5 2005/03/25 00:31:05 kosmikus Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.6 2006/02/22 14:52:51 dcoutts Exp $
+
+*wash-2.5.6 (22 Feb 2006)
+
+  22 Feb 2006; <duncan@gentoo.org> +wash-2.5.6.ebuild:
+  New upstream version. Add postgres USE flag.
+  Also try to limit memory use during build. 
+  Fix the build system's erroneous deps, linker flags and use of c2hs.
 
   25 Mar 2005; Andres Loeh <kosmikus@gentoo.org> wash-2.0.6.ebuild,
   wash-2.3.1.ebuild:
diff --git a/dev-haskell/wash/Manifest b/dev-haskell/wash/Manifest
index 8c299fc8696f..cd72a7b0ba2e 100644
--- a/dev-haskell/wash/Manifest
+++ b/dev-haskell/wash/Manifest
@@ -1,16 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 00d3e43edc0b378f2e75a709f693c56c wash-2.3.1.ebuild 1384
-MD5 83aa0233869acf8839485568a755f102 wash-2.0.6.ebuild 1385
-MD5 57581dc2ab4fd7851c9ac9d89f0b7e06 ChangeLog 1030
-MD5 e0ce59fd27b9382896cdb87d5fa48f89 metadata.xml 286
+MD5 560ce0b20ad8004a75036770e7c9bb13 ChangeLog 1180
+RMD160 62ca508c71a43e4104d54f5e19ebf19737ba3005 ChangeLog 1180
+SHA256 0a1d28c3a9b47bb8d0eaa123613125b457107ddc96d03344cd167c099f94c9ae ChangeLog 1180
 MD5 ce436420e114151be54e562439be9a55 files/digest-wash-2.0.6 62
+RMD160 c81584876666b0d50ba96bec98ee823fdaa0f4fb files/digest-wash-2.0.6 62
+SHA256 f745d7a94112c786151648ab5169deee30e1f6006fb0c0ba5fed960d02de81db files/digest-wash-2.0.6 62
 MD5 d03948a8a97cbef24d3e7b59c1597280 files/digest-wash-2.3.1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQ1zzOKSBj1ObwosRAq9jAJ9uk1g+FPgb2Fc4Y+bOKnZ8I/9TTgCghjwh
-ihK4pAUU/9CQ3GrO2kZrOWg=
-=HZmx
------END PGP SIGNATURE-----
+RMD160 6c5662fd2c87c15ddfc99ffedb123b9b02e6d38a files/digest-wash-2.3.1 62
+SHA256 23e00867d873387816fa7f50b201a6bc846cafabf80cdc76d5fe69c41670803f files/digest-wash-2.3.1 62
+MD5 cc12bbad344ae6c847eb57ad17012d84 files/digest-wash-2.5.6 232
+RMD160 7904699e4957c142aa5200b9cc6c112b2f5ae0d5 files/digest-wash-2.5.6 232
+SHA256 f6c7a5480e10bf42d959dc1a9ada803a38e4a4772a00af3ba99e19f7b737fecd files/digest-wash-2.5.6 232
+MD5 e0ce59fd27b9382896cdb87d5fa48f89 metadata.xml 286
+RMD160 eea8b96926379c8a0e31660f268dd917615d41a3 metadata.xml 286
+SHA256 0e0b237f9b1c40f9e276e0a0d11ba30285761b6348f19d6da06b0dc6c8a9efe2 metadata.xml 286
+MD5 83aa0233869acf8839485568a755f102 wash-2.0.6.ebuild 1385
+RMD160 deaf10242296617de8c34331b3ca49b382e6a588 wash-2.0.6.ebuild 1385
+SHA256 0f4e22d87891ecb8814b180e60bd7459a0db8be1e9b1df8a040f402e14930560 wash-2.0.6.ebuild 1385
+MD5 00d3e43edc0b378f2e75a709f693c56c wash-2.3.1.ebuild 1384
+RMD160 90d38bb8baca12009ccdad1ea2b5cd1f06619a6a wash-2.3.1.ebuild 1384
+SHA256 6bfbfb8ca3a03c5c31b9ded74cd76523f06008cf55c09078b8859d1121103f78 wash-2.3.1.ebuild 1384
+MD5 3ff23ef4ed861784f5a58bce88b86098 wash-2.5.6.ebuild 3338
+RMD160 e0a0d3432aeb646479d7bef8297dc44b4aaf9174 wash-2.5.6.ebuild 3338
+SHA256 2cced38a5e8154231fcf0da291047632aa1c57155bc744d47086e3d67d5b15bf wash-2.5.6.ebuild 3338
diff --git a/dev-haskell/wash/files/digest-wash-2.5.6 b/dev-haskell/wash/files/digest-wash-2.5.6
new file mode 100644
index 000000000000..d04feee7c064
--- /dev/null
+++ b/dev-haskell/wash/files/digest-wash-2.5.6
@@ -0,0 +1,3 @@
+MD5 e71b67eebef7369479aeb3b5bcc5dfc1 WashNGo-2.5.6.tgz 582358
+RMD160 b9ce662cc05f09238de0aa34d3b0bbb627fe84eb WashNGo-2.5.6.tgz 582358
+SHA256 69759637489fa187c875f8f100c98132d9e329fe004b7ddf37626df41fb03e30 WashNGo-2.5.6.tgz 582358
diff --git a/dev-haskell/wash/wash-2.5.6.ebuild b/dev-haskell/wash/wash-2.5.6.ebuild
new file mode 100644
index 000000000000..aef1ec9aa6a4
--- /dev/null
+++ b/dev-haskell/wash/wash-2.5.6.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.5.6.ebuild,v 1.1 2006/02/22 14:52:51 dcoutts Exp $
+
+inherit base ghc-package check-reqs
+
+# the installation bundle is called WashNGo
+MY_PN="WashNGo"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="WASH is a family of embedded domain-specific languages for programming Web applications"
+HOMEPAGE="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/"
+SRC_URI="http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc postgres"
+
+DEPEND=">=virtual/ghc-6.4.1
+		postgres? ( >=dev-haskell/c2hs-0.14.0 >=dev-db/postgresql-7.4.3 )
+		doc? ( dev-haskell/haddock )"
+
+RDEPEND=">=virtual/ghc-6.4.1
+		postgres? ( >=dev-db/postgresql-7.4.3 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# There are a couple Wash modules which take forever to compile and
+	# cause ghc take loads of memory. We try and limit ghc's heap size
+	# but it still takes a lot.
+	einfo "Some Wash modules take a lot of RAM and a very long time to compile."
+	# We need aproximately this much memory: (does *not* check swap)
+	case "${ARCH}" in
+		alpha|*64) CHECKREQS_MEMORY="400" ;;
+		*)         CHECKREQS_MEMORY="200" ;;
+	esac
+	check_reqs
+}
+
+src_unpack() {
+	base_src_unpack
+
+	# don't use -O2 in HCFLAGS because it makes ghc take 700Mb of RAM
+	sed -i 's/-O2/-O/' \
+		"${S}/lib/WASH/Utility/Makefile" \
+		"${S}/lib/Makefile.HTML" \
+		"${S}/lib/Makefile.Mail" \
+		"${S}/lib/Makefile.Dbconnect" \
+		"${S}/lib/Makefile.Utility" \
+		"${S}/lib/Makefile.CGI"
+}
+
+src_compile() {
+	# Wash doesn't know how to use c2hs properly so we have to fix it.
+	if use postgres; then
+		# make it import a local copy of the C2HS module
+		pushd ${S}/lib/WASH/Dbconnect
+		c2hs --copy-library
+		popd
+		sed -i 's/C2HS/WASH.Dbconnect.C2HS/' \
+			"${S}/lib/WASH/Dbconnect/C2HS.hs" \
+			"${S}/lib/WASH/Dbconnect/Libpqfe.chs"
+		# make it not use the (non-existant) c2hs package
+		sed -i 's/-package c2hs//' \
+			"${S}/lib/Makefile.Dbconnect"
+		# add the local C2HS module to the hidden-modules
+		sed -i 's/DBCONNECT_HIDDEN=/DBCONNECT_HIDDEN= C2HS/' \
+			"${S}/lib/modules.mk"
+		# remove unecessary ld options
+		sed -i 's/$(EXTRA_LD_OPTS)//' "${S}/lib/Makefile"
+	fi
+	# Wash doesn't need to directly depend on the rts package
+	# it doesn't want the text package, it wants the parsec package
+	# there is no c2hs package!
+	sed -i -e 's/rts//' -e 's/text/parsec/' -e 's/c2hs//' "${S}/lib/Makefile"
+
+	./configure \
+		--prefix="/usr" \
+		--libdir="/usr/$(get_libdir)/${P}" \
+		$(use_enable postgres dbconnect) \
+		$(use_enable doc build-docs) \
+		--with-hc=$(ghc-getghc) \
+		--with-hcflags="+RTS -M${CHECKREQS_MEMORY}m -RTS" \
+		--enable-register-package="${S}/$(ghc-localpkgconf)" \
+		|| die "configure failed"
+	make all || die "make all failed"
+}
+
+src_install() {
+	ghc-setup-pkg
+	make prefix="${D}/usr" \
+		 PACKAGELIBDIR="${D}/usr/$(get_libdir)/${P}/ghc-$(ghc-version)" \
+		 install \
+		|| die "make install failed"
+	ghc-install-pkg
+
+	# We really don't need the GenPKG program, it's an internal Wash thing.
+	# I see no reason for it to be installed.
+	rm -f "${D}/usr/bin/GenPKG"
+
+	dodoc README
+	if use doc; then
+		cp -r Examples ${D}/usr/share/doc/${PF}
+		cd doc
+		dohtml -r *
+	fi
+}