summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Loeh <kosmikus@gentoo.org>2005-03-24 14:54:39 +0000
committerAndres Loeh <kosmikus@gentoo.org>2005-03-24 14:54:39 +0000
commitc848bf96063a93db4b7f35db4aa912ceb104b717 (patch)
tree34cff55bb1fea95a19dd52081a20c90b5b333e47 /dev-haskell/haddock
parentFix typo, thanks to Herbie Hopkins <herbie@hopkins.net>, bug #84324. (diff)
downloadgentoo-2-c848bf96063a93db4b7f35db4aa912ceb104b717.tar.gz
gentoo-2-c848bf96063a93db4b7f35db4aa912ceb104b717.tar.bz2
gentoo-2-c848bf96063a93db4b7f35db4aa912ceb104b717.zip
haddock-0.6-r3 works with ghc-6.4 now
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-haskell/haddock')
-rw-r--r--dev-haskell/haddock/ChangeLog5
-rw-r--r--dev-haskell/haddock/haddock-0.6-r3.ebuild13
2 files changed, 11 insertions, 7 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index b1e21926b701..b47f1aca8020 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.20 2005/03/23 14:03:58 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.21 2005/03/24 14:54:39 kosmikus Exp $
+
+ 24 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r3.ebuild:
+ haddock-0.6-r3 works with ghc-6.4 now.
23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild,
haddock-0.6-r3.ebuild:
diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 2c70754d80c5..fba40bf96472 100644
--- a/dev-haskell/haddock/haddock-0.6-r3.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.5 2005/03/23 14:03:58 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.6 2005/03/24 14:54:39 kosmikus Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -20,7 +20,6 @@ KEYWORDS="x86 ~ppc ~amd64"
LICENSE="as-is"
DEPEND="virtual/ghc
- !>=virtual/ghc-6.4
doc? ( >=app-text/openjade-1.3.1
>=app-text/sgml-common-0.6.3
~app-text/docbook-sgml-dtd-3.1
@@ -30,9 +29,6 @@ DEPEND="virtual/ghc
RDEPEND=""
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
src_unpack() {
base_src_unpack
epatch ${FILESDIR}/${P}-gcc3.4.patch
@@ -41,7 +37,12 @@ src_unpack() {
src_compile() {
# unset SGML_CATALOG_FILES because documentation installation
# breaks otherwise ...
- PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
+ SGML_CATALOG_FILES="" econf || die "econf failed"
+
+ if $(ghc-cabal); then
+ echo "SRC_HC_OPTS += -package mtl" >> mk/build.mk
+ fi
+
# using -j1 because -j2 behaved strangely on my machine
emake -j1 || die "make failed"