Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.10.0-r2.ebuild haddock-2.13.1-r2.ebuild haddock-2.13.2-r1.ebuild ChangeLog
Date: Sat, 01 Aug 2015 21:42:55
Message-Id: 20150801214246.C49F0113@oystercatcher.gentoo.org
1 slyfox 15/08/01 21:42:46
2
3 Modified: haddock-2.10.0-r2.ebuild haddock-2.13.1-r2.ebuild
4 haddock-2.13.2-r1.ebuild ChangeLog
5 Log:
6 Put upper bound on ghc version for older packages.
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
9
10 Revision Changes Path
11 1.11 dev-haskell/haddock/haddock-2.10.0-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?rev=1.11&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?rev=1.11&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?r1=1.10&r2=1.11
16
17 Index: haddock-2.10.0-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v
20 retrieving revision 1.10
21 retrieving revision 1.11
22 diff -u -r1.10 -r1.11
23 --- haddock-2.10.0-r2.ebuild 2 Jan 2015 23:16:40 -0000 1.10
24 +++ haddock-2.10.0-r2.ebuild 1 Aug 2015 21:42:46 -0000 1.11
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.10 2015/01/02 23:16:40 slyfox Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.11 2015/08/01 21:42:46 slyfox Exp $
30
31 EAPI="4"
32
33 @@ -13,19 +13,20 @@
34
35 LICENSE="BSD"
36 SLOT="0"
37 +# ia64 lost as we don't have ghc-7 there yet
38 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
39 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
40 IUSE=""
41
42 RDEPEND="dev-haskell/ghc-paths[profile?]
43 =dev-haskell/xhtml-3000.2*[profile?]
44 - >=dev-lang/ghc-7.4 <dev-lang/ghc-7.6"
45 + >=dev-lang/ghc-7.4"
46 DEPEND="${RDEPEND}
47 >=dev-haskell/cabal-1.14"
48
49 RESTRICT="test" # avoid depends on QC
50
51 -CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
52 +CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
53
54 src_prepare() {
55 # we would like to avoid happy and alex depends
56
57
58
59 1.2 dev-haskell/haddock/haddock-2.13.1-r2.ebuild
60
61 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?rev=1.2&view=markup
62 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?rev=1.2&content-type=text/plain
63 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?r1=1.1&r2=1.2
64
65 Index: haddock-2.13.1-r2.ebuild
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v
68 retrieving revision 1.1
69 retrieving revision 1.2
70 diff -u -r1.1 -r1.2
71 --- haddock-2.13.1-r2.ebuild 10 Feb 2013 14:23:03 -0000 1.1
72 +++ haddock-2.13.1-r2.ebuild 1 Aug 2015 21:42:46 -0000 1.2
73 @@ -1,6 +1,6 @@
74 -# Copyright 1999-2013 Gentoo Foundation
75 +# Copyright 1999-2015 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.1 2013/02/10 14:23:03 slyfox Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.2 2015/08/01 21:42:46 slyfox Exp $
79
80 EAPI=5
81
82 @@ -15,18 +15,18 @@
83 SLOT="0/${PV}"
84 # ia64 lost as we don't have ghc-7 there yet
85 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
86 -KEYWORDS="~amd64 ~x86"
87 +KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
88 IUSE=""
89
90 RDEPEND="dev-haskell/ghc-paths:=[profile?]
91 =dev-haskell/xhtml-3000.2*:=[profile?]
92 - >=dev-lang/ghc-7.6.1:="
93 + >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
94 DEPEND="${RDEPEND}
95 >=dev-haskell/cabal-1.14"
96
97 RESTRICT="test" # avoid depends on QC
98
99 -CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
100 +CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
101
102 src_prepare() {
103 # we would like to avoid happy and alex depends
104
105
106
107 1.6 dev-haskell/haddock/haddock-2.13.2-r1.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?rev=1.6&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?rev=1.6&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?r1=1.5&r2=1.6
112
113 Index: haddock-2.13.2-r1.ebuild
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v
116 retrieving revision 1.5
117 retrieving revision 1.6
118 diff -u -r1.5 -r1.6
119 --- haddock-2.13.2-r1.ebuild 22 Sep 2013 06:44:28 -0000 1.5
120 +++ haddock-2.13.2-r1.ebuild 1 Aug 2015 21:42:46 -0000 1.6
121 @@ -1,6 +1,6 @@
122 -# Copyright 1999-2013 Gentoo Foundation
123 +# Copyright 1999-2015 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.5 2013/09/22 06:44:28 ago Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.6 2015/08/01 21:42:46 slyfox Exp $
127
128 EAPI=5
129
130 @@ -23,13 +23,13 @@
131
132 RDEPEND="dev-haskell/ghc-paths:=[profile?]
133 =dev-haskell/xhtml-3000.2*:=[profile?]
134 - >=dev-lang/ghc-7.6.1:="
135 + >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
136 DEPEND="${RDEPEND}
137 >=dev-haskell/cabal-1.14"
138
139 RESTRICT="test" # avoid depends on QC
140
141 -CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
142 +CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
143
144 src_prepare() {
145 # we would like to avoid happy and alex depends
146
147
148
149 1.118 dev-haskell/haddock/ChangeLog
150
151 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.118&view=markup
152 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.118&content-type=text/plain
153 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.117&r2=1.118
154
155 Index: ChangeLog
156 ===================================================================
157 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
158 retrieving revision 1.117
159 retrieving revision 1.118
160 diff -u -r1.117 -r1.118
161 --- ChangeLog 1 Aug 2015 21:23:32 -0000 1.117
162 +++ ChangeLog 1 Aug 2015 21:42:46 -0000 1.118
163 @@ -1,6 +1,10 @@
164 # ChangeLog for dev-haskell/haddock
165 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
166 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.117 2015/08/01 21:23:32 slyfox Exp $
167 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.118 2015/08/01 21:42:46 slyfox Exp $
168 +
169 + 01 Aug 2015; Sergei Trofimovich <slyfox@g.o> haddock-2.10.0-r2.ebuild,
170 + haddock-2.13.1-r2.ebuild, haddock-2.13.2-r1.ebuild:
171 + Put upper bound on ghc version for older packages.
172
173 *haddock-2.16.1 (01 Aug 2015)