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-haskell/gtk2hs-buildtools: gtk2hs-buildtools-0.12.3.1.ebuild ChangeLog
Date: Sun, 25 Nov 2012 05:42:47
Message-Id: 20121125054232.A335B20C9F@flycatcher.gentoo.org
1 gienah 12/11/25 05:42:32
2
3 Modified: gtk2hs-buildtools-0.12.3.1.ebuild ChangeLog
4 Log:
5 Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1
6
7 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.5 dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild?r1=1.4&r2=1.5
15
16 Index: gtk2hs-buildtools-0.12.3.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- gtk2hs-buildtools-0.12.3.1.ebuild 23 Sep 2012 08:43:07 -0000 1.4
23 +++ gtk2hs-buildtools-0.12.3.1.ebuild 25 Nov 2012 05:42:32 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.4 2012/09/23 08:43:07 phajdan.jr Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.5 2012/11/25 05:42:32 gienah Exp $
29
30 EAPI=4
31
32 @@ -21,6 +21,17 @@
33 dev-haskell/alex
34 >=dev-haskell/cabal-1.8
35 dev-haskell/happy
36 + dev-haskell/random
37 >=dev-lang/ghc-6.10.1"
38
39 -PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch)
40 +PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch
41 + "${FILESDIR}"/${PN}-0.12.3.1-ghc-7.5.patch
42 +)
43 +
44 +src_prepare() {
45 + base_src_prepare
46 + # c2hs ignores #if __GLASGOW_HASKELL__ >= 704
47 + if has_version ">=dev-lang/ghc-7.6.1"; then
48 + epatch "${FILESDIR}"/${PN}-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
49 + fi
50 +}
51
52
53
54 1.11 dev-haskell/gtk2hs-buildtools/ChangeLog
55
56 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog?rev=1.11&view=markup
57 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog?rev=1.11&content-type=text/plain
58 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog?r1=1.10&r2=1.11
59
60 Index: ChangeLog
61 ===================================================================
62 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v
63 retrieving revision 1.10
64 retrieving revision 1.11
65 diff -u -r1.10 -r1.11
66 --- ChangeLog 23 Sep 2012 08:43:07 -0000 1.10
67 +++ ChangeLog 25 Nov 2012 05:42:32 -0000 1.11
68 @@ -1,6 +1,12 @@
69 # ChangeLog for dev-haskell/gtk2hs-buildtools
70 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
71 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.10 2012/09/23 08:43:07 phajdan.jr Exp $
72 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.11 2012/11/25 05:42:32 gienah Exp $
73 +
74 + 25 Nov 2012; Mark Wright <gienah@g.o>
75 + +files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch, +files/gtk2hs-buildtools-0.12
76 + .3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch,
77 + gtk2hs-buildtools-0.12.3.1.ebuild:
78 + Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1
79
80 23 Sep 2012; Pawel Hajdan jr <phajdan.jr@g.o>
81 gtk2hs-buildtools-0.12.3.1.ebuild: