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

Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-haskell/citeproc-hs/, dev-haskell/citeproc-hs/files/
Date: Sat, 26 Sep 2020 20:56:44
Message-Id: 1601153739.34a724d27097055ff74816b6ed54f5b38ed381fc.slyfox@gentoo
1 commit: 34a724d27097055ff74816b6ed54f5b38ed381fc
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 20:55:39 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 20:55:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a724d2
7
8 dev-haskell/citeproc-hs: drop masked package
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 dev-haskell/citeproc-hs/Manifest | 1 -
13 .../citeproc-hs/citeproc-hs-0.3.10-r1.ebuild | 54 ---------
14 .../files/citeproc-hs-0.3.10-ghc-7.10.patch | 28 -----
15 .../files/citeproc-hs-0.3.10-pandoc-1.16.patch | 126 ---------------------
16 dev-haskell/citeproc-hs/metadata.xml | 26 -----
17 profiles/package.mask | 5 -
18 6 files changed, 240 deletions(-)
19
20 diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest
21 deleted file mode 100644
22 index eabd7c2b414..00000000000
23 --- a/dev-haskell/citeproc-hs/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST citeproc-hs-0.3.10.tar.gz 115588 BLAKE2B f4b62c40dfe8abaa2eded4d2440915670cd1903eb326f86f3451764ef249ff1226facd77d2b68f2f875460f3beeabc07dd3c231f47581d57d867c77fafa4d81c SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f
27
28 diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
29 deleted file mode 100644
30 index cdef1f881ff..00000000000
31 --- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
32 +++ /dev/null
33 @@ -1,54 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=5
38 -
39 -# ebuild generated by hackport 0.4.3
40 -
41 -CABAL_FEATURES="lib profile haddock hoogle hscolour"
42 -inherit haskell-cabal
43 -
44 -DESCRIPTION="A Citation Style Language implementation in Haskell"
45 -HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
46 -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
47 -
48 -LICENSE="BSD"
49 -SLOT="0/${PV}"
50 -KEYWORDS="~amd64 ~x86"
51 -IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode-collation"
52 -
53 -RDEPEND="dev-haskell/json:=[profile?]
54 - dev-haskell/mtl:=[profile?]
55 - >=dev-haskell/pandoc-types-1.8:=[profile?]
56 - dev-haskell/parsec:=[profile?]
57 - dev-haskell/syb:=[profile?]
58 - dev-haskell/utf8-string:=[profile?]
59 - >=dev-lang/ghc-7.4.1:=
60 - bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
61 - embed-data-files? ( dev-haskell/file-embed:=[profile?] )
62 - hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
63 - !hexpat? ( dev-haskell/xml:=[profile?] )
64 - network? ( >=dev-haskell/http-4000.0.9:=[profile?]
65 - >=dev-haskell/network-2.6:=[profile?]
66 - >=dev-haskell/network-uri-2.6:=[profile?] )
67 - unicode-collation? ( dev-haskell/text:=[profile?]
68 - dev-haskell/text-icu:=[profile?] )
69 -"
70 -DEPEND="${RDEPEND}
71 - >=dev-haskell/cabal-1.6
72 -"
73 -
74 -src_prepare() {
75 - epatch "${FILESDIR}"/${P}-ghc-7.10.patch
76 - epatch "${FILESDIR}"/${P}-pandoc-1.16.patch
77 -}
78 -
79 -src_configure() {
80 - haskell-cabal_src_configure \
81 - $(cabal_flag bibutils bibutils) \
82 - $(cabal_flag embed-data-files embed_data_files) \
83 - $(cabal_flag hexpat hexpat) \
84 - $(cabal_flag network network) \
85 - $(cabal_flag small-base small_base) \
86 - $(cabal_flag unicode-collation unicode_collation)
87 -}
88
89 diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
90 deleted file mode 100644
91 index 0ea6ce4e431..00000000000
92 --- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
93 +++ /dev/null
94 @@ -1,28 +0,0 @@
95 ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs 2015-03-17 21:32:38.000000000 +1100
96 -+++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs 2015-04-04 11:18:45.018893632 +1100
97 -@@ -1,4 +1,5 @@
98 - {-# LANGUAGE PatternGuards #-}
99 -+{-# LANGUAGE FlexibleContexts #-}
100 - -----------------------------------------------------------------------------
101 - -- |
102 - -- Module : Text.CSL.Eval
103 ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs 2015-03-17 21:32:38.000000000 +1100
104 -+++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs 2015-04-04 11:18:28.823909497 +1100
105 -@@ -1,4 +1,5 @@
106 - {-# LANGUAGE PatternGuards #-}
107 -+{-# LANGUAGE FlexibleContexts #-}
108 - -----------------------------------------------------------------------------
109 - -- |
110 - -- Module : Text.CSL.Eval.Names
111 ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs 2015-03-17 21:32:38.000000000 +1100
112 -+++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs 2015-04-04 11:21:42.164719120 +1100
113 -@@ -29,7 +29,9 @@
114 - import Data.Maybe (isJust)
115 - import Data.Time
116 - import System.Directory
117 -+#if !MIN_VERSION_time(1,5,0)
118 - import System.Locale
119 -+#endif
120 -
121 - import Text.ParserCombinators.Parsec
122 -
123
124 diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
125 deleted file mode 100644
126 index ab95388748d..00000000000
127 --- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
128 +++ /dev/null
129 @@ -1,126 +0,0 @@
130 -diff --git a/citeproc-hs.cabal b/citeproc-hs.cabal
131 -index 542f893..606ec05 100644
132 ---- a/citeproc-hs.cabal
133 -+++ b/citeproc-hs.cabal
134 -@@ -119,3 +119,3 @@ library
135 - build-depends: containers, directory, mtl, json, utf8-string,
136 -- bytestring, filepath, pandoc-types >= 1.8 && < 1.13
137 -+ bytestring, filepath, pandoc-types >= 1.8
138 -
139 -diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs
140 -index 0f2cdfb..74e698f 100644
141 ---- a/src/Text/CSL/Output/Pandoc.hs
142 -+++ b/src/Text/CSL/Output/Pandoc.hs
143 -@@ -1,2 +1,2 @@
144 --{-# LANGUAGE PatternGuards, DeriveDataTypeable #-}
145 -+{-# LANGUAGE PatternGuards, DeriveDataTypeable, CPP #-}
146 - -----------------------------------------------------------------------------
147 -@@ -78,2 +78,10 @@ tailFO (f:fs)
148 -
149 -+#if MIN_VERSION_pandoc_types(1,16,0)
150 -+# define P16_ATTRS nullAttr
151 -+# define P16_ATTRS_ _attrs
152 -+#else
153 -+# define P16_ATTRS
154 -+# define P16_ATTRS_
155 -+#endif
156 -+
157 - renderFo :: Style -> FormattedOutput -> [Inline]
158 -@@ -85,3 +93,3 @@ renderFo sty fo
159 - | FO fm xs <- fo = toPandoc fm $ rest xs
160 -- | FUrl u fm <- fo = toPandoc fm [Link (toStr $ snd u) u]
161 -+ | FUrl u fm <- fo = toPandoc fm [Link P16_ATTRS (toStr $ snd u) u]
162 - | otherwise = []
163 -@@ -109,3 +117,3 @@ renderFo sty fo
164 - setCase' f i
165 -- | Link s r <- i = Link (map (setCase f) s) r
166 -+ | Link P16_ATTRS_ s r <- i = Link P16_ATTRS_ (map (setCase f) s) r
167 - | otherwise = setCase f i
168 -@@ -148,3 +156,3 @@ renderFo sty fo
169 - rmZeros = dropWhile (== '0')
170 -- escape s x = Link x (s,s) -- we use a link to store some data
171 -+ escape s x = Link P16_ATTRS x (s,s) -- we use a link to store some data
172 -
173 -@@ -181,3 +189,4 @@ clean s b (i:is)
174 - | Strong x <- i = split (isLink' "strong" ) (return . Strong ) x ++ clean s b is
175 -- | Link x t <- i = clean' s b (Link x t : clean s b is)
176 -+ | Link P16_ATTRS_ x t <- i = clean'
177 -+ s b (Link P16_ATTRS_ x t : clean s b is)
178 - | otherwise = clean' s b (i : clean s b is)
179 -@@ -185,10 +194,10 @@ clean s b (i:is)
180 - unwrap f ls
181 -- | Link x _ : _ <- ls = clean' s b x
182 -- | _ : _ <- ls = f ls
183 -+ | Link P16_ATTRS_ x _ : _ <- ls = clean' s b x
184 -+ | _ : _ <- ls = f ls
185 - | otherwise = []
186 - isLink l il
187 -- | Link _ (x,y) <- il = x == l && x == y
188 -+ | Link P16_ATTRS_ _ (x,y) <- il = x == l && x == y
189 - | otherwise = False
190 - isLink' l il
191 -- | Link _ (x,y) <- il = (x == l || x == "nodecor") && x == y
192 -+ | Link P16_ATTRS_ _ (x,y) <- il = (x == l || x == "nodecor") && x == y
193 - | otherwise = False
194 -@@ -201,3 +210,3 @@ clean' _ _ [] = []
195 - clean' s b (i:is)
196 -- | Link inls (y,z) <- i, y == "inquote"
197 -+ | Link P16_ATTRS_ inls (y,z) <- i, y == "inquote"
198 - , y == z = case headInline is of
199 -@@ -235,7 +244,7 @@ flipFlop (i:is)
200 - reverseEmph' e
201 -- | bo, Emph inls <- e = Link (reverseEmph False inls) ("emph","emph")
202 -+ | bo, Emph inls <- e = Link P16_ATTRS (reverseEmph False inls) ("emph","emph")
203 - | Emph inls <- e = Emph (reverseEmph True inls)
204 -- | Link ls (x,y) <- e = if x == "nodecor" && x == y
205 -- then Link ls ("emph","emph")
206 -- else e
207 -+ | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y
208 -+ then Link P16_ATTRS_ ls ("emph","emph")
209 -+ else e
210 - | otherwise = e
211 -@@ -244,7 +253,7 @@ flipFlop (i:is)
212 - reverseStrong' e
213 -- | bo, Strong inls <- e = Link (reverseStrong False inls) ("strong","strong")
214 -+ | bo, Strong inls <- e = Link P16_ATTRS (reverseStrong False inls) ("strong","strong")
215 - | Strong inls <- e = Strong (reverseStrong True inls)
216 -- | Link ls (x,y) <- e = if x == "nodecor" && x == y
217 -- then Link ls ("strong","strong")
218 -- else e
219 -+ | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y
220 -+ then Link P16_ATTRS_ ls ("strong","strong")
221 -+ else e
222 - | otherwise = e
223 -@@ -306,3 +315,3 @@ initInline (i:[])
224 - | Strikeout is <- i = return $ Strikeout (initInline is)
225 -- | Link is t <- i = return $ Link (initInline is) t
226 -+ | Link P16_ATTRS_ is t <- i = return $ Link P16_ATTRS_ (initInline is) t
227 - | otherwise = []
228 -@@ -336,3 +345,3 @@ mapHeadInline f (i:xs)
229 - | Strikeout is <- i = Strikeout (mapHeadInline f is) : xs
230 -- | Link is t <- i = Link (mapHeadInline f is) t : xs
231 -+ | Link P16_ATTRS_ is t <- i = Link P16_ATTRS_ (mapHeadInline f is) t : xs
232 - | otherwise = i : xs
233 -@@ -348,3 +357,3 @@ getInline i
234 - | SmallCaps is <- i = is
235 -- | Link is _ <- i = is
236 -+ | Link P16_ATTRS_ is _ <- i = is
237 - | otherwise = []
238 -diff --git a/src/Text/CSL/Test.hs b/src/Text/CSL/Test.hs
239 -index 1a470cf..2d9befa 100644
240 ---- a/src/Text/CSL/Test.hs
241 -+++ b/src/Text/CSL/Test.hs
242 -@@ -166,2 +166,8 @@ pandocBib s
243 -
244 -+#if MIN_VERSION_pandoc_types(1,16,0)
245 -+# define P16_ATTRS_ _attrs
246 -+#else
247 -+# define P16_ATTRS_
248 -+#endif
249 -+
250 - pandocToHTML :: [Inline] -> String
251 -@@ -179,3 +185,3 @@ pandocToHTML (i:xs)
252 - SingleQuote -> "‘" ++ pandocToHTML is ++ "’" ++ pandocToHTML xs
253 -- | Link is x <- i = case snd x of
254 -+ | Link P16_ATTRS_ is x <- i = case snd x of
255 - "emph" -> "<span style=\"font-style:normal;\">" ++
256
257 diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
258 deleted file mode 100644
259 index 9c951e54db5..00000000000
260 --- a/dev-haskell/citeproc-hs/metadata.xml
261 +++ /dev/null
262 @@ -1,26 +0,0 @@
263 -<?xml version="1.0" encoding="UTF-8"?>
264 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
265 -<pkgmetadata>
266 - <maintainer type="project">
267 - <email>haskell@g.o</email>
268 - <name>Gentoo Haskell</name>
269 - </maintainer>
270 - <use>
271 - <flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
272 - <flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
273 - <flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
274 - <flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
275 - <flag name="small-base">Choose the new smaller, split-up base package.</flag>
276 - <flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
277 - </use>
278 - <longdescription>
279 - citeproc-hs is a library for rendering
280 - bibliographic reference citations into a variety
281 - of styles using a macro language called Citation
282 - Style Language (CSL). More details on CSL can be
283 - found here:
284 - &lt;http://citationstyles.org/&gt;.
285 -
286 - For the API documentation please see "Text.CSL".
287 - </longdescription>
288 -</pkgmetadata>
289
290 diff --git a/profiles/package.mask b/profiles/package.mask
291 index 68982941c34..58c848a34d0 100644
292 --- a/profiles/package.mask
293 +++ b/profiles/package.mask
294 @@ -654,11 +654,6 @@ app-admin/passook
295 # Does not compile against ghc-8.8. Removal in 30 days.
296 dev-haskell/process-conduit
297
298 -# Sergei Trofimovich <slyfox@g.o> (2020-08-29)
299 -# Abandoned upstream.
300 -# Does not compile against ghc-8.8. Removal in 30 days.
301 -dev-haskell/citeproc-hs
302 -
303 # Miroslav Šulc <fordfrog@g.o> (2020-08-29)
304 # Upstream has version 1.1.2, but only for Windows,
305 # sources are gone. Removal in 30 days.
Report Message
Find on MARC Find on Google Groups