Bump pandoc to 1.11.1

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

5 files changed, 140 insertions, 8 deletions

diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog
index 21e6ee2d20fc..88d8a2733999 100644
--- a/app-text/pandoc/ChangeLog
+++ b/app-text/pandoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pandoc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.14 2012/12/29 07:32:40 slyfox Exp $
+# 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 $
+
+*pandoc-1.11.1 (02 Apr 2013)
+
+  02 Apr 2013; Mark Wright <gienah@gentoo.org>
+  +files/pandoc-1.11.1-no-man-tests.patch, +pandoc-1.11.1.ebuild, metadata.xml:
+  Bump pandoc to 1.11.1
 
   29 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> pandoc-1.9.4.5.ebuild:
   Tie diff depend to 0.1 (fails tests with 0.2 for now).
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 4047e8cb2ecd..61290a55cbeb 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pandoc-1.11.1-no-man-tests.patch 899 SHA256 633640721ea96c90c0df7e3b8ca7524f0f47d24490019cd3e28faa9f7e4c1dfe SHA512 9d9f125de076fac08adf104b619a4b58875e9f26dea4c7923505535291a4e2e797b9635da744c20f648e3a8588d2ad04b175201d39a16044b962cdcad2e0a3fa WHIRLPOOL 0a14deae90397ae2d30b3e20892d59a2aa12ef76a316afdef778dd69a3d5121ac6d447b9be907c65f1c23b56204450c12df9bb4fcbcea26d23bcb00e75b5dbce
 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.9.4.5.ebuild 3015 SHA256 0ff608582e00da659a6df40198428c47a23034de1cf2a10d4f6565d292b6ab7e SHA512 3a4aa1ad4d1a044204b40640b0afed01ca5f805fe51a5df109fbea39133aef79a903c2a96ea957bbeea1e21ef43a79895b0894367daa0f833a11c6aaf9f326b7 WHIRLPOOL 07decb62d94b5c81e2bcd9afbe70ca2cabaff6b6979d227ffc1e8657530f8050d4de54d71fbe0b332b473c4fe94ad05985299957d4d881ff20fe9802a6c06bf2
-MISC ChangeLog 3139 SHA256 08521df88ab663ca8cec482d048f6552fb0796861b0fa47822705386540cdcd3 SHA512 629a16247168e66fbe4655a584270dcf2084afaece64df659a5ca0f052feba19662dfa0efe9cb83f3be0cc15eeab48c8be59928e3e0957152c4fe7b8005986cf WHIRLPOOL 5ea384f832f81aba5b0ba0ef41f73fe449a5d6190e91ae3efe18796ca86bbac8eb4bf95f31b46af99bf0389e3205e20c561ee7c154ab47f87c64d094f2174afb
-MISC metadata.xml 823 SHA256 e16707b8d0d06a0ff099025bc880a48506c03cf32a39b5391d178265b0d411be SHA512 4ea3aecb81945cd4a2e43dacbadf7ccaac846dc20f2513851c5c8fcdce6146d979e4157e069139795c6e019c3db0ab7c5c888ecac8926e3a82e71387f1820bc2 WHIRLPOOL babb2addca75acc34b740c09bdcc45039ed68ae74fe45f2944536ab9cc032f8a0c0e32b0d84500798e59af2271527aeb430508270f0b3b9fd2d9bc72396275d4
+MISC ChangeLog 3321 SHA256 19192fa546f2277af7f5f6144adcc42bcd3cfbe900168f6d36c7f237e423f498 SHA512 135e967fa1ad3afa8477722b762aa26887332b17b8268688356bea1d98920785a8aed94d73a80cd8a1955c49b7397ff0cb48b1369df29933ac0f0db6fcecee17 WHIRLPOOL 4c59e2e106386555cb34909aa0c163d47c1ebbfbe9a33a1d7105b4ea294c3c3a72574a6fa988702dfcbdcc39a47b90e7511d001bae46ef556c684663a5dbf493
+MISC metadata.xml 817 SHA256 f299da94e1b04a53c4c6298217fb4950c83bcc049490787f63a132eb1276f523 SHA512 74e1d62b12c37ae9b492de05ea198f4bdc753ea3b460492256c99c7b1472f67e818cbe14227bc71d6c5d0bfbd51f37fe7b5198f2c1f7dfc8e3f9a9b153dc16ff WHIRLPOOL e1ab3f1ad16ea9be9d5985cfcd480f76fb24565216b0d8e81fb8288d1ed517b2e3a02236d543f442f8ff08dd08ef22d0e16ca8aeca007012f5da37c1f92f5d26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDenIQACgkQcaHudmEf86o5JwCfYsNqlHe9FqQCJFbt4SY3+2LP
-tWAAnjf/H2ltgPffvt9dhJJgudvBzYN9
-=w0Av
+iF4EAREIAAYFAlFa13oACgkQoBEVQmGOlx+FSgEAtVznoIWuJ8A4mTrCgsq8dIKO
+VHBXBWORgmSi2U6OPZ0A/AiPWJ5CdTYIQOGqcxJ0/onbAf9PHzoqMJPb5zL9O5xA
+=9THN
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..93528d31204e
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
@@ -0,0 +1,24 @@
+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/metadata.xml b/app-text/pandoc/metadata.xml
index a1d842d3fdba..f4bb8363bde6 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,6 +16,6 @@
 		slide shows.
 	</longdescription>
 	<use>
-		<flag name="highlight">Add support for syntax highlighting with <pkg>dev-haskell/highlighting-kate</pkg></flag>
+                <flag name="embed_data_files">Embed data files in binary for relocatable executable.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.11.1.ebuild b/app-text/pandoc/pandoc-1.11.1.ebuild
new file mode 100644
index 000000000000..bd29de1c180e
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.11.1.ebuild
@@ -0,0 +1,99 @@
+# 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 $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit eutils 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"
+
+RDEPEND=">=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/citeproc-hs-0.3.7:=[profile?]
+		<dev-haskell/citeproc-hs-0.4:=[profile?]
+		>=dev-haskell/data-default-0.4:=[profile?]
+		<dev-haskell/data-default-0.6:=[profile?]
+		=dev-haskell/extensible-exceptions-0.1*:=[profile?]
+		>=dev-haskell/highlighting-kate-0.5.3.7:=[profile?]
+		<dev-haskell/highlighting-kate-0.6:=[profile?]
+		>=dev-haskell/http-4000.0.5:=[profile?]
+		<dev-haskell/http-4000.3:=[profile?]
+		>=dev-haskell/json-0.4:=[profile?]
+		<dev-haskell/json-0.8:=[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.10*:=[profile?]
+		=dev-haskell/parsec-3.1*:=[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.13:=[profile?]
+		=dev-haskell/temporary-1.1*:=[profile?]
+		>=dev-haskell/texmath-0.6.1.3:=[profile?]
+		<dev-haskell/texmath-0.7:=[profile?]
+		=dev-haskell/text-0.11*:=[profile?]
+		>=dev-haskell/xml-1.3.12:=[profile?]
+		<dev-haskell/xml-1.4:=[profile?]
+		>=dev-haskell/zip-archive-0.1.3.3:=[profile?]
+		<dev-haskell/zip-archive-0.2:=[profile?]
+		=dev-haskell/zlib-0.5*:=[profile?]
+		>=dev-lang/ghc-7.0.1:=
+		"
+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/hunit-1.2*
+			>=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() {
+	epatch "${FILESDIR}"/${P}-no-man-tests.patch
+
+	ghc-supports-threaded-runtime ||
+		cabal_chdeps \
+			'-threaded' ' '
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		--flag=blaze_html_0_5
+}
+
+src_install() {
+	cabal_src_install
+
+	doman "${S}/man/man1/${PN}.1"
+
+	# COPYING is installed by the Cabal eclass
+	dodoc README COPYRIGHT changelog
+}