gentoo auto-resync : 23:07:2022 - 02:48:51

7 files changed, 131 insertions, 298 deletions

diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 4eccd0e7236a..51c0e347af4f 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,8 +1,4 @@
-AUX pandoc-2.13-trypandoc.patch 402 BLAKE2B 68bba7e2cb0018fa7d6bc7ec82ae24041da01fd3f7cab776993cbdd9118ec71dba6c029187d131b1da254446bade79e1f36f88cbf6a0ddc96b83b7a705ed8905 SHA512 6953a987a43b3393333f6164f72f839b90750acd4dd6fa37197bdaac3e52f1a6dbd56c7724ba331e90aa89715704d237e6c49b747076812b8bde680540c85e37
-DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
-DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
-DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
-EBUILD pandoc-2.11.3.1.ebuild 6170 BLAKE2B 097a59b21710bb75bb17f3d93cca07918a041eecc9517d0e8476c44af174f5f6b227d9bc9065d705b552841a12d3068c40e0ac9a64bb36c9c0ee2a0988df3fb5 SHA512 5a2a9266d3285952688af54ed71f7d34eeb0612cf2c1b0d147597132e3393411edc73393759f5389496378d66b27d2e3e5241dcf920121bde8f750486ae9a21c
-EBUILD pandoc-2.13.ebuild 6315 BLAKE2B 55b79d26d088cfc619767f04c734308b66d33fc5b9feb4b28503d0e2834776904e3d060440fef6f8676e57a7a50a3619311bf632e192348a4ae84c9544b6e1cb SHA512 f9ec4eb2b911733770f186314c6fc708dd352e42f30653ae32126fe375ef0ec19e18695067c53c9eaa79a221fb494fa4dcba489ce3dc157b79584a79524b5466
-EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
-MISC metadata.xml 942 BLAKE2B fb8c9826d2bf26d06823a0a19ed451299ac68d99e7e7a823bf1f5fc35039f3004166b840ffbee6bbdd9e86fbffff39911f5d495f75e8fca9e3ed21b2b233a0a1 SHA512 c7d01c6abd187fb10c685ecca3f28030604ef12b3adfe3e4585ebd664787d39e1c0fbe181d225ee75dda6b0dd6ea893752fe6a1cfc7e8ae958dd7b2a4bd69658
+AUX pandoc-2.18-tests.patch 3868 BLAKE2B 16bbe9fba3e4e18c4ec37911ba462d7ca9773e6c0f7e19d9b75d8cf507c141d5a983de2ef4eee4149a1a9877afbb279b021ff691ae15183c102f9903ee938665 SHA512 9ef5dde4e854f20d55f6266cf24ad8bcd9e696b9efe9d1fda8901be7c00c25103849cb2d2cfc200b31f02cf6142180270d398f8d28b957ffb1fda3d4c3327385
+DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
+EBUILD pandoc-2.18.ebuild 6495 BLAKE2B 137d67e155fe3ec562fea77c329858b138e64214845a078e86b944b8ab0047d05657e0431419ad5818ca76ac2e5fdaa2ae4394821ed73477092044cdac1cc908 SHA512 731dbb39b8e674db58dda6852577902e06b197a737987a3807d08a6655570d2637a360c93892b52b97c135156ec917058e189030ee385184fc0991d55e2ea5a7
+MISC metadata.xml 861 BLAKE2B edac13880204a325ec7f8755aa34fe63a9b90c7afbe7cb9eae87b3f820e5808e2be18d7b609410da6c2a4a136685b689f391745a6a491c91a49a45356957dfe9 SHA512 15f941b83736276d38eb6597611f63abf6b3a38cc019dd0a7339b7f88212f108acdd7ec7c2ee631d7d3d2860593f6139dc3eef5454376776979434ad27c75257
diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
deleted file mode 100644
index 1a0dacce99bc..000000000000
--- a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/785268
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -729,7 +729,7 @@ executable trypandoc
-   main-is:         trypandoc.hs
-   hs-source-dirs:  trypandoc
-   if flag(trypandoc)
--    build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24
-+    build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text
-     buildable:     True
-   else
-     buildable:     False
diff --git a/app-text/pandoc/files/pandoc-2.18-tests.patch b/app-text/pandoc/files/pandoc-2.18-tests.patch
new file mode 100644
index 000000000000..6cf30a7c9bc6
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-2.18-tests.patch
@@ -0,0 +1,79 @@
+From 9aff86143e12e22cec152fd08ec8b68ee75ccafa Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm@berkeley.edu>
+Date: Tue, 31 May 2022 19:49:27 -0700
+Subject: [PATCH] Require skylighting 0.12.3.1 and update tests.
+
+---
+ pandoc.cabal           | 4 ++--
+ stack.yaml             | 4 ++--
+ test/lhs-test.html     | 4 ++--
+ test/lhs-test.html+lhs | 4 ++--
+ test/lhs-test.latex    | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/lhs-test.html b/test/lhs-test.html
+index 754b25e1f570..85e5d785d14a 100644
+--- a/test/lhs-test.html
++++ b/test/lhs-test.html
+@@ -190,7 +190,7 @@
+     code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+     code span.at { color: #7d9029; } /* Attribute */
+     code span.bn { color: #40a070; } /* BaseN */
+-    code span.bu { } /* BuiltIn */
++    code span.bu { color: #008000; } /* BuiltIn */
+     code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+     code span.ch { color: #4070a0; } /* Char */
+     code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+     code span.ex { } /* Extension */
+     code span.fl { color: #40a070; } /* Float */
+     code span.fu { color: #06287e; } /* Function */
+-    code span.im { } /* Import */
++    code span.im { color: #008000; font-weight: bold; } /* Import */
+     code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+     code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+     code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
+index 7198397d8f45..32e0baf4d7e2 100644
+--- a/test/lhs-test.html+lhs
++++ b/test/lhs-test.html+lhs
+@@ -190,7 +190,7 @@
+     code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+     code span.at { color: #7d9029; } /* Attribute */
+     code span.bn { color: #40a070; } /* BaseN */
+-    code span.bu { } /* BuiltIn */
++    code span.bu { color: #008000; } /* BuiltIn */
+     code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+     code span.ch { color: #4070a0; } /* Char */
+     code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+     code span.ex { } /* Extension */
+     code span.fl { color: #40a070; } /* Float */
+     code span.fu { color: #06287e; } /* Function */
+-    code span.im { } /* Import */
++    code span.im { color: #008000; font-weight: bold; } /* Import */
+     code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+     code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+     code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.latex b/test/lhs-test.latex
+index 49521d3c1522..435d1dfefb07 100644
+--- a/test/lhs-test.latex
++++ b/test/lhs-test.latex
+@@ -44,7 +44,7 @@
+ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
+ \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+-\newcommand{\BuiltInTok}[1]{#1}
++\newcommand{\BuiltInTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{#1}}
+ \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+ \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
+ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+@@ -57,7 +57,7 @@
+ \newcommand{\ExtensionTok}[1]{#1}
+ \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+ \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
+-\newcommand{\ImportTok}[1]{#1}
++\newcommand{\ImportTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{\textbf{#1}}}
+ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
+ \newcommand{\NormalTok}[1]{#1}
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 8f389f32b1ce..76ff98a64e2e 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,7 +16,6 @@
 	</longdescription>
 	<use>
 		<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="trypandoc">Build trypandoc cgi executable.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild
deleted file mode 100644
index d51982085be4..000000000000
--- a/app-text/pandoc/pandoc-2.11.3.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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: -static
-
-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 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.6:=[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.2:=[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/citeproc-0.3.0.1:=[profile?] <dev-haskell/citeproc-0.4:=[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.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.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.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?]
-	>=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.3.2:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[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.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.10.2:=[profile?] <dev-haskell/skylighting-0.11:=[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?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-haskell/texmath-0.12.0.2:=[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/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:=
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	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.15
-		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
-		>=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'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-static \
-		$(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	doman "${S}/man/${PN}.1"
-}
diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.18.ebuild
index f0ae5e9a8249..5e4604cd6f1d 100644
--- a/app-text/pandoc/pandoc-2.13.ebuild
+++ b/app-text/pandoc/pandoc-2.18.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: -static
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
+LUA_COMPAT=( "lua5-3" )
+inherit haskell-cabal lua-single
 
 DESCRIPTION="Conversion between markup formats"
 HOMEPAGE="https://pandoc.org"
@@ -15,102 +16,98 @@ 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 trypandoc"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="embed-data-files lua trypandoc"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
-# 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?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
 	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[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/citeproc-0.3.0.9:=[profile?] <dev-haskell/citeproc-0.3.1:=[profile?]
-	>=dev-haskell/commonmark-0.1.1.3:=[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/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?]
+	>=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/commonmark-pandoc-0.2.1.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.0.1:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	>=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
+	>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[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.4:=[profile?]
-	>=dev-haskell/hslua-module-path-0.1.0:=[profile?] <dev-haskell/hslua-module-path-0.2.0:=[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.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/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?]
+	>=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?]
+	>=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?]
+	>=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?]
+	>=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?]
+	>=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?]
 	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[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.3.4:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?]
+	>=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[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/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[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.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?]
+	>=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	>=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/safe-0.3.18:=[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.10.5:=[profile?] <dev-haskell/skylighting-0.10.6:=[profile?]
-	>=dev-haskell/skylighting-core-0.10.5:=[profile?] <dev-haskell/skylighting-core-0.10.6:=[profile?]
+	>=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?]
+	>=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[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.2:=[profile?] <dev-haskell/texmath-0.12.3:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[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/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
 	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/xml-conduit-1.7:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[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.4.3:=
+	>=dev-lang/ghc-8.10.1:=
+	lua? ( >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.2:=[profile?]
+			>=dev-haskell/hslua-aeson-2.1:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] )
+	!lua? ( >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] )
 	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
 			>=dev-haskell/wai-extra-3.0.24:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-3.2.0.0
 	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
 		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
 		>=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-lua-1.0 <dev-haskell/tasty-lua-1.1
 		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
 "
 
-PATCHES=("${FILESDIR}"/${P}-trypandoc.patch)
+PATCHES=( "${FILESDIR}"/${P}-tests.patch ) # backport from upstream, remove on next release
 
-src_prepare() {
-	default
-	# optimisations require ~16GB of memory on ghc-8.8.3
-	use optimize || HCFLAGS+=' -O0'
+pkg_setup() {
+	use lua && lua-single_pkg_setup
 }
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag embed-data-files embed_data_files) \
+		$(cabal_flag lua lua53) \
 		--flag=-static \
 		$(cabal_flag trypandoc trypandoc)
 }
 
 src_install() {
 	haskell-cabal_src_install
-
 	doman "${S}/man/${PN}.1"
 }
diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
deleted file mode 100644
index 878536e561c9..000000000000
--- a/app-text/pandoc/pandoc-2.9.2.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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"
-}