fix pandoc-1.11.1 test failure, thanks slyfox for the report

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0xEAD50D64D8D3571A!

4 files changed, 62 insertions, 8 deletions

diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog
index 88d8a2733999..bdc33607af82 100644
--- a/app-text/pandoc/ChangeLog
+++ b/app-text/pandoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pandoc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.15 2013/04/02 13:05:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.16 2013/06/19 06:07:54 qnikst Exp $
+
+  19 Jun 2013; Alexander Vershilov <qnikst@gentoo.org>
+  +files/pandoc-1.11.1-test.patch, pandoc-1.11.1.ebuild:
+  fix pandoc-1.11.1 test failure, thanks slyfox for the report
 
 *pandoc-1.11.1 (02 Apr 2013)
 
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 61290a55cbeb..a74e3ee45809 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -2,17 +2,24 @@
 Hash: SHA256
 
 AUX pandoc-1.11.1-no-man-tests.patch 899 SHA256 633640721ea96c90c0df7e3b8ca7524f0f47d24490019cd3e28faa9f7e4c1dfe SHA512 9d9f125de076fac08adf104b619a4b58875e9f26dea4c7923505535291a4e2e797b9635da744c20f648e3a8588d2ad04b175201d39a16044b962cdcad2e0a3fa WHIRLPOOL 0a14deae90397ae2d30b3e20892d59a2aa12ef76a316afdef778dd69a3d5121ac6d447b9be907c65f1c23b56204450c12df9bb4fcbcea26d23bcb00e75b5dbce
+AUX pandoc-1.11.1-test.patch 1583 SHA256 da6ddb7b668d7fe043f4032be975eaf8a85d2d0c0eeffec4036d9aa2ade74b0c SHA512 9d6d13989d86ddcbb3ede45bc356710c8ef2f459652bbb4b06589f7312c74b8a77f6941727684fc9f315460360ef102961da04a79f57c3d03cddee41bf909bdc WHIRLPOOL f5063c32fa23f1b9dd0c3d8d015c6338d9c8a573f8095c97437850023489ce22de4395d6443f9b5f1d6990f95237351a40e6cd5965da9566c2f9d48aafc49e8e
 AUX pandoc-1.9.4.5-disable-writes-other-man.patch 930 SHA256 cf2c41dcfb0f96b0bb653d1ee9c5f38b9e4be4ad7f7484e872a3fc4aa8750765 SHA512 70ed080dea38d795200d1cc502ca53007fe70c17806d68c5383b41a5461b5df30fb19c38b1a74bd46a3253d6b4849b0a08c84a0dd310e6d8eeecc9fad1b9b25e WHIRLPOOL f96a8e17316d8c3ab7d86203fc153741c816e8631b4959e428bfca3d5215283eeb37d10a65748cd2f153a820ea8f04488b3a371567b77faccc8bf8521f3f75af
 DIST pandoc-1.11.1.tar.gz 1093354 SHA256 ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c SHA512 100cadc021fd88621ab0a5a8747e913312e569e26bf4c22caddcb00b98e8877a047a6289fb478946515cdf15da2dc0840110c94bb81988b893f0d201de91fcf0 WHIRLPOOL 4409ab19581002a5f488af7107cfe8f2098b47891262a30fdd1fa6e24348bfc7f4a5b752a92cb48e2ce92cc566f04e8a3702cea1bc3e7a8369a3ec47198ab1b3
 DIST pandoc-1.9.4.5.tar.gz 574992 SHA256 cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816 SHA512 c147c4557733358135916a41b0108c9f1e7d02e237e156c2345f0ffb3eec0e2a10c910f80c758552f03d62b3ba689feb50b4e0cd207e4965a97a71502bc47f17 WHIRLPOOL c284553a1d4a7e2e687e9ecdb53b43a37e02c45120e2aacd6a6c613ae4e9d6238d3f7e3e9e504a5d4f866c73b77a75fc7e2a01cf2b79028ec7344c915664a71f
-EBUILD pandoc-1.11.1.ebuild 3167 SHA256 5bca866cd66ac3a8de6617c52ab536b65a4b0b7219ca4e67476740a98c3e63e1 SHA512 94413ca91feaab3d005d3f38ccb51d86eda7078badcd9c7f7f4f5cf51d47b04941557e4f2ab2c6b1332c9a348a3cadfccdd4b27aee8edaf11320442a4a417b2b WHIRLPOOL 267c370234866df5ec22841af838c9cf03b384c633df97892150303a397b51288c1b1bbc302f3dce1be612eaa514cc5d67ac3cf5fbac5cb0bf34742b1eb88668
+EBUILD pandoc-1.11.1.ebuild 3205 SHA256 69d1dfc6d0659526e79414e616d8b5bd83e5c6e70c36399f038e863c468714bd SHA512 5b51d896a2d101f2166328dd255d317270a78b6aaf830b700bacc35a1f17f3d62c58a01de767dbbc1fba8ddc880a28a4005826c63184d8d2c448a3cb6e676b86 WHIRLPOOL d4b71b2b7b33f969a99441b09652536da5221ea4de3d7a318637444e2880d6bef1a52f7378ff1a222c3df2166b96132868c854a4f8e82ab658873a198f8a0ad8
 EBUILD pandoc-1.9.4.5.ebuild 3015 SHA256 0ff608582e00da659a6df40198428c47a23034de1cf2a10d4f6565d292b6ab7e SHA512 3a4aa1ad4d1a044204b40640b0afed01ca5f805fe51a5df109fbea39133aef79a903c2a96ea957bbeea1e21ef43a79895b0894367daa0f833a11c6aaf9f326b7 WHIRLPOOL 07decb62d94b5c81e2bcd9afbe70ca2cabaff6b6979d227ffc1e8657530f8050d4de54d71fbe0b332b473c4fe94ad05985299957d4d881ff20fe9802a6c06bf2
-MISC ChangeLog 3321 SHA256 19192fa546f2277af7f5f6144adcc42bcd3cfbe900168f6d36c7f237e423f498 SHA512 135e967fa1ad3afa8477722b762aa26887332b17b8268688356bea1d98920785a8aed94d73a80cd8a1955c49b7397ff0cb48b1369df29933ac0f0db6fcecee17 WHIRLPOOL 4c59e2e106386555cb34909aa0c163d47c1ebbfbe9a33a1d7105b4ea294c3c3a72574a6fa988702dfcbdcc39a47b90e7511d001bae46ef556c684663a5dbf493
+MISC ChangeLog 3497 SHA256 323bd19abfde477cdc20f43be18fa0bec99593f14f2c968d9a9ea6f2bbcba604 SHA512 3243932a88f0caeb2e39d1c5f4e00a780d7b2b9b0349339d6dc165aeecea8d969ef1888d5fb8d9f32b86e95370c53b4c8d63734927a7ec6d0082d53abd748325 WHIRLPOOL e49eb397440edccc823fc051a1b3786a8268d7d827cd03a11ce7cfe718831ec52fa6347188ade319abe5459f5b372702c7f17e20ecb098a156fc041fc9f78a1a
 MISC metadata.xml 817 SHA256 f299da94e1b04a53c4c6298217fb4950c83bcc049490787f63a132eb1276f523 SHA512 74e1d62b12c37ae9b492de05ea198f4bdc753ea3b460492256c99c7b1472f67e818cbe14227bc71d6c5d0bfbd51f37fe7b5198f2c1f7dfc8e3f9a9b153dc16ff WHIRLPOOL e1ab3f1ad16ea9be9d5985cfcd480f76fb24565216b0d8e81fb8288d1ed517b2e3a02236d543f442f8ff08dd08ef22d0e16ca8aeca007012f5da37c1f92f5d26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlFa13oACgkQoBEVQmGOlx+FSgEAtVznoIWuJ8A4mTrCgsq8dIKO
-VHBXBWORgmSi2U6OPZ0A/AiPWJ5CdTYIQOGqcxJ0/onbAf9PHzoqMJPb5zL9O5xA
-=9THN
+iQF8BAEBCABmBQJRwUrCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caSOAIAKq7Ub0URYCfsYixKE/f6FPC
+zqlVbY4qcNpRkebXxa+6qCOxzCxB//GWEr01tRNO5koWNxqukhqkr+TDrO9FCLjf
+Zw729kBH+JP0XbAn4oevjzf34ZA7SO9jetzzz+mbSQZ2rA3KpwDPwiMCsj95IRan
+USg1S1M6F2Hd552hxXw/Cub2c+/p+/GI15b55NLdht589NO+fdqRpr5Rjgj72iKE
+GFv2xaQjauRWuy4pFX/OHjJ+nEHu18KuP3QenYTqydo5gteG1cNuBgigD9sYYP7R
+13WS/XWZIRGjnpAHV/H33bHATc/WF7fW+fBRLXy9h32TjTgQV7FT5HopIrnP/wI=
+=Vn9U
 -----END PGP SIGNATURE-----
diff --git a/app-text/pandoc/files/pandoc-1.11.1-test.patch b/app-text/pandoc/files/pandoc-1.11.1-test.patch
new file mode 100644
index 000000000000..d5d1e894d505
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-test.patch
@@ -0,0 +1,42 @@
+commit fa978e13658f76be109243224f7491550db74240
+Author: John MacFarlane <fiddlosopher@gmail.com>
+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/pandoc-1.11.1.ebuild b/app-text/pandoc/pandoc-1.11.1.ebuild
index bd29de1c180e..457595cee55e 100644
--- a/app-text/pandoc/pandoc-1.11.1.ebuild
+++ b/app-text/pandoc/pandoc-1.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.11.1.ebuild,v 1.1 2013/04/02 13:05:31 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.11.1.ebuild,v 1.2 2013/06/19 06:07:54 qnikst Exp $
 
 EAPI=5
 
@@ -77,6 +77,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-man-tests.patch
+	epatch "${FILESDIR}"/${P}-test.patch
 
 	ghc-supports-threaded-runtime ||
 		cabal_chdeps \