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/http: ChangeLog http-4000.1.2.ebuild http-4000.2.2.ebuild
Date: Sun, 04 Mar 2012 03:38:08
Message-Id: 20120304033758.AE9492004B@flycatcher.gentoo.org
1 gienah 12/03/04 03:37:58
2
3 Modified: ChangeLog http-4000.1.2.ebuild
4 Added: http-4000.2.2.ebuild
5 Log:
6 Fix http-4000.1.2 build with ghc 7.4.1. Add http-4000.2.2 for ghc 7.4.1
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.20 dev-haskell/http/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?rev=1.20&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?rev=1.20&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?r1=1.19&r2=1.20
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v
20 retrieving revision 1.19
21 retrieving revision 1.20
22 diff -u -r1.19 -r1.20
23 --- ChangeLog 4 Dec 2011 17:26:32 -0000 1.19
24 +++ ChangeLog 4 Mar 2012 03:37:58 -0000 1.20
25 @@ -1,8 +1,16 @@
26 # ChangeLog for dev-haskell/http
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.19 2011/12/04 17:26:32 slyfox Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.20 2012/03/04 03:37:58 gienah Exp $
31
32 -*http-4000.1.2 (04 Dec 2011)
33 +*http-4000.2.2 (04 Mar 2012)
34 +
35 + 04 Mar 2012; Mark Wright <gienah@g.o> +http-4000.2.2.ebuild:
36 + Add http-4000.2.2 for ghc 7.4.1
37 +
38 +*http-4000.1.2 (04 Mar 2012)
39 +
40 + 04 Mar 2012; Mark Wright <gienah@g.o> http-4000.1.2.ebuild,
41 + Fix http-4000.1.2 build with ghc 7.4.1.
42
43 04 Dec 2011; Sergei Trofimovich <slyfox@g.o> +http-4000.1.2.ebuild:
44 Version bump.
45
46
47
48 1.2 dev-haskell/http/http-4000.1.2.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?rev=1.2&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?rev=1.2&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?r1=1.1&r2=1.2
53
54 Index: http-4000.1.2.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v
57 retrieving revision 1.1
58 retrieving revision 1.2
59 diff -u -r1.1 -r1.2
60 --- http-4000.1.2.ebuild 4 Dec 2011 17:26:32 -0000 1.1
61 +++ http-4000.1.2.ebuild 4 Mar 2012 03:37:58 -0000 1.2
62 @@ -1,10 +1,10 @@
63 -# Copyright 1999-2011 Gentoo Foundation
64 +# Copyright 1999-2012 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.1 2011/12/04 17:26:32 slyfox Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.2 2012/03/04 03:37:58 gienah Exp $
68
69 # ebuild generated by hackport 0.2.13
70
71 -EAPI="3"
72 +EAPI="4"
73
74 CABAL_FEATURES="lib profile haddock hscolour hoogle"
75 inherit haskell-cabal
76 @@ -21,11 +21,16 @@
77 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
78 IUSE=""
79
80 -RDEPEND="dev-haskell/mtl
81 - dev-haskell/network
82 - dev-haskell/parsec
83 +RDEPEND="dev-haskell/mtl[profile?]
84 + dev-haskell/network[profile?]
85 + dev-haskell/parsec[profile?]
86 >=dev-lang/ghc-6.8.2"
87 DEPEND="${RDEPEND}
88 >=dev-haskell/cabal-1.2"
89
90 S="${WORKDIR}/${MY_P}"
91 +
92 +src_prepare() {
93 + sed -e 's@base >= 2 && < 4.5@base >= 2 \&\& < 4.6@' \
94 + -i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
95 +}
96
97
98
99 1.1 dev-haskell/http/http-4000.2.2.ebuild
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild?rev=1.1&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild?rev=1.1&content-type=text/plain
103
104 Index: http-4000.2.2.ebuild
105 ===================================================================
106 # Copyright 1999-2012 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 # $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild,v 1.1 2012/03/04 03:37:58 gienah Exp $
109
110 # ebuild generated by hackport 0.2.13
111
112 EAPI="4"
113
114 CABAL_FEATURES="lib profile haddock hscolour hoogle"
115 inherit base haskell-cabal
116
117 MY_PN="HTTP"
118 MY_P="${MY_PN}-${PV}"
119
120 DESCRIPTION="A library for client-side HTTP"
121 HOMEPAGE="https://github.com/haskell/HTTP"
122 SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
123
124 LICENSE="BSD"
125 SLOT="0"
126 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
127 IUSE="test"
128
129 RDEPEND="=dev-haskell/mtl-2.0*[profile?]
130 dev-haskell/network[profile?]
131 dev-haskell/parsec[profile?]
132 >=dev-lang/ghc-6.8.2"
133 DEPEND="${RDEPEND}
134 >=dev-haskell/cabal-1.8
135 test? ( >=dev-haskell/cabal-1.10
136 dev-haskell/hunit[profile?]
137 dev-haskell/httpd-shed[profile?]
138 =dev-haskell/split-0.1*[profile?]
139 dev-haskell/test-framework[profile?]
140 dev-haskell/test-framework-hunit[profile?]
141 )
142 "
143
144 S="${WORKDIR}/${MY_P}"
145
146 src_configure() {
147 cabal_src_configure $(use test && use_enable test tests) #395351
148 }