summaryrefslogtreecommitdiff
path: root/dev-haskell
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/citeproc/Manifest1
-rw-r--r--dev-haskell/citeproc/citeproc-0.3.0.1.ebuild49
-rw-r--r--dev-haskell/citeproc/metadata.xml19
-rw-r--r--dev-haskell/commonmark-extensions/Manifest1
-rw-r--r--dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild32
-rw-r--r--dev-haskell/commonmark-extensions/metadata.xml9
-rw-r--r--dev-haskell/commonmark-pandoc/Manifest1
-rw-r--r--dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild28
-rw-r--r--dev-haskell/commonmark-pandoc/metadata.xml9
-rw-r--r--dev-haskell/commonmark/Manifest1
-rw-r--r--dev-haskell/commonmark/commonmark-0.1.1.2.ebuild30
-rw-r--r--dev-haskell/commonmark/metadata.xml9
-rw-r--r--dev-haskell/doctemplates/Manifest1
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.9.ebuild40
-rw-r--r--dev-haskell/hakyll/Manifest1
-rw-r--r--dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch209
-rw-r--r--dev-haskell/hakyll/hakyll-4.13.4.1.ebuild87
-rw-r--r--dev-haskell/hslua/Manifest1
-rw-r--r--dev-haskell/hslua/hslua-1.1.2.ebuild49
-rw-r--r--dev-haskell/hslua/metadata.xml10
-rw-r--r--dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild18
-rw-r--r--dev-haskell/icalendar/metadata.xml6
-rw-r--r--dev-haskell/jira-wiki-markup/Manifest1
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild29
-rw-r--r--dev-haskell/pandoc-citeproc/Manifest2
-rw-r--r--dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild (renamed from dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild)6
-rw-r--r--dev-haskell/pandoc-types/Manifest1
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.22.ebuild34
-rw-r--r--dev-haskell/rfc5051/Manifest1
-rw-r--r--dev-haskell/rfc5051/rfc5051-0.2.ebuild25
-rw-r--r--dev-haskell/skylighting-core/Manifest1
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild52
-rw-r--r--dev-haskell/skylighting/Manifest1
-rw-r--r--dev-haskell/skylighting/skylighting-0.10.2.ebuild36
-rw-r--r--dev-haskell/timeit/Manifest1
-rw-r--r--dev-haskell/timeit/metadata.xml9
-rw-r--r--dev-haskell/timeit/timeit-2.0.ebuild24
37 files changed, 807 insertions, 27 deletions
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
new file mode 100644
index 000000000000..497936f5b81d
--- /dev/null
+++ b/dev-haskell/citeproc/Manifest
@@ -0,0 +1 @@
+DIST citeproc-0.3.0.1.tar.gz 567617 BLAKE2B 8b6df78401f392d3bc3045fe183b25850328bc9a5b0c0ce9334f6cf14e4451e4a526bd23266846d8a625011b1cf5b1b52fee0a5f7c83ea405769704203da5ce6 SHA512 113f3b5dae2bfce13a4b39ef87ea21f763a897182c7a10eae5e7aabbddbb12b773be6583f51578a92bf078e40b0718a69b908049f700f317bbfb509253dae27b
diff --git a/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild b/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
new file mode 100644
index 000000000000..ee9b06f64280
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable icu"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ >=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/uniplate:=[profile?]
+ dev-haskell/vector:=[profile?]
+ dev-haskell/xml-conduit:=[profile?]
+ >=dev-lang/ghc-8.6.5:=
+ executable? ( dev-haskell/aeson-pretty:=[profile?] )
+ icu? ( dev-haskell/text-icu:=[profile?] )
+ !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/diff-0.4
+ dev-haskell/mtl
+ dev-haskell/timeit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ $(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/metadata.xml b/dev-haskell/citeproc/metadata.xml
new file mode 100644
index 000000000000..4785516d4389
--- /dev/null
+++ b/dev-haskell/citeproc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="executable">Build citeproc executable</flag>
+ <flag name="icu">Use Haskell bindings to the ICU library</flag>
+ </use>
+ <longdescription>
+ citeproc parses CSL style files and uses them to
+ generate a list of formatted citations and bibliography
+ entries. For more information about CSL, see
+ &lt;https://citationstyles.org/&gt;.
+ </longdescription>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
new file mode 100644
index 000000000000..c98f1254596e
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -0,0 +1 @@
+DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
new file mode 100644
index 000000000000..4af1c67261ac
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+ >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark-extensions/metadata.xml b/dev-haskell/commonmark-extensions/metadata.xml
new file mode 100644
index 000000000000..bd664ac1426b
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
new file mode 100644
index 000000000000..c075f06dc9bd
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -0,0 +1 @@
+DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
new file mode 100644
index 000000000000..3fc16f6d2a8f
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+ >=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+ >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/commonmark-pandoc/metadata.xml b/dev-haskell/commonmark-pandoc/metadata.xml
new file mode 100644
index 000000000000..bd664ac1426b
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
new file mode 100644
index 000000000000..8f36044de453
--- /dev/null
+++ b/dev-haskell/commonmark/Manifest
@@ -0,0 +1 @@
+DIST commonmark-0.1.1.2.tar.gz 98983 BLAKE2B 8ec8e46c39d54af276d12388938d6ef7dd02a40fa0a5aba58f5c3026ce5be970ebf37cf351524e30cd80f80f49df1f03175941c97c658744c212379bd6e5051e SHA512 746539c055ef84b4458e910bf260222498c7081f62f421ca63aa2652a1297c3ad6b518cc27a3783868b8db3df39fe454e78f6ebf51439e73495ab4699c5c8427
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild
new file mode 100644
index 000000000000..66535724ad97
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark/metadata.xml b/dev-haskell/commonmark/metadata.xml
new file mode 100644
index 000000000000..bd664ac1426b
--- /dev/null
+++ b/dev-haskell/commonmark/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index d99063f1ef65..c479a2395b2a 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1 +1,2 @@
DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
+DIST doctemplates-0.9.tar.gz 27366 BLAKE2B e4c88e3abce07f6fa94e51e63124a7a6f1fa054a1f70595fe81b058a5fd6c87a25085cc5373eb6ee191fcdabd34650d30f9ce6251bfedaa2e16961ce3b74a816 SHA512 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
new file mode 100644
index 000000000000..88f81e5d48bc
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
+ >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/text-conversions:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( dev-haskell/glob
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/temporary )
+"
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
index a6b73ffc3dc6..941255071a39 100644
--- a/dev-haskell/hakyll/Manifest
+++ b/dev-haskell/hakyll/Manifest
@@ -1 +1,2 @@
DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
+DIST hakyll-4.13.4.1.tar.gz 105251 BLAKE2B 6a2c83f2784aad1c80ecce7d01ade1d1bde0546c3f828acc74c88df95b4217f191eb516bf57cc1993bdaebd76629d86d3963bf386f7df68ca5dc17288f3f2b3f SHA512 6045a1461855d46f57a20f7a84636f90e6d151bcbaf09511f10ab66fa0567062e355ff580d1f12a4432bbe517bc9e162d65927f3c343f8f077e81981e7c7973c
diff --git a/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch b/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
new file mode 100644
index 000000000000..1598c89c8995
--- /dev/null
+++ b/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
@@ -0,0 +1,209 @@
+From 77afcbc2937a4ee5db9666c1f3e0c090914d3980 Mon Sep 17 00:00:00 2001
+From: Jasper Van der Jeugt <m@jaspervdj.be>
+Date: Sun, 6 Dec 2020 19:24:06 +0100
+Subject: [PATCH] Pandoc 2.11 compatibility (#826)
+
+* Pandoc 2.11 compatibility
+
+* Bump stack.yaml
+
+* Bump stack dependencies
+---
+ lib/Hakyll/Web/Pandoc/Biblio.hs | 102 +++++++++++++++++---------------
+ lib/Hakyll/Web/Pandoc/Binary.hs | 12 ----
+ 5 files changed, 123 insertions(+), 86 deletions(-)
+diff --git a/lib/Hakyll/Web/Pandoc/Biblio.hs b/lib/Hakyll/Web/Pandoc/Biblio.hs
+index 5127d881..567f478b 100644
+--- a/lib/Hakyll/Web/Pandoc/Biblio.hs
++++ b/lib/Hakyll/Web/Pandoc/Biblio.hs
+@@ -12,6 +12,7 @@
+ {-# LANGUAGE Arrows #-}
+ {-# LANGUAGE DeriveDataTypeable #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE OverloadedStrings #-}
+ module Hakyll.Web.Pandoc.Biblio
+ ( CSL
+ , cslCompiler
+@@ -23,33 +24,31 @@ module Hakyll.Web.Pandoc.Biblio
+
+
+ --------------------------------------------------------------------------------
+-import Control.Monad (liftM, replicateM)
+-import Data.Binary (Binary (..))
+-import Data.Typeable (Typeable)
++import Control.Monad (liftM)
++import Data.Binary (Binary (..))
++import qualified Data.ByteString as B
++import qualified Data.ByteString.Lazy as BL
++import qualified Data.Map as Map
++import qualified Data.Time as Time
++import Data.Typeable (Typeable)
+ import Hakyll.Core.Compiler
+ import Hakyll.Core.Compiler.Internal
+ import Hakyll.Core.Identifier
+ import Hakyll.Core.Item
+-import Hakyll.Core.Provider
+ import Hakyll.Core.Writable
+ import Hakyll.Web.Pandoc
+-import Hakyll.Web.Pandoc.Binary ()
+-import qualified Text.CSL as CSL
+-import Text.CSL.Pandoc (processCites)
+-import Text.Pandoc (Pandoc, ReaderOptions (..),
+- enableExtension, Extension (..))
++import Text.Pandoc (Extension (..), Pandoc,
++ ReaderOptions (..),
++ enableExtension)
++import qualified Text.Pandoc as Pandoc
++import qualified Text.Pandoc.Citeproc as Pandoc (processCitations)
+
+
+ --------------------------------------------------------------------------------
+-data CSL = CSL
+- deriving (Show, Typeable)
++newtype CSL = CSL {unCSL :: B.ByteString}
++ deriving (Binary, Show, Typeable)
+
+
+---------------------------------------------------------------------------------
+-instance Binary CSL where
+- put CSL = return ()
+- get = return CSL
+-
+
+ --------------------------------------------------------------------------------
+ instance Writable CSL where
+@@ -59,21 +58,12 @@ instance Writable CSL where
+
+ --------------------------------------------------------------------------------
+ cslCompiler :: Compiler (Item CSL)
+-cslCompiler = makeItem CSL
+-
+-
+---------------------------------------------------------------------------------
+-newtype Biblio = Biblio [CSL.Reference]
+- deriving (Show, Typeable)
++cslCompiler = fmap (CSL . BL.toStrict) <$> getResourceLBS
+
+
+ --------------------------------------------------------------------------------
+-instance Binary Biblio where
+- -- Ugly.
+- get = do
+- len <- get
+- Biblio <$> replicateM len get
+- put (Biblio rs) = put (length rs) >> mapM_ put rs
++newtype Biblio = Biblio {unBiblio :: B.ByteString}
++ deriving (Binary, Show, Typeable)
+
+
+ --------------------------------------------------------------------------------
+@@ -84,12 +74,7 @@ instance Writable Biblio where
+
+ --------------------------------------------------------------------------------
+ biblioCompiler :: Compiler (Item Biblio)
+-biblioCompiler = do
+- filePath <- getResourceFilePath
+- makeItem =<< unsafeCompiler (Biblio <$> CSL.readBiblioFile idpred filePath)
+- where
+- -- This is a filter on citations. We include all citations.
+- idpred = const True
++biblioCompiler = fmap (Biblio . BL.toStrict) <$> getResourceLBS
+
+
+ --------------------------------------------------------------------------------
+@@ -99,19 +84,42 @@ readPandocBiblio :: ReaderOptions
+ -> (Item String)
+ -> Compiler (Item Pandoc)
+ readPandocBiblio ropt csl biblio item = do
+- -- Parse CSL file, if given
+- provider <- compilerProvider <$> compilerAsk
+- style <- unsafeCompiler $
+- CSL.readCSLFile Nothing . (resourceFilePath provider) . itemIdentifier $ csl
+-
+- -- We need to know the citation keys, add then *before* actually parsing the
+- -- actual page. If we don't do this, pandoc won't even consider them
+- -- citations!
+- let Biblio refs = itemBody biblio
+- pandoc <- itemBody <$> readPandocWith ropt item
+- let pandoc' = processCites style refs pandoc
+-
+- return $ fmap (const pandoc') item
++ -- It's not straightforward to use the Pandoc API as of 2.11 to deal with
++ -- citations, since it doesn't export many things in 'Text.Pandoc.Citeproc'.
++ -- The 'citeproc' package is also hard to use.
++ --
++ -- So instead, we try treating Pandoc as a black box. Pandoc can read
++ -- specific csl and bilbio files based on metadata keys.
++ --
++ -- So we load the CSL and Biblio files and pass them to Pandoc using the
++ -- ersatz filesystem.
++ Pandoc.Pandoc (Pandoc.Meta meta) blocks <- itemBody <$>
++ readPandocWith ropt item
++
++ let cslFile = Pandoc.FileInfo zeroTime . unCSL $ itemBody csl
++ bibFile = Pandoc.FileInfo zeroTime . unBiblio $ itemBody biblio
++ addBiblioFiles = \st -> st
++ { Pandoc.stFiles =
++ Pandoc.insertInFileTree "_hakyll/style.csl" cslFile .
++ Pandoc.insertInFileTree "_hakyll/refs.bib" bibFile $
++ Pandoc.stFiles st
++ }
++ biblioMeta = Pandoc.Meta .
++ Map.insert "csl" (Pandoc.MetaString "_hakyll/style.csl") .
++ Map.insert "bibliography" (Pandoc.MetaString "_hakyll/refs.bib") $
++ meta
++ errOrPandoc = Pandoc.runPure $ do
++ Pandoc.modifyPureState addBiblioFiles
++ Pandoc.processCitations $ Pandoc.Pandoc biblioMeta blocks
++
++ pandoc <- case errOrPandoc of
++ Left e -> compilerThrow ["Error during processCitations: " ++ show e]
++ Right x -> return x
++
++ return $ fmap (const pandoc) item
++
++ where
++ zeroTime = Time.UTCTime (toEnum 0) 0
+
+ --------------------------------------------------------------------------------
+ pandocBiblioCompiler :: String -> String -> Compiler (Item String)
+diff --git a/lib/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs
+index 5d3efead..3f7f4fb5 100644
+--- a/lib/Hakyll/Web/Pandoc/Binary.hs
++++ b/lib/Hakyll/Web/Pandoc/Binary.hs
+@@ -4,9 +4,6 @@ module Hakyll.Web.Pandoc.Binary where
+
+ import Data.Binary (Binary (..))
+
+-import qualified Text.CSL as CSL
+-import qualified Text.CSL.Reference as REF
+-import qualified Text.CSL.Style as STY
+ import Text.Pandoc
+
+ --------------------------------------------------------------------------------
+@@ -18,7 +15,6 @@ instance Binary Caption
+ instance Binary Cell
+ instance Binary ColSpan
+ instance Binary ColWidth
+-instance Binary CSL.Reference
+ instance Binary Citation
+ instance Binary CitationMode
+ instance Binary Format
+@@ -27,17 +23,9 @@ instance Binary ListNumberDelim
+ instance Binary ListNumberStyle
+ instance Binary MathType
+ instance Binary QuoteType
+-instance Binary REF.CLabel
+-instance Binary REF.CNum
+-instance Binary REF.Literal
+-instance Binary REF.RefDate
+-instance Binary REF.RefType
+-instance Binary REF.Season
+ instance Binary Row
+ instance Binary RowHeadColumns
+ instance Binary RowSpan
+-instance Binary STY.Agent
+-instance Binary STY.Formatted
+ instance Binary TableBody
+ instance Binary TableFoot
+ instance Binary TableHead
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild b/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild
new file mode 100644
index 000000000000..87f239ca1460
--- /dev/null
+++ b/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A static website compiler library"
+HOMEPAGE="https://jaspervdj.be/hakyll"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+ >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.14:=[profile?]
+ >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
+ >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
+ >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
+ >=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+ >=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+ buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
+ checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
+ previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
+ >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+ >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
+ !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
+ watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
+ usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-pandoc-2.11.patch )
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'pandoc >= 2.10 && < 2.11,' 'pandoc >= 2.11' \
+ 'pandoc >= 2.10 && < 2.11' 'pandoc >= 2.11' \
+ 'pandoc-citeproc >= 0.14 && < 0.18' ' ' \
+ 'file-embed >= 0.0.10.1 && < 0.0.12' 'file-embed >= 0.0.10.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag buildwebsite buildwebsite) \
+ $(cabal_flag checkexternal checkexternal) \
+ $(cabal_flag previewserver previewserver) \
+ $(cabal_flag usepandoc usepandoc) \
+ $(cabal_flag watchserver watchserver)
+}
+
+src_test() {
+ # unixFilter test expects 'option' output in error message
+ # But it's a localized string that:
+ # https://github.com/jaspervdj/hakyll/issues/607
+ LANGUAGE=en haskell-cabal_src_test
+}
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index d37196f3d47d..8b539a46607c 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1 +1,2 @@
DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
+DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
diff --git a/dev-haskell/hslua/hslua-1.1.2.ebuild b/dev-haskell/hslua/hslua-1.1.2.ebuild
new file mode 100644
index 000000000000..829469faf3e7
--- /dev/null
+++ b/dev-haskell/hslua/hslua-1.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Lua language interpreter embedding in Haskell"
+HOMEPAGE="https://hslua.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="hardcode-reg-keys"
+
+RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+ >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
+ >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
+ --flag=-lua501 \
+ --flag=-lua502 \
+ --flag=-lua_32bits \
+ --flag=-pkg-config \
+ --flag=-system-lua
+}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index a37b3680d462..d37321e2d414 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The Scripting.Lua module is a wrapper of Lua language interpreter
- as described in www.lua.org.
-
- The package is standalone: full Lua interpreter version 5.1.4
- is distributed in this package as well.
- </longdescription>
+ <use>
+ <flag name="hardcode-reg-keys">Don't use CAPI to determine the names of certain registry key names but Use hard coded values for instead. This flag is required when compiling against Lua 5.3.3 or earlier, as those do not expose the necessary information in the @lauxlib.h@ header file.</flag>
+ </use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
index 0a3044a8a291..16848e1417b2 100644
--- a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
+++ b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +network-uri
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -18,24 +19,21 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
>=dev-haskell/case-insensitive-0.4:=[profile?]
>=dev-haskell/data-default-0.3:=[profile?]
>=dev-haskell/mime-0.4.0.2:=[profile?]
>=dev-haskell/mtl-2.1.0:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
dev-haskell/old-locale:=[profile?]
>=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
+ >=dev-haskell/cabal-2.2.0.1
"
S="${WORKDIR}/${MY_P}"
@@ -50,5 +48,5 @@ src_prepare() {
src_configure() {
haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
+ --flag=network-uri
}
diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
index 2303a6c19e00..bd664ac1426b 100644
--- a/dev-haskell/icalendar/metadata.xml
+++ b/dev-haskell/icalendar/metadata.xml
@@ -5,11 +5,5 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="network-uri">use network-uri package</flag>
- </use>
- <upstream>
- <remote-id type="github">chrra/iCalendar</remote-id>
- </upstream>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index a3acd6b786c4..4c9ad0a1e5bf 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1 +1,2 @@
DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
+DIST jira-wiki-markup-1.3.2.tar.gz 23081 BLAKE2B 09a426ebbfc480d64eb1c7012622b358ae7a9e3d6491eb0fa1cba24d8385d7b94455150399e14a5c02783876ebb3ea57b74da76afc95b96c06e3734c4a7c19c7 SHA512 14d68dcbdcfa9e0a7959df3a38cfe475047ad42aab9c6c3e1caee4d2491e7efb9a58e99e3b9c601726a235c592d2763016f709d5a23c6d80e1e6d2115fdce269
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild
new file mode 100644
index 000000000000..7857af088d8c
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
index 004ecd9ac933..66930925f619 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -1 +1 @@
-DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96
+DIST pandoc-citeproc-0.17.0.2.tar.gz 344577 BLAKE2B f2b4687fe5de8cb8b76d1d8022ec9629c7834a3f3d3bc2735c52ec40ea0132caa8d7b9ad3c603d6120800e2c1f75e76cb13a3c45a4cbdd0e4bbba6d6fd54ed24 SHA512 5ce079a542b096c06d6e4e205625a993422a972f04787495ac9013dd3131df62733f30e4c3004335e3738b02bb22a7ad50a31c1eb3f67d2b4ef51605c7fcbf16
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
index 7c28423ccd3e..b5c9b3c6e24d 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+bibutils debug embed-data-files static unicode-collation"
-RESTRICT=test # fails
+RESTRICT=test # tests fail when system already has pandoc-citeproc installed
RDEPEND=">=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?]
>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
@@ -50,7 +50,7 @@ RDEPEND=">=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?]
debug? ( dev-haskell/pretty-show:=[profile?] )
embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
unicode-collation? ( dev-haskell/text-icu:=[profile?] )
- !unicode-collation? ( dev-haskell/rfc5051:=[profile?] )
+ !unicode-collation? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.12
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index 182e4db1144a..dbe4fc293c3b 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1 +1,2 @@
DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
+DIST pandoc-types-1.22.tar.gz 34702 BLAKE2B 17c4a33c1d9c5afed2eae2dfc805273c949bfea583c705c469560c0cb58d8b0d31a29afd698062493e8452d9d63c717ef3c26f75afe640dec98b924f083a3e93 SHA512 b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild
new file mode 100644
index 000000000000..79aa10c82703
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
+ >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+ >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+ >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/string-qq-0.0.2 <dev-haskell/string-qq-0.1
+ >=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 )
+"
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
index d646a973f939..b84670fd8e11 100644
--- a/dev-haskell/rfc5051/Manifest
+++ b/dev-haskell/rfc5051/Manifest
@@ -1 +1,2 @@
DIST rfc5051-0.1.0.4.tar.gz 218105 BLAKE2B 456ab3fe7d1cffebaeaef0aea1b0867ef69729076af9317cdf8f0f802800552a5a1e6ce27e6684eee94457acc925ad9d7c750864b6098b687af576b5aa74d772 SHA512 5a8a3f3ccb846986242152c8c30a0069466072f2b3fb449565b7fb95615c7909be04a320b9215d313d8b8e442a01959ffead0d5076bc61ee7f33f5ff1d9dd67b
+DIST rfc5051-0.2.tar.gz 285338 BLAKE2B a54f411a00c8f961f9691e2a75e85530f314518f31477f0c43cde23b75b4de3d3cfff0ce41794901e7803ffffcaaf4ec410e4f9eafd512e08667c3919b60390e SHA512 93222535d9c94ac947d9760c8d856ec150b17b93342999f6594a048905c791b08220e656f26c95702bec3c1e835b537635395d1dae6f3607fd8a8a767b24a23f
diff --git a/dev-haskell/rfc5051/rfc5051-0.2.ebuild b/dev-haskell/rfc5051/rfc5051-0.2.ebuild
new file mode 100644
index 000000000000..00f73561cfbf
--- /dev/null
+++ b/dev-haskell/rfc5051/rfc5051-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple unicode collation as per RFC5051"
+HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0
+"
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index b0366c25c958..ebd831534665 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1 +1,2 @@
+DIST skylighting-core-0.10.2.tar.gz 695555 BLAKE2B b4ef476780b9cf613e8bc7150abc57f4bcc282321a31ff549bb4ffb518c2519aaddeb4c94ca974f79d6fe803729b444da4f6c01784dab1cf63b7a596f2676818 SHA512 c3d20694b29dee660cbba681dec4b7610b1b5be8e5b359931935b0e2a466f41a494847231557c6c5906d5b31487360516af0e00c46689cbc03c9de58e3430698
DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild
new file mode 100644
index 000000000000..3e890f211b07
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ >=dev-haskell/ansi-terminal-0.7:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/colour-2.0:=[profile?]
+ dev-haskell/hxt:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0.0.2
+ test? ( dev-haskell/diff
+ dev-haskell/hunit
+ dev-haskell/pretty-show
+ dev-haskell/quickcheck
+ dev-haskell/random
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index 89608250e239..99667335661e 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1 +1,2 @@
+DIST skylighting-0.10.2.tar.gz 633776 BLAKE2B 9f8899a7ad65e812009299f385033250d0ddc467d9f2574709a896bda45a27abf9d1ef275dd4b33ad351055b6f4476881f60a7f14cd21cd15da2b15cb10e17a4 SHA512 04d411580caf6102e3f8732c53b103412c6d42becfadbbcdd13053557235b632f07d82b22acad87ffc37f5705a387367aa21a0b70b1c5cf2ef52acce1b3e4e86
DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
diff --git a/dev-haskell/skylighting/skylighting-0.10.2.ebuild b/dev-haskell/skylighting/skylighting-0.10.2.ebuild
new file mode 100644
index 000000000000..69413875bb52
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.10.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.10.2:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+ executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/pretty-show:=[profile?]
+ dev-haskell/text:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bootstrap \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/timeit/Manifest b/dev-haskell/timeit/Manifest
new file mode 100644
index 000000000000..6be26af01903
--- /dev/null
+++ b/dev-haskell/timeit/Manifest
@@ -0,0 +1 @@
+DIST timeit-2.0.tar.gz 2117 BLAKE2B 3cb601e87cd77af879572aca0fc495ce6e446d4c402c3e1010b114a18326254f94fc212985df722a47b0a6870d1789424b65620ebc471c177e22b18c6aa7c577 SHA512 3cbe554ddb17fbeb5f8be1f6459144921f8be4db0fa9571678980251ca397fca0700df61d0e5bd8466b0b2cdcedac8473ac53debbd9b4e9c239ebb37bec2845b
diff --git a/dev-haskell/timeit/metadata.xml b/dev-haskell/timeit/metadata.xml
new file mode 100644
index 000000000000..bd664ac1426b
--- /dev/null
+++ b/dev-haskell/timeit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/timeit/timeit-2.0.ebuild b/dev-haskell/timeit/timeit-2.0.ebuild
new file mode 100644
index 000000000000..fba159e684ae
--- /dev/null
+++ b/dev-haskell/timeit/timeit-2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Time a computation"
+HOMEPAGE="https://github.com/merijn/timeit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"