Gentoo Archives: gentoo-commits

From: "Duncan Coutts (dcoutts)" <dcoutts@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-0.8.ebuild haddock-0.7.ebuild
Date: Wed, 31 Oct 2007 12:57:16
Message-Id: E1InD8B-00076D-Vz@stork.gentoo.org
1 dcoutts 07/10/31 12:57:11
2
3 Modified: ChangeLog haddock-0.8.ebuild haddock-0.7.ebuild
4 Log:
5 Drop virtual/ghc in favour of dev-lang/ghc
6 (Portage version: 2.1.3.16)
7
8 Revision Changes Path
9 1.50 dev-haskell/haddock/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.50&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.50&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.49&r2=1.50
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
18 retrieving revision 1.49
19 retrieving revision 1.50
20 diff -u -r1.49 -r1.50
21 --- ChangeLog 11 Aug 2007 15:34:57 -0000 1.49
22 +++ ChangeLog 31 Oct 2007 12:57:11 -0000 1.50
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-haskell/haddock
25 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.49 2007/08/11 15:34:57 beandog Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.50 2007/10/31 12:57:11 dcoutts Exp $
28 +
29 + 31 Oct 2007; Duncan Coutts <dcoutts@g.o> haddock-0.7.ebuild,
30 + haddock-0.8.ebuild:
31 + Drop virtual/ghc in favour of dev-lang/ghc
32
33 11 Aug 2007; Steve Dibb <beandog@g.o> haddock-0.8.ebuild:
34 amd64 stable, bug 186849
35
36
37
38 1.10 dev-haskell/haddock/haddock-0.8.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild?rev=1.10&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild?rev=1.10&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild?r1=1.9&r2=1.10
43
44 Index: haddock-0.8.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v
47 retrieving revision 1.9
48 retrieving revision 1.10
49 diff -u -r1.9 -r1.10
50 --- haddock-0.8.ebuild 11 Aug 2007 15:34:57 -0000 1.9
51 +++ haddock-0.8.ebuild 31 Oct 2007 12:57:11 -0000 1.10
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2007 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.9 2007/08/11 15:34:57 beandog Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.10 2007/10/31 12:57:11 dcoutts Exp $
57
58 CABAL_FEATURES="bin"
59 inherit haskell-cabal eutils versionator
60 @@ -17,7 +17,7 @@
61
62 IUSE="doc"
63
64 -DEPEND=">=virtual/ghc-6.4
65 +DEPEND=">=dev-lang/ghc-6.4
66 >=dev-haskell/cabal-1.1.4
67 doc? ( ~app-text/docbook-xml-dtd-4.2
68 app-text/docbook-xsl-stylesheets
69
70
71
72 1.16 dev-haskell/haddock/haddock-0.7.ebuild
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild?rev=1.16&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild?rev=1.16&content-type=text/plain
76 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild?r1=1.15&r2=1.16
77
78 Index: haddock-0.7.ebuild
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v
81 retrieving revision 1.15
82 retrieving revision 1.16
83 diff -u -r1.15 -r1.16
84 --- haddock-0.7.ebuild 13 Jul 2007 06:03:10 -0000 1.15
85 +++ haddock-0.7.ebuild 31 Oct 2007 12:57:11 -0000 1.16
86 @@ -1,6 +1,6 @@
87 -# Copyright 1999-2006 Gentoo Foundation
88 +# Copyright 1999-2007 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.15 2007/07/13 06:03:10 mr_bones_ Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.16 2007/10/31 12:57:11 dcoutts Exp $
92 #
93 # USE variable summary:
94 # doc - Build extra documenation from DocBook sources,
95 @@ -19,8 +19,8 @@
96 KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
97 LICENSE="as-is"
98
99 -DEPEND="virtual/ghc
100 - !>=virtual/ghc-6.6
101 +DEPEND="dev-lang/ghc
102 + !>=dev-lang/ghc-6.6
103 doc? ( ~app-text/docbook-xml-dtd-4.2
104 app-text/docbook-xsl-stylesheets
105 >=dev-libs/libxslt-1.1.2
106 @@ -29,7 +29,7 @@
107 RDEPEND=""
108
109 pkg_setup() {
110 - if ! has_version virtual/ghc; then
111 + if ! has_version dev-lang/ghc; then
112 eerror "Due to a bug in the portage dependency resolution, emerge"
113 eerror "sometimes tries to merge haddock before a version of ghc"
114 eerror "is available on the system. This is usually triggered when"
115
116
117
118 --
119 gentoo-commits@g.o mailing list