diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-28 18:51:02 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-28 18:51:02 +0000 |
| commit | 142fe1600f5debda1affadc3e06c42004745021d (patch) | |
| tree | 8cc097314f48760765ffeb34c2ac9be082ccf3ff /dev-haskell/haddock | |
| parent | Version bump dev-haskell/x11 (diff) | |
| download | gentoo-2-142fe1600f5debda1affadc3e06c42004745021d.tar.gz gentoo-2-142fe1600f5debda1affadc3e06c42004745021d.tar.bz2 gentoo-2-142fe1600f5debda1affadc3e06c42004745021d.zip | |
Remove dep from dev-haskell/haddock, dev-haskell/filepath.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.4.1.ebuild | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index eb4574608a52..32a52aa1734a 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.62 2009/07/23 20:15:07 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.63 2009/07/28 18:51:01 kolmodin Exp $ + + 28 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild: + Don't depend on dev-haskell/filepath to avoid circular dependency. + dev-haskell/filepath is included in >=ghc-6.8.2 anyway, so we use it from + core. See comments in ebuild. *haddock-2.4.1 (23 Jul 2009) diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild index 829f87375390..b0c3ec7b6db5 100644 --- a/dev-haskell/haddock/haddock-2.4.1.ebuild +++ b/dev-haskell/haddock/haddock-2.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.2 2009/07/24 15:07:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling @@ -20,6 +20,12 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86" IUSE="doc" +# haddock-2.4.1 also deps on the upgradeable package dev-haskell/filepath. +# however, it's included in >=ghc-6.8.2, so we use the core package without +# stating the dependency in DEPEND. +# ghc-6.8.2 has filepath-1.1.0.0 +# ghc-6.10.4 has filepath-1.1.0.2 + # we bundle the dep on ghc-paths to reduce the dependencies on this critical # package. ghc-paths would like to be compiled with USE=doc, which pulls in # haddock, which requires ghc-paths, which pulls in haddock... @@ -27,7 +33,6 @@ IUSE="doc" RDEPEND=">=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2 - dev-haskell/filepath doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )" |