gentoo resync : 25.08.2020

11 files changed, 116 insertions, 678 deletions

diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 62c1c5d817b0..3c80bbe2b259 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,15 +1,3 @@
-AUX pandoc-1.15.0.6-no-https.patch 407 BLAKE2B f884a11a29b111f2b7ba278aa3aa3b5a8a5b9ad0ee47b1881c4d163ca2266bcb1d311da81d66be93cb379704e6b7b365b335f8d6248626b40fd048a796db2b78 SHA512 3c8901649fdedd56bd6ae65af5667c563a04aff8f282194cfb70ae343408d82a6842e9e2e46be73f1938db889773fe946ae8da46bca45acbc882f5eabbf747e1
-DIST pandoc-1.12.4.2.tar.gz 1048263 BLAKE2B 0caef0e612dc45be1a4fec59143ea4640229fdf10f55074afb0e986c3384a0a9c71936b2ee4a981fa0a095fcf79b2c946eb1c8798e43693c8fcf9c886855ba9e SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743
-DIST pandoc-1.13.2.1.tar.gz 1999641 BLAKE2B bbf0f4bdb42a86a72995e3b3bcae7c3b452d6efa5bc68011c1eb87f2e0b024ef6a0df09011a8428f0ff67d6bbc8b53612baafc1312e8557e1c1fea46c4b32391 SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d
-DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90ebbdb1c8c3477f45e277ce88b4f8c37d93fbf0040f287675010010f7cfe2ce9f10b206e8094683b8b781ebaa9718 SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443
-DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
-DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
-DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
-EBUILD pandoc-1.12.4.2-r1.ebuild 4142 BLAKE2B aece6deed0d32ab7a30fce9a80bb1b1649054230fa171103c25744d857cfb89d3ce79e017c0cf36dbfc6be362f6727c9ec4b7d4e09ed3d219259899a737daf1b SHA512 33da73a4d5a4bebf453475f97da67927c80671178ba1d79b90f0198719c0feb57b64a1528eec8ef64a21064e412143dd41429a99b87ea9a5393392e547f69800
-EBUILD pandoc-1.13.2.1.ebuild 5034 BLAKE2B c68c245aec5243374c433fe7c6901146e73dbf02e8b13e4d27e01abe92386abe7403adbacd844f35711ae26525eaa7b404c2a3a19239b1f60eda8141170695d4 SHA512 26ca2918ce5c27dfc341dd05b03be05a1a9ed2e8cd1c512d810969041006436d2bc58001d3c2e3bafd9b9b3ac0b9095ab779442342022b5d8ac713ef83ee2062
-EBUILD pandoc-1.14.0.4.ebuild 5333 BLAKE2B 6d76d063b8212c5699f1423ec12487a5cdfded00659797005b4193c9fca1645cc7cbba60c1dfeb6b57062a86f33e9faeed7f559caa726b2bab8ea7c98a8f383e SHA512 98c21b76c045b8a4dad6f583fef63f6ed9a66a20534fdbea4fa14eeebcf305b56929cbb8a827ad7ab49327564c52f4671d05692ded71a80b6201061c009b5563
-EBUILD pandoc-1.15.0.6.ebuild 4920 BLAKE2B 7976bae8f35cbff0ee64cd466e1c3ae0c592a3f9b9426b4e8c156bda181d75c2f36d52f83d6c55379c160e650f664288d30ca4e238a8f0d74416ca4c37cff275 SHA512 d3caed0c908d3333dbfbde80a5be8f32af62d6410d479dee6dd0d82e5fe20ff733a511c2d0f5a57d3efe721189b7af2b674aeca9be0617125f3589a138218917
-EBUILD pandoc-1.18.ebuild 4830 BLAKE2B b0c0c5fbf0df87840f4442d5b4c5a1bfa2d23c3aac4f82588b4d3710aefaf8875651ae47d51e24f6f6ed67f94ed56fb9f42a56b1fb87da6007cb94076097fb2a SHA512 ac324508b6655d446a70d7fcbe28aaa4c1aa3aaf9c8382ed6fe6185c24b94d32eeaf5f365c74b569ffa1e2abae1541892fee32b6eae711295b02ae987a20a25a
-EBUILD pandoc-1.19.2.1-r1.ebuild 4908 BLAKE2B e55010ee0388eb10bbbd49e6b197a40c2d7e09690867a330dd19c3db38b59c858ad5d95db46d33404045b1691054520841b532aa202c645ae3f002d9d28191eb SHA512 e8fbd73e60351c2429fabafa7758b3a5940c3876317fa8f00312706ad04efbd86dfc8fbb73811fa581a0ba11eb10ba46f644a10c347627c89cad4bb724e1c7e9
-EBUILD pandoc-1.19.2.1.ebuild 4780 BLAKE2B 4a969419563723a4d86d4faecd2035dd48d5bc1309861b7a5bf47384d4942800748e26e5fbe116a4cd6510609df897b4b04b65d187adf05715e678c85e9f805c SHA512 8da769f19eb43f0b5fead89f4ef42fc7d8bfb90fae9f056eccfa86cdf1fb933230c8954a0895db101861ae965b450505c88ab4eb2a55730fa3fc10b185231a60
-MISC metadata.xml 1284 BLAKE2B 0ac01c07148aa682d4e6bd074b246d2578a816c76d6110ba3a9506e051b5ef2254f98e3faa8399c5f51200af26155dbabb6d08987bba32dd27f863f7c8183c15 SHA512 ba9a2c3897e5b645c0faa2a1a2f918cf5c30e3cace81343b01de73b25c26c343d95d7a09c50d56bf2aaa18a0a39318a506131e6bcdd7a48ab32197f3ef68be2a
+DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
+MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
deleted file mode 100644
index 7e0f4d375a71..000000000000
--- a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
-index ef9f66a..50b0ec4 100644
---- a/src/Text/Pandoc/Shared.hs
-+++ b/src/Text/Pandoc/Shared.hs
-@@ -143,2 +143,3 @@ import Paths_pandoc (getDataFileName)
- #endif
-+import Codec.Archive.Zip
- #ifdef HTTP_CLIENT
-@@ -152,3 +153,2 @@ import Network.HTTP.Types.Header ( hContentType)
- import Network (withSocketsDo)
--import Codec.Archive.Zip
- #else
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 837984f412b5..4394f8602323 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,11 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
-		<flag name="http-conduit">Enable downloading of resources over https.</flag>
+		<flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
 		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
-		<flag name="https">Enable support for downloading of resources over https.</flag>
-		<flag name="make-pandoc-man-pages">Build program to regenerate pandoc man pages from README.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="weigh-pandoc">Build weigh-pandoc to measure memory usage.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
deleted file mode 100644
index 87ca53e3060d..000000000000
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +http-conduit"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[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.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	embed-data-files? ( dev-haskell/hsb2hs )
-	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/syb-0.1 <dev-haskell/syb-0.5
-		>=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
-		>=dev-haskell/text-0.11 <dev-haskell/text-1.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'scientific >= 0.2 && < 0.3' 'scientific >= 0.2 && < 0.4' \
-		'attoparsec >= 0.10 && < 0.12' 'attoparsec >= 0.10 && < 0.13'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag http-conduit http-conduit)
-}
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
deleted file mode 100644
index 334780d77031..000000000000
--- a/app-text/pandoc/pandoc-1.13.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.11.1:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	embed-data-files? ( dev-haskell/hsb2hs )
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4:2
-		>=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 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4' \
-		'aeson >= 0.7 && < 0.9'  'aeson >= 0.7' \
-		'aeson >= 0.7.0.5 && < 0.9' 'aeson >= 0.7.0.5' \
-		'highlighting-kate >= 0.5.11.1 && < 0.6' 'highlighting-kate >= 0.5.11.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	doman man/man1/pandoc.1
-	doman man/man5/pandoc_markdown.5
-}
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
deleted file mode 100644
index 85ab78a926c1..000000000000
--- a/app-text/pandoc/pandoc-1.14.0.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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.11:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=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 )
-"
-
-src_prepare() {
-	if ! use make-pandoc-man-pages; then
-		sed -e '/Executable make-pandoc-man-pages/,/Buildable:   True/d' \
-			-i "${S}/${PN}.cabal" \
-				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/${PN}.cabal"
-		sed -e '/, postBuild = /,/makeManPages args bf pkgdescr lbi/d' \
-			-i "${S}/Setup.hs" \
-				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/Setup.hs"
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
deleted file mode 100644
index a483adcb7e23..000000000000
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit eutils 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 +https +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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.12:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=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 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-https.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	doman man/pandoc.1
-}
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
deleted file mode 100644
index a617c37202e0..000000000000
--- a/app-text/pandoc/pandoc-1.18.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-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 +https +network-uri trypandoc"
-
-RESTRICT=test # fails to load dynamic libraries
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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.12:=[profile?]
-	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[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.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=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 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1 && < 1.3' 'directory >= 1' \
-		'directory >= 1.2 && < 1.3' 'directory >= 1.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
deleted file mode 100644
index a3e82072acbb..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.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 +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=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/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.1.1.4:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[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.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=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 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'skylighting >= 0.1.1.4 && < 0.2' 'skylighting >= 0.1.1.4' \
-		'skylighting >= 0.1.1.3 && < 0.2' 'skylighting >= 0.1.1.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc) \
-		$(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
deleted file mode 100644
index 2a4bbf6d04b9..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.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 +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=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/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
-	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
-	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
-	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.17:=[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/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[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/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[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.10:=[profile?] )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
-			dev-haskell/wai-extra:=[profile?]
-			!https? ( dev-haskell/http-types:=[profile?] ) )
-	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
-		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
-		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=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 )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag https https) \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag trypandoc trypandoc) \
-		$(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
new file mode 100644
index 000000000000..878536e561c9
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.9.2.1.ebuild
@@ -0,0 +1,112 @@
+# 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"
+}