summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vershilov <qnikst@gentoo.org>2013-03-27 14:49:03 +0000
committerAlexander Vershilov <qnikst@gentoo.org>2013-03-27 14:49:03 +0000
commit948e6c95a477640a94dda89721f01a0a9b6aad23 (patch)
tree5f644f3355221a5259515cf6ff821bddecd5e240 /dev-lang/ghc
parentStable for arm, wrt bug #456446 (diff)
downloadgentoo-2-948e6c95a477640a94dda89721f01a0a9b6aad23.tar.gz
gentoo-2-948e6c95a477640a94dda89721f01a0a9b6aad23.tar.bz2
gentoo-2-948e6c95a477640a94dda89721f01a0a9b6aad23.zip
fix haddock dependency, thanks to ago
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0xDAD24B57AB9F1B01!)
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/ChangeLog5
-rw-r--r--dev-lang/ghc/ghc-7.4.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 0548c3af560f..e441aeee5d44 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.232 2013/03/26 20:19:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.233 2013/03/27 14:49:03 qnikst Exp $
+
+ 27 Mar 2013; <qnikst@gentoo.org> ghc-7.4.2.ebuild:
+ fix haddock dependency, thanks to ago
26 Mar 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.4.2.ebuild:
Add ia64 binary.
diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild
index c918af5d5bd2..6fbaaa2e6ab6 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.3 2013/03/26 20:19:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.4 2013/03/27 14:49:03 qnikst 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.4.2
+ !<dev-haskell/haddock-2.11.0
sys-libs/ncurses[unicode]"
# earlier versions than 2.4.2 of haddock only works with older ghc releases