diff options
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.4.2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index e441aeee5d44..508bd0109c1f 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.233 2013/03/27 14:49:03 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.234 2013/03/28 19:41:33 slyfox Exp $ + + 28 Mar 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.4.2.ebuild: + Allow haddock-2.10 (ghc has incorrect version in it's source). 27 Mar 2013; <qnikst@gentoo.org> ghc-7.4.2.ebuild: fix haddock dependency, thanks to ago diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild index 6fbaaa2e6ab6..889558c73248 100644 --- a/dev-lang/ghc/ghc-7.4.2.ebuild +++ b/dev-lang/ghc/ghc-7.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.4 2013/03/27 14:49:03 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.5 2013/03/28 19:41:33 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -86,7 +86,7 @@ RDEPEND=" >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 virtual/libffi - !<dev-haskell/haddock-2.11.0 + !<dev-haskell/haddock-2.10.0 sys-libs/ncurses[unicode]" # earlier versions than 2.4.2 of haddock only works with older ghc releases |