commit: 0a8c5873e9894ae0b17d0f233178cff360d9bf03
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 19:08:14 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 14 19:34:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8c5873
app-text/pandoc: drop old
Package-Manager: portage-2.2.28
app-text/pandoc/Manifest | 1 -
...ndoc-1.11.1-highlighting-kate-0.5.5-tests.patch | 42 ----
.../pandoc/files/pandoc-1.11.1-no-man-tests.patch | 24 --
.../pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch | 62 -----
app-text/pandoc/files/pandoc-1.11.1-test.patch | 42 ----
app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch | 251 ---------------------
app-text/pandoc/pandoc-1.12.1-r1.ebuild | 74 ------
7 files changed, 496 deletions(-)
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 795a983..e6bf84f 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,4 +1,3 @@
-DIST pandoc-1.12.1.tar.gz 991330 SHA256
ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512
79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979
WHIRLPOOL
b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0
DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256
2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512
fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743
WHIRLPOOL
795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256
66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512
3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d
WHIRLPOOL
2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
DIST pandoc-1.14.0.4.tar.gz 2052114 SHA256
01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf SHA512
57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443
WHIRLPOOL
bc95f9b480b2336c7e0470187609a12d5e1f3ef5074af0bebb72c622d7c056efa74fa682190c08d9721f16b919d9264b859b2cbede2ac192870c419a60b5ef8c
diff --git
a/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
b/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
deleted file mode 100644
index 0ba930f..0000000
--- a/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- pandoc-1.11.1-orig/tests/lhs-test.html+lhs 2013-03-18 09:26:59.000000000
+1100
-+++ pandoc-1.11.1/tests/lhs-test.html+lhs 2013-09-14 10:27:51.318546683
+1000
-@@ -30,7 +30,7 @@
- <h1>lhs test</h1>
- <p><code>unsplit</code> is an arrow that takes a pair of values and combines
them to return a single value:</p>
- <pre class="sourceCode literate literatehaskell"><code class="sourceCode
literatehaskell"><span class="ot">> unsplit ::</span> (<span
class="dt">Arrow</span> a) <span class="ot">=></span> (b <span
class="ot">-></span> c <span class="ot">-></span> d) <span
class="ot">-></span> a (b, c) d
--<span class="ot">></span> unsplit <span class="fu">=</span> arr <span
class="fu">.</span> <span class="fu">uncurry</span>
-+<span class="ot">></span> unsplit <span class="fu">=</span> arr <span
class="fu">.</span> uncurry
- <span class="ot">></span> <span class="co">-- arr (\op (x,y)
-> x `op` y)</span></code></pre>
- <p><code>(***)</code> combines two arrows into a new arrow by running the two
arrows on a pair of values (one arrow on the first item of the pair and one
arrow on the second item of the pair).</p>
- <pre><code>f *** g = first f >>> second g</code></pre>
---- pandoc-1.11.1-orig/tests/lhs-test.html 2013-03-18 09:26:59.000000000
+1100
-+++ pandoc-1.11.1/tests/lhs-test.html 2013-09-14 10:27:28.671546899 +1000
-@@ -30,7 +30,7 @@
- <h1>lhs test</h1>
- <p><code>unsplit</code> is an arrow that takes a pair of values and combines
them to return a single value:</p>
- <pre class="sourceCode literate haskell"><code class="sourceCode
haskell"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a)
<span class="ot">=></span> (b <span class="ot">-></span> c <span
class="ot">-></span> d) <span class="ot">-></span> a (b, c) d
--unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span
class="fu">uncurry</span>
-+unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry
- <span class="co">-- arr (\op (x,y) -> x `op`
y)</span></code></pre>
- <p><code>(***)</code> combines two arrows into a new arrow by running the two
arrows on a pair of values (one arrow on the first item of the pair and one
arrow on the second item of the pair).</p>
- <pre><code>f *** g = first f >>> second g</code></pre>
---- pandoc-1.11.1-orig/tests/lhs-test.latex 2013-09-14 10:46:07.412536229
+1000
-+++ pandoc-1.11.1/tests/lhs-test.latex 2013-09-14 10:45:51.638536380 +1000
-@@ -21,7 +21,7 @@
- \usepackage{color}
- \usepackage{fancyvrb}
- \newcommand{\VerbBar}{|}
--\DefineShortVerb[commandchars=\\\{\}]{\|}
-+\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
- \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
- % Add ',fontsize=\small' for more characters per line
- \newenvironment{Shaded}{}{}
-@@ -73,7 +73,7 @@
- \begin{Shaded}
- \begin{Highlighting}[]
- \OtherTok{unsplit ::} \NormalTok{(}\DataTypeTok{Arrow} \NormalTok{a)
}\OtherTok{=>} \NormalTok{(b }\OtherTok{->} \NormalTok{c }\OtherTok{->}
\NormalTok{d) }\OtherTok{->} \NormalTok{a (b, c) d}
--\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.}
\FunctionTok{uncurry}
-+\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.}
\NormalTok{uncurry}
- \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
- \end{Highlighting}
- \end{Shaded}
diff --git a/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
b/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
deleted file mode 100644
index 93528d3..0000000
--- a/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fails on ghc-7.6 only as:
-
- tables.man
- ../dist/build/pandoc/pandoc --data-dir .. tables.native -r native -w man
--columns=78
-- 141 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 141 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-- 177 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 177 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-- 247 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 247 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-
-diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
-index 9e74935..d4cf2a9 100644
---- a/tests/Tests/Old.hs
-+++ b/tests/Tests/Old.hs
-@@ -126,7 +126,7 @@ tests = [ testGroup "markdown"
- ]
- , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
- [ "opendocument" , "context" , "texinfo"
-- , "man" , "plain" , "rtf", "org", "asciidoc"
-+ {- , "man" -} , "plain" , "rtf", "org", "asciidoc"
- ]
- ]
-
diff --git a/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
b/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
deleted file mode 100644
index ed3c3e8..0000000
--- a/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- pandoc-1.11.1-orig/pandoc.cabal 2013-03-18 09:26:59.000000000 +1100
-+++ pandoc-1.11.1/pandoc.cabal 2013-08-10 12:52:49.969834000 +1000
-@@ -232,7 +232,7 @@
- citeproc-hs >= 0.3.7 && < 0.4,
- pandoc-types >= 1.10 && < 1.11,
- json >= 0.4 && < 0.8,
-- tagsoup >= 0.12.5 && < 0.13,
-+ tagsoup >= 0.12.5 && < 0.14,
- base64-bytestring >= 0.1 && < 1.1,
- zlib >= 0.5 && < 0.6,
- highlighting-kate >= 0.5.3.7 && < 0.6,
---- /dev/null 2013-08-09 12:59:27.506999856 +1000
-+++ pandoc-1.11.1/src/Text/Pandoc/Compat/TagSoupEntity.hs 2013-08-10
12:28:14.261739000 +1000
-@@ -0,0 +1,15 @@
-+{-# LANGUAGE CPP #-}
-+module Text.Pandoc.Compat.TagSoupEntity (lookupEntity
-+ ) where
-+
-+import qualified Text.HTML.TagSoup.Entity as TE
-+
-+lookupEntity :: String -> Maybe Char
-+#if MIN_VERSION_tagsoup(0,13,0)
-+lookupEntity = str2chr . TE.lookupEntity
-+ where str2chr :: Maybe String -> Maybe Char
-+ str2chr (Just [c]) = Just c
-+ str2chr _ = Nothing
-+#else
-+lookupEntity = TE.lookupEntity
-+#endif
---- pandoc-1.11.1-orig/src/Text/Pandoc/Parsing.hs 2013-03-18
09:26:57.000000000 +1100
-+++ pandoc-1.11.1/src/Text/Pandoc/Parsing.hs 2013-08-10 12:28:14.262814000
+1000
-@@ -159,7 +159,7 @@
- import Text.Pandoc.Shared
- import qualified Data.Map as M
- import Text.TeXMath.Macros (applyMacros, Macro, parseMacroDefinitions)
--import Text.HTML.TagSoup.Entity ( lookupEntity )
-+import Text.Pandoc.Compat.TagSoupEntity ( lookupEntity )
- import Data.Default
- import qualified Data.Set as Set
- import Control.Monad.Reader
---- pandoc-1.11.1-orig/src/Text/Pandoc/Readers/DocBook.hs 2013-03-18
09:26:57.000000000 +1100
-+++ pandoc-1.11.1/src/Text/Pandoc/Readers/DocBook.hs 2013-08-10
12:28:14.264936000 +1000
-@@ -4,7 +4,7 @@
- import Text.Pandoc.Definition
- import Text.Pandoc.Builder
- import Text.XML.Light
--import Text.HTML.TagSoup.Entity (lookupEntity)
-+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
- import Data.Generics
- import Data.Monoid
- import Data.Char (isSpace)
---- pandoc-1.11.1-orig/src/Text/Pandoc/XML.hs 2013-03-18 09:26:57.000000000
+1100
-+++ pandoc-1.11.1/src/Text/Pandoc/XML.hs 2013-08-10 12:28:17.333957000
+1000
-@@ -39,7 +39,7 @@
-
- import Text.Pandoc.Pretty
- import Data.Char (ord, isAscii, isSpace)
--import Text.HTML.TagSoup.Entity (lookupEntity)
-+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
-
- -- | Remove everything between <...>
- stripTags :: String -> String
diff --git a/app-text/pandoc/files/pandoc-1.11.1-test.patch
b/app-text/pandoc/files/pandoc-1.11.1-test.patch
deleted file mode 100644
index d5d1e89..0000000
--- a/app-text/pandoc/files/pandoc-1.11.1-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit fa978e13658f76be109243224f7491550db74240
-Author: John MacFarlane <[email protected]>
-Date: Tue May 7 20:22:09 2013 -0700
-
- Use latest highlighting-kate and texmath.
-
- Closes #849.
-
-diff --git a/pandoc.cabal b/pandoc.cabal
-index 5f290a9..ea9e850 100644
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -241,7 +241,7 @@ Library
- old-locale >= 1 && < 1.1,
- time >= 1.2 && < 1.5,
- HTTP >= 4000.0.5 && < 4000.3,
-- texmath >= 0.6.1.3 && < 0.7,
-+ texmath >= 0.6.1.5 && < 0.7,
- xml >= 1.3.12 && < 1.4,
- random >= 1 && < 1.1,
- extensible-exceptions >= 0.1 && < 0.2,
-@@ -251,7 +251,7 @@ Library
- tagsoup >= 0.12.5 && < 0.13,
- base64-bytestring >= 0.1 && < 1.1,
- zlib >= 0.5 && < 0.6,
-- highlighting-kate >= 0.5.3.7 && < 0.6,
-+ highlighting-kate >= 0.5.3.9 && < 0.6,
- data-default >= 0.4 && < 0.6,
- temporary >= 1.1 && < 1.2,
- blaze-html >= 0.5 && < 0.7,
-diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
-index 16e9a79..2a5025a 100644
---- a/tests/lhs-test.latex
-+++ b/tests/lhs-test.latex
-@@ -22,6 +22,7 @@
- \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
- \usepackage{color}
- \usepackage{fancyvrb}
-+\newcommand{\VerbBar}{|}
- \DefineShortVerb[commandchars=\\\{\}]{\|}
- \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
- % Add ',fontsize=\small' for more characters per line
diff --git a/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
b/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
deleted file mode 100644
index 3ed96c2..0000000
--- a/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- pandoc-1.13.2-orig/pandoc.cabal 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/pandoc.cabal 2015-01-05 10:39:17.951823846 +1100
-@@ -250,7 +250,7 @@
- hslua >= 0.3 && < 0.4,
- binary >= 0.5 && < 0.8,
- SHA >= 1.6 && < 1.7,
-- haddock-library >= 1.1 && < 1.2,
-+ haddock-library >= 1.1 && < 1.3,
- old-time,
- deepseq-generics >= 0.1 && < 0.2,
- JuicyPixels >= 3.1.6.1 && < 3.3
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Haddock.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Haddock.hs 2015-01-05
14:24:34.371820789 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {- |
- Module : Text.Pandoc.Readers.Haddock
- Copyright : Copyright (C) 2013 David Lazar
-@@ -29,7 +30,12 @@
- readHaddock :: ReaderOptions -- ^ Reader options
- -> String -- ^ String to parse
- -> Pandoc
--readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
-+readHaddock opts =
-+#if MIN_VERSION_haddock_library(1,2,0)
-+ B.doc . docHToBlocks . trace' . _doc . parseParas
-+#else
-+ B.doc . docHToBlocks . trace' . parseParas
-+#endif
- where trace' x = if readerTrace opts
- then trace (show x) x
- else x
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/LaTeX.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/LaTeX.hs 2015-01-05
11:20:35.193045904 +1100
-@@ -592,7 +592,7 @@
-
- unescapeURL :: String -> String
- unescapeURL ('\\':x:xs) | isEscapable x = x:unescapeURL xs
-- where isEscapable c = c `elem` "#$%&~_^\\{}"
-+ where isEscapable c = c `elem` ("#$%&~_^\\{}" :: String)
- unescapeURL (x:xs) = x:unescapeURL xs
- unescapeURL [] = ""
-
-@@ -1224,7 +1224,7 @@
- <* optional sp
- <* optional (char ',')
- <* optional sp)
-- where isBibtexKeyChar c = isAlphaNum c || c `elem` ".:;?!`'()/*@_+=-[]*"
-+ where isBibtexKeyChar c = isAlphaNum c || c `elem` (".:;?!`'()/*@_+=-[]*"
:: String)
-
- cites :: CitationMode -> Bool -> LP [Citation]
- cites mode multi = try $ do
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Org.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Org.hs 2015-01-05
11:24:53.294689830 +1100
-@@ -1,5 +1,6 @@
- {-# LANGUAGE OverloadedStrings #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE FlexibleContexts #-}
- {-
- Copyright (C) 2014 Albert Krewinkel <[email protected]>
-
-@@ -1168,7 +1169,7 @@
-
- isUri :: String -> Bool
- isUri s = let (scheme, path) = break (== ':') s
-- in all (\c -> isAlphaNum c || c `elem` ".-") scheme
-+ in all (\c -> isAlphaNum c || c `elem` (".-" :: String)) scheme
- && not (null path)
-
- isAbsoluteFilePath :: String -> Bool
-@@ -1214,7 +1215,7 @@
- solidify = map replaceSpecialChar
- where replaceSpecialChar c
- | isAlphaNum c = c
-- | c `elem` "_.-:" = c
-+ | c `elem` ("_.-:" :: String) = c
- | otherwise = '-'
-
- -- | Parses an inline code block and marks it as an babel block.
-@@ -1465,7 +1466,7 @@
- parseAsMathMLSym :: String -> Maybe Inlines
- parseAsMathMLSym cs = B.str <$> MathMLEntityMap.getUnicode (clean cs)
- -- dropWhileEnd would be nice here, but it's not available before base 4.5
-- where clean = reverse . dropWhile (`elem` "{}") . reverse . drop 1
-+ where clean = reverse . dropWhile (`elem` ("{}" :: String)) . reverse .
drop 1
-
- state :: ParserState
- state = def{ stateOptions = def{ readerParseRaw = True }}
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/RST.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/RST.hs 2015-01-05
11:21:59.819266953 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE OverloadedStrings #-}
-+{-# LANGUAGE FlexibleContexts #-}
- {-
- Copyright (C) 2006-2014 John MacFarlane <[email protected]>
-
-@@ -708,7 +709,7 @@
- toChunks :: String -> [String]
- toChunks = dropWhile null
- . map (trim . unlines)
-- . splitBy (all (`elem` " \t")) . lines
-+ . splitBy (all (`elem` (" \t" :: String))) . lines
-
- codeblock :: Maybe String -> String -> String -> RSTParser Blocks
- codeblock numberLines lang body =
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/TWiki.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/TWiki.hs 2015-01-05
11:25:22.450138135 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances #-}
-+{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances,
FlexibleContexts #-}
- -- RelaxedPolyRec needed for inlinesBetween on GHC < 7
- {-
- Copyright (C) 2014 Alexander Sulfrian <[email protected]>
---- pandoc-1.13.2-orig/src/Text/Pandoc/Templates.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Templates.hs 2015-01-05 10:45:45.255969737
+1100
-@@ -124,7 +124,7 @@
- -> String -- ^ Name of writer
- -> IO (Either E.IOException String)
- getDefaultTemplate user writer = do
-- let format = takeWhile (`notElem` "+-") writer -- strip off extensions
-+ let format = takeWhile (`notElem` ("+-" :: String)) writer -- strip off
extensions
- case format of
- "native" -> return $ Right ""
- "json" -> return $ Right ""
-@@ -288,7 +288,7 @@
- reservedWords = ["else","endif","for","endfor","sep"]
-
- skipEndline :: Parser ()
--skipEndline = P.try $ P.skipMany (P.satisfy (`elem` " \t")) >> P.char '\n' >>
return ()
-+skipEndline = P.try $ P.skipMany (P.satisfy (`elem` (" \t" :: String))) >>
P.char '\n' >> return ()
-
- pConditional :: Parser Template
- pConditional = do
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ConTeXt.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ConTeXt.hs 2015-01-05
11:36:04.213852145 +1100
-@@ -119,7 +119,7 @@
- toLabel :: String -> String
- toLabel z = concatMap go z
- where go x
-- | elem x "\\#[]\",{}%()|=" = "ux" ++ printf "%x" (ord x)
-+ | elem x ("\\#[]\",{}%()|=" :: String) = "ux" ++ printf "%x" (ord x)
- | otherwise = [x]
-
- -- | Convert Elements to ConTeXt
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/EPUB.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/EPUB.hs 2015-01-05
11:35:29.166882307 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns #-}
-+{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns,
FlexibleContexts #-}
- {-
- Copyright (C) 2010-2014 John MacFarlane <[email protected]>
-
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ICML.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ICML.hs 2015-01-05
11:35:07.163880901 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE OverloadedStrings #-}
-+{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
-
- {- |
- Module : Text.Pandoc.Writers.ICML
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/LaTeX.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/LaTeX.hs 2015-01-05
11:32:29.461099578 +1100
-@@ -240,7 +240,7 @@
- where go [] = ""
- go (x:xs)
- | (isLetter x || isDigit x) && isAscii x = x:go xs
-- | elem x "-+=:;." = x:go xs
-+ | elem x ("-+=:;." :: String) = x:go xs
- | otherwise = "ux" ++ printf "%x" (ord x) ++ go xs
-
- -- | Puts contents into LaTeX command.
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Markdown.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Markdown.hs 2015-01-05
11:34:25.437241616 +1100
-@@ -323,9 +323,9 @@
- then Just $ writerColumns opts
- else Nothing
- let rendered = render colwidth contents
-- let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs
-- | otherwise = x : escapeDelimiter xs
-- escapeDelimiter [] = []
-+ let escapeDelimiter (x:xs) | x `elem` (".()" :: String) = '\\':x:xs
-+ | otherwise = x :
escapeDelimiter xs
-+ escapeDelimiter [] = []
- let contents' = if isEnabled Ext_all_symbols_escapable opts &&
- not (stPlain st) && beginsWithOrderedListMarker rendered
- then text $ escapeDelimiter rendered
-@@ -681,7 +681,7 @@
- mapM (inlineToMarkdown opts) (avoidBadWraps lst) >>= return . cat
- where avoidBadWraps [] = []
- avoidBadWraps (Space:Str (c:cs):xs)
-- | c `elem` "-*+>" = Str (' ':c:cs) : avoidBadWraps xs
-+ | c `elem` ("-*+>" :: String) = Str (' ':c:cs) : avoidBadWraps xs
- avoidBadWraps (x:xs) = x : avoidBadWraps xs
-
- escapeSpaces :: Inline -> Inline
-@@ -821,8 +821,8 @@
- sdoc <- inlineListToMarkdown opts sinlines
- let k' = text (modekey m ++ "@" ++ k)
- r = case sinlines of
-- Str (y:_):_ | y `elem` ",;]@" -> k' <> sdoc
-- _ -> k' <+> sdoc
-+ Str (y:_):_ | y `elem` (",;]@" :: String) -> k' <>
sdoc
-+ _ -> k' <+>
sdoc
- return $ pdoc <+> r
- modekey SuppressAuthor = "-"
- modekey _ = ""
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/OpenDocument.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/OpenDocument.hs 2015-01-05
11:36:22.915591722 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards, OverloadedStrings #-}
-+{-# LANGUAGE PatternGuards, OverloadedStrings, FlexibleContexts #-}
- {-
- Copyright (C) 2008-2014 Andrea Rossato <[email protected]>
- and John MacFarlane.
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/RST.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/RST.hs 2015-01-05
11:32:00.815007351 +1100
-@@ -105,7 +105,7 @@
- -> State WriterState Doc
- keyToRST (label, (src, _)) = do
- label' <- inlineListToRST label
-- let label'' = if ':' `elem` (render Nothing label')
-+ let label'' = if ':' `elem` ((render Nothing label') :: String)
- then char '`' <> label' <> char '`'
- else label'
- return $ nowrap $ ".. _" <> label'' <> ": " <> text src
-@@ -333,12 +333,12 @@
- okAfterComplex :: Inline -> Bool
- okAfterComplex Space = True
- okAfterComplex LineBreak = True
-- okAfterComplex (Str (c:_)) = isSpace c || c `elem`
"-.,:;!?\\/'\")]}>–—"
-+ okAfterComplex (Str (c:_)) = isSpace c || c `elem`
("-.,:;!?\\/'\")]}>–—" :: String)
- okAfterComplex _ = False
- okBeforeComplex :: Inline -> Bool
- okBeforeComplex Space = True
- okBeforeComplex LineBreak = True
-- okBeforeComplex (Str (c:_)) = isSpace c || c `elem` "-:/'\"<([{–—"
-+ okBeforeComplex (Str (c:_)) = isSpace c || c `elem` ("-:/'\"<([{–—"
:: String)
- okBeforeComplex _ = False
- isComplex :: Inline -> Bool
- isComplex (Emph _) = True
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Texinfo.hs 2014-12-20
19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Texinfo.hs 2015-01-05
11:33:07.407217820 +1100
-@@ -368,7 +368,7 @@
-
- -- periods, commas, colons, and parentheses are disallowed in node names
- disallowedInNode :: Char -> Bool
--disallowedInNode c = c `elem` ".,:()"
-+disallowedInNode c = c `elem` (".,:()" :: String)
-
- -- | Convert inline element to Texinfo
- inlineToTexinfo :: Inline -- ^ Inline to convert
diff --git a/app-text/pandoc/pandoc-1.12.1-r1.ebuild
b/app-text/pandoc/pandoc-1.12.1-r1.ebuild
deleted file mode 100644
index 280068d..0000000
--- a/app-text/pandoc/pandoc-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc";
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="embed_data_files +http-conduit"
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?]
<dev-haskell/attoparsec-0.11:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?]
<dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
<dev-haskell/blaze-html-0.7:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?]
<dev-haskell/blaze-markup-0.6:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?]
<dev-haskell/data-default-0.6:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?]
<dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/highlighting-kate-0.5.5:=[profile?]
<dev-haskell/highlighting-kate-0.6:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?]
<dev-haskell/http-4000.3:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
- >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
- >=dev-haskell/pandoc-types-1.12.3:=[profile?]
<dev-haskell/pandoc-types-1.13:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
- >=dev-haskell/tagsoup-0.12.5:=[profile?]
<dev-haskell/tagsoup-0.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?]
<dev-haskell/temporary-1.2:=[profile?]
- >=dev-haskell/texmath-0.6.4:=[profile?]
<dev-haskell/texmath-0.7:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
<dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?]
<dev-haskell/vector-0.11:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.1.3.3:=[profile?]
<dev-haskell/zip-archive-0.2:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
- >=dev-lang/ghc-7.0.1:=
- embed_data_files? ( dev-haskell/hsb2hs )
- http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?]
<dev-haskell/http-conduit-1.10:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?]
<dev-haskell/http-types-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.10.0.0
- dev-haskell/happy
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2
<dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9
<dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
- cabal_chdeps \
- 'text >= 0.11 && < 0.12' 'text >= 0.11'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag http-conduit http-conduit)
-}
