diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-09 22:01:11 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-09 22:01:11 +0000 |
| commit | cc7e79a8621806f202f56b85f68aff52f58c56f5 (patch) | |
| tree | c0e97a6ec8168eec140838e27306e71e13903d29 /eclass/haskell-cabal.eclass | |
| parent | Fix build failure against system's cabal-1.10 (use cabal bundled with ghc). F... (diff) | |
| download | gentoo-2-cc7e79a8621806f202f56b85f68aff52f58c56f5.tar.gz gentoo-2-cc7e79a8621806f202f56b85f68aff52f58c56f5.tar.bz2 gentoo-2-cc7e79a8621806f202f56b85f68aff52f58c56f5.zip | |
Drop haddock from DEPENDS when USE=doc haddock. haddock-2.9.2+ can be used right in the ebuild phase to build it's docs.
Diffstat (limited to 'eclass/haskell-cabal.eclass')
| -rw-r--r-- | eclass/haskell-cabal.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index fe101b834608..44f35688f787 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.27 2012/02/07 12:47:54 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.28 2012/03/09 22:01:11 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -95,7 +95,9 @@ done if [[ -n "${CABAL_USE_HADDOCK}" ]]; then IUSE="${IUSE} doc" - DEPEND="${DEPEND} doc? ( dev-haskell/haddock )" + # don't require depend on itself to build docs. + # ebuild bootstraps docs from just built binary + [[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || DEPEND="${DEPEND} doc? ( dev-haskell/haddock )" fi if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then |