Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-text/pandoc
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/pandoc')
-rw-r--r--app-text/pandoc/ChangeLog10
-rw-r--r--app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch24
-rw-r--r--app-text/pandoc/metadata.xml2
-rw-r--r--app-text/pandoc/pandoc-1.11.1.ebuild99
4 files changed, 132 insertions, 3 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/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
+}