New minor version and fix building with ghc-6.6.1.

(Portage version: 2.1.2.9)

4 files changed, 74 insertions, 4 deletions

diff --git a/dev-haskell/hmake/ChangeLog b/dev-haskell/hmake/ChangeLog
index ae0a79e50b0a..056f02fa21f9 100644
--- a/dev-haskell/hmake/ChangeLog
+++ b/dev-haskell/hmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hmake
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.31 2007/07/28 14:45:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.32 2007/07/29 13:48:46 dcoutts Exp $
+
+*hmake-3.13 (29 Jul 2007)
+
+  29 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> hmake-3.11.ebuild,
+  +hmake-3.13.ebuild:
+  New minor version and fix building with ghc-6.6.1.
 
   28 Jul 2007; nixnut <nixnut@gentoo.org> ChangeLog:
   Stable on ppc wrt bug 186849
diff --git a/dev-haskell/hmake/files/digest-hmake-3.13 b/dev-haskell/hmake/files/digest-hmake-3.13
new file mode 100644
index 000000000000..a6a901a38973
--- /dev/null
+++ b/dev-haskell/hmake/files/digest-hmake-3.13
@@ -0,0 +1,3 @@
+MD5 c87f79f1846f6b5eccbe5f0a00928b8b hmake-3.13.tar.gz 104283
+RMD160 3a08df9a47bb28be01a85c11e223d0186b38efa9 hmake-3.13.tar.gz 104283
+SHA256 bc1ebc01a5d471daf6746bec3a1012806bd449359a304431072b40d2a12cde39 hmake-3.13.tar.gz 104283
diff --git a/dev-haskell/hmake/hmake-3.11.ebuild b/dev-haskell/hmake/hmake-3.11.ebuild
index 86ed57dcb08a..9bd4ad0f3776 100644
--- a/dev-haskell/hmake/hmake-3.11.ebuild
+++ b/dev-haskell/hmake/hmake-3.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.9 2007/07/28 20:55:30 diox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.10 2007/07/29 13:48:46 dcoutts Exp $
 
 inherit base eutils fixheadtails ghc-package
 
-DESCRIPTION="a make tool for Haskell programs"
+DESCRIPTION="A make tool for Haskell programs"
 HOMEPAGE="http://www.haskell.org/hmake/"
 SRC_URI="http://www.haskell.org/hmake/${P}.tar.gz"
 
@@ -29,6 +29,13 @@ src_unpack() {
 	cd ${S}
 	epatch "${FILESDIR}/${P}-ghc66.patch"
 
+	# Fix the way hmake discovers the ghc version
+	sed -i -e '/echo __GLASGOW_HASKELL__/,+2 c \
+		touch ghcsym.hs; \
+		$1 -E -cpp -optP-dM ghcsym.hs -o ghcsym.out; \
+		grep __GLASGOW_HASKELL__ ghcsym.out | cut -d" " -f 3 > $2;' \
+		"${S}/script/confhc"
+
 	# fix all head/tail declarations
 	sed -i 's/tail -1/tail  -n 1/' src/hmake/MkConfig.hs
 	# the line above prevents current fixheadtails.eclass from doing nonsense;
diff --git a/dev-haskell/hmake/hmake-3.13.ebuild b/dev-haskell/hmake/hmake-3.13.ebuild
new file mode 100644
index 000000000000..55eeccfc8640
--- /dev/null
+++ b/dev-haskell/hmake/hmake-3.13.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.13.ebuild,v 1.1 2007/07/29 13:48:46 dcoutts Exp $
+
+inherit base eutils ghc-package
+
+DESCRIPTION="A make tool for Haskell programs"
+HOMEPAGE="http://www.haskell.org/hmake/"
+SRC_URI="http://www.haskell.org/hmake/${P}.tar.gz"
+
+LICENSE="nhc98"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/ghc
+		sys-libs/readline
+		>=sys-apps/sandbox-1.2.12"
+RDEPEND="virtual/ghc
+		sys-libs/readline"
+
+# sandbox dependency due to bug #97441, #101433
+
+# if using readline, hmake depends also on ncurses; but
+# readline already has this dependency
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix the way hmake discovers the ghc version
+	sed -i -e '/echo __GLASGOW_HASKELL__/,+2 c \
+		touch ghcsym.hs; \
+		$1 -E -cpp -optP-dM ghcsym.hs -o ghcsym.out; \
+		grep __GLASGOW_HASKELL__ ghcsym.out | cut -d" " -f 3 > $2;' \
+		"${S}/script/confhc"
+}
+
+src_compile() {
+	# package uses non-standard configure, therefore econf does
+	# not work ...
+	READLINE='-package readline' ./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man/man1 \
+		--buildwith="$(ghc-getghc)" \
+		|| die "./configure failed"
+
+	# emake tested; parallel make does not work
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dohtml docs/hmake/*
+}