Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/darcs: darcs-2.5.2-r1.ebuild darcs-2.5.2.ebuild ChangeLog darcs-2.4.4-r1.ebuild
Date: Sun, 04 Mar 2012 07:20:39
Message-Id: 20120304072025.F2CBA2004B@flycatcher.gentoo.org
1 gienah 12/03/04 07:20:25
2
3 Modified: darcs-2.5.2.ebuild ChangeLog darcs-2.4.4-r1.ebuild
4 Added: darcs-2.5.2-r1.ebuild
5 Log:
6 Patch darcs 2.5.2 for ghc 7.4.1, patches sent upstream and applied to darcs repo.
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.3 dev-vcs/darcs/darcs-2.5.2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild?r1=1.2&r2=1.3
16
17 Index: darcs-2.5.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- darcs-2.5.2.ebuild 8 Dec 2011 20:42:47 -0000 1.2
24 +++ darcs-2.5.2.ebuild 4 Mar 2012 07:20:25 -0000 1.3
25 @@ -1,10 +1,10 @@
26 -# Copyright 1999-2011 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.2 2011/12/08 20:42:47 slyfox Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.3 2012/03/04 07:20:25 gienah Exp $
31
32 EAPI="3"
33 CABAL_FEATURES="bin lib profile haddock hscolour"
34 -inherit haskell-cabal bash-completion
35 +inherit haskell-cabal bash-completion-r1
36
37 DESCRIPTION="a distributed, interactive, smart revision control system"
38 HOMEPAGE="http://darcs.net/"
39 @@ -15,19 +15,19 @@
40 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
41 IUSE="doc test"
42
43 -RDEPEND="=dev-haskell/hashed-storage-0.5*
44 - =dev-haskell/haskeline-0.6*
45 - =dev-haskell/html-1.0*
46 - <dev-haskell/http-4000.2
47 - =dev-haskell/mmap-0.5*
48 - <dev-haskell/mtl-2.1
49 - >=dev-haskell/network-2.2
50 - <dev-haskell/parsec-3.2
51 - <dev-haskell/regex-compat-0.96
52 - =dev-haskell/tar-0.3*
53 - =dev-haskell/terminfo-0.3*
54 - =dev-haskell/text-0.11*
55 - <dev-haskell/zlib-0.6.0.0
56 +RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
57 + =dev-haskell/haskeline-0.6*[profile?]
58 + =dev-haskell/html-1.0*[profile?]
59 + <dev-haskell/http-4000.2[profile?]
60 + =dev-haskell/mmap-0.5*[profile?]
61 + <dev-haskell/mtl-2.1[profile?]
62 + >=dev-haskell/network-2.2[profile?]
63 + <dev-haskell/parsec-3.2[profile?]
64 + <dev-haskell/regex-compat-0.96[profile?]
65 + =dev-haskell/tar-0.3*[profile?]
66 + =dev-haskell/terminfo-0.3*[profile?]
67 + =dev-haskell/text-0.11*[profile?]
68 + <dev-haskell/zlib-0.6.0.0[profile?]
69 >=dev-lang/ghc-6.10.1
70 net-misc/curl
71 virtual/mta"
72 @@ -40,9 +40,9 @@
73 dev-tex/latex2html[gif]
74 )
75 )
76 - test? ( dev-haskell/test-framework
77 - dev-haskell/test-framework-hunit
78 - dev-haskell/test-framework-quickcheck2
79 + test? ( dev-haskell/test-framework[profile?]
80 + dev-haskell/test-framework-hunit[profile?]
81 + dev-haskell/test-framework-quickcheck2[profile?]
82 )
83 "
84
85
86
87
88 1.24 dev-vcs/darcs/ChangeLog
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/ChangeLog?rev=1.24&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/ChangeLog?rev=1.24&content-type=text/plain
92 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/ChangeLog?r1=1.23&r2=1.24
93
94 Index: ChangeLog
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v
97 retrieving revision 1.23
98 retrieving revision 1.24
99 diff -u -r1.23 -r1.24
100 --- ChangeLog 8 Dec 2011 20:42:47 -0000 1.23
101 +++ ChangeLog 4 Mar 2012 07:20:25 -0000 1.24
102 @@ -1,14 +1,25 @@
103 # ChangeLog for dev-vcs/darcs
104 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
105 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.23 2011/12/08 20:42:47 slyfox Exp $
106 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
107 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.24 2012/03/04 07:20:25 gienah Exp $
108 +
109 +*darcs-2.5.2-r1 (04 Mar 2012)
110 +
111 + 04 Mar 2012; Mark Wright <gienah@g.o> darcs-2.5.2-r1.ebuild,
112 + +files/darcs-2.5.2-ghc-7.4.patch,
113 + +files/darcs-2.5.2-relax-http-libs-deps.patch:
114 + Patch darcs 2.5.2 for ghc 7.4.1, patches sent upstream and applied to darcs
115 + repo. Remove ia64 keyword.
116 +
117 +*darcs-2.5.2 (04 Mar 2012)
118 +
119 + 04 Mar 2012; Mark Wright <gienah@g.o> darcs-2.4.4-r1.ebuild,
120 + Add [profile?] to haskell library dependencies.
121
122 08 Dec 2011; Sergei Trofimovich <slyfox@g.o> darcs-2.4.4-r1.ebuild,
123 darcs-2.5.2.ebuild:
124 Drop tests/external.sh from tests as it reloes on ecample.com layout.
125 Partially fixes bug #392647 by Paweł Hajdan, Jr.
126
127 -*darcs-2.5.2 (04 Aug 2011)
128 -
129 04 Aug 2011; Sergei Trofimovich <slyfox@g.o> +darcs-2.5.2.ebuild,
130 +files/darcs-2.5.2-ghc-7.2.patch,
131 +files/darcs-2.5.2-relax-regex-libs-deps.patch,
132 @@ -71,7 +82,10 @@
133 darcs-2.0.2.ebuild, darcs-2.1.0-r1.ebuild, darcs-2.2.1.ebuild:
134 Drop support for ghc and darcs.
135
136 -*darcs-2.4.4-r1 (28 Jun 2010)
137 +*darcs-2.4.4-r1 (04 Mar 2012)
138 +
139 + 04 Mar 2012; Mark Wright <gienah@g.o> darcs-2.4.4-r1.ebuild,
140 + Add [profile?] to haskell library dependencies.
141
142 28 Jun 2010; Lennart Kolmodin <kolmodin@g.o>
143 +darcs-2.4.4-r1.ebuild,
144
145
146
147 1.15 dev-vcs/darcs/darcs-2.4.4-r1.ebuild
148
149 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild?rev=1.15&view=markup
150 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild?rev=1.15&content-type=text/plain
151 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild?r1=1.14&r2=1.15
152
153 Index: darcs-2.4.4-r1.ebuild
154 ===================================================================
155 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v
156 retrieving revision 1.14
157 retrieving revision 1.15
158 diff -u -r1.14 -r1.15
159 --- darcs-2.4.4-r1.ebuild 8 Dec 2011 20:42:47 -0000 1.14
160 +++ darcs-2.4.4-r1.ebuild 4 Mar 2012 07:20:25 -0000 1.15
161 @@ -1,10 +1,10 @@
162 -# Copyright 1999-2011 Gentoo Foundation
163 +# Copyright 1999-2012 Gentoo Foundation
164 # Distributed under the terms of the GNU General Public License v2
165 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.14 2011/12/08 20:42:47 slyfox Exp $
166 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.15 2012/03/04 07:20:25 gienah Exp $
167
168 EAPI="3"
169 CABAL_FEATURES="bin lib profile haddock hscolour"
170 -inherit haskell-cabal eutils bash-completion
171 +inherit haskell-cabal eutils bash-completion-r1
172
173 DESCRIPTION="a distributed, interactive, smart revision control system"
174 HOMEPAGE="http://darcs.net/"
175 @@ -23,17 +23,17 @@
176 # 4) Use the same bounds for mmap as hashed-storage.
177
178 COMMONDEPS=">=dev-lang/ghc-6.8
179 - >=dev-haskell/hashed-storage-0.4.13
180 - =dev-haskell/haskeline-0.6*
181 - =dev-haskell/html-1.0*
182 - =dev-haskell/mmap-0.4*
183 - <dev-haskell/mtl-1.2
184 - >=dev-haskell/network-2.2
185 - >=dev-haskell/parsec-2.0
186 - <dev-haskell/regex-compat-0.94
187 - =dev-haskell/terminfo-0.3*
188 - =dev-haskell/utf8-string-0.3*
189 - <dev-haskell/zlib-0.6.0.0
190 + >=dev-haskell/hashed-storage-0.4.13[profile?]
191 + =dev-haskell/haskeline-0.6*[profile?]
192 + =dev-haskell/html-1.0*[profile?]
193 + =dev-haskell/mmap-0.4*[profile?]
194 + <dev-haskell/mtl-1.2[profile?]
195 + >=dev-haskell/network-2.2[profile?]
196 + >=dev-haskell/parsec-2.0[profile?]
197 + <dev-haskell/regex-compat-0.94[profile?]
198 + =dev-haskell/terminfo-0.3*[profile?]
199 + =dev-haskell/utf8-string-0.3*[profile?]
200 + <dev-haskell/zlib-0.6.0.0[profile?]
201 net-misc/curl"
202
203 DEPEND="${COMMONDEPS}
204 @@ -41,9 +41,9 @@
205 dev-util/pkgconfig
206 doc? ( virtual/latex-base
207 dev-tex/latex2html )
208 - test? ( dev-haskell/test-framework
209 - dev-haskell/test-framework-hunit
210 - dev-haskell/test-framework-quickcheck2 )
211 + test? ( dev-haskell/test-framework[profile?]
212 + dev-haskell/test-framework-hunit[profile?]
213 + dev-haskell/test-framework-quickcheck2[profile?] )
214 "
215
216 # darcs also has a library version; we thus need $DEPEND
217
218
219
220 1.1 dev-vcs/darcs/darcs-2.5.2-r1.ebuild
221
222 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r1.ebuild?rev=1.1&view=markup
223 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r1.ebuild?rev=1.1&content-type=text/plain
224
225 Index: darcs-2.5.2-r1.ebuild
226 ===================================================================
227 # Copyright 1999-2012 Gentoo Foundation
228 # Distributed under the terms of the GNU General Public License v2
229 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r1.ebuild,v 1.1 2012/03/04 07:20:25 gienah Exp $
230
231 EAPI="4"
232 CABAL_FEATURES="bin lib profile haddock hscolour"
233 inherit haskell-cabal bash-completion-r1
234
235 DESCRIPTION="a distributed, interactive, smart revision control system"
236 HOMEPAGE="http://darcs.net/"
237 SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
238
239 LICENSE="GPL-2"
240 SLOT="0"
241 KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
242 IUSE="doc test"
243
244 RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
245 =dev-haskell/haskeline-0.6*[profile?]
246 =dev-haskell/html-1.0*[profile?]
247 <dev-haskell/http-4000.3[profile?]
248 =dev-haskell/mmap-0.5*[profile?]
249 <dev-haskell/mtl-2.1[profile?]
250 >=dev-haskell/network-2.2[profile?]
251 <dev-haskell/parsec-3.2[profile?]
252 <dev-haskell/regex-compat-0.96[profile?]
253 =dev-haskell/tar-0.3*[profile?]
254 =dev-haskell/terminfo-0.3*[profile?]
255 =dev-haskell/text-0.11*[profile?]
256 <dev-haskell/zlib-0.6.0.0[profile?]
257 >=dev-lang/ghc-6.10.1
258 net-misc/curl
259 virtual/mta"
260
261 # darcs also has a library version; we thus need $DEPEND
262 DEPEND="${RDEPEND}
263 >=dev-haskell/cabal-1.8
264 doc? ( virtual/latex-base
265 || ( dev-tex/latex2html[png]
266 dev-tex/latex2html[gif]
267 )
268 )
269 test? ( dev-haskell/test-framework[profile?]
270 dev-haskell/test-framework-hunit[profile?]
271 dev-haskell/test-framework-quickcheck2[profile?]
272 )
273 "
274
275 src_prepare() {
276 cd "${S}/contrib"
277 epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
278 cd ..
279
280 epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
281 epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
282 epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
283 epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
284 epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
285
286 # hlint tests tend to break on every newly released hlint
287 rm "${S}/tests/haskell_policy.sh"
288 rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
289
290 # use a more recent API, and thus depend on a more recent package
291 sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"
292 }
293
294 src_configure() {
295 # checking whether ghc supports -threaded flag
296 # Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
297 # contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
298 # It might have interactivity impact.
299
300 threaded_flag=""
301 if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
302 threaded_flag="--flags=threaded"
303 einfo "$P will be built with threads support"
304 else
305 threaded_flag="--flags=-threaded"
306 einfo "$P will be built without threads support"
307 fi
308
309 # Use curl for net stuff to avoid strict version dep on HTTP and network
310 cabal_src_configure \
311 --flags=curl \
312 --flags=-http \
313 --flags=curl-pipelining \
314 --flags=color \
315 --flags=terminfo \
316 --flags=mmap \
317 $threaded_flag \
318 $(cabal_flag test)
319 }
320
321 src_test() {
322 # run cabal test from haskell-cabal
323 haskell-cabal_src_test || die "cabal test failed"
324
325 # run the unit tests (not part of cabal test for some reason...)
326 # breaks the cabal abstraction a bit...
327 "${S}/dist/build/unit/unit" || die "unit tests failed"
328 }
329
330 src_install() {
331 cabal_src_install
332 dobashcompletion "${S}/contrib/darcs_completion" "${PN}"
333
334 rm "${ED}/usr/bin/unit" 2> /dev/null
335
336 # fixup perms in such an an awkward way
337 mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
338 doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
339
340 # if tests were enabled, make sure the unit test driver is deleted
341 rm -rf "${ED}/usr/bin/unit"
342 }
343
344 pkg_postinst() {
345 ghc-package_pkg_postinst
346 bash-completion_pkg_postinst
347
348 ewarn "NOTE: in order for the darcs send command to work properly,"
349 ewarn "you must properly configure your mail transport agent to relay"
350 ewarn "outgoing mail. For example, if you are using ssmtp, please edit"
351 ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
352 }
Report Message
Find on MARC Find on Google Groups