summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2013-02-10 14:26:06 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2013-02-10 14:26:06 +0000
commitf491c56eca83496a337e299568a0442b97332107 (patch)
treea34848f725373f5ba1a23cff4cb1ed5ca582b751 /dev-haskell
parentUse distutils_install_for_testing(). (diff)
downloadgentoo-2-f491c56eca83496a337e299568a0442b97332107.tar.gz
gentoo-2-f491c56eca83496a337e299568a0442b97332107.tar.bz2
gentoo-2-f491c56eca83496a337e299568a0442b97332107.zip
Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).
(Portage version: 2.2.0_alpha153_p6/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/haddock/ChangeLog5
-rw-r--r--dev-haskell/haddock/haddock-2.6.1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 5fb4ed433b58..c9e91881cf2e 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haddock
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.98 2013/02/10 14:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.99 2013/02/10 14:26:06 slyfox Exp $
+
+ 10 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild:
+ Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).
*haddock-2.13.1-r2 (10 Feb 2013)
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
index 00c1dd109e7e..72adfdc0a71c 100644
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.15 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.16 2013/02/10 14:26:06 slyfox Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -19,7 +19,7 @@ IUSE="doc"
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
-RDEPEND=">=dev-lang/ghc-6.12"
+RDEPEND=">=dev-lang/ghc-6.12 <dev-lang/ghc-7"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
doc? ( ~app-text/docbook-xml-dtd-4.2