[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

["Sergei Trofimovich (slyfox)" <slyfox@gentoo.org>]

slyfox      12/03/09 22:01:11

  Modified:             ChangeLog haskell-cabal.eclass
  Log:
  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.

Revision  Changes    Path
1.158                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.157&r2=1.158

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog	8 Mar 2012 14:24:40 -0000	1.157
+++ ChangeLog	9 Mar 2012 22:01:11 -0000	1.158
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.157 2012/03/08 14:24:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.158 2012/03/09 22:01:11 slyfox Exp $
+
+  09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+  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.
 
   08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Die earlier on unsupported EAPI.



1.28                 eclass/haskell-cabal.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.27&r2=1.28

Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- haskell-cabal.eclass	7 Feb 2012 12:47:54 -0000	1.27
+++ haskell-cabal.eclass	9 Mar 2012 22:01:11 -0000	1.28
@@ -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 @@
 
 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