Bump citeproc-hs to 0.3.10, patch for ghc 7.10.1

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

diff --git a/dev-haskell/citeproc-hs/ChangeLog b/dev-haskell/citeproc-hs/ChangeLog
index a7d715c7c5d7ae36a2084eab0da8931ea99c6033..bd6b696d7d6fa2cb96552bb7256fd4ff1f2da9db 100644 (file)
--- a/dev-haskell/citeproc-hs/ChangeLog
+++ b/dev-haskell/citeproc-hs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/citeproc-hs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/ChangeLog,v 1.13 2014/07/25 08:58:35 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/ChangeLog,v 1.14 2015/04/04 00:41:09 gienah Exp $
+
+*citeproc-hs-0.3.10 (04 Apr 2015)
+
+  04 Apr 2015; Mark Wright <gienah@gentoo.org> +citeproc-hs-0.3.10.ebuild,
+  +files/citeproc-hs-0.3.10-ghc-7.10.patch:
+  Bump citeproc-hs to 0.3.10, patch for ghc 7.10.1
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
   Drop redundant '<maintainer>' field, leave only '<herd>'.

diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest
index 97074d009509b5998586831da589a1dd46f6408c..f72217f6799c956b7251784a78a60682f7080bb3 100644 (file)
--- a/dev-haskell/citeproc-hs/Manifest
+++ b/dev-haskell/citeproc-hs/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX citeproc-hs-0.3.10-ghc-7.10.patch 1106 SHA256 c20ec1f204e6e523d0bbcd449a768334dc20ed7af523c47a5027bab69b5de7fa SHA512 99743acfe916238dfbd7ed3e7bd680787e48eee38300243be284a8d20632957f9c52dd3b3574a96423a7f9f921eb2531a1495fc7975ef83d7a65748393013a97 WHIRLPOOL 4d71d209490575ea18e781d1adeac34ca9ca9e2e5f7a2327a01d8aba0118859c1ac90d19916f34f33ec34ecc253ebfbd04eb893eb74df8d575389b90ac80be64
+DIST citeproc-hs-0.3.10.tar.gz 115588 SHA256 1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9 SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f WHIRLPOOL 9b4d7d23aa43a06c43ff7600f92a03b93f7f0b44fcaaa6f846789633f993db44893c795014b2a13961839a341f8e6f9fd0ff8a72c670beb11c97443ea43222cf
 DIST citeproc-hs-0.3.9.tar.gz 114621 SHA256 4f6b7db9b731789f25e4faebce8ec2ea4a19a920aaad6951a5e8b23cd4187438 SHA512 54e84f458985a5605d3473a66af30351aa100ba3630c25976d4a17ffb980e364d514acbca168bc93b785cd7519b82dd228bbdddf1c5e0e4ad4f03e74b0ec254f WHIRLPOOL 1ed3bb9c07c469f225470498d3ebb1a8ae9650b0b36da6be949959d5c263ed08594fe012ab58ce8136a580fe9a4ec839b8f4554059129ae6e05301099f9da26f
+EBUILD citeproc-hs-0.3.10.ebuild 1790 SHA256 bb6a640e2e47e8d07cce6612bfd73f3fb779066c47dd45bef4339d5c4739efc4 SHA512 a685415c1ec16555e2bd89dd7c450a8f9d07f2ed5e9a3117f28cbb8a6f1bab6bba74d84eacde785908dd2e9c2ae8ec1572d4880a059896b9f631fddbd90c46d2 WHIRLPOOL 2c2eb8aad84b751fb8eab7248852b7a2ea88ffc64417235e783b327d35b0dd7b98be71e1243dd01560b4f9c093b71876d0ca5d7045afd7d125efbb4765e57e53
 EBUILD citeproc-hs-0.3.9.ebuild 1700 SHA256 d95d47dffc8cfb2d3087554a789e503cb77b78e38ac83047b5c1580a9c676308 SHA512 d8afe346485850fd2f34dacf1659ae254d87ca2ae672ea40ba9532ccd61f7476b06cc4849afd86544a84d4680fe469dcc9bac3a54b16c95b8a3199e9242ed687 WHIRLPOOL afcb71d2779bfa47068e3624987a37fd2b572e21e687ccea3f9c47893fad9186b652f782557d790a185ba89d9335abc3d996fba209e17480961a3fd0892ffe38
-MISC ChangeLog 2515 SHA256 61834b1eb3f9ff1bba256a13058c68e1e0b15dbc7bd1a0be4fa8e3aff35266d1 SHA512 fccd4c1488425e9c338e0742634d1ac67f88993c165ef55b67417ad4ca6e493a6f803132e2c57ad686eb325a1895390c217be7f6b365ec8e3d86c07677a43319 WHIRLPOOL 25cf89c6503eb400a3c5cbd492d8e50872c03d47616ad8f07ee261462655c14cca30471d815edd5bfcaff44cb1e41b5d60b00aaf6c0e8c22c6233b4b24446c77
+MISC ChangeLog 2721 SHA256 c6a0c003c622fa4a494474a2f9be1b69b94cabfd1fb202ca9952fff2f7adcde2 SHA512 a25d413a2a961f1930ca9ccd9a0623272837cea7d25e0ce50ccf922f33b515b7d133fc83863f3f0df4349003aa9ae8b61b4280e3e22f15a8628ee82ae4415a6e WHIRLPOOL efcd33cf99e78d637ce25235a58b82e98a3fe8ef90bf6e62fae3c6030952224ee3490f57de655a1f75facea2d66346b21918cbafb5d0f46ecee6e163149574ce
 MISC metadata.xml 1127 SHA256 ad1c7c3796da422b2270b7f6a4bb86b03c8bde764da5a10175b240f4dca1a5c4 SHA512 bf9f16ff103ac0e0544b3fe73d30ef2b0b0e90cd910c118d36908680ac00794200c2b10e74952d977fbe28b458c641130259d50130a1516562e00bf070ce5411 WHIRLPOOL d5ed6eb65795d46cde52ab5990fee0563727f710239c39e4ebd951b4e2ccdfe99cf20fed3044cf7422e149b41c5faef31b05fdd259d51da0a78ce23d0f41183a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPSHIUACgkQcaHudmEf86oJ3ACfQc/Gj+MobCTZ2+j78bo7tzKy
-w7gAn1X7YV2vbavJ1T3cA/aJkm00TCRt
-=SaNO
+iF4EAREIAAYFAlUfMysACgkQoBEVQmGOlx+uMwD/XlKH8RR/dSsTWvQzHFmvzZKD
+TsENUJ/tbRKOHGwoGhAA/1bBTRiXYlUgWCqlyI/TgngDnRMT5FMYyKcQqza4SpxT
+=34tR
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild
new file mode 100644 (file)
index 0000000..e933a08
--- /dev/null
+++ b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild,v 1.1 2015/04/04 00:41:09 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="A Citation Style Language implementation in Haskell"
+HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
+
+RDEPEND="dev-haskell/json:=[profile?]
+       dev-haskell/mtl:=[profile?]
+       >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+       dev-haskell/parsec:=[profile?]
+       dev-haskell/syb:=[profile?]
+       dev-haskell/utf8-string:=[profile?]
+       >=dev-lang/ghc-7.4.1:=
+       bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
+       embed_data_files? ( dev-haskell/file-embed:=[profile?] )
+       hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
+       !hexpat? ( dev-haskell/xml:=[profile?] )
+       network? ( >=dev-haskell/http-4000.0.9:=[profile?]
+                       >=dev-haskell/network-2.6:=[profile?]
+                       >=dev-haskell/network-uri-2.6:=[profile?] )
+       unicode_collation? ( dev-haskell/text:=[profile?]
+                               dev-haskell/text-icu:=[profile?] )
+"
+DEPEND="${RDEPEND}
+       >=dev-haskell/cabal-1.6
+"
+
+PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
+
+src_configure() {
+       haskell-cabal_src_configure \
+               $(cabal_flag bibutils bibutils) \
+               $(cabal_flag embed_data_files embed_data_files) \
+               $(cabal_flag hexpat hexpat) \
+               $(cabal_flag network network) \
+               $(cabal_flag small_base small_base) \
+               $(cabal_flag unicode_collation unicode_collation)
+}

diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
new file mode 100644 (file)
index 0000000..0ea6ce4
--- /dev/null
+++ b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
@@ -0,0 +1,28 @@
+--- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs       2015-03-17 21:32:38.000000000 +1100
++++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs    2015-04-04 11:18:45.018893632 +1100
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE FlexibleContexts #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Text.CSL.Eval
+--- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs 2015-03-17 21:32:38.000000000 +1100
++++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs      2015-04-04 11:18:28.823909497 +1100
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE FlexibleContexts #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Text.CSL.Eval.Names
+--- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs       2015-03-17 21:32:38.000000000 +1100
++++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs    2015-04-04 11:21:42.164719120 +1100
+@@ -29,7 +29,9 @@
+ import Data.Maybe (isJust)
+ import Data.Time
+ import System.Directory
++#if !MIN_VERSION_time(1,5,0)
+ import System.Locale
++#endif
+ 
+ import Text.ParserCombinators.Parsec
+