diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-29 17:31:30 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-29 17:31:30 +0000 |
| commit | 783518c010da6668d6eb8dd87df082234068520b (patch) | |
| tree | 34ae285b3c69390baddf5b4c1e414c20c2adce89 /dev-haskell/haddock | |
| parent | Initial commit from kde-testing. Per bug #238458. (diff) | |
| download | gentoo-2-783518c010da6668d6eb8dd87df082234068520b.tar.gz gentoo-2-783518c010da6668d6eb8dd87df082234068520b.tar.bz2 gentoo-2-783518c010da6668d6eb8dd87df082234068520b.zip | |
Make cabal dep to dev-haskell/haddock more strict
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.4.1.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 32a52aa1734a..43cf52a55408 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,10 @@ # 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.63 2009/07/28 18:51:01 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.64 2009/07/29 17:31:30 kolmodin Exp $ + + 29 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild: + Update cabal dependency due to bundled ghc-paths, ghc-paths needs + >=cabal-1.6. 28 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild: Don't depend on dev-haskell/filepath to avoid circular dependency. diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild index b0c3ec7b6db5..c3185ba7ed26 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-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.3 2009/07/28 18:51:02 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.4 2009/07/29 17:31:30 kolmodin Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling @@ -29,10 +29,11 @@ IUSE="doc" # 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... +# bundling ghc-paths forces us to depend on >=cabal-1.6 rather than >=cabal-1.2 RDEPEND=">=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 + >=dev-haskell/cabal-1.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )" @@ -82,3 +83,4 @@ src_install () { fi dodoc CHANGES README } + |