diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2020-09-26 21:55:39 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-09-26 21:55:39 +0100 |
commit | 34a724d27097055ff74816b6ed54f5b38ed381fc (patch) | |
tree | df9e3205d6dd56a26dbb48b33416dbe5843b5d72 /dev-haskell | |
parent | dev-haskell/cipher-blowfish: drop masked package (diff) | |
download | gentoo-34a724d27097055ff74816b6ed54f5b38ed381fc.tar.gz gentoo-34a724d27097055ff74816b6ed54f5b38ed381fc.tar.bz2 gentoo-34a724d27097055ff74816b6ed54f5b38ed381fc.zip |
dev-haskell/citeproc-hs: drop masked package
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/citeproc-hs/Manifest | 1 | ||||
-rw-r--r-- | dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild | 54 | ||||
-rw-r--r-- | dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch | 28 | ||||
-rw-r--r-- | dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch | 126 | ||||
-rw-r--r-- | dev-haskell/citeproc-hs/metadata.xml | 26 |
5 files changed, 0 insertions, 235 deletions
diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest deleted file mode 100644 index eabd7c2b4145..000000000000 --- a/dev-haskell/citeproc-hs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST citeproc-hs-0.3.10.tar.gz 115588 BLAKE2B f4b62c40dfe8abaa2eded4d2440915670cd1903eb326f86f3451764ef249ff1226facd77d2b68f2f875460f3beeabc07dd3c231f47581d57d867c77fafa4d81c SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f 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 deleted file mode 100644 index cdef1f881ffb..000000000000 --- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.3 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="A Citation Style Language implementation in Haskell" -HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode-collation" - -RDEPEND="dev-haskell/json:=[profile?] - dev-haskell/mtl:=[profile?] - >=dev-haskell/pandoc-types-1.8:=[profile?] - dev-haskell/parsec:=[profile?] - dev-haskell/syb:=[profile?] - dev-haskell/utf8-string:=[profile?] - >=dev-lang/ghc-7.4.1:= - bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) - embed-data-files? ( dev-haskell/file-embed:=[profile?] ) - hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) - !hexpat? ( dev-haskell/xml:=[profile?] ) - network? ( >=dev-haskell/http-4000.0.9:=[profile?] - >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] ) - unicode-collation? ( dev-haskell/text:=[profile?] - dev-haskell/text-icu:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-ghc-7.10.patch - epatch "${FILESDIR}"/${P}-pandoc-1.16.patch -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag bibutils bibutils) \ - $(cabal_flag embed-data-files embed_data_files) \ - $(cabal_flag hexpat hexpat) \ - $(cabal_flag network network) \ - $(cabal_flag small-base small_base) \ - $(cabal_flag unicode-collation unicode_collation) -} 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 deleted file mode 100644 index 0ea6ce4e4313..000000000000 --- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs 2015-03-17 21:32:38.000000000 +1100 -+++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs 2015-04-04 11:18:45.018893632 +1100 -@@ -1,4 +1,5 @@ - {-# LANGUAGE PatternGuards #-} -+{-# LANGUAGE FlexibleContexts #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Text.CSL.Eval ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs 2015-03-17 21:32:38.000000000 +1100 -+++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs 2015-04-04 11:18:28.823909497 +1100 -@@ -1,4 +1,5 @@ - {-# LANGUAGE PatternGuards #-} -+{-# LANGUAGE FlexibleContexts #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Text.CSL.Eval.Names ---- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs 2015-03-17 21:32:38.000000000 +1100 -+++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs 2015-04-04 11:21:42.164719120 +1100 -@@ -29,7 +29,9 @@ - import Data.Maybe (isJust) - import Data.Time - import System.Directory -+#if !MIN_VERSION_time(1,5,0) - import System.Locale -+#endif - - import Text.ParserCombinators.Parsec - 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 deleted file mode 100644 index ab95388748d4..000000000000 --- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/citeproc-hs.cabal b/citeproc-hs.cabal -index 542f893..606ec05 100644 ---- a/citeproc-hs.cabal -+++ b/citeproc-hs.cabal -@@ -119,3 +119,3 @@ library - build-depends: containers, directory, mtl, json, utf8-string, -- bytestring, filepath, pandoc-types >= 1.8 && < 1.13 -+ bytestring, filepath, pandoc-types >= 1.8 - -diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs -index 0f2cdfb..74e698f 100644 ---- a/src/Text/CSL/Output/Pandoc.hs -+++ b/src/Text/CSL/Output/Pandoc.hs -@@ -1,2 +1,2 @@ --{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} -+{-# LANGUAGE PatternGuards, DeriveDataTypeable, CPP #-} - ----------------------------------------------------------------------------- -@@ -78,2 +78,10 @@ tailFO (f:fs) - -+#if MIN_VERSION_pandoc_types(1,16,0) -+# define P16_ATTRS nullAttr -+# define P16_ATTRS_ _attrs -+#else -+# define P16_ATTRS -+# define P16_ATTRS_ -+#endif -+ - renderFo :: Style -> FormattedOutput -> [Inline] -@@ -85,3 +93,3 @@ renderFo sty fo - | FO fm xs <- fo = toPandoc fm $ rest xs -- | FUrl u fm <- fo = toPandoc fm [Link (toStr $ snd u) u] -+ | FUrl u fm <- fo = toPandoc fm [Link P16_ATTRS (toStr $ snd u) u] - | otherwise = [] -@@ -109,3 +117,3 @@ renderFo sty fo - setCase' f i -- | Link s r <- i = Link (map (setCase f) s) r -+ | Link P16_ATTRS_ s r <- i = Link P16_ATTRS_ (map (setCase f) s) r - | otherwise = setCase f i -@@ -148,3 +156,3 @@ renderFo sty fo - rmZeros = dropWhile (== '0') -- escape s x = Link x (s,s) -- we use a link to store some data -+ escape s x = Link P16_ATTRS x (s,s) -- we use a link to store some data - -@@ -181,3 +189,4 @@ clean s b (i:is) - | Strong x <- i = split (isLink' "strong" ) (return . Strong ) x ++ clean s b is -- | Link x t <- i = clean' s b (Link x t : clean s b is) -+ | Link P16_ATTRS_ x t <- i = clean' -+ s b (Link P16_ATTRS_ x t : clean s b is) - | otherwise = clean' s b (i : clean s b is) -@@ -185,10 +194,10 @@ clean s b (i:is) - unwrap f ls -- | Link x _ : _ <- ls = clean' s b x -- | _ : _ <- ls = f ls -+ | Link P16_ATTRS_ x _ : _ <- ls = clean' s b x -+ | _ : _ <- ls = f ls - | otherwise = [] - isLink l il -- | Link _ (x,y) <- il = x == l && x == y -+ | Link P16_ATTRS_ _ (x,y) <- il = x == l && x == y - | otherwise = False - isLink' l il -- | Link _ (x,y) <- il = (x == l || x == "nodecor") && x == y -+ | Link P16_ATTRS_ _ (x,y) <- il = (x == l || x == "nodecor") && x == y - | otherwise = False -@@ -201,3 +210,3 @@ clean' _ _ [] = [] - clean' s b (i:is) -- | Link inls (y,z) <- i, y == "inquote" -+ | Link P16_ATTRS_ inls (y,z) <- i, y == "inquote" - , y == z = case headInline is of -@@ -235,7 +244,7 @@ flipFlop (i:is) - reverseEmph' e -- | bo, Emph inls <- e = Link (reverseEmph False inls) ("emph","emph") -+ | bo, Emph inls <- e = Link P16_ATTRS (reverseEmph False inls) ("emph","emph") - | Emph inls <- e = Emph (reverseEmph True inls) -- | Link ls (x,y) <- e = if x == "nodecor" && x == y -- then Link ls ("emph","emph") -- else e -+ | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y -+ then Link P16_ATTRS_ ls ("emph","emph") -+ else e - | otherwise = e -@@ -244,7 +253,7 @@ flipFlop (i:is) - reverseStrong' e -- | bo, Strong inls <- e = Link (reverseStrong False inls) ("strong","strong") -+ | bo, Strong inls <- e = Link P16_ATTRS (reverseStrong False inls) ("strong","strong") - | Strong inls <- e = Strong (reverseStrong True inls) -- | Link ls (x,y) <- e = if x == "nodecor" && x == y -- then Link ls ("strong","strong") -- else e -+ | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y -+ then Link P16_ATTRS_ ls ("strong","strong") -+ else e - | otherwise = e -@@ -306,3 +315,3 @@ initInline (i:[]) - | Strikeout is <- i = return $ Strikeout (initInline is) -- | Link is t <- i = return $ Link (initInline is) t -+ | Link P16_ATTRS_ is t <- i = return $ Link P16_ATTRS_ (initInline is) t - | otherwise = [] -@@ -336,3 +345,3 @@ mapHeadInline f (i:xs) - | Strikeout is <- i = Strikeout (mapHeadInline f is) : xs -- | Link is t <- i = Link (mapHeadInline f is) t : xs -+ | Link P16_ATTRS_ is t <- i = Link P16_ATTRS_ (mapHeadInline f is) t : xs - | otherwise = i : xs -@@ -348,3 +357,3 @@ getInline i - | SmallCaps is <- i = is -- | Link is _ <- i = is -+ | Link P16_ATTRS_ is _ <- i = is - | otherwise = [] -diff --git a/src/Text/CSL/Test.hs b/src/Text/CSL/Test.hs -index 1a470cf..2d9befa 100644 ---- a/src/Text/CSL/Test.hs -+++ b/src/Text/CSL/Test.hs -@@ -166,2 +166,8 @@ pandocBib s - -+#if MIN_VERSION_pandoc_types(1,16,0) -+# define P16_ATTRS_ _attrs -+#else -+# define P16_ATTRS_ -+#endif -+ - pandocToHTML :: [Inline] -> String -@@ -179,3 +185,3 @@ pandocToHTML (i:xs) - SingleQuote -> "‘" ++ pandocToHTML is ++ "’" ++ pandocToHTML xs -- | Link is x <- i = case snd x of -+ | Link P16_ATTRS_ is x <- i = case snd x of - "emph" -> "<span style=\"font-style:normal;\">" ++ diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml deleted file mode 100644 index 9c951e54db57..000000000000 --- a/dev-haskell/citeproc-hs/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <use> - <flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag> - <flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag> - <flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag> - <flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag> - <flag name="small-base">Choose the new smaller, split-up base package.</flag> - <flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag> - </use> - <longdescription> - citeproc-hs is a library for rendering - bibliographic reference citations into a variety - of styles using a macro language called Citation - Style Language (CSL). More details on CSL can be - found here: - <http://citationstyles.org/>. - - For the API documentation please see "Text.CSL". - </longdescription> -</pkgmetadata> |