Bump pandoc to 1.9.3

Package-Manager: portage-2.1.10.64/cvs/Linux x86_64

4 files changed, 171 insertions, 5 deletions

diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog
index 59fab68e1c17..1203d411d25b 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.5 2012/04/07 05:24:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.6 2012/06/02 09:49:45 gienah Exp $
+
+*pandoc-1.9.3 (02 Jun 2012)
+
+  02 Jun 2012; Mark Wright <gienah@gentoo.org>
+  +files/pandoc-1.9.3-ghc-7.5.patch, +pandoc-1.9.3.ebuild:
+  Bump pandoc to 1.9.3
 
 *pandoc-1.9.2 (07 Apr 2012)
 
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 1e4b7a3d01ab..c901e1818086 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 AUX pandoc-1.9.1.2-haddock-2.10.0.patch 873 RMD160 e7d11455337e81c032d9bc6ea118c80643db449e SHA1 c5e7e9194bc9664f39a63b8f70d6939cd81062c5 SHA256 0e2c59034a9ed3c5b92ce207129b860bfb90efaada5f35cc80fec49576d0a296
+AUX pandoc-1.9.3-ghc-7.5.patch 3048 RMD160 3dbe7ddc129a806d7bf4103252b4ebcc0546ff14 SHA1 80f8c01c3938a15b2a61ba904808e0ac7afc72e1 SHA256 f5ce30f706ff730534b7e90b6687e0a2eb328cf61b872c0996b0a343a9265540
 DIST pandoc-1.8.1.1.tar.gz 459135 RMD160 6909fc5358abf628a7ef2eefca673ab76db4bd91 SHA1 c5974ce9594df55a60f482c518cd5af34ec7afe2 SHA256 526355ddcbff69c0df7757d30d37e08864995b7ebd899916e329ecd19104c83c
 DIST pandoc-1.9.1.2.tar.gz 529866 RMD160 f3a5228a3f8349cbfff1e0dc74b9f1a1d05fc32f SHA1 c5d8c8eaed7658005c1c4fdef70d3db140891660 SHA256 52659ff6981cab33fadeb97732dfc9719c3acf1d5ebcd0014e9e98395c654d6a
 DIST pandoc-1.9.2.tar.gz 542758 RMD160 cfc05e82d066ce3180e5a2efb3d71304d0b43d08 SHA1 6bfd3ee4844e4246ab97ae00623db9ad2afe64e5 SHA256 584b7444a7875c115d293eaa552c3940938cf871509a60cbbbe451ee5a0be5c2
+DIST pandoc-1.9.3.tar.gz 560502 RMD160 3e81b5b46eb29b404938803ca91b6fe42460c890 SHA1 c8397b25386358f7c393bfa39ca621bd98580747 SHA256 40929596f7a57de4cbd58e30beca2faaf237e4eee1db3f6265b94a1a52ff1f36
 EBUILD pandoc-1.8.1.1-r1.ebuild 1606 RMD160 e917b95d9e57cc04a56403f7eb5b3ffe642602d9 SHA1 042395904dadbd2130af00cdda1ebc88fd1a1176 SHA256 482279d0472ed356828d9db5eb438ff432267dcdb674b9b225efb7027a0eb4c4
 EBUILD pandoc-1.9.1.2.ebuild 2530 RMD160 2c0b64c2a5be269989276daeac8709230d627116 SHA1 3e344c60bf4de4b032f5dbe75cab5eb8237ba2ee SHA256 42b1a1d1590352485ea00426efbf33a6b207a15591c72a31d97185a2dd80cbdb
 EBUILD pandoc-1.9.2.ebuild 2540 RMD160 5a4704c8f37bfd018064eca6ba7fb80f083c4446 SHA1 ccf01f7a190b56e45c160c05d242bc0a272ef210 SHA256 e3c0222a4d595ff5e84dbad0a832f615247e5ecc89046da5e421f45c3efed057
-MISC ChangeLog 1068 RMD160 fbb60b60fc8d99d82568af1925bfc4b1e2965246 SHA1 b9329f414b9c8a16f5c1e26e37e92b650bbdc6b3 SHA256 83ef05840354ac30a3e05ef2293d286a6b21ff3a2c36b09daddc991f3d633c31
+EBUILD pandoc-1.9.3.ebuild 2595 RMD160 a2ec38634e9f480af9c4a75658c2b7ce09011377 SHA1 3104c3cac6e522a052ec3b519494d4120a851d26 SHA256 f1f299879266c87c3c487e504d9734d79119881f728e21875cfdadd902a15f37
+MISC ChangeLog 1227 RMD160 663589650a30fee843c6f454ad090f8ef277ac3c SHA1 8f18d1cc09b75abe1b5af84121d18954d253b0ea SHA256 a4f8b9e44c16a2e48572ff18b982d5b671ad1ee366a8aa40051a855f6365e5ef
 MISC metadata.xml 823 RMD160 ec6d5588b18f195cf4d6e10f259f5810c3d64281 SHA1 7448e8db7f71a138c2b4c378d4c4c807159b9bc3 SHA256 e16707b8d0d06a0ff099025bc880a48506c03cf32a39b5391d178265b0d411be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9/z6EACgkQoBEVQmGOlx+7sQD/d7sVGdKuCMW7p6L7Ku4e1nRD
-z8FixDl2Ljv8rAWn3UUBAKJhkYiZQA9GoJHokjA2u3PBpIMiLtrQ8hZmMWi5NJ0H
-=0eyF
+iF4EAREIAAYFAk/J4csACgkQoBEVQmGOlx/JZwEAj8nZC8P4rT7ldSnkwuQOnNFx
+tqaGjDxJt/FCYvJBiDYA/01ZLfB2XU32MyRFFNVKGA2BGY/mKhkrdmN/BFUtDeud
+=xdIk
 -----END PGP SIGNATURE-----
diff --git a/app-text/pandoc/files/pandoc-1.9.3-ghc-7.5.patch b/app-text/pandoc/files/pandoc-1.9.3-ghc-7.5.patch
new file mode 100644
index 000000000000..4a8b013b57a4
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.9.3-ghc-7.5.patch
@@ -0,0 +1,75 @@
+--- pandoc-1.9.3-orig/pandoc.cabal	2012-05-13 13:04:40.000000000 +1000
++++ pandoc-1.9.3/pandoc.cabal	2012-05-19 16:39:31.005923639 +1000
+@@ -193,7 +193,7 @@
+   -- Note: the following is duplicated in all stanzas.
+   -- It needs to be duplicated because of the library & executable flags.
+   -- BEGIN DUPLICATED SECTION
+-  Build-Depends: containers >= 0.1 && < 0.5,
++  Build-Depends: containers >= 0.1 && < 0.6,
+                  parsec >= 3.1 && < 3.2,
+                  mtl >= 1.1 && < 2.2,
+                  network >= 2 && < 2.4,
+@@ -298,7 +298,7 @@
+   -- Note: the following is duplicated in all stanzas.
+   -- It needs to be duplicated because of the library & executable flags.
+   -- BEGIN DUPLICATED SECTION
+-  Build-Depends: containers >= 0.1 && < 0.5,
++  Build-Depends: containers >= 0.1 && < 0.6,
+                  parsec >= 3.1 && < 3.2,
+                  mtl >= 1.1 && < 2.2,
+                  network >= 2 && < 2.4,
+@@ -362,7 +362,7 @@
+   -- Note: the following is duplicated in all stanzas.
+   -- It needs to be duplicated because of the library & executable flags.
+   -- BEGIN DUPLICATED SECTION
+-  Build-Depends: containers >= 0.1 && < 0.5,
++  Build-Depends: containers >= 0.1 && < 0.6,
+                  parsec >= 3.1 && < 3.2,
+                  mtl >= 1.1 && < 2.2,
+                  network >= 2 && < 2.4,
+--- pandoc-1.9.3-orig/Setup.hs	2012-05-13 13:04:40.000000000 +1000
++++ pandoc-1.9.3/Setup.hs	2012-05-19 17:03:57.948263601 +1000
+@@ -1,3 +1,5 @@
++{-# LANGUAGE CPP #-}
++
+ import Distribution.Simple
+ import Distribution.Simple.Setup
+          (copyDest, copyVerbosity, fromFlag, installVerbosity, BuildFlags(..))
+@@ -20,6 +22,10 @@
+ import Data.Maybe ( catMaybes )
+ import Data.List ( (\\) )
+ 
++#if (__GLASGOW_HASKELL__>=705)
++import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
++#endif
++
+ main :: IO ()
+ main = do
+   defaultMainWithHooks $ simpleUserHooks {
+@@ -89,14 +95,24 @@
+   installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+              (zip (repeat manDir) manpages)
+ 
++getModificationTime' :: FilePath -> IO ClockTime
++getModificationTime' file = 
++#if (__GLASGOW_HASKELL__>=705)
++    do utcTime <- getModificationTime file
++       let s = (toEnum . fromEnum . utcTimeToPOSIXSeconds) utcTime
++       return (TOD s 0)
++#else
++    getModificationTime file
++#endif
++
+ -- | Returns a list of 'dependencies' that have been modified after 'file'.
+ modifiedDependencies :: FilePath -> [FilePath] -> IO [FilePath]
+ modifiedDependencies file dependencies = do
+-  fileModTime <- catch (getModificationTime file) $
++  fileModTime <- catch (getModificationTime' file) $
+                  \e -> if isDoesNotExistError e
+                           then return (TOD 0 0)   -- the minimum ClockTime
+                           else ioError e
+-  depModTimes <- mapM getModificationTime dependencies
++  depModTimes <- mapM getModificationTime' dependencies
+   let modified = zipWith (\dep time -> if time > fileModTime then Just dep else Nothing) dependencies depModTimes
+   return $ catMaybes modified
+ 
diff --git a/app-text/pandoc/pandoc-1.9.3.ebuild b/app-text/pandoc/pandoc-1.9.3.ebuild
new file mode 100644
index 000000000000..d7db206265f7
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.9.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.9.3.ebuild,v 1.1 2012/06/02 09:49:45 gienah Exp $
+
+EAPI=4
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://johnmacfarlane.net/pandoc"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="=dev-haskell/base64-bytestring-0.1*[profile?]
+		=dev-haskell/blaze-html-0.5*[profile?]
+		>=dev-haskell/blaze-markup-0.5.1[profile?]
+		<dev-haskell/blaze-markup-0.6[profile?]
+		>=dev-haskell/citeproc-hs-0.3.4[profile?]
+		<dev-haskell/citeproc-hs-0.4[profile?]
+		>=dev-haskell/highlighting-kate-0.5.0.2[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.6[profile?]
+		>=dev-haskell/mtl-1.1[profile?]
+		<dev-haskell/mtl-2.2[profile?]
+		>=dev-haskell/network-2[profile?]
+		<dev-haskell/network-2.4[profile?]
+		>=dev-haskell/pandoc-types-1.9.0.2[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.4[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.0.2[profile?]
+		<dev-haskell/texmath-0.7[profile?]
+		>=dev-haskell/time-1.2[profile?]
+		<dev-haskell/time-1.5[profile?]
+		=dev-haskell/utf8-string-0.3*[profile?]
+		>=dev-haskell/xml-1.3.12[profile?]
+		<dev-haskell/xml-1.4[profile?]
+		>=dev-haskell/zip-archive-0.1.1.7[profile?]
+		<dev-haskell/zip-archive-0.2[profile?]
+		=dev-haskell/zlib-0.5*[profile?]
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.10
+		test? ( dev-haskell/ansi-terminal[profile?]
+			dev-haskell/diff[profile?]
+			dev-haskell/hunit[profile?]
+			dev-haskell/quickcheck:2[profile?]
+			dev-haskell/test-framework-hunit[profile?]
+			dev-haskell/test-framework-quickcheck2[profile?]
+			dev-haskell/test-framework[profile?]
+		)
+		"
+
+PATCHES=("${FILESDIR}/${PN}-1.9.3-ghc-7.5.patch")
+
+src_configure() {
+	cabal_src_configure \
+		$(cabal_flag test tests)
+}
+
+src_install() {
+	cabal_src_install
+
+	doman "${S}/man/man1/${PN}.1"
+
+	# COPYING is installed by the Cabal eclass
+	dodoc README COPYRIGHT changelog
+}