From 5a61a58fb3fa6596f4fabe07071d47db0c51054e Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Sat, 10 Jan 2015 09:19:03 +0000 Subject: [PATCH] Patch pandoc-citeproc for ghc 7.10.1 RC1 https://github.com/jgm/pandoc-citeproc/pull/99 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/pandoc-citeproc/ChangeLog | 7 +- dev-haskell/pandoc-citeproc/Manifest | 11 +- .../files/pandoc-citeproc-0.6-ghc-7.10.patch | 115 ++++++++++++++++++ .../pandoc-citeproc-0.6.ebuild | 8 +- 4 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch diff --git a/dev-haskell/pandoc-citeproc/ChangeLog b/dev-haskell/pandoc-citeproc/ChangeLog index bc1ec5dfad6d..10b3d67c5b93 100644 --- a/dev-haskell/pandoc-citeproc/ChangeLog +++ b/dev-haskell/pandoc-citeproc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/pandoc-citeproc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pandoc-citeproc/ChangeLog,v 1.7 2015/01/02 10:33:11 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pandoc-citeproc/ChangeLog,v 1.8 2015/01/10 09:18:55 gienah Exp $ + + 10 Jan 2015; Mark Wright + +files/pandoc-citeproc-0.6-ghc-7.10.patch, pandoc-citeproc-0.6.ebuild: + Patch pandoc-citeproc for ghc 7.10.1 RC1 https://github.com/jgm/pandoc- + citeproc/pull/99 02 Jan 2015; Sergei Trofimovich pandoc-citeproc-0.3.1.ebuild: diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest index dc49b12fc8ca..b728913660c0 100644 --- a/dev-haskell/pandoc-citeproc/Manifest +++ b/dev-haskell/pandoc-citeproc/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX pandoc-citeproc-0.6-ghc-7.10.patch 5725 SHA256 2f8cbfd40791281c7c2749a40eaf68929ec6309839fe6f335b9d545906f7996b SHA512 ce3286a45b0d49e7e2d6544f5378c4789dbd9092fdd5eddc04a1f162770d828e5af1fc81d7c52a2c57d35c52323a60a660aeb6a77a57686413e423c70b07a00f WHIRLPOOL e7f7eee3cbca53ed422ad497d3d03501d2727bcd5688ab8651472ebe1184fd328e98adeece9387c45adbddfee077c5d04d2b16bc4519f6765097f4a31a321ef8 DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 SHA256 3b8ea95a02051ded8e097db85445f822d474ba3cebce7ab35e5ca7b62ed4248e SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e WHIRLPOOL 6585eb1d435a207fc7d94616d09602e9c602f33c7f5e1fdde124022e07c6bc671a62c84fa31838c541a139b0988ea67a3acba881d4e2bbfe439dd4724bd2c194 DIST pandoc-citeproc-0.2.tar.gz 249374 SHA256 4d54092a277e547e2d5f57aab12836a59f1060344a5fca83939b6541eb9f0d3e SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4 WHIRLPOOL a7db263793ba69b97e492e66a2185f9d141035aea50e686fe933f18031bd9a65417fa2cc76c85e873701ddf5a53285cd8ce7800e10325f4d80044d7c50be6a37 DIST pandoc-citeproc-0.3.0.1.tar.gz 255740 SHA256 9d6e5b8e0d22cba9b0277488ac7efb344fa75413af7a08365e431556819314f1 SHA512 0cf616e8790b1afa654830cc0578d034c957fe0a3dcdce811a57cf17c59a0b27f39f571e23cf795651071657db6d13c80dff8d315969fe4b532450e9e7919340 WHIRLPOOL eec51b1d103a22d1c34b0e801e419ab1771c742f84b32c28cdf05c46f86cecdae7e46705b11996b3f678ca8184c3f680d3702984fa6cdb79fb7bdb34f736fdbd @@ -10,13 +11,13 @@ EBUILD pandoc-citeproc-0.1.2.1.ebuild 2245 SHA256 33e831b836d7219d027d85335e425b EBUILD pandoc-citeproc-0.2.ebuild 2233 SHA256 d1f64b666f81d6b8ac5e57f63dbc917f026d6365b82c057e4de2b13927aa1b45 SHA512 49b42ec1c4bf3bd6edd3ace251b97c424e597770704723b5b63df394a7c967a6fa3d5694c602514653c76dc7a875c61ec3d19c9980c4b390f11747797587480d WHIRLPOOL ab2765a333c72d016874e48e9cc1675c87e8309e2aa5396ee97e470be520562ac87091f1cf2936bd928ea6687fc980ecf07d9740f3169e7f3c2b122086cfe5d7 EBUILD pandoc-citeproc-0.3.0.1.ebuild 1903 SHA256 b909757bb912b19b57a12c8e43c1bfc841f7d7696d214eab82a3e5f81514682a SHA512 dcfb7cf3d897ec5b7185c3ec7a058f880bcf99fa8e22cdc389d42da18625395b40dee8a39ca1bc541839f90112b895e04df7c70a73290a7538e8e98d99300a9a WHIRLPOOL f8be6173f6981ca867fab65fbfc5acb21714af069abbbb915e3ed346c156238cdeb6718c6c36c531bb72e45a9567e60d19e6a3ec56fb8e4cf9617a2efcffc246 EBUILD pandoc-citeproc-0.3.1.ebuild 2589 SHA256 a179f7bc2589328f72347588c8ad7839902d1c0636a30a4dbf616ba5f2c2fa50 SHA512 5872d3b1285489b250a0ec7c6c1ccfff2d7fe5f1a067aeac9b5f0fb45b87a89bd531558d7c8cba9771367a7e5e180f6f4c7c1a2bfdfc2a3f60c501e2ccb6208b WHIRLPOOL 7eda3baec96cf63e65681e8cb8311e043aea926c5b3e58fbd4c3d63ca358c695d479ead8f5b2bb298c1fab3506a6d4fe3b0fa91a02a64e51a358a08961bbdba5 -EBUILD pandoc-citeproc-0.6.ebuild 2210 SHA256 58e700467597d9664351f57ed318d16407440a940e7428ebb99affd73bb99110 SHA512 fd21637c113e2fb16686d62bc41adf669975079f324e10f235ae3bc781dd8094f4671e79feccc0bd09c3cb569a0aab45f39c93312d541e1da15655fd335f1df4 WHIRLPOOL b93ac67b5db5ba46b9fe2d46b011d47cb01d46b06b124412dedcdfb4c03ce4e0fe3c0f51e923d596d729f79ae215ad8790978499ec7c32c899ba554882620b49 -MISC ChangeLog 1311 SHA256 c81269a924a3ff14c382a846a366541c267eb1406bed922dbc8aea0aafe7f4a7 SHA512 54cd4d9a1b521d6f6e5306dd327a650376b15aef2499e7d4c41bb285e83e50c84ad664a45f12a7cd6854fe2ce8a79119d74e0afa092c9f20529d80320ecdf583 WHIRLPOOL 43b4990b4b5c4a268e142aaf13b9723096df093415ae0cd59949eebae277fc8b9a399edf54506e54d04c44973c2df652cdbc122b41fa1ab57ca55d07edd9755d +EBUILD pandoc-citeproc-0.6.ebuild 2265 SHA256 e0eb61503386f7c93053dcb4d71844ffff0996a2aaa64f9d5f5b4b95bc5a0870 SHA512 578bdbf4c115500029a66dfc29dc4c39719875c4f5af38f7377c154c1a4531afe9376a2583cef65a68fb218f958e6894233322785dc6854e296d121be30b1532 WHIRLPOOL 50cb7763d80190f0ba0d5fecc5dd2b499702c65ee509af98993f5bfe5fd2f06b4c4f52c47bec035a19758419b2b7273ba77bf1d5643fcd14bd9150b60ffe7893 +MISC ChangeLog 1525 SHA256 3ed14b9f547b4b2d146d64b8309efbeabe394c516963cb34d0f5441d43b072ed SHA512 77a98f68533388e55b2c327848d2971f9d483c9e23bff651a9c8b4bb63956374eb21e2b9217536c9a96c61e12353a0dddcfb7a1d919d1635b23daec12b148992 WHIRLPOOL 3ee8754cfa4695363f6f38d6c52094d60fc227fc397ef423030b0cf0e64e79cb4fffcd1621967484cbf58b9029e877d8fdd417b6c44db72217bedb0f319b6f80 MISC metadata.xml 1648 SHA256 43d6b70c2d41466b1dbdb4f393ee5429ac2c3a067bba6ce0283ab1b59f822be4 SHA512 bd45b85b9a702efc19299cdbd8ffcea72c07f2e30465d78aca3565c7ea3c9b544afd1b11b2a08ad8ffbaf2b17f7594e5ff59a2e17be102ae03a38b5d75df2757 WHIRLPOOL bcb8198dcd9bec97f46fd384763224703845f8810374683e72b868dafbab9e361126b5e8f8955f05d60b3d7287b4d40b2d4d95defc8914aaa990111fb2548e36 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSmc+gACgkQcaHudmEf86q8SACfYKaAJEcyPXWIpNOIXTYvmRlV -P0gAn27gW3PWvxqoL2rFUkaZCDL8BYa9 -=dBCi +iF4EAREIAAYFAlSw7oYACgkQoBEVQmGOlx8olQD/exCyWGlWFn/RlLiHXLX5ICwT +0uLtFl9xxjehDdWYELkA/1fSXBmv5uUbcWV1Ys/P5G3XtHhqwOkTbRO/tyE2YGO6 +=7Uzn -----END PGP SIGNATURE----- diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch new file mode 100644 index 000000000000..cee2d93bc213 --- /dev/null +++ b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch @@ -0,0 +1,115 @@ +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Pandoc.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Pandoc.hs 2015-01-10 11:57:26.900041860 +1100 +@@ -201,10 +201,10 @@ + && isEndPunct c -> True + (c:_) | isEndPunct c -> True + | otherwise -> False +- where isEndPunct c = c `elem` ".,;:!?" ++ where isEndPunct c = c `elem` (".,;:!?" :: String) + + startWithPunct :: [Inline] -> Bool +-startWithPunct = and . map (`elem` ".,;:!?") . headInline ++startWithPunct = and . map (`elem` (".,;:!?" :: String)) . headInline + + deNote :: Pandoc -> Pandoc + deNote = topDown go +@@ -324,7 +324,7 @@ + sp <- option "" (pSpace >> return " ") + r <- many1 (notFollowedBy pSpace >> notFollowedBy pLocatorPunct >> anyToken) + let s = stringify r +- guard $ any isDigit s || all (`elem` "IVXLCM") s ++ guard $ any isDigit s || all (`elem` ("IVXLCM" :: String)) s + return $ punct ++ sp ++ s + + pDigit :: Parsec [Inline] st () +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Proc.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Proc.hs 2015-01-10 11:56:18.797456065 +1100 +@@ -288,7 +288,7 @@ + case ys of + Formatted [] -> xs + Formatted (Note _ : _) -> xs <> ys +- Formatted (Str [c]:_) | c `elem` ", ;:" -> xs <> ys ++ Formatted (Str [c]:_) | c `elem` (", ;:" :: String) -> xs <> ys + _ -> xs <> Formatted [Space] <> ys + formatAuth = formatOutput . localMod + formatCits = (if isNote then toNote else id) . +@@ -328,7 +328,7 @@ + | otherwise = id + where + isPunct' [] = False +- isPunct' xs = all (`elem` ".,;:!? ") xs ++ isPunct' xs = all (`elem` (".,;:!? " :: String)) xs + check o = case cleanOutput o of + [] -> ONull + x -> case trim' x of +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval/Names.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Eval/Names.hs 2015-01-10 11:55:41.839119783 +1100 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE PatternGuards #-} ++{-# LANGUAGE PatternGuards, FlexibleContexts #-} + ----------------------------------------------------------------------------- + -- | + -- Module : Text.CSL.Eval.Names +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Eval.hs 2015-01-10 11:55:23.090597159 +1100 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE PatternGuards #-} ++{-# LANGUAGE PatternGuards, FlexibleContexts #-} + ----------------------------------------------------------------------------- + -- | + -- Module : Text.CSL.Eval +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Parser.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Parser.hs 2015-01-10 11:54:59.755477862 +1100 +@@ -144,7 +144,7 @@ + + parseCslTerm :: Cursor -> CslTerm + parseCslTerm cur = +- let body = unpack $ T.dropAround (`elem` " \t\r\n") $ ++ let body = unpack $ T.dropAround (`elem` (" \t\r\n" :: String)) $ + T.concat $ cur $/ content + in CT + { cslTerm = stringAttr "name" cur +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Style.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Style.hs 2015-01-10 11:53:23.641828264 +1100 +@@ -130,7 +130,7 @@ + -- this is needed for versions of pandoc that don't turn + -- a span with font-variant:small-caps into a SmallCaps element: + where handleSmallCapsSpans (Span ("",[],[("style",sty)]) ils) +- | filter (`notElem` " \t;") sty == "font-variant:small-caps" = ++ | filter (`notElem` (" \t;" :: String)) sty == "font-variant:small-caps" = + SmallCaps ils + handleSmallCapsSpans x = x + +@@ -206,15 +206,15 @@ + appendWithPunct (Formatted left) (Formatted right) = + Formatted $ + case concat [lastleft, firstright] of +- [' ',d] | d `elem` ",.:;" -> initInline left ++ right +- [c,d] | c `elem` " ,.:;", d == c -> left ++ tailInline right +- [c,'.'] | c `elem` ",.!:;?" -> left ++ tailInline right +- [c,':'] | c `elem` ",!:;?" -> left ++ tailInline right -- Mich.: 2005 +- [c,'!'] | c `elem` ",.!:;?" -> left ++ tailInline right +- [c,'?'] | c `elem` ",.!:;?" -> left ++ tailInline right +- [c,';'] | c `elem` ",:;" -> left ++ tailInline right -- et al.; +- [':',c] | c `elem` ",.!:;?" -> left ++ tailInline right +- [';',c] | c `elem` ",.!:;?" -> left ++ tailInline right ++ [' ',d] | d `elem` (",.:;" :: String) -> initInline left ++ right ++ [c,d] | c `elem` (" ,.:;" :: String), d == c -> left ++ tailInline right ++ [c,'.'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right ++ [c,':'] | c `elem` (",!:;?" :: String) -> left ++ tailInline right -- Mich.: 2005 ++ [c,'!'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right ++ [c,'?'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right ++ [c,';'] | c `elem` (",:;" :: String) -> left ++ tailInline right -- et al.; ++ [':',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right ++ [';',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right + -- ".;" -> right -- e.g. et al.; + _ -> left ++ right + where lastleft = lastInline left +--- pandoc-citeproc-0.6-orig/src/Text/CSL/Util.hs 2014-09-22 14:04:21.000000000 +1000 ++++ pandoc-citeproc-0.6/src/Text/CSL/Util.hs 2015-01-10 11:51:31.789057499 +1100 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE ScopedTypeVariables, PatternGuards #-} ++{-# LANGUAGE ScopedTypeVariables, PatternGuards, FlexibleContexts #-} + module Text.CSL.Util + ( safeRead + , readNum diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild index f43ae449ba56..9df6fafc14bc 100644 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild,v 1.1 2014/12/14 08:46:43 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild,v 1.2 2015/01/10 09:18:55 gienah Exp $ EAPI=5 @@ -8,7 +8,7 @@ EAPI=5 #hackport: flags: -small_base CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="Supports using pandoc with citeproc" HOMEPAGE="http://hackage.haskell.org/package/pandoc-citeproc" @@ -46,6 +46,8 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.12 " +PATCHES=("${FILESDIR}/${PN}-0.6-ghc-7.10.patch") + src_configure() { # workaround bug on ghc-7.6.3: # > [13 of 24] Compiling Text.CSL.Input.Bibtex ... -- 2.26.2