Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/haddock/files/, dev-haskell/haddock/
Date: Wed, 28 Dec 2016 22:49:48
Message-Id: 1482964654.4f397f1abe3ed5d48c31cc500da3de21e2868869.slyfox@gentoo
1 commit: 4f397f1abe3ed5d48c31cc500da3de21e2868869
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 28 22:35:04 2016 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 22:37:34 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f397f1a
7
8 dev-haskell/haddock: drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-haskell/haddock/Manifest | 5 --
13 ...-crash-on-unicode-strings-in-doc-comments.patch | 22 -------
14 .../haddock/files/haddock-2.10.0-drop-tools.patch | 26 --------
15 .../haddock/files/haddock-2.10.0-ticket-202.patch | 30 ---------
16 .../haddock/files/haddock-2.13.1-drop-tools.patch | 13 ----
17 .../haddock/files/haddock-2.13.1-renameType.patch | 56 ----------------
18 dev-haskell/haddock/haddock-2.10.0-r2.ebuild | 75 ---------------------
19 dev-haskell/haddock/haddock-2.13.1-r2.ebuild | 67 -------------------
20 dev-haskell/haddock/haddock-2.13.2-r1.ebuild | 74 ---------------------
21 dev-haskell/haddock/haddock-2.13.2.1.ebuild | 76 ----------------------
22 dev-haskell/haddock/haddock-2.13.2.ebuild | 71 --------------------
23 11 files changed, 515 deletions(-)
24
25 diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
26 index b0f20e2..657952a 100644
27 --- a/dev-haskell/haddock/Manifest
28 +++ b/dev-haskell/haddock/Manifest
29 @@ -1,7 +1,2 @@
30 -DIST haddock-2.10.0.tar.gz 159750 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410 SHA512 0680ffafce7a2e6a24ae85869694ea5c590305007da07cdffd6adb8a837164452cdf2de159c9fdcba059f76fc01f30771237dbcd71dd44d04afc0d2317e28563 WHIRLPOOL b584452acbe6e1c3474c97a62b17621e1ce0ef31574845499ca8b6ebdcf54559fed2b37d1890b80b1d526cc9b45d52b51a9acf6ae0d9472e15f93c1a7ff7ef3f
31 -DIST haddock-2.13.1.tar.gz 176831 SHA256 6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f SHA512 2cff54f4a3676c605327a6ad926df51976e7ec2bd512e464d0bf84d24f29fa3078dd5f8006329a4a6913607717c2c45f1db2b63d9e9f655d64cbbe92e0fe35fc WHIRLPOOL d1d9202767f4d5ee68ed100f3b95c9be6bff5024b3155b3dbaf3d1d690ac9dc0be2841ef1ea960c095a30005dc2bbb16046dbc4827c6047ee50ad6b1671ae38f
32 -DIST haddock-2.13.2-pregenerated-files.patch 206413 SHA256 dd603527692c12055d6a03c59d414f24dc43a0c56cdb815a0755126586a61f4c SHA512 447d7478365f895028fa56a06695ad71792cb3631fe06b18fb051a6d20d1c829eeff6d2c579c90d4d6b5594f245d2aa4f296bff280e5162f090b9b3f98e780c8 WHIRLPOOL 57bdf7bab4077afe003760015aa9535b4af5f2549f51db1a9d7ca87fd67faa842bd1e0adbfabceffee6ff1cb6ad9b4ec6a34b70630190e89b67900f834538e4f
33 -DIST haddock-2.13.2.1.tar.gz 208851 SHA256 c9cfe2bd2e8e1201870f88bc9a2ccdb0173315d0a8c734b459ec344feb1af34e SHA512 91e451264ff1c82c801f32a48f33d9fd808d22135e0ca6c73a0bd5b515ec69f2530ca9566ee11109cdf67005c4f794cf5e12b7743cf72e34e1e76f094a5744e2 WHIRLPOOL 42f4c9e37ed928403b4d228a3288f6c95372965b8875e97106482bbe0163a124b3c6a6fc727030ca5c04d7d5cc8f092c5b304147fc763971f81135a380e8fd70
34 -DIST haddock-2.13.2.tar.gz 174973 SHA256 25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3 SHA512 6b70f4cc659858e86919cd35a4e936215a53d23767262e25c7add5986cf21d04a761dc3581fe97c6510b3cb0c9867df3e6fa9668732b55e0e9d56b4932dca330 WHIRLPOOL ff06c0d092cdeaf2ddbffd225d30f53239523cd7d482c73f4b7a20100ebcc4e6b6c329bab5cf828ae2730503cff7709061b04cda29ea034939c5acc59191ac52
35 DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 SHA256 8bcdea48e3fbba6e38d2e629edf230da39d07421424bb1c615198c77623ff2c4 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be WHIRLPOOL afd36c8f04aa29c007d83d7c7731098347836daa4e8307710b839ecbc764e191624075df5c3e353c8bcd9f640dfe560a07477bf7909d53ed7e13b34a806efc9a
36 DIST haddock-2.16.1.tar.gz 216323 SHA256 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8 WHIRLPOOL 0f60978d1e4303d6586b164ab40236f949c14308a0b0ddec9e63ff9b332835ca846187b65de8c122203ace666450f40d55955a3c287f576611d7df2bc6c9161c
37
38 diff --git a/dev-haskell/haddock/files/haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch b/dev-haskell/haddock/files/haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch
39 deleted file mode 100644
40 index 254266d..00000000
41 --- a/dev-haskell/haddock/files/haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch
42 +++ /dev/null
43 @@ -1,22 +0,0 @@
44 ---- haddock-2.10.0-orig/src/Haddock/Lex.x 2012-03-04 03:21:18.000000000 +1100
45 -+++ haddock-2.10.0/src/Haddock/Lex.x 2012-05-30 22:19:31.858259148 +1000
46 -@@ -181,7 +181,7 @@
47 - go inp@(pos, _, str) sc =
48 - case alexScan inp sc of
49 - AlexEOF -> []
50 -- AlexError _ -> error "lexical error"
51 -+ AlexError _ -> []
52 - AlexSkip inp' _ -> go inp' sc
53 - AlexToken inp'@(pos',_,_) len act -> act pos (take len str) sc (\sc -> go inp' sc) dflags
54 -
55 ---- haddock-2.10.0-orig/dist/build/haddock/haddock-tmp/Haddock/Lex.hs 2012-03-04 03:21:21.000000000 +1100
56 -+++ haddock-2.10.0/dist/build/haddock/haddock-tmp/Haddock/Lex.hs 2012-05-30 22:23:40.209770708 +1000
57 -@@ -131,7 +131,7 @@
58 - go inp@(pos, _, str) sc =
59 - case alexScan inp sc of
60 - AlexEOF -> []
61 -- AlexError _ -> error "lexical error"
62 -+ AlexError _ -> []
63 - AlexSkip inp' _ -> go inp' sc
64 - AlexToken inp'@(pos',_,_) len act -> act pos (take len str) sc (\sc -> go inp' sc) dflags
65 -
66
67 diff --git a/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch
68 deleted file mode 100644
69 index f7f7f4a..00000000
70 --- a/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch
71 +++ /dev/null
72 @@ -1,26 +0,0 @@
73 -diff --git a/haddock.cabal b/haddock.cabal
74 -index 84d3c2a..9587450 100644
75 ---- a/haddock.cabal
76 -+++ b/haddock.cabal
77 -@@ -78,10 +78,6 @@ flag test
78 -
79 - executable haddock
80 - default-language: Haskell2010
81 -- -- In a GHC tree - in particular, in a source tarball - we don't
82 -- -- require alex or happy
83 -- if !flag(in-ghc-tree)
84 -- build-tools: alex >= 2.3, happy >= 1.18
85 - build-depends:
86 - base >= 4.3 && < 4.6,
87 - filepath,
88 -@@ -140,10 +136,6 @@ executable haddock
89 -
90 - library
91 - default-language: Haskell2010
92 -- -- In a GHC tree - in particular, in a source tarball - we don't
93 -- -- require alex or happy
94 -- if !flag(in-ghc-tree)
95 -- build-tools: alex >= 2.3, happy >= 1.18
96 - build-depends:
97 - base >= 4.3 && < 4.6,
98 - filepath,
99
100 diff --git a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
101 deleted file mode 100644
102 index 7446090..00000000
103 --- a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
104 +++ /dev/null
105 @@ -1,30 +0,0 @@
106 ---- haddock-2.10.0-orig/src/Haddock/Interface/Create.hs 2012-03-04 03:21:18.000000000 +1100
107 -+++ haddock-2.10.0/src/Haddock/Interface/Create.hs 2012-06-27 00:05:37.874840635 +1000
108 -@@ -35,6 +35,7 @@
109 - import Name
110 - import Bag
111 - import RdrName (GlobalRdrEnv)
112 -+import TcRnTypes
113 -
114 -
115 - -- | Use a 'TypecheckedModule' to produce an 'Interface'.
116 -@@ -50,6 +51,8 @@
117 - instances = modInfoInstances mi
118 - exportedNames = modInfoExports mi
119 -
120 -+ (TcGblEnv {tcg_rdr_env = gre}, _) = tm_internals_ tm
121 -+
122 - -- The renamed source should always be available to us, but it's best
123 - -- to be on the safe side.
124 - (group_, mayExports, mayDocHeader) <-
125 -@@ -59,10 +62,6 @@
126 - return (emptyRnGroup, Nothing, Nothing)
127 - Just (x, _, y, z) -> return (x, y, z)
128 -
129 -- -- The pattern-match should not fail, because createInterface is only
130 -- -- done on loaded modules.
131 -- Just gre <- liftGhcToErrMsgGhc $ lookupLoadedHomeModuleGRE (moduleName mdl)
132 --
133 - opts0 <- liftErrMsg $ mkDocOpts (haddockOptions dflags) flags mdl
134 - let opts
135 - | Flag_IgnoreAllExports `elem` flags = OptIgnoreExports : opts0
136
137 diff --git a/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch
138 deleted file mode 100644
139 index f8e4365..00000000
140 --- a/dev-haskell/haddock/files/haddock-2.13.1-drop-tools.patch
141 +++ /dev/null
142 @@ -1,13 +0,0 @@
143 ---- haddock-2.13.1-orig/haddock.cabal 2012-10-11 21:56:14.000000000 +1100
144 -+++ haddock-2.13.1/haddock.cabal 2012-10-11 22:21:37.594323046 +1100
145 -@@ -108,10 +108,6 @@
146 -
147 - library
148 - default-language: Haskell2010
149 -- -- In a GHC tree - in particular, in a source tarball - we don't
150 -- -- require alex or happy
151 -- if !flag(in-ghc-tree)
152 -- build-tools: alex >= 2.3, happy >= 1.18
153 - build-depends:
154 - base >= 4.3 && < 4.7,
155 - filepath,
156
157 diff --git a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
158 deleted file mode 100644
159 index 1a4abab..00000000
160 --- a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
161 +++ /dev/null
162 @@ -1,56 +0,0 @@
163 ---- haddock-2.13.1-orig/src/Haddock/Interface/Rename.hs 2012-10-11 21:56:13.000000000 +1100
164 -+++ haddock-2.13.1/src/Haddock/Interface/Rename.hs 2013-01-04 10:55:06.725718923 +1100
165 -@@ -271,9 +271,20 @@
166 -
167 - HsTyLit x -> return (HsTyLit x)
168 -
169 -+ HsWrapTy a b -> HsWrapTy a <$> renameType b
170 -+ HsRecTy a -> HsRecTy <$> mapM renameConDeclFieldField a
171 -+ HsCoreTy a -> pure (HsCoreTy a)
172 -+ HsExplicitListTy a b -> HsExplicitListTy a <$> mapM renameLType b
173 -+ HsExplicitTupleTy a b -> HsExplicitTupleTy a <$> mapM renameLType b
174 -+ HsQuasiQuoteTy a -> HsQuasiQuoteTy <$> renameHsQuasiQuote a
175 -+ HsSpliceTy _ _ _ -> error "renameType: HsSpliceTy"
176 -+
177 - _ -> error "renameType"
178 -
179 -
180 -+renameHsQuasiQuote :: HsQuasiQuote Name -> RnM (HsQuasiQuote DocName)
181 -+renameHsQuasiQuote (HsQuasiQuote a b c) = HsQuasiQuote <$> rename a <*> pure b <*> pure c
182 -+
183 - renameLTyVarBndrs :: LHsTyVarBndrs Name -> RnM (LHsTyVarBndrs DocName)
184 - renameLTyVarBndrs (HsQTvs { hsq_kvs = _, hsq_tvs = tvs })
185 - = do { tvs' <- mapM renameLTyVarBndr tvs
186 -@@ -398,22 +409,25 @@
187 - return (decl { con_name = lname', con_qvars = ltyvars', con_cxt = lcontext'
188 - , con_details = details', con_res = restype', con_doc = mbldoc' })
189 - where
190 -- renameDetails (RecCon fields) = return . RecCon =<< mapM renameField fields
191 -+ renameDetails (RecCon fields) = return . RecCon =<< mapM renameConDeclFieldField fields
192 - renameDetails (PrefixCon ps) = return . PrefixCon =<< mapM renameLType ps
193 - renameDetails (InfixCon a b) = do
194 - a' <- renameLType a
195 - b' <- renameLType b
196 - return (InfixCon a' b')
197 -
198 -- renameField (ConDeclField name t doc) = do
199 -- name' <- renameL name
200 -- t' <- renameLType t
201 -- doc' <- mapM renameLDocHsSyn doc
202 -- return (ConDeclField name' t' doc')
203 --
204 - renameResType (ResTyH98) = return ResTyH98
205 - renameResType (ResTyGADT t) = return . ResTyGADT =<< renameLType t
206 -
207 -+
208 -+renameConDeclFieldField :: ConDeclField Name -> RnM (ConDeclField DocName)
209 -+renameConDeclFieldField (ConDeclField name t doc) = do
210 -+ name' <- renameL name
211 -+ t' <- renameLType t
212 -+ doc' <- mapM renameLDocHsSyn doc
213 -+ return (ConDeclField name' t' doc')
214 -+
215 -+
216 - renameSig :: Sig Name -> RnM (Sig DocName)
217 - renameSig sig = case sig of
218 - TypeSig lnames ltype -> do
219
220 diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
221 deleted file mode 100644
222 index d3524d6..00000000
223 --- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
224 +++ /dev/null
225 @@ -1,75 +0,0 @@
226 -# Copyright 1999-2015 Gentoo Foundation
227 -# Distributed under the terms of the GNU General Public License v2
228 -# $Id$
229 -
230 -EAPI="4"
231 -
232 -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
233 -inherit eutils haskell-cabal pax-utils
234 -
235 -DESCRIPTION="A documentation-generation tool for Haskell libraries"
236 -HOMEPAGE="http://www.haskell.org/haddock/"
237 -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
238 -
239 -LICENSE="BSD"
240 -SLOT="0"
241 -# ia64 lost as we don't have ghc-7 there yet
242 -# ppc64 needs to be rekeyworded due to xhtml not being keyworded
243 -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
244 -IUSE=""
245 -
246 -RDEPEND="dev-haskell/ghc-paths[profile?]
247 - =dev-haskell/xhtml-3000.2*[profile?]
248 - >=dev-lang/ghc-7.4"
249 -DEPEND="${RDEPEND}
250 - >=dev-haskell/cabal-1.14"
251 -
252 -RESTRICT="test" # avoid depends on QC
253 -
254 -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
255 -
256 -src_prepare() {
257 - # we would like to avoid happy and alex depends
258 - epatch "${FILESDIR}"/${P}-drop-tools.patch
259 - # http://www.mail-archive.com/cvs-ghc@×××××××.org/msg37186.html
260 - epatch "${FILESDIR}"/${P}-dont-crash-on-unicode-strings-in-doc-comments.patch
261 - # http://trac.haskell.org/haddock/ticket/202 fixed by upstream in ghc-7.4
262 - # branch only (fix is not in master branch on 20120626)
263 - epatch "${FILESDIR}/${P}-ticket-202.patch"
264 -
265 - for f in Lex Parse; do
266 - rm "src/Haddock/$f."*
267 - mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/
268 - done
269 -}
270 -
271 -src_configure() {
272 - # create a fake haddock executable. it'll set the right version to cabal
273 - # configure, but will eventually get overwritten in src_compile by
274 - # the real executable.
275 - local exe="${S}/dist/build/haddock/haddock"
276 - mkdir -p $(dirname "${exe}")
277 - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
278 - chmod +x "${exe}"
279 -
280 - # we use 'nocabaldep' to use ghc's bundled Cabal
281 - # as external one is likely to break our haddock
282 - # (known to work on 1.16.0 and breaks on 1.16.0.1!)
283 - haskell-cabal_src_configure \
284 - --with-haddock="${exe}" \
285 - --constraint="Cabal == $(cabal-version)"
286 -}
287 -
288 -src_compile() {
289 - # when building the (recursive..) haddock docs, change the datadir to the
290 - # current directory, as we're using haddock inplace even if it's built to be
291 - # installed into the system first.
292 - haddock_datadir="${S}" haskell-cabal_src_compile
293 -}
294 -
295 -src_install() {
296 - cabal_src_install
297 - # haddock uses GHC-api to process TH source.
298 - # TH requires GHCi which needs mmap('rwx') (bug #299709)
299 - pax-mark -m "${D}/usr/bin/${PN}"
300 -}
301
302 diff --git a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
303 deleted file mode 100644
304 index 8979b4f..00000000
305 --- a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
306 +++ /dev/null
307 @@ -1,67 +0,0 @@
308 -# Copyright 1999-2015 Gentoo Foundation
309 -# Distributed under the terms of the GNU General Public License v2
310 -# $Id$
311 -
312 -EAPI=5
313 -
314 -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
315 -inherit eutils haskell-cabal pax-utils
316 -
317 -DESCRIPTION="A documentation-generation tool for Haskell libraries"
318 -HOMEPAGE="http://www.haskell.org/haddock/"
319 -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
320 -
321 -LICENSE="BSD"
322 -SLOT="0/${PV}"
323 -# ia64 lost as we don't have ghc-7 there yet
324 -# ppc64 needs to be rekeyworded due to xhtml not being keyworded
325 -KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
326 -IUSE=""
327 -
328 -RDEPEND="dev-haskell/ghc-paths:=[profile?]
329 - =dev-haskell/xhtml-3000.2*:=[profile?]
330 - >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
331 -DEPEND="${RDEPEND}
332 - >=dev-haskell/cabal-1.14"
333 -
334 -RESTRICT="test" # avoid depends on QC
335 -
336 -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
337 -
338 -src_prepare() {
339 - # we would like to avoid happy and alex depends
340 - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
341 - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used
342 - epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
343 -}
344 -
345 -src_configure() {
346 - # create a fake haddock executable. it'll set the right version to cabal
347 - # configure, but will eventually get overwritten in src_compile by
348 - # the real executable.
349 - local exe="${S}/dist/build/haddock/haddock"
350 - mkdir -p $(dirname "${exe}")
351 - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
352 - chmod +x "${exe}"
353 -
354 - # we use 'nocabaldep' to use ghc's bundled Cabal
355 - # as external one is likely to break our haddock
356 - # (known to work on 1.16.0 and breaks on 1.16.0.1!)
357 - haskell-cabal_src_configure \
358 - --with-haddock="${exe}" \
359 - --constraint="Cabal == $(cabal-version)"
360 -}
361 -
362 -src_compile() {
363 - # when building the (recursive..) haddock docs, change the datadir to the
364 - # current directory, as we're using haddock inplace even if it's built to be
365 - # installed into the system first.
366 - haddock_datadir="${S}" haskell-cabal_src_compile
367 -}
368 -
369 -src_install() {
370 - cabal_src_install
371 - # haddock uses GHC-api to process TH source.
372 - # TH requires GHCi which needs mmap('rwx') (bug #299709)
373 - pax-mark -m "${D}/usr/bin/${PN}"
374 -}
375
376 diff --git a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
377 deleted file mode 100644
378 index 23279a4..00000000
379 --- a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
380 +++ /dev/null
381 @@ -1,74 +0,0 @@
382 -# Copyright 1999-2015 Gentoo Foundation
383 -# Distributed under the terms of the GNU General Public License v2
384 -# $Id$
385 -
386 -EAPI=5
387 -
388 -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
389 -inherit eutils haskell-cabal pax-utils
390 -
391 -DESCRIPTION="A documentation-generation tool for Haskell libraries"
392 -HOMEPAGE="http://www.haskell.org/haddock/"
393 -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
394 - https://dev.gentoo.org/~qnikst/patches/dev-haskell-${PN}/${P}-pregenerated-files.patch
395 - "
396 -
397 -LICENSE="BSD"
398 -SLOT="0/${PV}"
399 -# ia64 lost as we don't have ghc-7 there yet
400 -# ppc64 needs to be rekeyworded due to xhtml not being keyworded
401 -# x86-fbsd is lost due xhtml
402 -KEYWORDS="amd64 -ia64 x86"
403 -IUSE=""
404 -
405 -RDEPEND="dev-haskell/ghc-paths:=[profile?]
406 - =dev-haskell/xhtml-3000.2*:=[profile?]
407 - >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
408 -DEPEND="${RDEPEND}
409 - >=dev-haskell/cabal-1.14"
410 -
411 -RESTRICT="test" # avoid depends on QC
412 -
413 -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
414 -
415 -src_prepare() {
416 - # we would like to avoid happy and alex depends
417 - epatch "${DISTDIR}"/${P}-pregenerated-files.patch
418 - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
419 - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used
420 - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
421 - if use doc && [ ! -e "${S}/html" ]; then
422 - ln -s "${S}/resources/html" "${S}/html" || die "Could not create symbolic link ${S}/html"
423 - fi
424 -}
425 -
426 -src_configure() {
427 - # create a fake haddock executable. it'll set the right version to cabal
428 - # configure, but will eventually get overwritten in src_compile by
429 - # the real executable.
430 - local exe="${S}/dist/build/haddock/haddock"
431 - mkdir -p $(dirname "${exe}")
432 - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
433 - chmod +x "${exe}"
434 -
435 - # we use 'nocabaldep' to use ghc's bundled Cabal
436 - # as external one is likely to break our haddock
437 - # (known to work on 1.16.0 and breaks on 1.16.0.1!)
438 - haskell-cabal_src_configure \
439 - --with-haddock="${exe}" \
440 - --constraint="Cabal == $(cabal-version)"
441 -}
442 -
443 -src_compile() {
444 - # when building the (recursive..) haddock docs, change the datadir to the
445 - # current directory, as we're using haddock inplace even if it's built to be
446 - # installed into the system first.
447 - haddock_datadir="${S}" haskell-cabal_src_compile
448 -}
449 -
450 -src_install() {
451 - cabal_src_install
452 - # haddock uses GHC-api to process TH source.
453 - # TH requires GHCi which needs mmap('rwx') (bug #299709)
454 - pax-mark -m "${D}/usr/bin/${PN}"
455 -}
456
457 diff --git a/dev-haskell/haddock/haddock-2.13.2.1.ebuild b/dev-haskell/haddock/haddock-2.13.2.1.ebuild
458 deleted file mode 100644
459 index 860799c..00000000
460 --- a/dev-haskell/haddock/haddock-2.13.2.1.ebuild
461 +++ /dev/null
462 @@ -1,76 +0,0 @@
463 -# Copyright 1999-2014 Gentoo Foundation
464 -# Distributed under the terms of the GNU General Public License v2
465 -# $Id$
466 -
467 -EAPI=5
468 -
469 -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep test-suite"
470 -inherit eutils haskell-cabal pax-utils
471 -
472 -DESCRIPTION="A documentation-generation tool for Haskell libraries"
473 -HOMEPAGE="http://www.haskell.org/haddock/"
474 -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
475 -
476 -LICENSE="BSD"
477 -SLOT="0/${PV}"
478 -# ia64 lost as we don't have ghc-7 there yet
479 -# ppc64 needs to be rekeyworded due to xhtml not being keyworded
480 -# x86-fbsd is lost due xhtml
481 -KEYWORDS="~amd64 -ia64 ~x86"
482 -IUSE=""
483 -
484 -RDEPEND="dev-haskell/ghc-paths:=[profile?]
485 - =dev-haskell/xhtml-3000.2*:=[profile?]
486 - >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
487 -DEPEND="${RDEPEND}
488 - >=dev-haskell/cabal-1.14"
489 -
490 -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
491 -
492 -src_prepare() {
493 - # we would like to avoid happy and alex depends
494 - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
495 - # pick pregenerated files
496 - for f in Lex Parse; do
497 - rm "src/Haddock/$f."* || die
498 - mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ || die
499 - done
500 - rm -r "dist/build/"* || die
501 -
502 - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used
503 - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
504 - if [[ ! -e "${S}/html" ]]; then
505 - ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
506 - fi
507 -}
508 -
509 -src_configure() {
510 - # create a fake haddock executable. it'll set the right version to cabal
511 - # configure, but will eventually get overwritten in src_compile by
512 - # the real executable.
513 - local exe="${S}/dist/build/haddock/haddock"
514 - mkdir -p $(dirname "${exe}")
515 - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
516 - chmod +x "${exe}"
517 -
518 - # we use 'nocabaldep' to use ghc's bundled Cabal
519 - # as external one is likely to break our haddock
520 - # (known to work on 1.16.0 and breaks on 1.16.0.1!)
521 - haskell-cabal_src_configure \
522 - --with-haddock="${exe}" \
523 - --constraint="Cabal == $(cabal-version)"
524 -}
525 -
526 -src_compile() {
527 - # when building the (recursive..) haddock docs, change the datadir to the
528 - # current directory, as we're using haddock inplace even if it's built to be
529 - # installed into the system first.
530 - haddock_datadir="${S}" haskell-cabal_src_compile
531 -}
532 -
533 -src_install() {
534 - cabal_src_install
535 - # haddock uses GHC-api to process TH source.
536 - # TH requires GHCi which needs mmap('rwx') (bug #299709)
537 - pax-mark -m "${D}/usr/bin/${PN}"
538 -}
539
540 diff --git a/dev-haskell/haddock/haddock-2.13.2.ebuild b/dev-haskell/haddock/haddock-2.13.2.ebuild
541 deleted file mode 100644
542 index ade1581..00000000
543 --- a/dev-haskell/haddock/haddock-2.13.2.ebuild
544 +++ /dev/null
545 @@ -1,71 +0,0 @@
546 -# Copyright 1999-2014 Gentoo Foundation
547 -# Distributed under the terms of the GNU General Public License v2
548 -# $Id$
549 -
550 -EAPI=5
551 -
552 -CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
553 -inherit eutils haskell-cabal pax-utils
554 -
555 -DESCRIPTION="A documentation-generation tool for Haskell libraries"
556 -HOMEPAGE="http://www.haskell.org/haddock/"
557 -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
558 -
559 -LICENSE="BSD"
560 -SLOT="0/${PV}"
561 -# ia64 lost as we don't have ghc-7 there yet
562 -# ppc64 needs to be rekeyworded due to xhtml not being keyworded
563 -# x86-fbsd is lost due xhtml
564 -KEYWORDS="~amd64 -ia64 ~x86"
565 -IUSE=""
566 -
567 -RDEPEND="dev-haskell/ghc-paths:=[profile?]
568 - =dev-haskell/xhtml-3000.2*:=[profile?]
569 - >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
570 -DEPEND="${RDEPEND}
571 - >=dev-haskell/cabal-1.14"
572 -
573 -RESTRICT="test" # avoid depends on QC
574 -
575 -CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
576 -
577 -src_prepare() {
578 - # we would like to avoid happy and alex depends
579 - epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
580 - # Fix: Ticket #213 Haddock fails when advanced typesystem features are used
581 - # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
582 - if use doc && [ ! -e "${S}/html" ]; then
583 - ln -s "${S}/resources/html" "${S}/html" || die "Could not create symbolic link ${S}/html"
584 - fi
585 -}
586 -
587 -src_configure() {
588 - # create a fake haddock executable. it'll set the right version to cabal
589 - # configure, but will eventually get overwritten in src_compile by
590 - # the real executable.
591 - local exe="${S}/dist/build/haddock/haddock"
592 - mkdir -p $(dirname "${exe}")
593 - echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
594 - chmod +x "${exe}"
595 -
596 - # we use 'nocabaldep' to use ghc's bundled Cabal
597 - # as external one is likely to break our haddock
598 - # (known to work on 1.16.0 and breaks on 1.16.0.1!)
599 - haskell-cabal_src_configure \
600 - --with-haddock="${exe}" \
601 - --constraint="Cabal == $(cabal-version)"
602 -}
603 -
604 -src_compile() {
605 - # when building the (recursive..) haddock docs, change the datadir to the
606 - # current directory, as we're using haddock inplace even if it's built to be
607 - # installed into the system first.
608 - haddock_datadir="${S}" haskell-cabal_src_compile
609 -}
610 -
611 -src_install() {
612 - cabal_src_install
613 - # haddock uses GHC-api to process TH source.
614 - # TH requires GHCi which needs mmap('rwx') (bug #299709)
615 - pax-mark -m "${D}/usr/bin/${PN}"
616 -}