Gentoo Archives: gentoo-commits

From: "Lennart Kolmodin (kolmodin)" <kolmodin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.4.1.ebuild
Date: Wed, 29 Jul 2009 17:31:32
Message-Id: E1MWCzy-0000HQ-3f@stork.gentoo.org
1 kolmodin 09/07/29 17:31:30
2
3 Modified: ChangeLog haddock-2.4.1.ebuild
4 Log:
5 Make cabal dep to dev-haskell/haddock more strict
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.64 dev-haskell/haddock/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.64&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.64&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.63&r2=1.64
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
18 retrieving revision 1.63
19 retrieving revision 1.64
20 diff -u -r1.63 -r1.64
21 --- ChangeLog 28 Jul 2009 18:51:01 -0000 1.63
22 +++ ChangeLog 29 Jul 2009 17:31:30 -0000 1.64
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-haskell/haddock
25 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.63 2009/07/28 18:51:01 kolmodin Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.64 2009/07/29 17:31:30 kolmodin Exp $
28 +
29 + 29 Jul 2009; Lennart Kolmodin <kolmodin@g.o> haddock-2.4.1.ebuild:
30 + Update cabal dependency due to bundled ghc-paths, ghc-paths needs
31 + >=cabal-1.6.
32
33 28 Jul 2009; Lennart Kolmodin <kolmodin@g.o> haddock-2.4.1.ebuild:
34 Don't depend on dev-haskell/filepath to avoid circular dependency.
35
36
37
38 1.4 dev-haskell/haddock/haddock-2.4.1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild?r1=1.3&r2=1.4
43
44 Index: haddock-2.4.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- haddock-2.4.1.ebuild 28 Jul 2009 18:51:02 -0000 1.3
51 +++ haddock-2.4.1.ebuild 29 Jul 2009 17:31:30 -0000 1.4
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.4 2009/07/29 17:31:30 kolmodin Exp $
57
58 CABAL_FEATURES="bin lib"
59 # don't enable profiling as the 'ghc' package is not built with profiling
60 @@ -29,10 +29,11 @@
61 # we bundle the dep on ghc-paths to reduce the dependencies on this critical
62 # package. ghc-paths would like to be compiled with USE=doc, which pulls in
63 # haddock, which requires ghc-paths, which pulls in haddock...
64 +# bundling ghc-paths forces us to depend on >=cabal-1.6 rather than >=cabal-1.2
65
66 RDEPEND=">=dev-lang/ghc-6.8.2"
67 DEPEND="${RDEPEND}
68 - >=dev-haskell/cabal-1.2
69 + >=dev-haskell/cabal-1.6
70 doc? ( ~app-text/docbook-xml-dtd-4.2
71 app-text/docbook-xsl-stylesheets
72 >=dev-libs/libxslt-1.1.2 )"
73 @@ -82,3 +83,4 @@
74 fi
75 dodoc CHANGES README
76 }
77 +