summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Loeh <kosmikus@gentoo.org>2005-03-23 14:03:58 +0000
committerAndres Loeh <kosmikus@gentoo.org>2005-03-23 14:03:58 +0000
commit09502288298e25cd9bbbdb9e4f7e243edabd54e4 (patch)
tree85d1c0e562f4a45d6aef7159721cfb253c5679d2 /dev-haskell/haddock
parentRemoved dependency on libungif. Added a dep on libexif. (diff)
downloadgentoo-2-09502288298e25cd9bbbdb9e4f7e243edabd54e4.tar.gz
gentoo-2-09502288298e25cd9bbbdb9e4f7e243edabd54e4.tar.bz2
gentoo-2-09502288298e25cd9bbbdb9e4f7e243edabd54e4.zip
added another ghc-6.4 block, and haddock-0.6-r3 now inherits ghc-package.eclass, hopefully fixing bug #86214
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-haskell/haddock')
-rw-r--r--dev-haskell/haddock/ChangeLog7
-rw-r--r--dev-haskell/haddock/haddock-0.6-r2.ebuild3
-rw-r--r--dev-haskell/haddock/haddock-0.6-r3.ebuild5
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 609107b34f73..b1e21926b701 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
# 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.19 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.20 2005/03/23 14:03:58 kosmikus Exp $
+
+ 23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild,
+ haddock-0.6-r3.ebuild:
+ haddock is currently blocked by ghc-6.4, and haddock-0.6-r3 now inherits
+ ghc-package.eclass, hopefully fixing bug #86214.
23 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> haddock-0.6-r2.ebuild,
haddock-0.6-r3.ebuild:
diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild
index 72b727a64eba..a3090bd419d5 100644
--- a/dev-haskell/haddock/haddock-0.6-r2.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r2.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-r2.ebuild,v 1.11 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.12 2005/03/23 14:03:58 kosmikus Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -20,6 +20,7 @@ KEYWORDS="x86 ppc"
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
diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 754293645b33..2c70754d80c5 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.4 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.5 2005/03/23 14:03:58 kosmikus Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -8,7 +8,7 @@
# tetex - Build the above docs as PostScript as well.
-inherit base eutils
+inherit base eutils ghc-package
IUSE="doc tetex"
DESCRIPTION="A documentation tool for Haskell"
@@ -20,6 +20,7 @@ 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