Sergei Trofimovich · Sergei Trofimovich · Sergei Trofimovich · Sergei Trofimovich · Sergei Trofimovich · Sergei Trofimovich
20 changed files
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
-DIST pandoc-2.10.1.tar.gz 12627447 BLAKE2B a9aa593501814ba2125c4e79fdfa5689621f9ed6ea0e09be96643cf8182e615cce9130423efbf50900dead1f7cdce33949d4f1d67515ce1c6a2da1564a0c8d2a SHA512 055d0d87c621ec428da7d2c589de9e1371ec6ebf613d943573d89c8bb98f2a0d67d4c156cf31f4257f0093c69f4006d06e11426ee04e7267f535c68381cfabf2
+DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
-DIST pandoc-2.7.3.tar.gz 11281840 BLAKE2B dc71ea3ab9759c66c25db236c45d12014885e14bb982154cefeeece4ddeee9e350deab7c9a3abab2f60cdabd0669c72a1fcbee27725895131678f216cd20166a SHA512 7db610ed1f5bad7ae91b9c89b210500c0e2f8660982cf424080ea8a603ca1891187bbf6e4a48144b48716fd0131d204e953175a82668be44c39898041bac9740
-DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -6,10 +6,8 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="derive-json-via-th">Use Template Haskell instead of GHC Generics to derive ToJSON and FromJSON instances.</flag>
 		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
 		<flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
-		<flag name="static">Use static linking for pandoc executable.</flag>
 		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
 	</use>
 	<longdescription>
@@ -21,14 +19,15 @@
 		TikiWiki markup, Jira markup, Creole 1.0, Haddock markup,
 		OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter
 		notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2,
-		roff man, Textile, and CSV, and it can write Markdown,
+		roff man, Textile, BibTeX, BibLaTeX, CSL JSON,
+		, and CSV, and it can write Markdown,
 		reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
 		JATS, OPML, TEI, OpenDocument, ODT, Word docx,
 		PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki,
 		ZimWiki, Textile, Jira, roff man, roff ms, plain text,
 		Emacs Org-Mode, AsciiDoc, Haddock markup,
 		EPUB (v2 and v3), ipynb, FictionBook2,
-		InDesign ICML, Muse, LaTeX beamer slides,
+		InDesign ICML, Muse, CSL JSON, LaTeX beamer slides,
 		and several kinds of HTML/JavaScript slide shows
 		(S5, Slidy, Slideous, DZSlides, reveal.js).

--- a/app-text/pandoc/pandoc-2.10.1.ebuild
+++ b/app-text/pandoc/pandoc-2.10.1.ebuild
@@ -3,7 +3,7 @@
 EAPI=7
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: -static
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -18,7 +18,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="embed-data-files optimize trypandoc"
-RESTRICT=test # fails
+# test failure: error while loading shared libraries:
+# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
+# cannot open shared object file: No such file or directory
+RESTRICT=test
 RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
 	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
@@ -28,20 +31,22 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
 	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
 	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
 	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/commonmark-0.1.0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+	>=dev-haskell/citeproc-0.3.0.1:=[profile?] <dev-haskell/citeproc-0.4:=[profile?]
-	>=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
 	>=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
 	>=dev-haskell/connection-0.3.1:=[profile?]
 	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
 	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	>=dev-haskell/doctemplates-0.8.2:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
+	>=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
 	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
 	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
 	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
 	>=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
-	>=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
+	>=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
 	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
-	>=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
+	>=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
 	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
 	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
 	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
@@ -53,14 +58,14 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
 	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/network-2.6:=[profile?]
 	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
 	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
 	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.8.5:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
+	>=dev-haskell/skylighting-0.10.2:=[profile?] <dev-haskell/skylighting-0.11:=[profile?]
-	>=dev-haskell/skylighting-core-0.8.5:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?]
+	>=dev-haskell/skylighting-core-0.10.2:=[profile?] <dev-haskell/skylighting-core-0.11:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
 	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
 	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
@@ -74,7 +79,6 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
 	>=dev-lang/ghc-8.0.1:=
-	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
 	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
 			dev-haskell/wai-extra:=[profile?] )
 "

--- a/app-text/pandoc/pandoc-2.7.3-r1.ebuild
+++ b/app-text/pandoc/pandoc-2.7.3-r1.ebuild
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-# ebuild generated by hackport 0.6.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+derive-json-via-th embed-data-files static trypandoc"
-RESTRICT=test # fails on newer skylighting
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.2.1:=[profile?] <dev-haskell/doctemplates-0.3:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
-	>=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.8:=[profile?]
-	>=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
-	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
-	>=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
-	>=dev-haskell/hsyaml-0.1.1.1:=[profile?] <dev-haskell/hsyaml-0.2:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/pandoc-types-1.17.5:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.8.1:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-haskell/texmath-0.11.2.1:=[profile?] <dev-haskell/texmath-0.12:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0"
-#	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-#		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-#		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
-#		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
-#		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
-#		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-#		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
-#		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-#"
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag derive-json-via-th derive_json_via_th) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag static static) \
-		$(cabal_flag trypandoc trypandoc)
-}
-src_install() {
-	haskell-cabal_src_install
-	doman man/pandoc.1
-}
--- a/app-text/pandoc/pandoc-2.9.2.1.ebuild
+++ b/app-text/pandoc/pandoc-2.9.2.1.ebuild
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-# ebuild generated by hackport 0.6.4.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files optimize static trypandoc"
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?]
-	>=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	>=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
-	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
-	>=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
-	>=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
-	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
-	>=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
-	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
-	>=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
-	>=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
-	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0
-	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-src_prepare() {
-	default
-	# optimisations require ~16GB of memory on ghc-8.8.3
-	use optimize || HCFLAGS+=' -O0'
-	cabal_chdeps \
-		'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7'
-}
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag static static) \
-		$(cabal_flag trypandoc trypandoc)
-}
-src_install() {
-	haskell-cabal_src_install
-	doman "${S}/man/${PN}.1"
-}
--- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild
+++ b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@@ -29,5 +29,5 @@ src_prepare() {
 	cabal_chdeps \
 		'base >=4.7 && <4.12' 'base >=4.7' \
-		'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0 && <2.16'
+		'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0'
 }
--- a/dev-haskell/bound/bound-2.0.1-r1.ebuild
+++ b/dev-haskell/bound/bound-2.0.1-r1.ebuild
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+template-haskell"
+RESTRICT=test # USE=doc breaks tests
 RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
 	>=dev-haskell/bytes-0.4:=[profile?] <dev-haskell/bytes-1:=[profile?]
 	>=dev-haskell/cereal-0.3.5.2:=[profile?] <dev-haskell/cereal-0.6:=[profile?]

--- a/dev-haskell/butcher/Manifest
+++ b/dev-haskell/butcher/Manifest
+DIST butcher-1.3.3.2.tar.gz 38069 BLAKE2B 58454093754d9fa2a02b23d4d64b162fb970285698f1b95bea3f73b53bf87466606b0b9f7e9e7bb9ff799ffead12b15d9efe5fef9b960f42792e80e86ca28d5a SHA512 98dece006460c00280ef16ea66d91405644e10e496059e5f1412ec8461674f1eca6a3d429800611329351b35d60855d69f21be9d9a96ed027b6e4b5f2c000703
--- a/dev-haskell/butcher/butcher-1.3.3.2.ebuild
+++ b/dev-haskell/butcher/butcher-1.3.3.2.ebuild
+# Copyright 1999-2020 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="Chops a command or program invocation into digestable pieces"
+HOMEPAGE="https://github.com/lspitzner/butcher/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="<dev-haskell/bifunctors-5.6:=[profile?]
+	>=dev-haskell/deque-0.3:=[profile?] <dev-haskell/deque-0.5:=[profile?]
+	<dev-haskell/extra-1.8:=[profile?]
+	<dev-haskell/free-5.2:=[profile?]
+	<dev-haskell/microlens-0.5:=[profile?]
+	<dev-haskell/microlens-th-0.5:=[profile?]
+	<dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/multistate-0.7:=[profile?] <dev-haskell/multistate-0.9:=[profile?]
+	<dev-haskell/unsafe-0.1:=[profile?]
+	<dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec )
+"
--- a/dev-haskell/butcher/metadata.xml
+++ b/dev-haskell/butcher/metadata.xml
+<?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>
+</pkgmetadata>
--- a/dev-haskell/cabal-file-th/cabal-file-th-0.2.7.ebuild
+++ b/dev-haskell/cabal-file-th/cabal-file-th-0.2.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 # ebuild generated by hackport 0.6.6.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Fails build: test-suite"
 inherit haskell-cabal
 DESCRIPTION="Template Haskell expressions for reading fields from a project's cabal file"
@@ -17,6 +17,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+# Reported as: https://github.com/nkpart/cabal-file-th/issues/12
+#test/Test.hs:15:95: error:
+#    Couldn't match type ‘Distribution.Utils.ShortText.ShortText’
+#                   with ‘[Char]’
+RESTRICT=test
 RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "

--- a/dev-haskell/cborg-json/cborg-json-0.2.2.0.ebuild
+++ b/dev-haskell/cborg-json/cborg-json-0.2.2.0.ebuild
@@ -29,3 +29,10 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base >=4.7 && < 4.14' 'base >=4.7'
+}
--- a/dev-haskell/citeproc/Manifest
+++ b/dev-haskell/citeproc/Manifest
+DIST citeproc-0.3.0.1.tar.gz 567617 BLAKE2B 8b6df78401f392d3bc3045fe183b25850328bc9a5b0c0ce9334f6cf14e4451e4a526bd23266846d8a625011b1cf5b1b52fee0a5f7c83ea405769704203da5ce6 SHA512 113f3b5dae2bfce13a4b39ef87ea21f763a897182c7a10eae5e7aabbddbb12b773be6583f51578a92bf078e40b0718a69b908049f700f317bbfb509253dae27b
--- a/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
+++ b/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
+# Copyright 1999-2020 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)
+}
--- a/dev-haskell/citeproc/metadata.xml
+++ b/dev-haskell/citeproc/metadata.xml
+<?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>
+</pkgmetadata>
--- a/dev-haskell/commonmark-extensions/Manifest
+++ b/dev-haskell/commonmark-extensions/Manifest
-DIST commonmark-extensions-0.2.0.1.tar.gz 31536 BLAKE2B 14d12de5e57b0a3e3b5f33a24f2886dc5524f875e6d80abead6f7fbdeff3fb3ba7ce3cf2b22822680585f639bf2dd3785fe2c665b7fab1b7ac7a719596a85a9e SHA512 5fc775e5a0b5c920629e71ff897034085b9c2ef1acce646e930b2af2877fee85046a0eaea3d8aebfb34049d53703f0a5c770d94251a3bd0fb994197e113a0883
+DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
--- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.1.ebuild
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.1.ebuild
@@ -3,7 +3,7 @@
 EAPI=7
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.6.7.9999
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+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?]

--- a/dev-haskell/commonmark-extensions/metadata.xml
+++ b/dev-haskell/commonmark-extensions/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-	</use>
-	<longdescription>
-		This library provides some useful extensions to core commonmark
-		syntax: smart quotes, definition lists, tables, footnotes, math,
-		and more.
-	</longdescription>
 </pkgmetadata>
--- a/dev-haskell/commonmark-pandoc/Manifest
+++ b/dev-haskell/commonmark-pandoc/Manifest
-DIST commonmark-pandoc-0.2.0.0.tar.gz 4760 BLAKE2B f59b6e5ff3ca2d14f3d604372779536ee475a8fe9292413f09687ca1a2df2da2c7da744b1f412fd7b0177e99412c52bc962938e7f87b378d9bf71cb28ff7c025 SHA512 c670cb8de8161ddb461992429e271b33004bd4a224d039806b36b0315c5eb06c5e88e3712a0267852a8adcc1a32ef960a9ee04d1ffe65980c7b69b035a10e9ce
+DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
--- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.0.ebuild
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.0.ebuild
@@ -3,7 +3,7 @@
 EAPI=7
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.6.7.9999
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -19,11 +19,10 @@ 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.22:=[profile?]
+	>=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
 	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.0.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-1.24.0.0
 "