diff options
| -rw-r--r-- | app-text/pandoc/ChangeLog | 11 | ||||
| -rw-r--r-- | app-text/pandoc/Manifest | 10 | ||||
| -rw-r--r-- | app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch | 251 | ||||
| -rw-r--r-- | app-text/pandoc/pandoc-1.13.2-r1.ebuild | 83 |
4 files changed, 349 insertions, 6 deletions
diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog index 35499647bb2c..6f6d4ee1890b 100644 --- a/app-text/pandoc/ChangeLog +++ b/app-text/pandoc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/pandoc -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.34 2014/12/20 09:52:26 gienah Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.35 2015/01/05 05:04:03 gienah Exp $ + +*pandoc-1.13.2-r1 (05 Jan 2015) + + 05 Jan 2015; Mark Wright <gienah@gentoo.org> + +files/pandoc-1.13.2-ghc-7.10.patch, +pandoc-1.13.2-r1.ebuild: + Patch pandoc 1.13.2 for ghc 7.10.1 RC1 and haddock-libary 1.2 + https://github.com/jgm/pandoc/pull/1856 *pandoc-1.13.2 (20 Dec 2014) diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest index 7bfc10792f3e..a8c7fd2ead46 100644 --- a/app-text/pandoc/Manifest +++ b/app-text/pandoc/Manifest @@ -5,6 +5,7 @@ AUX pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch 3344 SHA256 7363840edf89cc AUX pandoc-1.11.1-no-man-tests.patch 899 SHA256 633640721ea96c90c0df7e3b8ca7524f0f47d24490019cd3e28faa9f7e4c1dfe SHA512 9d9f125de076fac08adf104b619a4b58875e9f26dea4c7923505535291a4e2e797b9635da744c20f648e3a8588d2ad04b175201d39a16044b962cdcad2e0a3fa WHIRLPOOL 0a14deae90397ae2d30b3e20892d59a2aa12ef76a316afdef778dd69a3d5121ac6d447b9be907c65f1c23b56204450c12df9bb4fcbcea26d23bcb00e75b5dbce AUX pandoc-1.11.1-tagsoup-0.13.patch 2529 SHA256 45578ec8bdb219af9d8cdd45f992f9f376f6c77d4c7619ab19d9a218bc1147b7 SHA512 7dc5839924df61a948b65eaa79e755fabfe4589543f076dcfc2ad501a9e671bceed86d587d901e9146b5d7b6e3379187c75f59b5ae23a019288a9deb3cc4d951 WHIRLPOOL 71ae44c99d7db952438531d132e2f3dada25f8944f44b157082f313ceffaa0b0bef72d1f360b6321bdaa1bb937113085703c588555ebf56fdc0fbeec90f79c97 AUX pandoc-1.11.1-test.patch 1583 SHA256 da6ddb7b668d7fe043f4032be975eaf8a85d2d0c0eeffec4036d9aa2ade74b0c SHA512 9d6d13989d86ddcbb3ede45bc356710c8ef2f459652bbb4b06589f7312c74b8a77f6941727684fc9f315460360ef102961da04a79f57c3d03cddee41bf909bdc WHIRLPOOL f5063c32fa23f1b9dd0c3d8d015c6338d9c8a573f8095c97437850023489ce22de4395d6443f9b5f1d6990f95237351a40e6cd5965da9566c2f9d48aafc49e8e +AUX pandoc-1.13.2-ghc-7.10.patch 11614 SHA256 b9889ea1e9d4bddc1197a79a676900dc7c6f418ae9c147eca5d6172aebcac76a SHA512 7cebb333454720dd79eeb7f76f73fd32bee7b818a255fdd9dacabc334889cb7d4c850abcf1f006342f5f8998ab852d461c2fedf335b8d3329b4dc4ba0d42f034 WHIRLPOOL 528b393d81380e8e9e6017112b901ac93c02aaeb591187cd69975a88d990307ab2635af7e8bd20c6ff799111eb590169c1a584619fe6e0fb26a1a0572ad2ecd6 DIST pandoc-1.12.1.tar.gz 991330 SHA256 ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512 79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979 WHIRLPOOL b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0 DIST pandoc-1.12.2.1.tar.gz 1004090 SHA256 8e9a37bb802efd44e6e6063060105ad4ef8328a093fccbd971c533f0b583dbf7 SHA512 2dc17f6ae9a4cbdeb62aaf1b21b4922f480de425120442bfea1c832a0cf53c25120ded1c91df1e985946c6a5664671075f24edeece163e9d691fea784bab62f8 WHIRLPOOL 8fd4901e6f59b6ea224fe72f427fa80ca61d686b12a9bab19b8add18bdd52952d1f18befc32425299502c0106412b75ddb6afa41c52ff8032a003a87b7d94855 DIST pandoc-1.12.3.1.tar.gz 1081035 SHA256 ec06bb322950c900f1a69426756fcffa0f5b9fa0a2ffe41337615b261a087c4f SHA512 6fe52fdafe6c3951297d819a137c1c6ea1d86d3173637fb1bf99cade89dc03fe29fd321024c6137747fd81028a0475156c4d8724ad4366cc0a27821bbf75f7e5 WHIRLPOOL 2618c83fa07979fe6f571af690fb0a12177eeca1f65307980c6e809cfee40be889389bf74eb8846899a4ac88757474eb7c18775be769a3bd5d622e4a4240c790 @@ -22,13 +23,14 @@ EBUILD pandoc-1.12.4.2-r1.ebuild 4223 SHA256 0359965e5fdbe9718a3f29c03c6b9171a21 EBUILD pandoc-1.12.4.ebuild 4057 SHA256 2e8b1aeca601c751dee00579d1556c605f1517f5a1ae1abc2829bf3bd5e3aabf SHA512 8d08a5f850f07ce7e9083b87e8d13e455d506fc874a7f707f38a004ed446d850a306e3b68a4f39413c7712d2d43315779b89cdcc7c64194730c3e6c80352fabc WHIRLPOOL 010fc173d30f284220be82fbdee0321858dc01122a9aaa8754ea911b6333620be1818d0a9b45dcafea5c3ba6a6f74b14aa9a1be2459ba86450511bd52dc286ae EBUILD pandoc-1.12.ebuild 3857 SHA256 ac15d83161e674bd986c40802f8da1b096e15a2368f8825f394bfca9e26453d4 SHA512 dc116ecea6cf2036ec9425334c1f7e87aae7dee8079b6760d8033e3cd1df569365abf086395f5a48b06f07b61cf6b94ee324524f27732c25600dcda9e4e372a4 WHIRLPOOL 7b23989f55edeed51abb54fbb37c63e1bcf4377722382b597df2524f0200b73b1e32f46317ecdc412adbc445b43029e07ca832538f96362b1de0707458c45ea2 EBUILD pandoc-1.13.1-r3.ebuild 4792 SHA256 b3ef2d4a0416f38ca5eb7dee62260a9f2d477f256096246987303d1348ca1c56 SHA512 d8dddc9d488e832e8e015bce393655517338642af40ae07d67b7393352b06f5a666926d2c1cbfba1c0791bfe737b86c9d6486f7a441c5e34d5fe356888438547 WHIRLPOOL 64896dd48a0b68a90de8ab0055843c30537870e9d550d56decc1d5b75ecbdc53a5b28e716077fca62d988979dc6bd945bb5c5dfa783c7301c9852adf2e18a35f +EBUILD pandoc-1.13.2-r1.ebuild 4697 SHA256 3ebfb3e3b53bf59628c9203fd9e82dbd4b050417da4849853463d06c442e1ffa SHA512 e20b496d3c5c9d0743b321225252e9f04779d73a34f3249bbe1c4b64a4c21c2039a0cd4117d911d8330a56de1fc1b3f96fb8ddb0785ef7917c2e514961653d2f WHIRLPOOL 843fa20bf23db93f7ecf3c7965682a3a84d359e869483cef9e8d9b19244a370c02fa18627216b7605f2cafdcd31ae5ea42a9aff7e6fdfc3fcd8c3ef973521692 EBUILD pandoc-1.13.2.ebuild 4636 SHA256 5d2e3800a2f1d99502dc7f691f4b4c64d4e9f5a6e4db57feb14b93a12b7d5a1c SHA512 f21b1954a0982e20e98576acd4019796e936ba87a10050973b606ed46da8c203fa19493e73e10cae31851dc3e8310fc4e89d60f1db5a5cb1d3fc5d01c890ac13 WHIRLPOOL 3556cbf4d17fb5bc4cf506159e409debb0625db7bc8cb8a9cdf067c53c365c10968a35f807fe4246900a10bcebf2de7eab62f55ca0393335bf49d8318c6dcbd0 -MISC ChangeLog 6212 SHA256 52f99882b0c0d55d579455da3015fa052a094ee8d71ade58c8e3ead8bbc988fe SHA512 65be84418421f5ba9d8275c7f70c45ec82116f9d39756ab9d31684c077c3b9fe9f27501c54c0cb9762324b89a8da092c87227b7ac4b0e3cb4c4b7ef79428aeb5 WHIRLPOOL 5499f5efeab79521c80482aac7aab36b65c32375394b5ae75b325a2975e3b993ee1711b8e7ecd90e53055eeef48675b0a206dbdffb6e63dd7e2dcf5b859a0f97 +MISC ChangeLog 6464 SHA256 24632004e38ec086dfbdaf983169c8176ca837d8038c2f92d124167126a24df8 SHA512 f3e7417c21944ee5fe21ac62fcc6e8342bcc1935c78c85214a19ae8e0aadc9eb46c1964210ae47afe4e91dc83d0746b7966625c8d8f6d609bb96870b4a1a0462 WHIRLPOOL e0c4bc067be2424c8f6cb304e2a5ca0a8839df83130fff2e34c0f4a4d995f194d538011c6a51d1aa1703e6c92b3e3bbbb9fcf8a72223ba27e32b7d11dbf21913 MISC metadata.xml 1232 SHA256 d4908e6f47857ddaf0848285a62b50a75ff7706a14b1e403cd976b4525e0f2c5 SHA512 5c884f5ce92a521507c956381bbdf0a8cdaa109ea5384fbc8ca975010dbe0f38812efd1d27801f1897bb81b59491e0b23658567fa4ef7a4e6cbb40e1af9abd46 WHIRLPOOL 32922f56b54c5f7b54f59a2d35d723e0ec3b939be553914a4aba46550c955855a34f8283bacf941c297990eb20cc7c364a6ec2ca187f039bddbf885ac5a98e0f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSVRuAACgkQoBEVQmGOlx+XhQD8DnKmMIcUDSQ0Yb6L7s9CbOkR -HJt6+hLodJLWHf/YgZQA/3PvxjWFh0ou7oAFC6tOVKXrtifR0/XL1p0gDH8C4SIs -=wKxt +iF4EAREIAAYFAlSqG0wACgkQoBEVQmGOlx/ipgD7BI6S3+MdYDsLsRuJPSO7H49Q +2gliv7POZaI4UBNVN9oBANlGUDp7vhVI9Gb7DapluxvKY8Yd0SIE0ErBqKbLMeVG +=9T8D -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..3ed96c2a1b94 --- /dev/null +++ b/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch @@ -0,0 +1,251 @@ +--- 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 <tarleb@moltkeplatz.de> + +@@ -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 <jgm@berkeley.edu> + +@@ -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 <alexander.sulfrian@fu-berlin.de> +--- 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 <jgm@berkeley.edu> + +--- 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 <andrea.rossato@ing.unitn.it> + 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.13.2-r1.ebuild b/app-text/pandoc/pandoc-1.13.2-r1.ebuild new file mode 100644 index 000000000000..b28efbcce7aa --- /dev/null +++ b/app-text/pandoc/pandoc-1.13.2-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.1 2015/01/05 05:04:03 gienah Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.4.4.9999 + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" +inherit base 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 +https make-pandoc-man-pages +network-uri trypandoc" + +RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?] + >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] + >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] + >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] + >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] + >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] + >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] + >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] + >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] + >=dev-haskell/highlighting-kate-0.5.11.1:=[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/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] + >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] + >=dev-haskell/pandoc-types-1.12.4:=[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.2:=[profile?] + >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] + >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] + >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] + >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] + >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] + >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] + >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] + >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] + >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] + >=dev-lang/ghc-7.4.1:= + https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] + >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] + >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) + network-uri? ( >=dev-haskell/network-2.6:=[profile?] + >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) + !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) + trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] + dev-haskell/wai-extra:=[profile?] + !https? ( dev-haskell/http-types:=[profile?] ) ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10 + 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/executable-path-0.0 <dev-haskell/executable-path-0.1 + >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 + >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 + >=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 ) +" + +PATCHES=("${FILESDIR}/${PN}-1.13.2-ghc-7.10.patch") + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag embed_data_files embed_data_files) \ + $(cabal_flag https https) \ + $(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \ + $(cabal_flag network-uri network-uri) \ + $(cabal_flag trypandoc trypandoc) +} |