summaryrefslogtreecommitdiff
path: root/dev-haskell
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-haskell
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/Manifest.gzbin129593 -> 129492 bytes
-rw-r--r--dev-haskell/cabal-doctest/Manifest1
-rw-r--r--dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild25
-rw-r--r--dev-haskell/cairo/Manifest2
-rw-r--r--dev-haskell/cairo/cairo-0.13.6.1.ebuild38
-rw-r--r--dev-haskell/citeproc/Manifest4
-rw-r--r--dev-haskell/citeproc/citeproc-0.3.0.9.ebuild (renamed from dev-haskell/citeproc/citeproc-0.3.0.1.ebuild)0
-rw-r--r--dev-haskell/commonmark/Manifest4
-rw-r--r--dev-haskell/commonmark/commonmark-0.1.1.4.ebuild (renamed from dev-haskell/commonmark/commonmark-0.1.1.2.ebuild)5
-rw-r--r--dev-haskell/doclayout/Manifest4
-rw-r--r--dev-haskell/doclayout/doclayout-0.3.0.2.ebuild (renamed from dev-haskell/doclayout/doclayout-0.3.ebuild)9
-rw-r--r--dev-haskell/editline/Manifest2
-rw-r--r--dev-haskell/editline/editline-0.2.1.1-r1.ebuild4
-rw-r--r--dev-haskell/ekg-core/Manifest2
-rw-r--r--dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild33
-rw-r--r--dev-haskell/encoding/Manifest4
-rw-r--r--dev-haskell/encoding/encoding-0.8.5.ebuild46
-rw-r--r--dev-haskell/encoding/files/encoding-0.8.2-overflow.patch41
-rw-r--r--dev-haskell/encoding/metadata.xml14
-rw-r--r--dev-haskell/fclabels/Manifest2
-rw-r--r--dev-haskell/fclabels/fclabels-2.0.3.3.ebuild35
-rw-r--r--dev-haskell/filepattern/Manifest3
-rw-r--r--dev-haskell/filepattern/filepattern-0.1.2.ebuild (renamed from dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild)14
-rw-r--r--dev-haskell/filepattern/metadata.xml26
-rw-r--r--dev-haskell/geniplate/Manifest3
-rw-r--r--dev-haskell/ghc-lib-parser-ex/Manifest3
-rw-r--r--dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild36
-rw-r--r--dev-haskell/ghc-lib-parser-ex/metadata.xml (renamed from dev-haskell/geniplate/metadata.xml)0
-rw-r--r--dev-haskell/ghc-lib-parser/Manifest3
-rw-r--r--dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild (renamed from dev-haskell/geniplate/geniplate-0.6.0.5.ebuild)20
-rw-r--r--dev-haskell/ghc-lib-parser/metadata.xml (renamed from dev-haskell/network-protocol-xmpp/metadata.xml)0
-rw-r--r--dev-haskell/gtk2hs-buildtools/Manifest1
-rw-r--r--dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild35
-rw-r--r--dev-haskell/hakyll/Manifest7
-rw-r--r--dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch209
-rw-r--r--dev-haskell/hakyll/hakyll-4.13.4.0.ebuild76
-rw-r--r--dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild (renamed from dev-haskell/hakyll/hakyll-4.13.4.1.ebuild)17
-rw-r--r--dev-haskell/happstack-server/Manifest4
-rw-r--r--dev-haskell/happstack-server/happstack-server-7.6.0.ebuild56
-rw-r--r--dev-haskell/happstack-server/metadata.xml1
-rw-r--r--dev-haskell/haskell-src-exts/Manifest2
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild4
-rw-r--r--dev-haskell/hlint/Manifest7
-rw-r--r--dev-haskell/hlint/files/60hlint-gentoo.el7
-rw-r--r--dev-haskell/hlint/hlint-2.1.17-r1.ebuild82
-rw-r--r--dev-haskell/hlint/hlint-3.2.7.ebuild59
-rw-r--r--dev-haskell/hlint/metadata.xml7
-rw-r--r--dev-haskell/hoauth2/Manifest2
-rw-r--r--dev-haskell/hoauth2/hoauth2-1.11.0.ebuild39
-rw-r--r--dev-haskell/hslua-module-path/Manifest3
-rw-r--r--dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild28
-rw-r--r--dev-haskell/hslua-module-path/metadata.xml (renamed from dev-haskell/test-framework-th-prime/metadata.xml)0
-rw-r--r--dev-haskell/hslua-module-system/Manifest4
-rw-r--r--dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild (renamed from dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild)7
-rw-r--r--dev-haskell/hslua-module-text/Manifest2
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild28
-rw-r--r--dev-haskell/hslua/Manifest2
-rw-r--r--dev-haskell/hslua/hslua-1.3.0.1.ebuild47
-rw-r--r--dev-haskell/jira-wiki-markup/Manifest4
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild (renamed from dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild)9
-rw-r--r--dev-haskell/libmpd/Manifest6
-rw-r--r--dev-haskell/libmpd/libmpd-0.9.2.0.ebuild (renamed from dev-haskell/libmpd/libmpd-0.9.1.0.ebuild)4
-rw-r--r--dev-haskell/libmpd/metadata.xml3
-rw-r--r--dev-haskell/megaparsec/Manifest2
-rw-r--r--dev-haskell/megaparsec/megaparsec-8.0.0.ebuild35
-rw-r--r--dev-haskell/network-protocol-xmpp/Manifest3
-rw-r--r--dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild32
-rw-r--r--dev-haskell/safe/Manifest4
-rw-r--r--dev-haskell/safe/safe-0.3.19.ebuild (renamed from dev-haskell/safe/safe-0.3.17.ebuild)8
-rw-r--r--dev-haskell/shakespeare/Manifest2
-rw-r--r--dev-haskell/shakespeare/shakespeare-2.0.21.ebuild42
-rw-r--r--dev-haskell/skylighting-core/Manifest4
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.10.5.ebuild (renamed from dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild)8
-rw-r--r--dev-haskell/skylighting/Manifest4
-rw-r--r--dev-haskell/skylighting/skylighting-0.10.5.ebuild (renamed from dev-haskell/skylighting/skylighting-0.10.2.ebuild)6
-rw-r--r--dev-haskell/syb-with-class/Manifest2
-rw-r--r--dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild32
-rw-r--r--dev-haskell/tasty-lua/Manifest4
-rw-r--r--dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild (renamed from dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild)8
-rw-r--r--dev-haskell/test-framework-th-prime/Manifest6
-rw-r--r--dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch76
-rw-r--r--dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild27
-rw-r--r--dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild29
-rw-r--r--dev-haskell/texmath/Manifest4
-rw-r--r--dev-haskell/texmath/texmath-0.12.2.ebuild (renamed from dev-haskell/texmath/texmath-0.12.0.3.ebuild)8
-rw-r--r--dev-haskell/th-expand-syns/Manifest2
-rw-r--r--dev-haskell/th-orphans/Manifest2
-rw-r--r--dev-haskell/th-orphans/th-orphans-0.13.3.ebuild30
-rw-r--r--dev-haskell/th-utilities/Manifest3
-rw-r--r--dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch67
-rw-r--r--dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild32
-rw-r--r--dev-haskell/timezone-olson/Manifest6
-rw-r--r--dev-haskell/timezone-olson/metadata.xml13
-rw-r--r--dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild (renamed from dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild)11
-rw-r--r--dev-haskell/top/Manifest2
-rw-r--r--dev-haskell/top/top-1.7.ebuild4
-rw-r--r--dev-haskell/uniqueid/Manifest2
-rw-r--r--dev-haskell/uniqueid/uniqueid-0.1.1.ebuild4
-rw-r--r--dev-haskell/vault/Manifest2
-rw-r--r--dev-haskell/vault/vault-0.3.1.3.ebuild33
-rw-r--r--dev-haskell/wx/Manifest4
-rw-r--r--dev-haskell/wx/wx-0.92.3.0-r1.ebuild (renamed from dev-haskell/wx/wx-0.92.2.0.ebuild)19
-rw-r--r--dev-haskell/wxc/Manifest3
-rw-r--r--dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch27
-rw-r--r--dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild (renamed from dev-haskell/wxc/wxc-0.92.3.0.ebuild)10
-rw-r--r--dev-haskell/wxcore/Manifest2
-rw-r--r--dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild (renamed from dev-haskell/wxcore/wxcore-0.92.3.0.ebuild)7
-rw-r--r--dev-haskell/wxdirect/Manifest2
-rw-r--r--dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild (renamed from dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild)5
-rw-r--r--dev-haskell/xml-conduit/Manifest4
-rw-r--r--dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild (renamed from dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild)11
111 files changed, 409 insertions, 1389 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 8585204da23b..b87768eaa7a2 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
Binary files differ
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index 8811dcdc9532..4e86277474c7 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1,4 +1,3 @@
DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
EBUILD cabal-doctest-1.0.8-r1.ebuild 768 BLAKE2B 388f49569c581fc485c0bf0b2a3a3a98fe1a140b83ff3c008883837e4f6edb88f3fddb781e7465c75f3462ce4ee6d5aaf028c4368f18afae292c3a8f07a989a3 SHA512 faf431b81d18512e68fc880aedc4050fa5a7aea821bfc90f7574c4cd56e3bf73a710ec34771ba673bc4c7e83b5e82630075ed03fc03db491f78bc7ec96b46bcf
-EBUILD cabal-doctest-1.0.8.ebuild 613 BLAKE2B 5d1251e1ab4e2f57ada4216afbcdbce3045bf906ad7e89d7fe3a82345005408e0b7ebeda22114cd346b1e794ccf0ef599b0cd27afa1dc112a46504dce7ba545d SHA512 e4536edf2d62466ba0c116b2063ad10d209f6265b9c8622259b3675eb638b59161ae10d0ac4d667dcc5eea485bc5ef5e4e8c3fcd09a3a85591094a3883a952e4
MISC metadata.xml 723 BLAKE2B 9dda95bba28b06fc0af23fb9ab8cd996d89e5d2c2a759c303634e0ab39838fb7b0a5272246dd12352f1c5433719c1c4b8e4fb348140921430d6c69d339f0cac2 SHA512 25745138b02b609df373a14f09d26a1f4809b5b082ff23f11febdf05f864f35b239fb64c9666e6186eb945e0848c9c3dc7abeb8fad0eda43ff333cbc6e5f15ba
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
deleted file mode 100644
index fc699db32cf3..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index bdad065c5746..6cd89b687fcd 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,5 +1,3 @@
-DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727
-EBUILD cairo-0.13.6.1.ebuild 1086 BLAKE2B decc8ecb97e7e72cf0126b70ae17321f6641d022d03efa6577c29b154fdc74e9abe65d8f313b2b2f8ae94f93231cdae0f6b5b57a8086989ecd4ec45bdd58cff0 SHA512 9eb536a6a339a2c98b989e454062116c5903843d687f4c0802942e8d809f37bc7e17b8e3bc2e6b2ea48a9950ebd8bc5eec7fbf86828fed19aeffc6534aa0ebe3
EBUILD cairo-0.13.8.1.ebuild 1091 BLAKE2B 8b3bd6dab36ae0a3e7a2a9c9cf2df9b9e4fcbb9f9d81911489dab7eaaa57d609b927827b076f6f4f355a53da5dc6f9c338d1c68178b7a8d85cb1bf6e458e7cf9 SHA512 365cd5f56a429ae2e909b0d2414a3a311f992d75234c012c720fb044cb35ed56d43d383c025b9b4e2a38db811d3a73309fe4ef27043014fa13171211862ecd9c
MISC metadata.xml 468 BLAKE2B 04053766d0971041ea0c68c8945622845833dee8fac5b144799ea1c21874fc739f9c60ee5f418a9a4e94e12f9bd8d621a8419fa6b916bf8fc518aa0cebab90cf SHA512 30c5d32612972f08d6d51603a6972b6a084b2f68e644c72ceb4472bbac83122916070ffc597b8199874c62fc80dcee775ca6632a45e82619d9927669559c79a9
diff --git a/dev-haskell/cairo/cairo-0.13.6.1.ebuild b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
deleted file mode 100644
index 42eff6558c01..000000000000
--- a/dev-haskell/cairo/cairo-0.13.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag pdf cairo_pdf) \
- $(cabal_flag postscript cairo_ps) \
- $(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
index 722a671912e8..fde39bb960f3 100644
--- a/dev-haskell/citeproc/Manifest
+++ b/dev-haskell/citeproc/Manifest
@@ -1,3 +1,3 @@
-DIST citeproc-0.3.0.1.tar.gz 567617 BLAKE2B 8b6df78401f392d3bc3045fe183b25850328bc9a5b0c0ce9334f6cf14e4451e4a526bd23266846d8a625011b1cf5b1b52fee0a5f7c83ea405769704203da5ce6 SHA512 113f3b5dae2bfce13a4b39ef87ea21f763a897182c7a10eae5e7aabbddbb12b773be6583f51578a92bf078e40b0718a69b908049f700f317bbfb509253dae27b
-EBUILD citeproc-0.3.0.1.ebuild 1529 BLAKE2B 1b106817f7a352aef0b867101d3e2d138914d89e03dd80d1026c8f72007155e2b7380c871f25a175f8947b7358c5b4ed822634e9dfaebb25848b302b94f0d6e7 SHA512 7defd3b05a00223e6eccb0bc8280186759874f467adaa19d62267a21dc0901070cbe2420889089bce19e110bdf8a1b725acf0bcc5a95d54cd127b507aeb87a34
+DIST citeproc-0.3.0.9.tar.gz 572112 BLAKE2B df1ff046f4356f5feebf3551b3be9807b3bfca6ef927805efeb2ff5133968f1bd0ae14923ec83309ad2b8dd50d674f4506b1f62adc53a78f6afccea7cb6da5fa SHA512 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f
+EBUILD citeproc-0.3.0.9.ebuild 1529 BLAKE2B 1b106817f7a352aef0b867101d3e2d138914d89e03dd80d1026c8f72007155e2b7380c871f25a175f8947b7358c5b4ed822634e9dfaebb25848b302b94f0d6e7 SHA512 7defd3b05a00223e6eccb0bc8280186759874f467adaa19d62267a21dc0901070cbe2420889089bce19e110bdf8a1b725acf0bcc5a95d54cd127b507aeb87a34
MISC metadata.xml 624 BLAKE2B e41c62aa3d4886828f0d00576edc6c2fc4aad728e5996f1bde6c1fee0b55c801db9ef8719abc1a2b852c800c77abd804f4cb8b5410b422e62617993e9f001728 SHA512 eec77dd81a936c85e1bcb01831178ecf32e43e4bae12b77ccedea98925697e1d123ed8fb5fde80fecf8e49a8b5809a7201296faac7bb996597894f1364bb1cc9
diff --git a/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild b/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild
index ee9b06f64280..ee9b06f64280 100644
--- a/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
+++ b/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
index e391a647d0f9..532e7e920368 100644
--- a/dev-haskell/commonmark/Manifest
+++ b/dev-haskell/commonmark/Manifest
@@ -1,3 +1,3 @@
-DIST commonmark-0.1.1.2.tar.gz 98983 BLAKE2B 8ec8e46c39d54af276d12388938d6ef7dd02a40fa0a5aba58f5c3026ce5be970ebf37cf351524e30cd80f80f49df1f03175941c97c658744c212379bd6e5051e SHA512 746539c055ef84b4458e910bf260222498c7081f62f421ca63aa2652a1297c3ad6b518cc27a3783868b8db3df39fe454e78f6ebf51439e73495ab4699c5c8427
-EBUILD commonmark-0.1.1.2.ebuild 714 BLAKE2B 8aa4bbb15767cd3262240c2e1014ac8d381a36f9f60a817d8b60797afb8c992565082383b1fd17f06ef23475ce4a872d7504c1f1415ed5c7d60578f8fe44fbaa SHA512 b314c2cad91c16c82fbabb720ce93fcda508782d404cb96581ae915cdd3b72b12998b4033390a9668909c2748938fed4d086b98f4b6b47618d08554d70642406
+DIST commonmark-0.1.1.4.tar.gz 99102 BLAKE2B 28fd60d2ddb385856ad824cbc73f9f20a35616312e2a4b340e4f0b7fd4311f35155a6fe3d6255a3e2e75a2058627c44119620e0e2caa917e5608cf1284a19641 SHA512 d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657
+EBUILD commonmark-0.1.1.4.ebuild 710 BLAKE2B 84e5ed868323c9a5e7b69ac362bf66f10f984fbaaf64a4f590642134e222d172ca765be21cbbcb324f6133ac2e291dc664fcb08aadc10ce3ea0476bf905f96c1 SHA512 16a7bbca1317c3e8dce096ae5c32d798d20dae9fc47fcc8201ed6773bd0177a18fdf5555bb91ead1be0e16f95632f14eafec659734521a817cce85bc0bb2b637
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
index 66535724ad97..f6eee2250939 100644
--- a/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild
+++ b/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
@@ -15,14 +15,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="dev-haskell/parsec:=[profile?]
dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/quickcheck
dev-haskell/tasty
dev-haskell/tasty-hunit
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
index cb6107369466..8182baaa9c84 100644
--- a/dev-haskell/doclayout/Manifest
+++ b/dev-haskell/doclayout/Manifest
@@ -1,3 +1,3 @@
-DIST doclayout-0.3.tar.gz 11968 BLAKE2B 60c9b1a0f8e6cbd18f130c392b19362754b0622def92e6404ac37cc3aa304712cf947fad0dd162f7919c93524f4cb87d8c9c240d22351087f629f5fb58321ad5 SHA512 ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0
-EBUILD doclayout-0.3.ebuild 737 BLAKE2B 56ea3be5632692fb1385d3fd30fd29811ac053766ed86d3e295ac171e286ded3e562eb637e692ec1baeb0a39410305fec2637983ae06ab44823aa8de35e5be17 SHA512 775d17451d3280a9574b74fd23f3a97198880e2085190e6be99060b8d1c086ce3efe4b595f27b6a3c0c0f91f9949c12cd363b9ac5cdb2d58240a6997ee06c261
+DIST doclayout-0.3.0.2.tar.gz 12140 BLAKE2B 831517277dad7cbec04335fa69a83a1fb7bbd90edfc14cdf4ea5a340f28416eaf28639c8388b9c305daf60097871d1c5454e28600374dab176aa3babe4449a98 SHA512 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0
+EBUILD doclayout-0.3.0.2.ebuild 728 BLAKE2B abfb116e9070617b556a83d9a96e65b1cf85c7fdc19088e9f1ea3629d237cf2379a5119900cc6c26783fa1ba3e5686d0df5e2712948f0154ac09b4aa94643ca0 SHA512 110f13bdf7ebc81511e75ba1dfbe92ebe52b3b3c45a9464e45ae72392028f66f9a88e60bbe311b2e2dce12df7368db9495eb48e81405ad445b495a563dbe5811
MISC metadata.xml 482 BLAKE2B 3c3c57ee2775a246e8ce92e4ce0e8559e1ed5cb7477f88883cf4948ef86f417411a17cc9a69b4fda8c909fadf1a47094db752e8025a17938409beb0bb49609a3 SHA512 8735b47506e6513f410ed082f3647fca1162c865da5e14fad48bc3b7567be3b058bc079df9bf5d4cb85a82b8da0f35841abdb5307ee464021691f10763987521
diff --git a/dev-haskell/doclayout/doclayout-0.3.ebuild b/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
index 9fc2a512278c..7ddee0ab5658 100644
--- a/dev-haskell/doclayout/doclayout-0.3.ebuild
+++ b/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,15 +15,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
dev-haskell/safe:=[profile?]
dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/tasty
dev-haskell/tasty-golden
dev-haskell/tasty-hunit )
diff --git a/dev-haskell/editline/Manifest b/dev-haskell/editline/Manifest
index 04c7b47e021a..05f52bf0b488 100644
--- a/dev-haskell/editline/Manifest
+++ b/dev-haskell/editline/Manifest
@@ -1,5 +1,5 @@
AUX editline-0.2.1.1-ghc-7.8.patch 564 BLAKE2B 522295c711fb091e9d06406505c522933599c95c7fa36ece36e02b365077ccf7972cbbbe83146aec1df74f071dde46ed92a61baf93b99d343de8bc68caacb6c2 SHA512 e3c9742d854294a77e6a646dc7d2b4fe96c9d2ad6d9c789278dfe7a6b20b55ee27da732f630211bcb705e5443cce1de716762dbe5f0b1c01fd5457a771cb8a93
AUX editline-0.2.1.1-tinfo.patch 576 BLAKE2B b08e5be5d897622a4c07dcdfd881970fc25ad59648b57d804ca27c0cffe8c7219822ed68280fb5716738c8283849da602eccc34500558eff260563e384b2eff8 SHA512 a327e33a3f535d2a298c9a73bd0ddff13b5795e146757b1961bea10be19f19635f7ee3513dcefdfa132bc92dbc573ae8cc63ea10a70a4c233829895472ee4638
DIST editline-0.2.1.1.tar.gz 47240 BLAKE2B 7bd9d4d894856653e14a3ebde954ad17bb8b8e3ec03151edf8107c0ad5095e9bd467fa737d8b6af00fbe50da3fef54521e2ec32c214a6362df27e3f0137c0f6c SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6
-EBUILD editline-0.2.1.1-r1.ebuild 792 BLAKE2B 948a2338b27c2784700873c240c91e484514debe2a07e94594d565b7cdc2a48697a2611ec1a5d21cc036e31859c1726a33c179a665fa541f2d183141b2090b98 SHA512 882cbe36e0dd6e0023843d150f0b501e6d0111a510c30098a347867029d3c2c81c26872dd1a5757f218cc6a84eb870fa7d8513d770ad18f303636c259ab28c24
+EBUILD editline-0.2.1.1-r1.ebuild 785 BLAKE2B 9eeca5d940551bf54fcbfefdac5aeb9d86fafa179b1a538e370c9067c5c21b8b996c97c56d9062b08b3a3f1d07f52439a3e5ef524fb743f3cd022b0d02956a64 SHA512 7e8835189f8b1224c6fc2c2724c79ff8876add3bd5792fca85431e6d129bbad936c3657a4647931d61823ccc924d70df07893381ce55b27cfb164ad5e05ae34d
MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
index c1a38cc5b45a..b7d24228f2c3 100644
--- a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
+++ b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
# ebuild generated by hackport 0.3.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit autotools eutils haskell-cabal
+inherit autotools haskell-cabal
DESCRIPTION="Bindings to the editline library (libedit)"
HOMEPAGE="http://code.haskell.org/editline"
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
index ecee7fc927db..610b26d688eb 100644
--- a/dev-haskell/ekg-core/Manifest
+++ b/dev-haskell/ekg-core/Manifest
@@ -1,5 +1,3 @@
-DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789 SHA512 5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
DIST ekg-core-0.1.1.7.tar.gz 13612 BLAKE2B d630fca0277890b6798c28ae83339d4de8491439edbe1ffbdb09177d382b9e3bb2f2ff43c12741061ae78e8c7e2b8bf499bb5748721df3378b3e78d19a5004bb SHA512 68915d62d7851ff99877a478b948ed119462883463949f551a0d94efa60209f734af0578b1437fcefead3e2cc80570d1a844f6be3b5b90b2fc804f9c85aaca90
-EBUILD ekg-core-0.1.1.6.ebuild 695 BLAKE2B 131abffc9ad4848907c716123d262881079919826580f81d99c4df341e973f2e3671255ffa10d3505f27981faf77f6002179ae8b30bd1e92bccb768efdfb5766 SHA512 8e897466a337675c5146909b845e04ad7f83dbd1004bc6eac01719f193818bf43684edbc969fcc207d976f2b67047ab8c309f5882a1f97c8ae2623b7bd8f733a
EBUILD ekg-core-0.1.1.7.ebuild 722 BLAKE2B 41a90477e274e3be82baa9841f1211f6eb6227c7547b7855577fd13971f5ae937286345d2d0e0e31d7f54a61846f966f267e66a88fcccbad94475bd7954f178c SHA512 17c505b06ca8c2b1f15a210979061101427500c29719ce87c218d58fd3d2134d827bfb808f5e506a0a596f7f84a3b84b08f42ec4089eb21d16eb4ec57f414b8d
MISC metadata.xml 328 BLAKE2B 4e16a7208c3f336c1c70b77f2bad7b1bd04c3ba3976b925409dd7caca28b85b938f8cdf67af2901fdeed22e7806ff1f1e1f06fd5a0fbe8cfa23d2713256c04df SHA512 f030ec00edd9ae0d27d387742c17e73e740fbd83923f8a1a476bdfe35909349da63845159b8740da75a495c0d279e816316bba5d0de1e1213b6318ba73600dd5
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
deleted file mode 100644
index f81499b6f803..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.6 && < 4.13' 'base >= 4.6'
-}
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
deleted file mode 100644
index b07e4a7a0aee..000000000000
--- a/dev-haskell/encoding/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX encoding-0.8.2-overflow.patch 1403 BLAKE2B 4ada33908b07997beba49b98f889b761e57867b8fa7f47aed1ca0023d3788af122044a78a04e501aba478eccc0b94d705ba7f1b9a529f4cb24034d382ada63d3 SHA512 4aad7e9a19347a55191c1cd9eccfb1d0814a74788ded5c5b5472c92549729d3af0c54bb3efed05ad38050d551232cbdae4cb7849b8e7904671e76eb6c0c39807
-DIST encoding-0.8.5.tar.gz 380798 BLAKE2B 0b8ccca2de17e00c59b114c8b6b7107a80e92e376cc3bf9d5e95eadf2a2c1e5a2d2a12294e7ec669b1203d4b4c6809c8a129aaf17f1022f361b64542fcf45d9b SHA512 2ae2f44007735bdcb6b7cd35614ffcb5fe211321d516350555b03d9074c679995260f30de1df788b800711613bfdca037cb9c24cf90afc88d32a706c237df386
-EBUILD encoding-0.8.5.ebuild 1195 BLAKE2B 516fe912c3c4a09b425be8aabff06e59b6b12f04d963284290cbfc800d4f6b0e97ec0f752606c04464e1c3f215fdb7fbd49d25f6061bc249fbbe7dc792c3c94c SHA512 c4f47840f6a8d45747b09ddf143f04debfacf96d3da6bedb8f16c707abefdd7a518e6b87f8d957f15b9ad9728e570e8cf9a276bb202a946a438756861ede8080
-MISC metadata.xml 676 BLAKE2B e2bfda2c8e81fdbb369a7a99d555ab71d7cdd93517bc54a4f399d3ae9dafc384d1921a0f0e78f9b738bb0d72cbb9814ea75613b4ffaec0ff2615141b5f795014 SHA512 86d83b18876390cb974df3ea61782f32b5e8c893877664e7e9722e6ad5d596c2b6454c60fe6537c2c2492f9fa28d614fe0c473a5bc702a21632210f516328d3c
diff --git a/dev-haskell/encoding/encoding-0.8.5.ebuild b/dev-haskell/encoding/encoding-0.8.5.ebuild
deleted file mode 100644
index 48de713accc6..000000000000
--- a/dev-haskell/encoding/encoding-0.8.5.ebuild
+++ /dev/null
@@ -1,46 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/regex-compat-0.71:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- >=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.2-overflow.patch
-)
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
- 'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch b/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
deleted file mode 100644
index c8085c827197..000000000000
--- a/dev-haskell/encoding/files/encoding-0.8.2-overflow.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/dmwit/encoding/pull/11
-
-From ce27249d4260c7eb3f514c95d5edd762804dd4f3 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 29 Aug 2020 13:52:33 +0100
-Subject: [PATCH] Data/Map/Static/Builder.hs: avoid shiftL with negative offset
-
-On ghc-8.8 building `encoding` fails as:
-
-```
-Preprocessing library for encoding-0.8.5..
-arithmetic overflow
-```
-
-This happens because `findSplitSize` can't handle
-small values, like `findSplitSize 1` and calls `shiftL`
-with negative value, which is forbdden:
- https://hackage.haskell.org/package/base-4.14.0.0/docs/Data-Bits.html#v:shiftL
-
-Work it around by always passing non-negative offset.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- Data/Map/Static/Builder.hs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Data/Map/Static/Builder.hs b/Data/Map/Static/Builder.hs
-index 486e19c..61851cd 100644
---- a/Data/Map/Static/Builder.hs
-+++ b/Data/Map/Static/Builder.hs
-@@ -37,6 +37,6 @@ treeDepth sz = find' [0..]
- findSplitSize :: Int -> Int
- findSplitSize len = let depth = treeDepth len
- free = (maxSize depth) - len
-- in if free <= (1 `shiftL` (depth - 2))
-+ in if 2 * free <= (1 `shiftL` (depth - 1))
- then maxSize (depth - 1)
- else len - (maxSize (depth - 2)) - 1
---
-2.28.0
-
diff --git a/dev-haskell/encoding/metadata.xml b/dev-haskell/encoding/metadata.xml
deleted file mode 100644
index 91bcaa50b9b3..000000000000
--- a/dev-haskell/encoding/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
- <longdescription>
- Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
- </longdescription>
- <use>
- <flag name="systemencoding">Provide the getSystemEncoding action to query the locale.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
index 4f3fafe70afc..691f6cbb535b 100644
--- a/dev-haskell/fclabels/Manifest
+++ b/dev-haskell/fclabels/Manifest
@@ -1,5 +1,3 @@
-DIST fclabels-2.0.3.3.tar.gz 24714 BLAKE2B 2bba8892bdacd87fda89106b60752714edd8d2bf15abffe0f1e8cd0b6d17f18f4313e1adbb8c1307de71927936208e65225f9a49b73389f15f1ea9cfccbe82a4 SHA512 0c0f7ed886b65a80aea4e19b5763d7b91ce948b63f86d507ecf0b6874716a190752e0806957c71e0ed0ed97422ba3d09a2be0c82588c8dabfd647474c1a33cff
DIST fclabels-2.0.5.tar.gz 24612 BLAKE2B 48742838f7d7e6194da0556c55ecfe80512f412f0cf03e30092199917f9037bdd3ce55d2744330e43a11a7c63b007ae8b25c2f2e92a277b7f6d2a65a54c439f7 SHA512 f6cc731d68cdf1e5867340a0b73385492008c2729a144dc685136ee6bf80ee0d0e07ddb80f83a18e6a1989d7f8a8755211aadcc92debffd5fe8c178a834021e4
-EBUILD fclabels-2.0.3.3.ebuild 916 BLAKE2B 7a2f665bd125cb46fcfd8b64702352b6cfd70e4da5f5f4e150fe7d6060e9a8245548ce643cd7a3657ea7338c83b15cea7eee4ece1f3dc78861d67ea977184d14 SHA512 34f7772a6b17826d7dff9ff7b0b5a58dd763a7a1e3b70e2a3385636293e47935b66f3ec3c74926dee3a7139baac7b1d43b2bc1f1db73d5471c27b0b0bc960980
EBUILD fclabels-2.0.5.ebuild 787 BLAKE2B 25bc1ee81184af22a09c380a67252ddafd378e387ec974cb3d0957f94935c0be3c004768471acfa6a6d5cc7d2721d5da2dcbc785ada76c56861dbd4e15cc9e0e SHA512 00983c40337867333be731b36d9d745fbc00433ff91ac5bd52efc93175815048f757385a914f472a9aa95b2590c55e1e5596a22280790b0aef3fc3a5572b6a43
MISC metadata.xml 1246 BLAKE2B 094973c2bd67ad69c84e3eb85c74bf4a1a5411f48a57a5b5c066da7ad2bc9b0d59282a8ecc06ddf857621e2ae381511717b7de552be637be1a5c6b5b86282424 SHA512 6000016c8b6806cc9352e0cd76a2655c9c9d09f36a3264a8451a235b2f877d74fe403984d187d3477ed744de562a6493459bc54aec0fe588a23e5ee7e6ce236c
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
deleted file mode 100644
index f9cd7dee05f4..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.12' 'base >= 4.5' \
- 'HUnit >= 1.2 && < 1.7' 'HUnit >= 1.2' \
- 'template-haskell >= 2.2 && < 2.14' 'template-haskell >= 2.2'
-}
diff --git a/dev-haskell/filepattern/Manifest b/dev-haskell/filepattern/Manifest
new file mode 100644
index 000000000000..76e34091eea8
--- /dev/null
+++ b/dev-haskell/filepattern/Manifest
@@ -0,0 +1,3 @@
+DIST filepattern-0.1.2.tar.gz 15737 BLAKE2B c90064a18115538cf7e1d5b26cb46971b86b0c7fb4f8e503db7cf7097cf1f19c8c1fdc3e89a0a90dbf915c95b71109359e94ad8f225a4cb450ad6a5fa71994d7 SHA512 16866d70efdf55ee4e6b246eb7f7300c9ad4c148d8136d817f601b9c0cac95eb1ddaf57ab0b6fad539298b55128fe5c255c31fd152a713bf312488eae823da23
+EBUILD filepattern-0.1.2.ebuild 669 BLAKE2B 20654617e100498c1ca2874de1f550da0274f071a9cf52b1311f45ff3690a5b913cb4b58dca8e59de9f4cb2957ae36d43980b2614241990570a1dd0e0a659af4 SHA512 11c8b6b56fff007869193d4a5bf99a48b1124bcf5081fce185ee0d826f98554f006738a829b1fa1eab8b2ca845a0935c28db85522a7fd0e8133da65262508b0b
+MISC metadata.xml 1020 BLAKE2B e985a0ac1c7494d46568c688397f5beda0671258e4a13e57a1d239276b7e02c02ceccd1b2850513b4325167b5f881f4deeb7f25b76c113f67f15803b5ba234be SHA512 535e11e332bc2128d2e282af750459f6fd4ac84aff0da8f1346558d8c6480dbbdf421d334be61f0aff333d56886bc9714bae7ab921b900c485c178577b404934
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild b/dev-haskell/filepattern/filepattern-0.1.2.ebuild
index c4a8b84b5ab0..148807303154 100644
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
+++ b/dev-haskell/filepattern/filepattern-0.1.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.4
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
+DESCRIPTION="File path glob-like matching"
+HOMEPAGE="https://github.com/ndmitchell/filepattern#readme"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
@@ -17,9 +17,11 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-haskell/syb:=[profile?]
+RDEPEND=">=dev-haskell/extra-1.6.2:=[profile?]
+ >=dev-haskell/semigroups-0.18:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
+ >=dev-haskell/cabal-1.18
+ test? ( >=dev-haskell/quickcheck-2.0 )
"
diff --git a/dev-haskell/filepattern/metadata.xml b/dev-haskell/filepattern/metadata.xml
new file mode 100644
index 000000000000..9b145f120dc0
--- /dev/null
+++ b/dev-haskell/filepattern/metadata.xml
@@ -0,0 +1,26 @@
+<?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>
+ <longdescription>
+ A library for matching files using patterns such as @\&quot;src\/**\/*.png\&quot;@ for all @.png@ files
+ recursively under the @src@ directory. Features:
+
+ * All matching is /O(n)/.
+
+ * See &quot;System.FilePattern&quot; and @?==@ simple matching and semantics.
+
+ * Use @match@ and @substitute@ to extract suitable
+ strings from the @*@ and @**@ matches, and substitute them back into other patterns.
+
+ * Use @step@ and @matchMany@ to perform bulk matching
+ of many patterns against many paths simultaneously.
+
+ * Use &quot;System.FilePattern.Directory&quot; to perform optimised directory traverals using patterns.
+
+ Originally taken from the &lt;https://hackage.haskell.org/package/shake Shake library&gt;.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/geniplate/Manifest b/dev-haskell/geniplate/Manifest
deleted file mode 100644
index 1657acb8b12f..000000000000
--- a/dev-haskell/geniplate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST geniplate-0.6.0.5.tar.gz 7738 BLAKE2B e60c36ba553034400740c4b42828cb8e333331846ce719243761b9a4f8cd5a9875ee00856bf7cac1f03658392df920b9a41b2295d807f6926db1e80eba333232 SHA512 37127fa364ef0a8c67abbbadc025b932ddc62aaf09e4096548263c140b232b5442889d24f18fbb4ed3ea5eb0643b6afb4634b73471a2ec35b626dcd0c1781987
-EBUILD geniplate-0.6.0.5.ebuild 686 BLAKE2B 08047ca898043359b88119e9eca1fc3edac66b64fcc9bf467d32329e72cbb231bc8417b415b757756280e30191bc2fbbb793293320ff1d60dcbfc553216b9510 SHA512 9670072c8385e09cd7339cb717504de8aac922bbc0dcedd37440b803b9251f168f404e585faefecd1d148fdf6b39145f3c955d45e03601b6cb836c8b79f379c1
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/ghc-lib-parser-ex/Manifest b/dev-haskell/ghc-lib-parser-ex/Manifest
new file mode 100644
index 000000000000..dcb086b2f88f
--- /dev/null
+++ b/dev-haskell/ghc-lib-parser-ex/Manifest
@@ -0,0 +1,3 @@
+DIST ghc-lib-parser-ex-8.10.0.19.tar.gz 21193 BLAKE2B 83bbc7f8ef439960cc075d12bfc64e36a44444be5a415d90a5cc3630b51c766158d12459cc9a4f1afc0a615ce1afcac8017333e388ba0c4c622f880dc56faa59 SHA512 a286a0874191e7e10484279e9a70e1dc1add602ee6180718e7936f9ac0714ad0997a0398d1879ae0b1d1864f5976c26eb05d8db621343885630e37739e6cc17f
+EBUILD ghc-lib-parser-ex-8.10.0.19.ebuild 944 BLAKE2B 17377b2de358c313daf09c3442dfcddd7213f73ab9deae8ac0e9f95ab8aeb5221624639740e729b6d27a7c4389433256165fa87428683209d2ea34066de7ca08 SHA512 c1b9748fbc06b50b6341fd576c9857d0626cc1f282394cb76dd16b09e46784a5048c292891c2a091b08143bf12100d1454d68b4f921ca004782217180b6886c4
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild b/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild
new file mode 100644
index 000000000000..8df43a19e93f
--- /dev/null
+++ b/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -no-ghc-lib,+auto
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Algorithms on GHC parse trees"
+HOMEPAGE="https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/ghc-lib-parser-8.10:=[profile?] <dev-haskell/ghc-lib-parser-8.11:=[profile?]
+ >=dev-haskell/uniplate-1.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/extra-1.6
+ >=dev-haskell/tasty-1.2
+ >=dev-haskell/tasty-hunit-0.10.0
+ >=dev-haskell/uniplate-1.6.12 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=auto \
+ --flag=-no-ghc-lib
+}
diff --git a/dev-haskell/geniplate/metadata.xml b/dev-haskell/ghc-lib-parser-ex/metadata.xml
index b7878815d80d..b7878815d80d 100644
--- a/dev-haskell/geniplate/metadata.xml
+++ b/dev-haskell/ghc-lib-parser-ex/metadata.xml
diff --git a/dev-haskell/ghc-lib-parser/Manifest b/dev-haskell/ghc-lib-parser/Manifest
new file mode 100644
index 000000000000..fcefab977270
--- /dev/null
+++ b/dev-haskell/ghc-lib-parser/Manifest
@@ -0,0 +1,3 @@
+DIST ghc-lib-parser-8.10.2.20200916.tar.gz 1627245 BLAKE2B 35290880c01acb455b3f6f1f65e5904f82a472dc6b5491aed397a063f38257c0ecb1095ee6e535bce63333f5148179a1e183e877a4fbcda30c69abf7e7a3a5b8 SHA512 b0544ac5d678324e7672f133c1236dd331f170dc99c73a5a22985c3b83d4c6c139d247cf924c6b6e4e4c4e76675c3c0f83e7c84a4ed9aa9a8afa039895730960
+EBUILD ghc-lib-parser-8.10.2.20200916.ebuild 585 BLAKE2B bd81615db77f874724b290f91904cc69ec05b2c3895d5114e1b2c73b41459ddbbc8f15be92229d5c14dff62aee34dbe24c01fa881c4eef26ee274d06d5899674 SHA512 bbdbbb57aff812151416161cc15d4271a23c3e8d5547906329aa5bfbc04101cc6513d0ff26ccc0ad7d457034873b5481db812a17724bf3908f0ce97d3d6a0da9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild b/dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild
index a9f1c0ab19fb..7de702a7f327 100644
--- a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+++ b/dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,8 +8,8 @@ EAPI=7
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://hackage.haskell.org/package/geniplate"
+DESCRIPTION="The GHC API, decoupled from GHC versions"
+HOMEPAGE="https://github.com/digital-asset/ghc-lib"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
@@ -17,16 +17,10 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.6.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
+ dev-haskell/alex
+ >=dev-haskell/cabal-2.4.0.1
+ dev-haskell/happy
"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell < 2.10' 'template-haskell'
-}
diff --git a/dev-haskell/network-protocol-xmpp/metadata.xml b/dev-haskell/ghc-lib-parser/metadata.xml
index b7878815d80d..b7878815d80d 100644
--- a/dev-haskell/network-protocol-xmpp/metadata.xml
+++ b/dev-haskell/ghc-lib-parser/metadata.xml
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index 4bf63dacad96..be613d45c157 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -1,5 +1,4 @@
AUX gtk2hs-buildtools-0.13.8.0-gcc-11.patch 1156 BLAKE2B 5d3485191fd380343412f977baf6e0d434235f012e425118317e5f9c810d4e7b4bde64c5683e912aea098afe84dd9d45f9e458e88214c005943f6ea919ad5987 SHA512 f01350cc6603d0b8cdd4ad4ba4539cd307058c81a4452e8a455c5c612e6a5e1156ffe71518a8fe762e4a56c8f0d173e9cf7fac498b2849e48ce811c511186cce
DIST gtk2hs-buildtools-0.13.8.0.tar.gz 178465 BLAKE2B 73a3bea8e002ba641f08f3104b7c8759dba2649e8b050ac769470c7d67441e86365c4687f2645fed62cb79cbe38947c02c2622224e4568440a8d2745a045b333 SHA512 fa427979f20f10ca8baf38c80c28a5190d18b767046de347950ea799660e1d54939d668c01c469da36d2df6c347f7ba67e2e85f3a7000021f8d37852093e03fd
EBUILD gtk2hs-buildtools-0.13.8.0-r1.ebuild 903 BLAKE2B a0f2c7dd51499141373eeb955bdb3ef8a682d9617db029add65b7d88dbfc0b2139a0bf3a2d2deeeeeb40cec10d132068b1670494ac25d35b1b426fb54ffe33a3 SHA512 5241a5a51445b76b425d1df8ad5fb415e24f36d321391ee309aea7e8f23e15ac5f1e8d94ea5af98e22a5398c639f1a8e84cac44424edacebbf6340a20d4d7166
-EBUILD gtk2hs-buildtools-0.13.8.0.ebuild 850 BLAKE2B 6006f7d07dc50a6eef337b058e23f074b5dc827472a5b49c4ba244ceb7490955a25db68bf6f186d1894613935b398083fb0451a849241439d8e30c1e605df98c SHA512 240a9459683800f4bec0e994a2b6fd2411a82b5284f9e2a14a22caeb6d822e9974015d8311395e9128eb35e8bb336925114ff32e0588b66823bb750b8464941f
MISC metadata.xml 838 BLAKE2B d807057f72ce471a31e5eda4e4c26d8c2e7a6e5c6a932dc577c293d5f52704ce64b055a2dc194fbce71d8028ee7d5dca05f863fa2519fc841f585400d05849de SHA512 81b67b9c4d461b291561a2ee3873c80c257fc0e3e8641724381567d378aafae21f8056b60b00d432a0db60f5795d6b7a78a74cce9e10722b809f46c6701e7feb
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild
deleted file mode 100644
index 2a1041ef1045..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild
+++ /dev/null
@@ -1,35 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
- dev-haskell/fail:=[profile?]
- dev-haskell/hashtables:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.18.1.3
- dev-haskell/happy
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
index ef2ecba20b06..d3fa2d5b47d0 100644
--- a/dev-haskell/hakyll/Manifest
+++ b/dev-haskell/hakyll/Manifest
@@ -1,6 +1,3 @@
-AUX hakyll-4.13.4.1-pandoc-2.11.patch 8213 BLAKE2B f30c9f5260ab834395d10358419e9b0d4bfe91acd80b1a45a7e432e92c480097138cd2e430257af2c24934d8bce1d377f8b84b6acd99036fe321f12b0f065063 SHA512 6e4c5f4440619e19d03a591b8771f810ecfb18ddbd9b4961fae64ef36defcb89191cd9b84998f61f3538854ebd2d9c1c8bda986a323d37ebf8361504fc126bc6
-DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
-DIST hakyll-4.13.4.1.tar.gz 105251 BLAKE2B 6a2c83f2784aad1c80ecce7d01ade1d1bde0546c3f828acc74c88df95b4217f191eb516bf57cc1993bdaebd76629d86d3963bf386f7df68ca5dc17288f3f2b3f SHA512 6045a1461855d46f57a20f7a84636f90e6d151bcbaf09511f10ab66fa0567062e355ff580d1f12a4432bbe517bc9e162d65927f3c343f8f077e81981e7c7973c
-EBUILD hakyll-4.13.4.0.ebuild 4079 BLAKE2B bdd468381be955fa43da8b5596e4e0c521936f4d51d922717da71d9c48d12edc5c0ad2e570c42805772018acd5e0d8f32803c419f2dab402412453dda801c90c SHA512 7a14b03e850212f32e1a66f9be83d9b6e9e51650d5a158b7889908d65aba2570d277fc42a2957e0a90fec554fc623f2268ea64af41a7a3116ea8f892403018f3
-EBUILD hakyll-4.13.4.1.ebuild 4333 BLAKE2B 82665d4629e697ac65494402797742f4d20f65e15b3ab34b860529be82799477c62f7129126514974dd46099b8ea41572b8220c5f65d0f0bcd2a1ce4b6674290 SHA512 90d97380fe9a629fb2a3cc38de12a959ea299b80e34b5d35c1f0e19a0082892a05fd8aafb4833ea8c3c20ba76d0a5a0d8f9d49c4b7177b7682b16b7446f34b05
+DIST hakyll-4.14.0.0.tar.gz 109807 BLAKE2B e1e6e541f5783571740744b9eee1bcd9edd79eec69b5556de39ef7a47f86e23fa0284ccb83ff9212ff4b07b7e2519eff67946ebdbf90663421cf98ea9761c529 SHA512 5f3f7a952b085cf1a59a646c15e42f29c89d4ed0a5a96f55156d19b86340c2361da6c19ff7a70bde98122423e237dc7082bfcc84bc5e96ab9421fdaef84a8cce
+EBUILD hakyll-4.14.0.0-r1.ebuild 4319 BLAKE2B 97d6aedc4e496f7696f6c1f306d07af9730f56749c54f65f45dabc2246491c700da386b566d2aefa715bf1d1c9f7cb0088b40354805eaa4375c4b26497860d0e SHA512 be78272f30ccb8188f6834a2ce4dd86966b32db04ec164c790fdfbc7bb92fd5bd45f521dac51dc0f24ba5ae32b8c65a892038214aec1d9aa9d67ca5282932cbc
MISC metadata.xml 1181 BLAKE2B a22ae826a948f6941e935e93f5381bffb53ec0c532e571d5c903ce5670cdc615a1a4915b2b0b66530e21877e57eb55d2947a5d54da18df8e0030aeb6e369dd8b SHA512 104a8d369da505e931d184a37661832fa99c27412b4e4e8c2dca8b857aaba48258a0fa52d47fafeb964b1633255a38b72383fa439038e948631730da02f07a8d
diff --git a/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch b/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
deleted file mode 100644
index 1598c89c8995..000000000000
--- a/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 77afcbc2937a4ee5db9666c1f3e0c090914d3980 Mon Sep 17 00:00:00 2001
-From: Jasper Van der Jeugt <m@jaspervdj.be>
-Date: Sun, 6 Dec 2020 19:24:06 +0100
-Subject: [PATCH] Pandoc 2.11 compatibility (#826)
-
-* Pandoc 2.11 compatibility
-
-* Bump stack.yaml
-
-* Bump stack dependencies
----
- lib/Hakyll/Web/Pandoc/Biblio.hs | 102 +++++++++++++++++---------------
- lib/Hakyll/Web/Pandoc/Binary.hs | 12 ----
- 5 files changed, 123 insertions(+), 86 deletions(-)
-diff --git a/lib/Hakyll/Web/Pandoc/Biblio.hs b/lib/Hakyll/Web/Pandoc/Biblio.hs
-index 5127d881..567f478b 100644
---- a/lib/Hakyll/Web/Pandoc/Biblio.hs
-+++ b/lib/Hakyll/Web/Pandoc/Biblio.hs
-@@ -12,6 +12,7 @@
- {-# LANGUAGE Arrows #-}
- {-# LANGUAGE DeriveDataTypeable #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE OverloadedStrings #-}
- module Hakyll.Web.Pandoc.Biblio
- ( CSL
- , cslCompiler
-@@ -23,33 +24,31 @@ module Hakyll.Web.Pandoc.Biblio
-
-
- --------------------------------------------------------------------------------
--import Control.Monad (liftM, replicateM)
--import Data.Binary (Binary (..))
--import Data.Typeable (Typeable)
-+import Control.Monad (liftM)
-+import Data.Binary (Binary (..))
-+import qualified Data.ByteString as B
-+import qualified Data.ByteString.Lazy as BL
-+import qualified Data.Map as Map
-+import qualified Data.Time as Time
-+import Data.Typeable (Typeable)
- import Hakyll.Core.Compiler
- import Hakyll.Core.Compiler.Internal
- import Hakyll.Core.Identifier
- import Hakyll.Core.Item
--import Hakyll.Core.Provider
- import Hakyll.Core.Writable
- import Hakyll.Web.Pandoc
--import Hakyll.Web.Pandoc.Binary ()
--import qualified Text.CSL as CSL
--import Text.CSL.Pandoc (processCites)
--import Text.Pandoc (Pandoc, ReaderOptions (..),
-- enableExtension, Extension (..))
-+import Text.Pandoc (Extension (..), Pandoc,
-+ ReaderOptions (..),
-+ enableExtension)
-+import qualified Text.Pandoc as Pandoc
-+import qualified Text.Pandoc.Citeproc as Pandoc (processCitations)
-
-
- --------------------------------------------------------------------------------
--data CSL = CSL
-- deriving (Show, Typeable)
-+newtype CSL = CSL {unCSL :: B.ByteString}
-+ deriving (Binary, Show, Typeable)
-
-
----------------------------------------------------------------------------------
--instance Binary CSL where
-- put CSL = return ()
-- get = return CSL
--
-
- --------------------------------------------------------------------------------
- instance Writable CSL where
-@@ -59,21 +58,12 @@ instance Writable CSL where
-
- --------------------------------------------------------------------------------
- cslCompiler :: Compiler (Item CSL)
--cslCompiler = makeItem CSL
--
--
----------------------------------------------------------------------------------
--newtype Biblio = Biblio [CSL.Reference]
-- deriving (Show, Typeable)
-+cslCompiler = fmap (CSL . BL.toStrict) <$> getResourceLBS
-
-
- --------------------------------------------------------------------------------
--instance Binary Biblio where
-- -- Ugly.
-- get = do
-- len <- get
-- Biblio <$> replicateM len get
-- put (Biblio rs) = put (length rs) >> mapM_ put rs
-+newtype Biblio = Biblio {unBiblio :: B.ByteString}
-+ deriving (Binary, Show, Typeable)
-
-
- --------------------------------------------------------------------------------
-@@ -84,12 +74,7 @@ instance Writable Biblio where
-
- --------------------------------------------------------------------------------
- biblioCompiler :: Compiler (Item Biblio)
--biblioCompiler = do
-- filePath <- getResourceFilePath
-- makeItem =<< unsafeCompiler (Biblio <$> CSL.readBiblioFile idpred filePath)
-- where
-- -- This is a filter on citations. We include all citations.
-- idpred = const True
-+biblioCompiler = fmap (Biblio . BL.toStrict) <$> getResourceLBS
-
-
- --------------------------------------------------------------------------------
-@@ -99,19 +84,42 @@ readPandocBiblio :: ReaderOptions
- -> (Item String)
- -> Compiler (Item Pandoc)
- readPandocBiblio ropt csl biblio item = do
-- -- Parse CSL file, if given
-- provider <- compilerProvider <$> compilerAsk
-- style <- unsafeCompiler $
-- CSL.readCSLFile Nothing . (resourceFilePath provider) . itemIdentifier $ csl
--
-- -- We need to know the citation keys, add then *before* actually parsing the
-- -- actual page. If we don't do this, pandoc won't even consider them
-- -- citations!
-- let Biblio refs = itemBody biblio
-- pandoc <- itemBody <$> readPandocWith ropt item
-- let pandoc' = processCites style refs pandoc
--
-- return $ fmap (const pandoc') item
-+ -- It's not straightforward to use the Pandoc API as of 2.11 to deal with
-+ -- citations, since it doesn't export many things in 'Text.Pandoc.Citeproc'.
-+ -- The 'citeproc' package is also hard to use.
-+ --
-+ -- So instead, we try treating Pandoc as a black box. Pandoc can read
-+ -- specific csl and bilbio files based on metadata keys.
-+ --
-+ -- So we load the CSL and Biblio files and pass them to Pandoc using the
-+ -- ersatz filesystem.
-+ Pandoc.Pandoc (Pandoc.Meta meta) blocks <- itemBody <$>
-+ readPandocWith ropt item
-+
-+ let cslFile = Pandoc.FileInfo zeroTime . unCSL $ itemBody csl
-+ bibFile = Pandoc.FileInfo zeroTime . unBiblio $ itemBody biblio
-+ addBiblioFiles = \st -> st
-+ { Pandoc.stFiles =
-+ Pandoc.insertInFileTree "_hakyll/style.csl" cslFile .
-+ Pandoc.insertInFileTree "_hakyll/refs.bib" bibFile $
-+ Pandoc.stFiles st
-+ }
-+ biblioMeta = Pandoc.Meta .
-+ Map.insert "csl" (Pandoc.MetaString "_hakyll/style.csl") .
-+ Map.insert "bibliography" (Pandoc.MetaString "_hakyll/refs.bib") $
-+ meta
-+ errOrPandoc = Pandoc.runPure $ do
-+ Pandoc.modifyPureState addBiblioFiles
-+ Pandoc.processCitations $ Pandoc.Pandoc biblioMeta blocks
-+
-+ pandoc <- case errOrPandoc of
-+ Left e -> compilerThrow ["Error during processCitations: " ++ show e]
-+ Right x -> return x
-+
-+ return $ fmap (const pandoc) item
-+
-+ where
-+ zeroTime = Time.UTCTime (toEnum 0) 0
-
- --------------------------------------------------------------------------------
- pandocBiblioCompiler :: String -> String -> Compiler (Item String)
-diff --git a/lib/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs
-index 5d3efead..3f7f4fb5 100644
---- a/lib/Hakyll/Web/Pandoc/Binary.hs
-+++ b/lib/Hakyll/Web/Pandoc/Binary.hs
-@@ -4,9 +4,6 @@ module Hakyll.Web.Pandoc.Binary where
-
- import Data.Binary (Binary (..))
-
--import qualified Text.CSL as CSL
--import qualified Text.CSL.Reference as REF
--import qualified Text.CSL.Style as STY
- import Text.Pandoc
-
- --------------------------------------------------------------------------------
-@@ -18,7 +15,6 @@ instance Binary Caption
- instance Binary Cell
- instance Binary ColSpan
- instance Binary ColWidth
--instance Binary CSL.Reference
- instance Binary Citation
- instance Binary CitationMode
- instance Binary Format
-@@ -27,17 +23,9 @@ instance Binary ListNumberDelim
- instance Binary ListNumberStyle
- instance Binary MathType
- instance Binary QuoteType
--instance Binary REF.CLabel
--instance Binary REF.CNum
--instance Binary REF.Literal
--instance Binary REF.RefDate
--instance Binary REF.RefType
--instance Binary REF.Season
- instance Binary Row
- instance Binary RowHeadColumns
- instance Binary RowSpan
--instance Binary STY.Agent
--instance Binary STY.Formatted
- instance Binary TableBody
- instance Binary TableFoot
- instance Binary TableHead
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild b/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
deleted file mode 100644
index 0cf1b6bd90e5..000000000000
--- a/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
+++ /dev/null
@@ -1,76 +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="A static website compiler library"
-HOMEPAGE="https://jaspervdj.be/hakyll/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
-
-RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.12:=[profile?]
- >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
- >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
- >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
- >=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- >=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
- >=dev-lang/ghc-8.6.3:=
- buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] )
- checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
- previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
- >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
- >=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
- >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
- !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
- watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
- usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?]
- >=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag buildwebsite buildwebsite) \
- $(cabal_flag checkexternal checkexternal) \
- $(cabal_flag previewserver previewserver) \
- $(cabal_flag usepandoc usepandoc) \
- $(cabal_flag watchserver watchserver)
-}
-
-src_test() {
- # unixFilter test expects 'option' output in error message
- # But it's a localized string that:
- # https://github.com/jaspervdj/hakyll/issues/607
- LANGUAGE=en haskell-cabal_src_test
-}
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild b/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild
index 87f239ca1460..a9d1b64fa5f2 100644
--- a/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild
+++ b/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
>=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
>=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
>=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
>=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
>=dev-lang/ghc-8.6.3:=
- buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
+ buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.14:=[profile?] )
checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
@@ -48,26 +48,25 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=
>=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
!previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
- usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.12:=[profile?] )
+ usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.14:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.4.0.1
test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
+ >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
"
-PATCHES=( "${FILESDIR}"/${P}-pandoc-2.11.patch )
-
src_prepare() {
default
+ # See upstream commit making this change:
+ # https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246
cabal_chdeps \
- 'pandoc >= 2.10 && < 2.11,' 'pandoc >= 2.11' \
- 'pandoc >= 2.10 && < 2.11' 'pandoc >= 2.11' \
- 'pandoc-citeproc >= 0.14 && < 0.18' ' ' \
- 'file-embed >= 0.0.10.1 && < 0.0.12' 'file-embed >= 0.0.10.1'
+ 'pandoc >= 2.11 && < 2.12' 'pandoc >= 2.11' \
+ 'pandoc >= 2.11 && < 2.12' 'pandoc >= 2.11'
}
src_configure() {
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index 34f98ac01f15..423c0f2136e2 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -1,5 +1,3 @@
-DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f SHA512 e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e
-EBUILD happstack-server-7.6.0.ebuild 2268 BLAKE2B deba298727d88769becf6c5a0337a774c0e45f5004d224c6a1cbad33f3d9b1f037a4c4831ea5dda714b820db6838a30d4442b3a0352d598f1ff22a3d1ef56a67 SHA512 b21bc776e44188d8381e679cbf73b3f14b852248efe7f76fa8ea2642bd225f5af6fcf71b8e59c382edbcb3a4e571560220050e8520b651019b69148848c306d1
EBUILD happstack-server-7.6.1.ebuild 2201 BLAKE2B 713d1d27e330f7e213c048ba112ac57ce3007138842b937dcdf71cd29bf11ea28de69456f7b24be8a3fafa2b984fbdf85af9b30eb5b0e65ad833ba3c3d76d908 SHA512 d6acc83a0d38c4b3f5da2d3f9993dd23d042860cbbdcc3e404a1daa8f37e8a82e1b01309cb1d1509eb2b2b24ee146e4f3f5d345bc91140445b1f954924f1436d
-MISC metadata.xml 783 BLAKE2B 51a13d512979778ff2fbfdad3eaf90e5ec64aaf086aef3e7a65f4ad544e718b5d08e68505b3446ba3c3fcec76a00e957ea9d534c85ab2f31d1f02088391eb7c8 SHA512 c85819776184a2a11e2ee9f4217000cafcd1c8f357f8875829483aa5ca16796cac2ccb113a392dde6b1653eb1478498320f931551e48fb59468bdcccf5a2248c
+MISC metadata.xml 686 BLAKE2B 3803beb66458d7fbc3344f91c6385c00dea5bca51660c5f2b77c269252d462c0ea3559d0a8a2629cbb50aeb73bf074c463aea971f82ca8732783aa491a46d385 SHA512 ab1d696021dd0ba209dba25d311ebb1a937836750ff9d1006a29b7b24320bcc265842e50ecfa02ac1fdbdf59072980f389da82bca4dfb17ec6d3031a9305523b
diff --git a/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
deleted file mode 100644
index ca46057156f8..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
+++ /dev/null
@@ -1,56 +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="Web related tools and services"
-HOMEPAGE="https://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- dev-haskell/exceptions:=[profile?]
- dev-haskell/extensible-exceptions:=[profile?]
- >=dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- dev-haskell/old-locale:=[profile?]
- <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?]
- >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?]
- dev-haskell/syb:=[profile?]
- >=dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/threads-0.5:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- dev-haskell/xhtml:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/network-3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
index 8de693a1c501..5cfc556a21d7 100644
--- a/dev-haskell/happstack-server/metadata.xml
+++ b/dev-haskell/happstack-server/metadata.xml
@@ -10,6 +10,5 @@
</longdescription>
<use>
<flag name="network-uri">Get Network.URI from the network-uri package</flag>
- <flag name="template-haskell">Description: Template Haskell is available on this system</flag>
</use>
</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index caf05b3121c7..3812fa3dd4e0 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,5 +1,5 @@
DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
-EBUILD haskell-src-exts-1.17.1.ebuild 1067 BLAKE2B 3efffa321c1e5092987a68b4a5d8e0d1f7432255fa8ae80233e1a60892fa4fef582dcf506d4d4dad52475879e8c22480bc081b7bc9ffdc7d71c88c11f45c7293 SHA512 82026a4cf81f0925167ce9ac2802a8e0d5c65d048f0e21518a3b47d9eaf7da57c5c67ccca51b07c4dd3efdbb5c07fcffb1d88b60336b7435bdd29701ab4950fd
+EBUILD haskell-src-exts-1.17.1.ebuild 1077 BLAKE2B 53d381b8e438fa91f8166e5f916a777c1433da7c619da67cfc60bd286fea4c7ec95d63234672ca977c442aac0b1331926d7231d7fb55118581f36aa26c5b807d SHA512 498d2c05878201e0cce8ff10d4ca652269787f2c1af1a88defc1728fe689b5baaa49af73d4d03ac7edfaebca7dc005654ea9223b5a79487e7222e0b33c04fd9d
EBUILD haskell-src-exts-1.21.1.ebuild 1014 BLAKE2B 986d5d068def2da1997b61323a77f6c03d3020dd3eae0469216e76464b3f0b5357f6f6d32987a7d8a63045c765a70c95f4eb20d991b062d28886f5e5a350ae4c SHA512 5ce4a51e6b06879985310982edbb9699c3d54351d208a58385a8688d508eae872879a5da25630c23d8f016a5dd9d3f657063371a4a69d33cab0d8cc22b222287
MISC metadata.xml 778 BLAKE2B 88754b796b4201cb9fd07d237a7c750dfa5f2a306e152bc8e0dedcf410bbbf0836d954e4522dc39790e18f83858844380d96f25be34f3133a042a234d6d50467 SHA512 ac9bfe683996bf5860b908657539f7cb79fcfb300cb6e852e18d1400fbca52e4d7320c525b15cd9a7924bb5be682d75bb5a5f4435012e49eaa66e1076fe73289
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
index 6eec8f814206..cc8b39436970 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ default
+
cabal_chdeps \
'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
}
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index 43ab0ccf8058..420b436987ec 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -1,4 +1,3 @@
-AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c8728ba528b0bd8b5c9e10fb765282de3f856ee59146e1f1043d7b5cb47c8352e60a72f2a86119654283c6 SHA512 1e83147144fb72a9e98fd405116baa2ff10532bdfb954fd86486f1abc3a6df7db54f90875dfe325f827546c03cc6c1d9980003fa839857f8c6b4410cfe8cccd4
-DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3
-EBUILD hlint-2.1.17-r1.ebuild 1948 BLAKE2B c599034a9b4139ff21d8d493efb4ceae6b072eda74077c6c3e19129dc0fb63506db1c6d438b3117e866e5239a7688344c643941bd271a8296c9dc65b02185a80 SHA512 cda3327dc8192d7b00ff35d0a380ab5c923f1c04f2a9fde8c8adee988d9cdb16570a2053de29b52688febad57acfd8227bbf0dc28d15483e0f49455a55b182db
-MISC metadata.xml 413 BLAKE2B fcda272b6d32522677922b85aaf4d0f61c670f81d89cec222efdec84de44116cfb4bd383e1d5b07568e4c949087c03bebae3f7771cf1f711823b487d847718a4 SHA512 859f47847efd9bfd4cc5c406df9efa406dff07c051fde2e101acc62588a920f3ccd1c2b06b9c324c10399d28327dd928265d80ce46cb3556d87d860ef0119840
+DIST hlint-3.2.7.tar.gz 159088 BLAKE2B 5fde93d35093aff4c56dd2b39f2f2318872b6d85cfa1d8ee21aaa7c970ecbd013eb5cac3b9d8742139fe3fa1e5c251364ea479facbc54338adcec5717e31dfaa SHA512 5db66f671d18279d5f4da8b158c9947e95804eff97b2efe1b53a2e3f0f5e23d7560c8085a253031e57d20bb77da0c266f2143b3b03899bfaa1a311d3ace2985b
+EBUILD hlint-3.2.7.ebuild 1890 BLAKE2B eb788ada53085c4e8eabc1a7edbad838387c1df8a0d3db055d610ace52dba7226793ede4d8afb41e02ec5fa06f2a043fc589ba69ad2cd0ef79c0e204fd27082d SHA512 45895cd4005cf68c13a81da27012d845e0e9dccabc76aadae74ba404bbf12636240af46b61bbb52115d8006481d9c4deb89456d87434853e77024c71897f7e69
+MISC metadata.xml 465 BLAKE2B a0a970ee7a7d014a51f22944aabcb2254e1b4448d7fbf20881b0222d82102d99c2ac5230999492334d3ba051f082364aa40cc05af796f5d984ff393f11277d9e SHA512 b02ceb7e170dd64f84db21b5a72656c08a3729e64f932e26adc3451d096f9ddb38753cf8a423920fc9fa039c97a365e51cccc3f8d52752fc12da09263344df72
diff --git a/dev-haskell/hlint/files/60hlint-gentoo.el b/dev-haskell/hlint/files/60hlint-gentoo.el
deleted file mode 100644
index 990d5a89b5fb..000000000000
--- a/dev-haskell/hlint/files/60hlint-gentoo.el
+++ /dev/null
@@ -1,7 +0,0 @@
-
-;; hlint emacs integration site initialisation
-(add-to-list 'load-path "@SITELISP@")
-(require 'hs-lint)
-(defun hlint-haskell-mode-hook ()
- (local-set-key "\C-cl" 'hs-lint))
-(add-hook 'haskell-mode-hook 'hlint-haskell-mode-hook)
diff --git a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild b/dev-haskell/hlint/hlint-2.1.17-r1.ebuild
deleted file mode 100644
index e725b17cfa22..000000000000
--- a/dev-haskell/hlint/hlint-2.1.17-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=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?]
- >=dev-haskell/ansi-terminal-0.6.2:=[profile?]
- >=dev-haskell/cmdargs-0.10:=[profile?]
- >=dev-haskell/cpphs-1.20.1:=[profile?]
- >=dev-haskell/data-default-0.3:=[profile?]
- >=dev-haskell/extra-1.6.6:=[profile?]
- dev-haskell/haskell-src-exts:1.21=[profile?]
- >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?]
- >=dev-haskell/refact-0.3:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/uniplate-1.5:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-haskell/yaml-0.5.0:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
- local threaded_flag=""
- if $(ghc-supports-threaded-runtime); then
- threaded_flag="--flags=threaded"
- else
- threaded_flag="--flags=-threaded"
- fi
-
- haskell-cabal_src_configure \
- $(cabal_flag gpl gpl) \
- $threaded_flag
-}
-
-src_compile() {
- cabal_src_compile
-
- use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
- cabal_src_install
-
- if use emacs; then
- elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- doman data/hlint.1
-}
-
-pkg_postinst() {
- haskell-cabal_pkg_postinst
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- haskell-cabal_pkg_postrm
- use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-3.2.7.ebuild b/dev-haskell/hlint/hlint-3.2.7.ebuild
new file mode 100644
index 000000000000..a66d70328900
--- /dev/null
+++ b/dev-haskell/hlint/hlint-3.2.7.ebuild
@@ -0,0 +1,59 @@
+# 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: -ghc-lib
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Source code suggestions"
+HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gpl hsyaml +threaded test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?]
+ >=dev-haskell/ansi-terminal-0.8.1:=[profile?]
+ >=dev-haskell/cmdargs-0.10:=[profile?]
+ >=dev-haskell/cpphs-1.20.1:=[profile?]
+ >=dev-haskell/data-default-0.3:=[profile?]
+ >=dev-haskell/extra-1.7.3:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ >=dev-haskell/filepattern-0.1.1:=[profile?]
+ >=dev-haskell/ghc-lib-parser-8.10:=[profile?] <dev-haskell/ghc-lib-parser-8.11:=[profile?]
+ >=dev-haskell/ghc-lib-parser-ex-8.10.0.17:=[profile?] <dev-haskell/ghc-lib-parser-ex-8.10.1:=[profile?]
+ >=dev-haskell/refact-0.3:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/uniplate-1.5:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+ hsyaml? ( >=dev-haskell/hsyaml-0.2:=[profile?]
+ >=dev-haskell/hsyaml-aeson-0.2:=[profile?] )
+ !hsyaml? ( >=dev-haskell/yaml-0.5.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-ghc-lib \
+ $(cabal_flag gpl gpl) \
+ $(cabal_flag hsyaml hsyaml) \
+ $(cabal_flag threaded threaded)
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}:${LD_LIBRARY_PATH}"
+ "${S}"/dist/build/hlint/hlint --datadir="${S}"/data --test || die
+}
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
index bea62cfa5834..a33e9d0bc4b3 100644
--- a/dev-haskell/hlint/metadata.xml
+++ b/dev-haskell/hlint/metadata.xml
@@ -6,9 +6,8 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="gpl">Use GPL libraries, specifically hscolour.</flag>
+ <flag name="gpl">Use GPL libraries, specifically hscolour</flag>
+ <flag name="hsyaml">Use HsYAML instead of yaml</flag>
+ <flag name="threaded">Build with support for multithreaded execution</flag>
</use>
- <upstream>
- <remote-id type="github">ndmitchell/hlint</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
index e80efee31bfa..aa7320feeda4 100644
--- a/dev-haskell/hoauth2/Manifest
+++ b/dev-haskell/hoauth2/Manifest
@@ -1,5 +1,3 @@
-DIST hoauth2-1.11.0.tar.gz 18270 BLAKE2B 8258e8e7a1bfe12ca0da09297c18354617cb525aee70418a85a56cd5421b4695aa22861e1368fbd2d0ac11ff155fd4cebb8d220ebc4b1f7c3403268682e11e95 SHA512 179c97045f33da6f6cb4c153b9be3482031ce8a150ad70defcbbbfa3c67ff10b31c86c45d845aa605b9c4d3ac921f4372bcd49fbb384e0c78409219bc0bf1607
DIST hoauth2-1.16.0.tar.gz 18479 BLAKE2B ca9aa0d35d3bfb9ee3a9cbe62c2ecb1a0efd109c89600642a062fbcbe62cefae53f4810b38eb55b81c29c72e4b80aca8f746966ccbaf17ecc83883e2f6fc3528 SHA512 fe42759c2ccaf035bfa15d9276a7c8bf6608a7b74732c6950c2081616196296a73c34474989c1eda5fcfc15066626e1facf2f58b6977d5e00520290948731cb6
-EBUILD hoauth2-1.11.0.ebuild 1353 BLAKE2B b41c3337299bca10862ce3ffd4ceb8ef3beb124e617d3901dfc0da22d840752175f16b0c7a307e68d8e8948871aa977b9273eedeffde83c46ad549025fcaa478 SHA512 42b0f3d2367c359a6c99e450c8ed4c182348dc6ec1e76f77af494de06878d732fa056af72b1fb8c86cc00198f517cd0063e7338e5e054ef5ddafadfa67922788
EBUILD hoauth2-1.16.0.ebuild 1398 BLAKE2B 5d4a31b3eeb8784ce694805f06c2769c64d39dd1b4c86004af4ce35d959e8218cec2ee58690f9c57f154dc1d1517ee0d00db802ba9ca29a5bbcae21a211a4b93 SHA512 8aaf230abae7ea1337fa1b9fc4b864d894b35134a26b2bf90ae811a27efbcdde0c3fa74b4436bf656ec424a2de2fdde9966c1374da68f0cb1a9b2b4f3b7ac71b
MISC metadata.xml 655 BLAKE2B 19a9e440b04b5bf2e3bc9847baf82c2dba9e10f0c1156ddea8346f1c7511b9447874916b8ffdbac637fd5e41e2cc78a0d7ee6fe9034d13366920c7bf27e80072 SHA512 e8ea432f6d8785580b6486b34c43423dd0e141a102abf18ff4a5b1b418df23101d82e6f3cffac71b749af75793f61f645ee5074abe79f633127c82ce740d1f72
diff --git a/dev-haskell/hoauth2/hoauth2-1.11.0.ebuild b/dev-haskell/hoauth2/hoauth2-1.11.0.ebuild
deleted file mode 100644
index 62e78143887b..000000000000
--- a/dev-haskell/hoauth2/hoauth2-1.11.0.ebuild
+++ /dev/null
@@ -1,39 +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
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
- >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5:=[profile?]
- >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
- >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-test
-}
diff --git a/dev-haskell/hslua-module-path/Manifest b/dev-haskell/hslua-module-path/Manifest
new file mode 100644
index 000000000000..f8bec2faf86a
--- /dev/null
+++ b/dev-haskell/hslua-module-path/Manifest
@@ -0,0 +1,3 @@
+DIST hslua-module-path-0.1.0.1.tar.gz 8144 BLAKE2B d86eb43e1bc5805c60971bf1d9c9f0824118b06879c5e74d820324451ead467fc08a8272dcb37a698ca35c46103456efa2333002c2627679b1f5952693af0a37 SHA512 b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb
+EBUILD hslua-module-path-0.1.0.1.ebuild 801 BLAKE2B 56dc787c691989bebddb9cec19e26b81b8202e42656fa653210e1b46cb9c33c2a3706fb2728663dba47eb425cbba5ff53f84c223f20520c5f0bafc2dcbc6fedb SHA512 24b2bee1f836b17365214dc0c0716a22270209ccf74c4ec4939f89d47ae052dcb630c947121109de267422eea55d5fa87fdb6d417452c5f6471bb41ef1ef8e6f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
new file mode 100644
index 000000000000..bebeecf74cf6
--- /dev/null
+++ b/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file paths"
+HOMEPAGE="https://github.com/hslua/hslua-module-path"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
+"
diff --git a/dev-haskell/test-framework-th-prime/metadata.xml b/dev-haskell/hslua-module-path/metadata.xml
index b7878815d80d..b7878815d80d 100644
--- a/dev-haskell/test-framework-th-prime/metadata.xml
+++ b/dev-haskell/hslua-module-path/metadata.xml
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
index 8b6d832cd1d9..ff912b7ef710 100644
--- a/dev-haskell/hslua-module-system/Manifest
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -1,3 +1,3 @@
-DIST hslua-module-system-0.2.1.tar.gz 6339 BLAKE2B 0019478bf29dac977ff5124e77765eac86876879514e0346a6126574b8ca948a89a66f8417842c45357124e2990e2394275be886b43db59e05ea9065dd2b6b5b SHA512 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
-EBUILD hslua-module-system-0.2.1.ebuild 882 BLAKE2B 55d1d8564766f9d0019cb7d29ae7d3a05760aa7b4e727103d708070cae0d3b2818bb1fad5e7d43c0419837d874ec47c7a16e680901560a6fb5e4481aefa12aa5 SHA512 77d6a2ce165c4f6283926bdd3833502712100be1b5419bbef9f5c0db67f02f928d63bdefab90c037390440796bd143e42051de1ec89dec701d606a03856183d9
+DIST hslua-module-system-0.2.2.1.tar.gz 6962 BLAKE2B bedc569bb969c0529a70b82fc1ddf14cc013c1954f97cb518cc5ea3495392812c2635b214c6a31d9f39107ea8e3ba68f4380fd1d9dd082b195a21ab697ef4e32 SHA512 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b
+EBUILD hslua-module-system-0.2.2.1.ebuild 941 BLAKE2B d9302fe139971b7024e003b6dc6c7a0a76c0a13578381ac8e3a8fa441ec95c93e32c386c0d56667dc7f3c928b863b042a9ebd6ad46a01f9bacd8a1c73af368da SHA512 c71ee43a5b88b5ee519aee4b19b96aaed22c5e19dded15530ce9c67146722f54cf6ed18b09f5ef30e47d85fa90c8be91e44bddf7cfc5141414461f6cf01a025b
MISC metadata.xml 604 BLAKE2B ea0b83d0b0aa9b8d1d0d44ee175d289da662033041d99eb90fe71b50677c9e77bd4e0b7fa45397ed78b16e33344ceb34c3f7272114a1914547c938376ced76b5 SHA512 220d83b871e28258b4c4f0543ac24ed78f61bdce499c17c861ef09173e9df07817a4fd16063b5fb65e1a885287b6a143c656c756b7f7ec228a30164aa5ae7d47
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
index 9dbc4cc797d2..85a0d5fd8f2f 100644
--- a/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
+++ b/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
+ >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
>=dev-lang/ghc-8.0.2:=
"
@@ -26,5 +26,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.2.0
test? ( dev-haskell/tasty
dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
dev-haskell/text )
"
diff --git a/dev-haskell/hslua-module-text/Manifest b/dev-haskell/hslua-module-text/Manifest
index 815c19494fd1..3e52fc09f010 100644
--- a/dev-haskell/hslua-module-text/Manifest
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -1,3 +1,5 @@
DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
+DIST hslua-module-text-0.3.0.1.tar.gz 4617 BLAKE2B 682650493a2757b6d40a75aee5995f39bbca649d072eefad4f5d5394efd152088304379fa5d1e605111f9329e4eb5ddf98228006f90f8c5a2566c9b3bc684bc6 SHA512 15ba5e97261e9fa0bb4053575a0dd368048141a401200c32bb53a969cc741d2bd2d04890fef5c488fb6f476438d28e4d5ab9fea4a62aecdee285e8f1a1adecc4
EBUILD hslua-module-text-0.2.1.ebuild 736 BLAKE2B 3191d844e61a220826f6bc85988d92630fb18fb389d4d2efb0f69303715743ccb690036b25c28dc92700c4c98dc52151ee9e79433b869ecddd00803505e26c3f SHA512 99564a1ba0e3c2a670212837e1771632a0439a98d1f81bb7be71ec0660802ca261439ddb5b05ca6a3566fe521d8e7a3fb22df13e0bd7a540ee8cd9cc70e1c30f
+EBUILD hslua-module-text-0.3.0.1.ebuild 784 BLAKE2B 4f81b6f5a5a0485d2f8e37ec2f19867326abdef3bd35c5e3ae5cc41ebaf9e2631c3e750cb097d1b470d3522daeb2ce10602d002b664c0a502295ecc3fc9dc6c8 SHA512 95cdc7db8f7142ffcf120157a9424bd31f2357eddece2810db01f9b6365044209742d15f49f64d560602b393f0b064fc922c12d52d295102a063b6c961b56ea1
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
new file mode 100644
index 000000000000..12af58705fdb
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua-module-text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
+ >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
+"
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index 6d07b37227af..e08b7e6ce863 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,5 +1,7 @@
DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
+DIST hslua-1.3.0.1.tar.gz 253503 BLAKE2B 381a0281d7bfd6713b1e8ec4023ff4a42e9b9248d20c958daa1ff75b0a52f9ed381bf3dda6ee87d51c130b31d6627f20f66dd9ff918bb5047ad98475b72a3304 SHA512 6c270cfd3abd81c3b06dc2005796909ea96e14ecc2ff4689f18164ac38fe13f99ff0e5cd25ed1aa020ad422c7e52d2d40001e1c7298436c10e04f3670aa08e98
EBUILD hslua-1.0.3.1.ebuild 1405 BLAKE2B cf81f09383e91ff08d5e02efdc64c80d4a1b6fabfc282fd5806022becf8b5f9bd56955ab148abc01abee8eda7f8835e8e21bef31d737ca879cdb3604964ffc01 SHA512 683aac87e2cd8846cca263c687b4f4e770d960c92005be242f580931522b422f0e856c6e583c502ef9b3730a54ab79a9d5118638143919ba47784c7b873167ff
EBUILD hslua-1.1.2.ebuild 1558 BLAKE2B 8b737fcbcee9cce4d4ebb749dbd432fd4536668cef86c5d024e81cd7275306e90bcf437d6acf839a9ace9e9a90065ecdf794839880dd7962bcdd3937a82111fd SHA512 9a3cc589126828d57b55a6ac5b3055885a6bbf154d0049dc39a61d12d09c2906fe89b2cde662f12fcce6ae19630dc98f42c542e5492fd94ac6b39bf7770d5c48
+EBUILD hslua-1.3.0.1.ebuild 1411 BLAKE2B 36a11a48464360b35e97b8ef720964c77aca0dfb5d2b1ac32c9fae361ef86462c5699169a7ce31114f81487e8716577bc4485b00d4b4fbd6fc67bbe5ff254636 SHA512 74f75ba264cb4c6c3b7530765b7dbc3f724ffe883b5c61fb89c15db7dacf366bf85231f899d0b70500b77c8c5cd9ae5e25ff844ef93f5cb0cde89c4814fd6d77
MISC metadata.xml 559 BLAKE2B f03daddb36339dfe0a0efc078588c9517e19f6753bc8d7087f3062845fb9dbab43ddfe9142a1fd45ab2bab2a3c26bd15950e282a45515b250b5f375b2baa158a SHA512 e132dcc9cebff3d70a283fd7dc078eab31074a5dbf9486a1155549a0e5b73792408a9628abd80b940d79074c87d6f5be871ec3a09ea7051eeeafb80e2eaffa87
diff --git a/dev-haskell/hslua/hslua-1.3.0.1.ebuild b/dev-haskell/hslua/hslua-1.3.0.1.ebuild
new file mode 100644
index 000000000000..7a67259435cd
--- /dev/null
+++ b/dev-haskell/hslua/hslua-1.3.0.1.ebuild
@@ -0,0 +1,47 @@
+# 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: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="hardcode-reg-keys"
+
+RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+ >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
+ --flag=-lua501 \
+ --flag=-lua502 \
+ --flag=-lua_32bits \
+ --flag=-pkg-config \
+ --flag=-system-lua
+}
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index 73d2ea91fd18..84c46d7eebad 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1,5 +1,5 @@
DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
-DIST jira-wiki-markup-1.3.2.tar.gz 23081 BLAKE2B 09a426ebbfc480d64eb1c7012622b358ae7a9e3d6491eb0fa1cba24d8385d7b94455150399e14a5c02783876ebb3ea57b74da76afc95b96c06e3734c4a7c19c7 SHA512 14d68dcbdcfa9e0a7959df3a38cfe475047ad42aab9c6c3e1caee4d2491e7efb9a58e99e3b9c601726a235c592d2763016f709d5a23c6d80e1e6d2115fdce269
+DIST jira-wiki-markup-1.3.4.tar.gz 23759 BLAKE2B 0492ceb9cbd2d4b7d579446ce3379dec5596c89b1617f113d2d455ef3c8a9bc4f9cb41905f6ca61229e67433c2ebe4e04927cb3b8261c0570a27063bcfdd8186 SHA512 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481
EBUILD jira-wiki-markup-1.1.4.ebuild 835 BLAKE2B 7ea9a7f709e4575923a82a2b5c849213b44e626dd68db079dfa8224a59770fa6a5bc83acc12bfd0d1fbe4c9a675e6d94de31323a0d93b8c40f304214ec4313fe SHA512 3ea322122f948cb3542be50ba85165034fec5ce6362d47158cd6bc0685ff4f30f63223842316bf2b91d4442ebb7f7bece8fab536961f570c1847bef0d2fc2316
-EBUILD jira-wiki-markup-1.3.2.ebuild 835 BLAKE2B 04ec00e34ad07178a1fdd21b43472fceb3282e3688a4ef3cc9fc09b0f7e139010ed1245a8013cd83d4e3e45ff53c8a92840b784d10ea855d04e937cad1719007 SHA512 b79ebf4bdd183d738d232292c2814fb6c0a43ea0a5f024c9b4adb0025a41e46b8dbd5293e65a9075b89a73da03307c42ad09b90d07b5db96489302a83bae777f
+EBUILD jira-wiki-markup-1.3.4.ebuild 805 BLAKE2B f75aeb0e45321a4c38c17c15d9c6e979958d31ae20da663b57f0385930f9ee75875ac102612779adb91eb18fd586d63ff3e404d12b20381ff9cfd8d7865301d5 SHA512 ae0f6b8c9d1103dff2784ef11dddcc1f390cc21353743d08138255f127bcccccdef7b114301f309e4d0ae6f5b1eeec626399a0ce6495aaa90bb63908c24dd30a
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
index 7857af088d8c..08606428538b 100644
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
@@ -3,27 +3,26 @@
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
-DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
+DESCRIPTION="Handle Jira wiki markup"
HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/tasty
dev-haskell/tasty-hunit )
"
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index a99f4599dc03..9fc790c6fc8c 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -1,3 +1,3 @@
-DIST libmpd-0.9.1.0.tar.gz 41332 BLAKE2B 16d4ee3ae4edeb647927ca03ebcad0ce94cf0e5dbcd15550843ad7a56f92683fe6e5c0e265875d4df944493d7273499e8ae0a8127d75a1b16416965d95a833df SHA512 f8fb657c4eec2444aaa6ec58966ea9fc8f4944ce13e4dc380f8fbf3dd87a39e1db18c563a25ac09ea1c6f3b5c8596a25dc0e81d8b7d2771c970d85c06d208496
-EBUILD libmpd-0.9.1.0.ebuild 1229 BLAKE2B ec69b85cb4a8efeb7d7279450c9c9d2f92b7cf822962ff37766aa0dbe7707ce999dec0132b09e8c0842c6dcd8924929f8f61b0da5bb51f9f024ec11e760050f6 SHA512 36d5cea449e7fdc83e1b55b34f87cc1e59a80477d025234a2218a50f7fb57784e3aa913e28670ec6a44d9decbedfb1e483602b9bcf9676485964cbd4eed39307
-MISC metadata.xml 341 BLAKE2B 0feb202f91a9ceebe0a9266c196ff6282d31a81a022a81bbc2efd5909b9f1077187dfbe10f7bf9a8198869b8c981be042366d2878e0b9cafba9bbf93e7b88a3f SHA512 f72681b7fa2dd1157621320811ba5172638940ebf74c519fcf52e391edbf2c11010ac2e952f95e3857e43754aa063424af0ae9c9d16b35c99bc8f61d5c669b24
+DIST libmpd-0.9.2.0.tar.gz 41824 BLAKE2B 1788acb7e4152a9612a8cd503ac9751a5165a80044f1470bb4b6b055e9a52b538c9bf9cd5f0d2796e08f11e1c7a80e2739cbedf6869e1929a2f27fda08ec32ae SHA512 44b09e239a757308e59434eec80382465b684c9a00803c917194268a5b5b548b9da8e33ead8582c2a797badd0edb38846267009848a4f2300098adda4004aa18
+EBUILD libmpd-0.9.2.0.ebuild 1229 BLAKE2B 5f1a7efe2add5180620793503126e7576dd80313c7f4129ecf64a4dcb64ec7bac388e69c85dee6edd073f08e6288c630d1cd2a9943bb4ac853caab15b1f087d6 SHA512 481e3055cc942c50242086a934941ba0e09865902b7132375e34b4df60a9d7e91aacef305dbb7046d38d6de880be0957bdb97e868a20d7d7838b894e54a75f52
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
index 8ab931fc2ed5..dab573197d1d 100644
--- a/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
index 65d5c95ca6b0..b7878815d80d 100644
--- a/dev-haskell/libmpd/metadata.xml
+++ b/dev-haskell/libmpd/metadata.xml
@@ -5,7 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <upstream>
- <remote-id type="github">vimus/libmpd-haskell#readme</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
index c9d36e5fdcd9..2792d383d5e8 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1,6 +1,4 @@
-DIST megaparsec-8.0.0.tar.gz 59692 BLAKE2B dabde94500b5f4e27437779fa2db288f71c7b493201e2150eed3d2ed6d2117bc9d9ba8100c1ffad7a6ac6160ea03d373fd3360e549d7f20284dae2257ba10e2c SHA512 ab550a99548da2739a70cc4bdb3313085b3179c58d19a84d30744d89fe2d7556b9b552d4ad7b177b18f9f5821daa5417c2b9267eadd9eb537132666c151513c3
DIST megaparsec-9.0.1.cabal 3248 BLAKE2B 66276c46371fee1eb8a4de8f380700eff4110f3e5f235b5d65e09a965fd2127e3e6b4c8d1496a0eef9561600d20e6930f6aa889e3cb7df7ae79b5e65848aa2cc SHA512 2d3933a46a909cf44a53d4e30d8bd6fc126e86acac4d297df1d0bbc3364f0463533ee141bbced82dc635bce6d8b86e856ebb358ad97e8c01d822a2623a4ec437
DIST megaparsec-9.0.1.tar.gz 59734 BLAKE2B 61408e911178a3bd96feaf9def4cba0d47042fbe949ff47b49abd249839ffe52c0df0d8c0f38644aade491e4af2d7f9cd3763cfb73ce9b12a8f49494877f0847 SHA512 24ae5f291611a06ff69199d642de32d6dc5efc40cf6c6ccddcc59ff9d210a7bbd061ca17f1b5e04c2dded72108f140785f4ccfa64898b41f4ac7e21784c7b074
-EBUILD megaparsec-8.0.0.ebuild 1038 BLAKE2B 385782945cffc0b29b598c3e0525c9a13cb375b6c6fcb610dbdcf64c81e48c1587fc726ee15da0fd6da610657802e0f9d40775abd8c5af2a28d32f6891a93f4b SHA512 aaab2c29d53f0af14597b9b8cf8894e05b8358d8d10826c408ba65045a88e40116bbb6ef4d7a3075902de0d8d3709a5cbd5f8f0de190ac239a5c97f0bfdc8f0e
EBUILD megaparsec-9.0.1.ebuild 1199 BLAKE2B 39d4a403df26464df090a2dc9f7a998bbbcfc446c40e38ff65acd80bccf2654b816fd72c877e9fef7f305a5917db2cdf4d775a3f9f5c07efd4b87c70ac313619 SHA512 3ef339561c76dad47b6e013d1fa6faac3db4c1e1360ac9fcb2965e47b130702b31931f46e9802bae7d6274dd4dff67906b3c825007eca7aac7d0f23a15de0f80
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild b/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
deleted file mode 100644
index aba2ec44c287..000000000000
--- a/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
+++ /dev/null
@@ -1,35 +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.5.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
- >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flags=-dev
-}
diff --git a/dev-haskell/network-protocol-xmpp/Manifest b/dev-haskell/network-protocol-xmpp/Manifest
deleted file mode 100644
index bbd0cb53c04d..000000000000
--- a/dev-haskell/network-protocol-xmpp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST network-protocol-xmpp-0.4.9.tar.gz 24623 BLAKE2B e8d0e611bdb2ce42a4ec0a9bd80221aa863eb8a5d69f3580a12c67ccf45492205f52b6de4232e7db0bdd568da1deaa39b610ea543c6f1ea63e05355567974472 SHA512 51c97677a4e56b016c23287076ee75a6ca023b9d4e073aae2d9b406e2f3aaa5147194d0f08e3673562df6b965b686b115577da9ce92a94892c515a6032989c86
-EBUILD network-protocol-xmpp-0.4.9.ebuild 1134 BLAKE2B baf0666f2d35ad1f43707e51e22cec64570887b81b3938afa070f03aea43e1b850a8c3c7b86c6b9becab8a856113b014d1dadb1fd39353c9f2567bdb3d062d0e SHA512 fb4af1895b3275d6cc9474eb8a2f054b5640325d923dfc860622291f3fd471ebd20498a697fb0f8cd0d06a9375b938e311a2fa5bedceeabc123b07f30e50bf35
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild b/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild
deleted file mode 100644
index a728492f5d64..000000000000
--- a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.9.ebuild
+++ /dev/null
@@ -1,32 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Client library for the XMPP protocol"
-HOMEPAGE="https://git.sr.ht/~singpolyma/network-protocol-xmpp"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?]
- >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?]
- >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?]
- >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
- >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
- >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-3.0.0.0:=[profile?]
- >=dev-haskell/text-0.10:=[profile?]
- >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/safe/Manifest b/dev-haskell/safe/Manifest
index e669db8b6a86..71cdb70a53cf 100644
--- a/dev-haskell/safe/Manifest
+++ b/dev-haskell/safe/Manifest
@@ -1,3 +1,3 @@
-DIST safe-0.3.17.tar.gz 10524 BLAKE2B 921f791f85ad4681c1c6a002b099699e0ca48fa3fe595734f02c3f27f812e9245dfedbb6cfa475ff6c791f2001afa979ca3c45f66dda314e8f8207072259b6f4 SHA512 7d9dc15f5694103b3734c262e893f94b6c27b8b1bf4525f2d6ea5ca73e2d66715c028259ede9e8064e3579dd63342dd088c4afa764bcaeda09434515435416ec
-EBUILD safe-0.3.17.ebuild 593 BLAKE2B b5a7611a849699c1cf537b9268183f8fab463ffc3e4c32e4b52519ec553383756180e5dd99d1482ab75b486d9339bab19fac0c0bf8c59739d7ccee84e561f6c9 SHA512 ea480c4f64240aa7c4932ff6ddc416d84249dcbba86f638b346308888fb78db3298e54a4ef16342eb530f61fc5eb439861395f9aa0b2aa6272bcba0d34804d08
+DIST safe-0.3.19.tar.gz 11267 BLAKE2B cea32bc80101230f177c4bf44f8c3348a26637ecf334320c58e1b3e7ba02f6e3b80d7c287f5d4fac874ac5e01e54054a35cde4c39fb983bb1464d3fbb133c733 SHA512 9e987a895f0f888338bb2b0088732a404246a28ce32d73808ed6aa3b6d909da884ec54d5fe71fd190e287f108be1800bef2865acfcfac3bf6873dfb7c679cfea
+EBUILD safe-0.3.19.ebuild 598 BLAKE2B 77c41f10cffd8d2a4ec03fbb20efec8f6e15caab153a9c038ce686c53be35aa01c8ea449993ec235d6775f0f37f1663b23fc94d1533fd3f382f2cc7aa406e0f2 SHA512 52f5fbdd57d416ecfbe0ee15d527572d945e6ec5ce520984ed65ae763d148f70783a42b96514c1cb2bcf9fa7b342abf2ae981052dffc699f16c5bbbdeac52a51
MISC metadata.xml 671 BLAKE2B b2ce84efb78cfd7dc4ab81fce425ba25ac3cccf3d8cd6fab27f4b787ffbcba43d8c37842702dbfb195473597491fbc87ffbd7d6fec21fef1658233fd8d983583 SHA512 7cae1ab2eff3fe2468b6d7e10601bc1b61c90937509865e2f3487d3b66ac87f9956129ee3eeb260114a3a27e4e523e82dacbadc77e6edf2b1dc9174ba1a3ef79
diff --git a/dev-haskell/safe/safe-0.3.17.ebuild b/dev-haskell/safe/safe-0.3.19.ebuild
index ca1f1120a8a5..bc16cc4eeacc 100644
--- a/dev-haskell/safe/safe-0.3.17.ebuild
+++ b/dev-haskell/safe/safe-0.3.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -17,9 +17,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.10.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
+ >=dev-haskell/cabal-1.22.2.0
test? ( dev-haskell/quickcheck )
"
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index 78bab20b5c75..44fb59938d95 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,5 +1,3 @@
-DIST shakespeare-2.0.21.tar.gz 65752 BLAKE2B fdcaf27cc9f9346b93b3f1eb8b215ee75c4751427be279574c93929f4f5f521c01091bbff81a849bef3f98d97cf662b725ab99da709437b98ac85afc34f74d99 SHA512 ca796206aafffb5a96c75d305e90bad48f17d213b24dce8c8adcc9c94299ed78b0a2b48b5116d18b0ee26b413e845df53d387d3ca1b3d4c127e9b02b9f124af7
DIST shakespeare-2.0.25.tar.gz 65816 BLAKE2B 65bf2313e74de6516fd0fdde91986e9ded0e8cbba46273402f296fc1a824893725c8b618cdfd1c6194d6b49b303c6ee8cbafd42fc3ffc70e7b9d56f7267d6eb3 SHA512 26805c070c712a7bd549a2923f7b39cf9eaf7c9a3451c0c672eeff3b22e4d3f696887f3846e39c73f1c0add6a21becae9e58bb2821c0158298e105e0a1bf8ac2
-EBUILD shakespeare-2.0.21.ebuild 1234 BLAKE2B db18728eeb30e35a24b19afcfe04f5323969fda373ba9853ca13ad566fea63bd68af99760f840833120ed7b2daa749d6c88347ef5238227a89c6a36ea0f9d76d SHA512 b8f3f179e974164474e5165d8eb81d032aea432ac15a71c46909014a9edb62ce44f78d7bacb169542ef7fbdcdae957c47786f0ee1d9ea3a7d0bb2518a715b45f
EBUILD shakespeare-2.0.25.ebuild 1269 BLAKE2B feacdc8123834c236bd1e4932345715bbe2e3b3e8f7dcf15ea5ba4c7b679339a75df0913f749160f97d98b6e242951ffd0369d11f9e274f8ae7fed81ffb809c0 SHA512 d8a183302fe65a95fe05979ccb15fa7ceefdc1c2002f99cda29a1ba0f26b1aa48f4a953288ad576b0cfcffe81790ac84b9eba87ef17d9ca3da768a65e25f6f45
MISC metadata.xml 1034 BLAKE2B 122bdf19c088484e3cb66f4f98a7946af84a742deb782bc8bbde17add33ec4eed1f4241bada666748ff5ddd5063aa3b20997b89fbd80b6ae3a414cfa8b54677c SHA512 3ad916e35105e916a43f2ab37c30ab7a2daebf813691743a8bd88306cce96c1474056838451396b451424b5f960b168ad07f6aac3bd155a89aa6af37f89826d9
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
deleted file mode 100644
index 297ed80775c6..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
+++ /dev/null
@@ -1,42 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test-coffee test-export test-roy"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/blaze-html:=[profile?]
- dev-haskell/blaze-markup:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/scientific-0.3.0.0:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
- dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag test-coffee test_coffee) \
- $(cabal_flag test-export test_export) \
- $(cabal_flag test-roy test_roy)
-}
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index 18ec49af83c4..82210a14edd1 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1,5 +1,5 @@
-DIST skylighting-core-0.10.2.tar.gz 695555 BLAKE2B b4ef476780b9cf613e8bc7150abc57f4bcc282321a31ff549bb4ffb518c2519aaddeb4c94ca974f79d6fe803729b444da4f6c01784dab1cf63b7a596f2676818 SHA512 c3d20694b29dee660cbba681dec4b7610b1b5be8e5b359931935b0e2a466f41a494847231557c6c5906d5b31487360516af0e00c46689cbc03c9de58e3430698
+DIST skylighting-core-0.10.5.tar.gz 711899 BLAKE2B 5f147c010a462c1ac8ac48c0b6c5502f91dd9e62a6e3e10d822aefcc81768e6b3d9cd34ac933d352ce14ea4d21e81e7e4b413373cfe616fb5a30f72416532d30 SHA512 cde536276f6c9bbae78cafa33016629ba2b78bcba317c88af3dac7cd384ce3028bc5733a644cac72e84810751faada2db51abe3a8c717b8db32a3f625fb9d7ba
DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
-EBUILD skylighting-core-0.10.2.ebuild 1356 BLAKE2B 75a8326e94a055d9521716261f1d2af25e3fa3d73dd5e7ef6571c56a3eb1a1f1ed5dc512fb73aea53627a13b93feaf49476914212a54cae36d68d119a1f7f811 SHA512 9fbcf7fe7b9f6d6ca4e09c9232408c8031889202d8837839f195b68c2ae0a103f0ee6823d7a396b77f067191bc90fee920f67c47a367c5ab06c3c2b992f6a149
+EBUILD skylighting-core-0.10.5.ebuild 1375 BLAKE2B e58f60e89dfba58e437aa2318267a41da3f129d1047673559a652c9633dd153edda2173a142912f3aa8d1aeed2a38da67287b9cea3e7c5c7253f5508273eae18 SHA512 431b3bb09a7c2248e5c8d09aad72d578afcb4d459c91d9be6d21041b7eb2d4050d9c74b85290cc3a81c48d7dd2b68ef136f5ea5048b2ba37378c117b0060a637
EBUILD skylighting-core-0.8.5.ebuild 1393 BLAKE2B cae9c111639ba16103db61609b380cae0268753a54eb3a61894b112e18768b041702695d4a2a84c58b18e5b38268c4371bb80be5796124a708351a3d4c350018 SHA512 aa65fb1f748c102c539bdc3f869a1c86a97716538588346ca5231fc37ad21837739c280bf885ac49b05331357f1632c80b5b29ee6c1c17b6cb66813d4d112d0c
MISC metadata.xml 856 BLAKE2B 5a7e4a810de2cd3f3030d7ef193f8c7c6f40b5c57ae3ed1f92d4f96c2617a1a3623c1e47381994c78a6386f959110b7794f4b83f94d3a7204c42cf3211d47b20 SHA512 f1c0cdf81291d8e209b2260f2df47065eadf359d68d8c395388f639117a7bfef44b54fca3c338a449fcc43a737730d0bbd4670c9c01492f56faf03931c7ab4b5
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.10.5.ebuild
index 3e890f211b07..ff9c93f9c9c5 100644
--- a/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild
+++ b/dev-haskell/skylighting-core/skylighting-core-0.10.5.ebuild
@@ -25,20 +25,18 @@ RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?]
dev-haskell/case-insensitive:=[profile?]
>=dev-haskell/colour-2.0:=[profile?]
- dev-haskell/hxt:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/safe:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-8.2.1:=
+ >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/diff
- dev-haskell/hunit
dev-haskell/pretty-show
dev-haskell/quickcheck
- dev-haskell/random
dev-haskell/tasty
dev-haskell/tasty-golden
dev-haskell/tasty-hunit
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index f75a00239842..26136e889b56 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,5 +1,5 @@
-DIST skylighting-0.10.2.tar.gz 633776 BLAKE2B 9f8899a7ad65e812009299f385033250d0ddc467d9f2574709a896bda45a27abf9d1ef275dd4b33ad351055b6f4476881f60a7f14cd21cd15da2b15cb10e17a4 SHA512 04d411580caf6102e3f8732c53b103412c6d42becfadbbcdd13053557235b632f07d82b22acad87ffc37f5705a387367aa21a0b70b1c5cf2ef52acce1b3e4e86
+DIST skylighting-0.10.5.tar.gz 647857 BLAKE2B fb10b9aa65598176113cc4e1c62b25b267f37c2a7a45decc819f8ac5972a653a2c4c16ded4ce155e7ddc8ac87108b969096daa4a7b68cf4d02a5579650c1575a SHA512 fc4fa852e12c6ac16db0de14744f9b079d0c0b0012edbdd2a9737efb7dbe2e36358b4ce713246e6cde4477b865f469e9eb3e1c2536c0a9acff39baa1de3d2d0a
DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
-EBUILD skylighting-0.10.2.ebuild 899 BLAKE2B 6a587e7f7400eca3034b3f0d734aae74988a2d1e384a4ce8f8197aab89fc9562dcca7cc1023593662ae9f833b8145670d34beee964717b598cbc20c604393663 SHA512 e26baf847e7d7c773bc4ec7da48a7664aafb58957c56917eaa7424b540200492aab58c8a67f12d96b730e8006d146dfd91a70655b12f572aa88f96f6e98c2151
+EBUILD skylighting-0.10.5.ebuild 897 BLAKE2B 376c3626ce65cc91a00a7bb38d58951eda5bfbf1a58699205214110592958a4a7f17ac5ce6fdc891c4e5d45997ab8385943344aeba5062065da23e591663b500 SHA512 6d2497d2ac9951df3c0ff45f6406eabca0b27df7076f2b3bbddd19ed7430fe0feb05a61b4d142db95a9b2f033432170f1c42f2fb2b7a5c6ef0910e6ced43a9cf
EBUILD skylighting-0.8.5.ebuild 898 BLAKE2B 628371708fba84fb319cc1174b8f2a9f12a41152da8857b31987a1be294d71431f0f0af26a253f5f5178bab06de7269e9b02a724a3e3eec6977a808aa76f411b SHA512 c4fd303427acc18e85d1f2aa76942d406257e778f4a45e147305f7a09414c4cb78cdb002f5a6d28d68453510de13b4a32bac412e511b2286a7b891574deaf3ed
MISC metadata.xml 824 BLAKE2B 9746617a3c5284d9c6fd93aa23b5672983261961f9aa4b411978911eb21711831804d3ba44451d9f6d784b3d6f07faa6a5fcfdfd2be7183bf6ab26fd8601d7be SHA512 b60271f8d5bde37488e37866698c3d081c285300b1f1bbd30af2e7901dab9c43ebf6753d19e6b5115c802e6869a27cbedd8f8e1b509e4614a982004edccb99c9
diff --git a/dev-haskell/skylighting/skylighting-0.10.2.ebuild b/dev-haskell/skylighting/skylighting-0.10.5.ebuild
index 69413875bb52..ac88cfd90c03 100644
--- a/dev-haskell/skylighting/skylighting-0.10.2.ebuild
+++ b/dev-haskell/skylighting/skylighting-0.10.5.ebuild
@@ -18,14 +18,14 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="executable"
-RDEPEND="~dev-haskell/skylighting-core-0.10.2:=[profile?]
- >=dev-lang/ghc-7.10.1:=
+RDEPEND="~dev-haskell/skylighting-core-0.10.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
dev-haskell/pretty-show:=[profile?]
dev-haskell/text:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
+ >=dev-haskell/cabal-2.2.0.1
"
src_configure() {
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
index 6692248e25d6..0232c3a13076 100644
--- a/dev-haskell/syb-with-class/Manifest
+++ b/dev-haskell/syb-with-class/Manifest
@@ -1,5 +1,3 @@
-DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
DIST syb-with-class-0.6.1.13.tar.gz 13225 BLAKE2B a218611f332037968513b3706bc35e903f335477fa490f0c709f085014e833f1969851a74ae0d2a40c6a085c9aec1bbd963a48d4362963d3a89fe8e399a790fc SHA512 40082f8b97ae49929fb2b686a840656fd2a62936ddc4873f3af4bdfe128e213dff509185e412c3c58bd48ec32abcade8ed68dd257d221bb08f9d20433067f371
-EBUILD syb-with-class-0.6.1.11.ebuild 707 BLAKE2B b4204c678ac0f342438546abbd662c87f2a0660ec6e63c3433ba278b19ff70da4bd24b52a72b574deb1ead2636641fe692bd843c3c9f1f042a24e2c903186574 SHA512 e11f67f698f21b6677a7a1d40f138ca566ad645773ad1d917a5fa7e6ad4406e409903ef812830979720744439cd9d7ec4f3ca5acff18e5bb38caeb0e1adde93b
EBUILD syb-with-class-0.6.1.13.ebuild 588 BLAKE2B 27b697c8ef2412adca8a6932abfdfb854f36cc2e1b25dbf304c774627dc251db7590778f99d478b47223e09b92a8e6177b43e4f248b94acce45b0998870a3ee7 SHA512 0d6e3166c070ca70511a24b6f454c37ad6727e0085b6a00af005745dba4a5b8d27b55110764cd03fcc388b21ebe3f56321630527a53505b51f1e13021603c5ed
MISC metadata.xml 400 BLAKE2B 6008bc250770a949e0074a7830d8451a38e7ee075295a4d2a15bb0c3b4cde670f25e5b5a91580002d19e6211b85ce06d04a650385bae6681cab3587dfbdef9d0 SHA512 db2b6e1778e715f28b5244b8d15e654692e619c2ddf674ad93dd54caaa79a3a87917b1a7ec4c0bff5af44c89faa7f0be03797cf33fad6f4fcd4279b397b6758c
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
deleted file mode 100644
index 68a24fb717be..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
+++ /dev/null
@@ -1,32 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell >= 2.4 && < 2.15' 'template-haskell >= 2.4 && < 2.16'
-}
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
index f3d232a0dec9..846362569ffd 100644
--- a/dev-haskell/tasty-lua/Manifest
+++ b/dev-haskell/tasty-lua/Manifest
@@ -1,3 +1,3 @@
-DIST tasty-lua-0.2.0.1.tar.gz 6830 BLAKE2B f32d0e593a54071aac5b12e9c8b0461e122864994bc43c5d8c2039dfec5cb67a9e22ab91ec2c74926fe1f45bc5811ea47a98f635c1c22c3e364c0fe781e5c97d SHA512 25981f483b1d890b74f5b0f16b273413de2dc2a2da1a0443014e605e41c93d276bca325717aca58d194c68e580dbfde8c1dee166c1974f4f2e544887e0ed0d12
-EBUILD tasty-lua-0.2.0.1.ebuild 887 BLAKE2B 9ddd91e054b90be6a217fd2bf204e9abc5a2cd11d9c7095fa7b45933191888817ce83a1e04bdeb4091fd36032c736413e7a673e375128c3efc44c10b388d7fcf SHA512 455eefea35b7a776870e5885d7e00cbf1c8980dafb392babe1fed7a2c6d54562c6949e9f99959057e12717dc77f1b6ce920f209ec37681a223cfe8399503d94c
+DIST tasty-lua-0.2.3.1.tar.gz 7520 BLAKE2B 61c60b1587fd09b1db6f46066d8037034b9631e17dfd6217375df870acd91ca2558260b4e50146df7968d61ea2772765b806bcd71b6a0b91f727ebe2ccbc5fe2 SHA512 7c97f001ee2659ec48a8810505fc820607be9969151fe082157a33a308617b68be83a792b7ff1da3d492d14490fdc1b71a7d9bda2643be760a78f46fb5e98ad7
+EBUILD tasty-lua-0.2.3.1.ebuild 887 BLAKE2B 4ed6dbf3043fd0f3107f0e16578762851576d8d13ef1e507d762f1cc4bc1b9692731b5337a6a821f2c334ccdbef9beb2677c543f3798c470beec6b6b8eae54e5 SHA512 501e8ff88552439738a8de0bc59a39160a21facd942dc19c1427951bdf814fa8ed873a273d793e253d0531615ee669f5e5e2be21643cb6a0e07eb35cd9d5ef0b
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild b/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
index 061ac8454e35..d135aac5da0e 100644
--- a/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
+++ b/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
- >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
- >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
+ >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
+ >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.4:=[profile?]
>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
>=dev-lang/ghc-8.0.1:=
"
diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
deleted file mode 100644
index 3d692ce6296a..000000000000
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX test-framework-th-prime-0.0.9-hse-1.18.patch 2666 BLAKE2B 7aa73a96cb24688bc42812c5fbb86faed1ca4fdc672f65a4fed13cfb3cdec4830017d50cb154b7e02731527898bcd52a1ad77a70f78eef33dbe74de5e0a1da7c SHA512 a87717808f6ea5fa47de0ecb3ae3789d59707957458c9569f10ee01bcd30bf52662dd8a63255e2975f7de4b2465b7e9e8d41849975442c0c46c349d481cc8fa7
-DIST test-framework-th-prime-0.0.10.tar.gz 4035 BLAKE2B 44c0f454ec4018f8aeccc9e7eec33c25778d05e257ce910dd779ac6bbb2acf1d4b54a897d0625e78308def417f1aa1b77194fba353802f2fce7a6e954dea3fbb SHA512 91298214c134821b298270c2770cab284131787a40293c01dba2e88a58f355d6811dea06bf14f237fea5d4aa80987790405644bc09ad64a4d7b4574e2bca97eb
-DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
-EBUILD test-framework-th-prime-0.0.10.ebuild 679 BLAKE2B 3b6da5b8be020a4bec38e6e33fa68cf7d8b21f0bd0714722b93c8c4735e656d41859fbfd11132452164d5c64cac197ab6ff5a4e3cfdc9bdb6102cb709396d13d SHA512 165ee0dd12b2a30475f05fafa3a355ffc3b38995df1569423e1f17f80d30b89e1e805c2b000ae9f492c00065734fbdbbe0bafdca39dc6e16fe3972b679a5427e
-EBUILD test-framework-th-prime-0.0.9.ebuild 722 BLAKE2B 3e8320932bb7298b019d028a075ecbecd09ddc3db97c47de4168236505827ea4cf55182c2c905ac421768987666f06d332b51d2b739bb91aaf35d03f17cc0e5e SHA512 ef4642e5dc56962a99ea8105d083a09a63f83bf76ee864f176e41d98de190043d8db457a0f66648e1a05daa4e6ca8e0f3d7672da1ccd23a5eeb7002fc5248496
-MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
deleted file mode 100644
index 359d5ea4f6a9..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Test/Framework/TH/Prime/Parser.hs b/Test/Framework/TH/Prime/Parser.hs
-index 87553a6..f188390 100644
---- a/Test/Framework/TH/Prime/Parser.hs
-+++ b/Test/Framework/TH/Prime/Parser.hs
-@@ -10,2 +10,5 @@ import Language.Haskell.Exts.Extension
- import Language.Haskell.Exts.Parser
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+import Language.Haskell.Exts.SrcLoc
-+#endif
- import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
-@@ -14,2 +17,11 @@ import Language.Preprocessor.Cpphs hiding (Ident)
-
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+-- location field for haskell-src-exts-1.18
-+#define L SrcSpanInfo
-+#define loc _
-+#else
-+#define L
-+#define loc
-+#endif
-+
- ----------------------------------------------------------------
-@@ -45,3 +57,7 @@ getTests :: FilePath -> IO ([String], [String])
- getTests file = do
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+ ParseOk (Module _ _ _ _ decls) <- parseTest file
-+#else
- ParseOk (Module _ _ _ _ _ _ decls) <- parseTest file
-+#endif
- let funs = map fromFunBind $ filter isFunBind decls
-@@ -54,3 +70,3 @@ getTests file = do
-
--parseTest :: FilePath -> IO (ParseResult Module)
-+parseTest :: FilePath -> IO (ParseResult (Module L))
- parseTest file = do
-@@ -74,4 +90,4 @@ parseTest file = do
- #endif
-- toStr (Ident str) = str
-- toStr (Symbol str) = str
-+ toStr (Ident loc str) = str
-+ toStr (Symbol loc str) = str
- opt raw = defaultParseMode {
-@@ -88,7 +104,7 @@ parseTest file = do
-
--isFunBind :: Decl -> Bool
--isFunBind (FunBind _) = True
--isFunBind _ = False
-+isFunBind :: Decl L -> Bool
-+isFunBind (FunBind loc _) = True
-+isFunBind _ = False
-
--isPatBind :: Decl -> Bool
-+isPatBind :: Decl L -> Bool
- isPatBind PatBind{} = True
-@@ -96,6 +112,6 @@ isPatBind _ = False
-
--fromPatBind :: Decl -> String
-+fromPatBind :: Decl L -> String
- #if MIN_VERSION_haskell_src_exts(1, 16, 0)
--fromPatBind (PatBind _ (PVar (Ident name)) _ _) = name
--fromPatBind (PatBind _ (PVar (Symbol name)) _ _) = name
-+fromPatBind (PatBind _ (PVar loc (Ident loc name)) _ _) = name
-+fromPatBind (PatBind _ (PVar loc (Symbol loc name)) _ _) = name
- #else
-@@ -106,5 +122,10 @@ fromPatBind _ = error "fromPatBind"
-
--fromFunBind :: Decl -> String
-+fromFunBind :: Decl L -> String
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+fromFunBind (FunBind _floc (Match _ (Ident _iloc name) _ _ _:_)) = name
-+fromFunBind (FunBind _floc (Match _ (Symbol _sloc name) _ _ _:_)) = name
-+#else
- fromFunBind (FunBind (Match _ (Ident name) _ _ _ _:_)) = name
- fromFunBind (FunBind (Match _ (Symbol name) _ _ _ _:_)) = name
-+#endif
- fromFunBind _ = error "fromFunBind"
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
deleted file mode 100644
index f0c62e9157cd..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
+++ /dev/null
@@ -1,27 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
- dev-haskell/haskell-src-exts:=[profile?]
- dev-haskell/test-framework:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
deleted file mode 100644
index 4a84d5c176be..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ /dev/null
@@ -1,29 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
- dev-haskell/haskell-src-exts:=[profile?]
- dev-haskell/test-framework:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-hse-1.18.patch)
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index 125ea13956e7..55e7cb593427 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1,3 +1,3 @@
-DIST texmath-0.12.0.3.tar.gz 1792577 BLAKE2B 0c5ecb7cc49a53ad0ce54755a2a8518066223733b51287013d6e649fdb94b022a9ab81ceb3bb42b80b84bf75e9aa0088adbafe76e147d5314907d8aeb6be9a8e SHA512 54b4789559dc7c6973854c290b018e7c00dd0ff1c06d8045b5d0a2304436bb59a951e93ab2c9d1d133a9d7c5197cc456334d40dc112c6c6a8f8e9370ab8aa190
-EBUILD texmath-0.12.0.3.ebuild 1231 BLAKE2B d7be618cb08d087c45316b8b2b6d66f8d1026d1f2f26fe1ef9db1e086bd00285be0e1b3ae00fedae8a817cfd0ccb5a81f1664e5d451e5ede0d674b007b6b85b1 SHA512 6e05924e9c50010b56bb7406a08f73f45963e14c93036299460a5e1df7f4f319d9c592104102a04ea18560e9f94dde6e98c74714f0971da8d947972bae16699f
+DIST texmath-0.12.2.tar.gz 1807359 BLAKE2B 31da9ba7186eb9140c2fe70ba7011e91c00c290ef4b099197cdfb81ee2b992bae73756973b77d6920cabadef71739eb7208136fd2a589f9b81a6afaa338b296b SHA512 89f3dc5c1042980abf06f1e4d3ca6806922f2094c6d7ec2cc1e4673ac16a7aaf73693c5fa5526eac96d6f9f5c2f894f2341295bacebb7216ef49eb8be7cc0424
+EBUILD texmath-0.12.2.ebuild 1230 BLAKE2B 74d91f654940d8c88699647d377be2908709defb1697c952d93feee66ca8735e21c4e01728708d8c97b5ed6d1af60538dbc51b3f95fcae6024cc1a8ece9c79f7 SHA512 af9c5fb5faf2c1490f0bc6c67e21d6e7ceb7185f2f9736ec020957ad35ddfe43ac6e9e5d9d9a55f075af8f3014494c3dfd924a059ed94c35a12f09c4cda60854
MISC metadata.xml 919 BLAKE2B dedb22c3d6a09fd989cd721c54ac1d91263e1f52f18edfdc1cdb7cfb46886318364bfe007fc5eb98fe3455ea0eca2a0d98856f84229f7be3d9cc1ba062033e0b SHA512 2d604c4422425e099e143520d559e645f7ffb4be8187209f59829a03770e2bcc345555b91eca0fd35a32222b25652b3a53514f3448cbb99c27c50608eebcc961
diff --git a/dev-haskell/texmath/texmath-0.12.0.3.ebuild b/dev-haskell/texmath/texmath-0.12.2.ebuild
index 53bc6fb956d6..e4edd72795d8 100644
--- a/dev-haskell/texmath/texmath-0.12.0.3.ebuild
+++ b/dev-haskell/texmath/texmath-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -23,13 +23,13 @@ RDEPEND="dev-haskell/mtl:=[profile?]
>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/xml:=[profile?]
- >=dev-lang/ghc-8.8.1:=
+ >=dev-lang/ghc-8.4.3:=
executable? ( dev-haskell/aeson:=[profile?]
network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/temporary
dev-haskell/utf8-string )
"
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
index 2891832cb84c..99769ac80a21 100644
--- a/dev-haskell/th-expand-syns/Manifest
+++ b/dev-haskell/th-expand-syns/Manifest
@@ -1,5 +1,3 @@
-DIST th-expand-syns-0.4.5.0.tar.gz 8112 BLAKE2B 9a4572993f309144e70adb2967c699c06871246a00eea97e551d79cb1117970d12bc9c7594e8908f9b6a59550ba4fcef8e3e9888375136c4fccd3dc53d7e1857 SHA512 4e72ec26dbe875c3d664b94d7892001af835794f04bec83ff05952c3b9ea9b9de242cee5c713671213479bce4cfae3d0d6172a581e7fff58923688624dd493bd
DIST th-expand-syns-0.4.6.0.tar.gz 8228 BLAKE2B 6f0a0ee73cc7999a2cc42aa4982980851d14e4db8aebd921cc04517505676b24fa5e2b6977ce7b2d73a3e153ffb4f98727503fc5d735e409c0dcb9d4930d4f09 SHA512 93c4516052b2130a189c72fe5ca99e44ffdb4937f6a8afd8c192ba24a7002bd45865992cebf44c5c9d6ddfd9f67a1d7d73633e7521c4a9828a0defee627e89b5
-EBUILD th-expand-syns-0.4.5.0.ebuild 598 BLAKE2B 35be6334b462b368388be45b8d4a25377a41716f135cb5c59b8820c6f0df2860b34f74780e5a9a099fee941d0ad4beedce8746b67639998e0cf6a0eabd800969 SHA512 d279febde7b26ee5e23337b898fede5ac1c64a26eaf2c6e09cd98efac01d56ece94ad7ee6546a7ec1d153610399e011d825b01aeb766a6fddf2bd5a05a8b5c68
EBUILD th-expand-syns-0.4.6.0.ebuild 600 BLAKE2B da6091de846999c6dc84474e34cce7096e2329f0d3ce583aa36ab040d6cb7e31cfae607fd83f51b103032703d5e2ee70023f625b3739e611258322d34d7ebfc4 SHA512 6e08c000f570e81e0297a9e41de123e6be72b0f7141bdc9ff290ad9507565cca4a4df4f9280b7e5e8fc403fcd09052a34428c2bf8dcdc75b1ca9b533aef7aadc
MISC metadata.xml 345 BLAKE2B dd891dc3b668319d8b13f785119a1872353f8449f895927c81036dc1041f0643f6032ce817dd622d49722657cbf7c0e2e3f63ab64404c13175c11659eaf13e1b SHA512 4242fbe3b53db98aa2010eeccfbbf4e213fb16a0628b8d25aa00b1b97baf240ec1bd8a19f4da9439088fcb7b4c178594dcb214de16287ba904d237193936a8f5
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
index 52a56a2a1a92..d20400b72b50 100644
--- a/dev-haskell/th-orphans/Manifest
+++ b/dev-haskell/th-orphans/Manifest
@@ -1,5 +1,3 @@
DIST th-orphans-0.13.10.tar.gz 8680 BLAKE2B fe03bfbd6ca27a9949573cdff3c496088fd6b082c6a334960388b45bc0bce38d2675ca9319c627d4d7b0df831fb497bea2d9dc753c76ce1d967e9f423b3562f6 SHA512 bdf9cc69f57b97772f2ef38dcda61ca352069ac07e45c85efdcabec9dd3a538f33b3d65cfdff77185c737b8050139e232c4ecf677d89fd79aa5b74238b8af651
-DIST th-orphans-0.13.3.tar.gz 6549 BLAKE2B 1a23b345fd5cf43715deac8c1f21df56bb75e6d683b7d8ab2b28ce3c72ece178e0a0096d970f04e947d0977ce4a7062c4f47616e0c56e046e0deb8f621dec60f SHA512 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d
EBUILD th-orphans-0.13.10.ebuild 904 BLAKE2B 6b093628db0ec18ab441cc64e8d962c4b148fb6220fd00c1ae49bdca8cf9158623eec469fcd8d9662c92c6841733b5ca7e9009059b7e6611bd31699afdd17fbc SHA512 093b81fb64f922b0a797c673484e92a469cc2ed49cf115953d1c7517490d8988ad7370f457d0064b7dbe5e5175656615fc48ea3bfd7d323101415b2acfbf062d
-EBUILD th-orphans-0.13.3.ebuild 833 BLAKE2B 57ccda07b4b1d9ba7b47c8a1f147be257c5f138dfd93dac79648007c710a923ab46840dcc7978edaf4915bb7629c8e4b18c3577f424e34145d752103c1b08cfb SHA512 d333a9badddf1d20dd8db8baa4c27d8a7ebe307f0ae24a0ae9e9be9ad818b627dfcad957894b8e11498b684f95f925cf7204e61103b60a378339cd087fcc917b
MISC metadata.xml 507 BLAKE2B 99ba933aab8c90265fa2794e4dc5b9c8b3012421b07b3a4375225cab2b544f3eeb485bfd3877f1ce2fe7f447ca272d6d64700e36333e5df562af463c532a24c2 SHA512 4bdb62e70a857bba59d2abe32dd5a28fa4ca20b0756c785323fcdc39327d89b85c9e936c767454dadfa60f52cccda99a08f8d5bf3dae1a758a0be9102fd8e4c2
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
deleted file mode 100644
index 3442e255996e..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
+++ /dev/null
@@ -1,30 +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="Orphan instances for TH datatypes"
-HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.9:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/th-lift-0.7.1:=[profile?]
- dev-haskell/th-lift-instances:=[profile?]
- >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
index 8612edca40fd..df1797b3edad 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1,6 +1,3 @@
-AUX th-utilities-0.2.3.0-ghc-8.8.patch 2566 BLAKE2B 3d59929531c5de3892155d836ffdbdbbe425bb959b65c2fa15fb58c5e9f083515f263717cc68e0a780dd95c476ce2c4cd504a4abc1f8f9c51f9d86b1cf10efb7 SHA512 346e3bf318d4f8aab2edfa89719a82997d91175ff11e2d649ac281269f062396f5dea9364a74ebb2ab0f78421dbc462ecea60e1b0868ad9fa08379659e446af3
-DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1 SHA512 b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02
-EBUILD th-utilities-0.2.3.0.ebuild 805 BLAKE2B d4c5d4b4278513198cbbb18e501bec598c9afcbf545e66b6a14655e2baba9d3fb446ab8f62111385fd2dfc1c7e8ff003dd6419ac3018aaa9665d385c2d5e6573 SHA512 392247a11b663044fd7528e0df8018b050d7494ef2487b099ede77d4a3f0156354dad3afd222acf34831ecd0c9f5264aee850b8f982959b46e1e3a6419886bab
EBUILD th-utilities-0.2.4.1.ebuild 763 BLAKE2B 1e05e0f88d026a67a6ee9dd3ffc8b078ed20634aecfffe0fe8743b9f7dea5cc8205538538534a5be11838b7de27224fcd4b6accc7a9c3d68099050e9d750f827 SHA512 1f77bbd1c7982942b3d7cb844d63227234358793d2c716983f0e65958af66b3b8dae1682231598b2ee406d364a845f8b12cab41fab829de8ec5fa631fbf69ab5
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
deleted file mode 100644
index 8a3795430b1f..000000000000
--- a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
-Author: Ryan Scott <ryan.gl.scott@gmail.com>
-Date: Mon Dec 10 15:12:47 2018 -0500
-
- Allow building with template-haskell-2.15.0.0
-
-diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
-index d179829..70b929e 100644
---- a/src/TH/ReifySimple.hs
-+++ b/src/TH/ReifySimple.hs
-@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
- Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
- _ -> Nothing
- where
--#if MIN_VERSION_template_haskell(2,11,0)
-- go (NewtypeInstD preds name params _kind con _deriving) =
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (NewtypeInstD preds _ lhs _kind con _deriving)
-+ | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+ go (NewtypeInstD preds name params _kind con _deriving)
- #else
-- go (NewtypeInstD preds name params con _deriving) =
-+ go (NewtypeInstD preds name params con _deriving)
- #endif
-- DataInst name preds params (conToDataCons con)
--#if MIN_VERSION_template_haskell(2,11,0)
-- go (DataInstD preds name params _kind cons _deriving) =
-+ = DataInst name preds params (conToDataCons con)
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (DataInstD preds _ lhs _kind cons _deriving)
-+ | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+ go (DataInstD preds name params _kind cons _deriving)
- #else
-- go (DataInstD preds name params cons _deriving) =
-+ go (DataInstD preds name params cons _deriving)
- #endif
-- DataInst name preds params (concatMap conToDataCons cons)
-+ = DataInst name preds params (concatMap conToDataCons cons)
- go info' = error $
- "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
-
-@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
- #endif
- _ -> Nothing
- where
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ goEqn _ (TySynEqn _ lhs ty)
-+ | ConT name:params <- unAppsT lhs
-+ = TypeInst name params ty
-+ | otherwise
-+ = error $ "Unexpected type family instance head: " ++ pprint lhs
-+#else
- goEqn name (TySynEqn params ty) = TypeInst name params ty
-+#endif
-+
-+#if MIN_VERSION_template_haskell(2,15,0)
-+ go (TySynInstD (TySynEqn _ lhs ty))
-+ | ConT name:params <- unAppsT lhs
-+ = TypeInst name params ty
-+#else
- go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
-+#endif
- go info' = error $
- "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
-
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
deleted file mode 100644
index ce7bbd312b27..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
- dev-haskell/syb:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/th-orphans:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec
- dev-haskell/vector )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
index 3dd8d1e29b5f..88232cac0913 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1,3 +1,3 @@
-DIST timezone-olson-0.1.9.tar.gz 11471 BLAKE2B 37ec5948b7584751ea3ed6e6aa0c11b78766d74969f6acd0813de08c36c78ddec58cc047eb5bca9fba26a692162985dbca25c6ba2d78172bb894edd4b7146c1c SHA512 1ad8f98ba3573f11154e18c5c0d2d7ee3b32f165d388318622195199da4765d1a0352b8a13fa38a6b2fb008de93f34d2a6aa35d2d7ada53e1ae8c5404d68b645
-EBUILD timezone-olson-0.1.9.ebuild 766 BLAKE2B 782f6083adf89e1696267dd4c27d4f89859b8557b3965abdd51e2ac2bf5b83ee0b8bae52bc498cb1891a8dc2a8a5032bfe4d1cb561530f951ba4f97ae4849595 SHA512 016cff39efcaed8e5c3332197e8f46f829e050af8c083644096259c8fb9cf0b22b16f883d9bb592d16267a32967f7f4122a2f391f770188a3b38ad91282ad96f
-MISC metadata.xml 821 BLAKE2B ad98bfb2a5a5854e2cae7091dca6c206a37dccffa001bed5df75a0f318b200a1571e265042857d1e74abf019deda50557ee655f811737eb63f8a7a67b18f1818 SHA512 1ee91c0270137d4710f9052eadf7f522006108d9d6d2939ae44641d365078daec9671699e09aa69c19d0a8e5e503f1bceb6a0458ef3ca6f123c73bb3f774c2de
+DIST timezone-olson-0.2.0.tar.gz 11301 BLAKE2B 51782a94097516e40f7f71548bd1f52ed673836a5bd289634f60bc9293534980966680ca689f584d15eeb0acd8a186ce9c8effb39a6c718008b1690d9858681e SHA512 06c73b24b23caa41f3dce472bca384e3ee7ba02a3dd8bc4458bc758bc6aabdeca9be299f16419702e860f38ea213fd62d90e63fc4746dc2015c0e06b15aba6dd
+EBUILD timezone-olson-0.2.0.ebuild 762 BLAKE2B a51a03b072ff165ce4d025c09864b195c3692aa5a912524c1a1139b334bcc00ba637ac22c4ae936bdd2c68fd3ea724df03c79d87465aa460d0256ba0e1aa2f73 SHA512 f31eff59ceb0b9054b1734b9cffde3ede563c0cee4e4f73d6fcc228d53b53e0d833aab43309ae4706f57f944b8a8b575eb05d396deddb7e32c643f052ec6ef8e
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
index dec7b007d319..b7878815d80d 100644
--- a/dev-haskell/timezone-olson/metadata.xml
+++ b/dev-haskell/timezone-olson/metadata.xml
@@ -5,17 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A parser and renderer for binary Olson timezone
- files whose format is specified by the tzfile(5)
- man page on Unix-like systems. For more
- information about this format, see
- &lt;http://www.twinsun.com/tz/tz-link.htm&gt;. Functions
- are provided for converting the parsed data into
- 'TimeZoneSeries' objects from the timezone-series
- package. On many platforms, binary Olson timezone
- files suitable for use with this package are
- available in the directory /usr/share/zoneinfo
- and its subdirectories on your computer.
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
index 8bf4ec391654..c2f5b93c0c90 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-# ebuild generated by hackport 0.5.6
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -15,12 +15,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
>=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
+ >=dev-haskell/cabal-2.2.0.1
"
diff --git a/dev-haskell/top/Manifest b/dev-haskell/top/Manifest
index 99cbcbfc97cb..5c08d2d3ff55 100644
--- a/dev-haskell/top/Manifest
+++ b/dev-haskell/top/Manifest
@@ -1,5 +1,5 @@
AUX top-1.7-ghc-7.10.patch 2305 BLAKE2B 13dd321a0e6f4a3fd935c650361a2c65f4ac015fefe66cee4c419e9960b98ec17738cbfc679b51bfa0e3eb10eef3809d37e3d4895b91ad22147d7d2cb6c4da9a SHA512 e5b6d8ad618787e70e06ad08e92b53c5d66dd4464a7cc476f55da86b740bf835a9e3c1e35a03dd3a390bb7798459afbdf7aed19c91491bb6d16c53092cd4a0fb
AUX top-1.7-ghc84.patch 380 BLAKE2B 87297984a0a521eaea8c87ecde9a16dc5be4784f4ea7416d4d2cd497386ce60701984f471a1e2a346fc6b3bea04b9b0916803975a247079277083136e8f9f72e SHA512 9446c5e961272d196e51749376863befab7750a1b91990c40c1655676e9cc0c7f52435197fe8d44cab0dbc3e4deaa6fcede96c890305cb18ce68a5b091728306
DIST Top-1.7.tar.gz 70721 BLAKE2B 90ddda99ab4dac209712494c28e15e90ffd2996151ab7df0a57fb8162bec09da6b28fd52b36672e081d10fa0b79d25bb2da2fd58d220573cea006d70c61229f0 SHA512 90d5f1042c07101c35bc1722c18667f551fa4d9034e70a4b7466ff25906899053a054f1227fed8d6d534d04fe9a1c2420585143cde44badfe98e08bf9a6225b4
-EBUILD top-1.7.ebuild 796 BLAKE2B fef4675b5f797858228b61bf369eab9c32e5efd4de3a58a21a8a245341337026528d4a892ab9b5c461a21118b73595eecf21502797d21a7f597747c883d80366 SHA512 08bf0d162010bb7b14591fee4dc8ef80522d0192ce7b1eac678fd4659a2493e36437643442548dad3cfd00d723a6c4e806a08e6a06ef004cb206d934b7ed23be
+EBUILD top-1.7.ebuild 789 BLAKE2B 59105887d1fe276b58e726d0a5a2d1bb60a6b77d020ac9a3ac198faebfce830d2ddb9b8a9e01fbea386ad224910f0e29886c6690b87b69c5b0993ed759b3ff04 SHA512 e8d339ec46f28a02aeb8977262e0ebbb39c0a66e663fa9192b93fd6f8104a8a53de85e063df13fb34e6e1d0a64493cbe5af4fbf02b818e14ebbe8e841ed317cf
MISC metadata.xml 662 BLAKE2B b039247722ec544417c47f53e9d7f4034e5097cc1d0874f26b735d71fa5b8a341e42f297531b15aa8fced4337dd300cf4e778406c59f58383fe74a1e8a876d9c SHA512 f335204b8139d294a18034055d76797412a4af6b98beb052878478b4246d6b2161c147fad254be262fd7732d96affe9952f231311debbd2a52fa9e338f0267be
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
index f3d825ce4f66..ad5807d25ead 100644
--- a/dev-haskell/top/top-1.7.ebuild
+++ b/dev-haskell/top/top-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
# ebuild generated by hackport 0.4.4.9999
CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
+inherit haskell-cabal
MY_PN="Top"
MY_P="${MY_PN}-${PV}"
diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest
index f9cd16e4c336..3290e669299a 100644
--- a/dev-haskell/uniqueid/Manifest
+++ b/dev-haskell/uniqueid/Manifest
@@ -1,4 +1,4 @@
AUX uniqueid-0.1.1-ghc-7.8.patch 1383 BLAKE2B 92ea3035b38b4f86559fff85d346940cd9f2222e4ef2e922128b14051db2b48ac70531146289bcd7a526d8498ab6f9440f1a8a4b6e38d5b3a88353f80a4acdec SHA512 2cb2bc04bc8ee52279ec953ed1435411d4715dec009012d191bd07df4ccd334ca4a60be123d00bf9a74a8f9e94e01b2fcea0c0692fdcf77c7d7a0c5d7b0948e5
DIST uniqueid-0.1.1.tar.gz 2779 BLAKE2B 73ad9af177f20575caaefb12261d58801a391bfcbaa6b8ef1596538fd7536ec8b6aa35997277a39454250bc779c4c6174b1b3e7853bad5cc21d9ed72764ce517 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68
-EBUILD uniqueid-0.1.1.ebuild 588 BLAKE2B d047f51f2e40ebe1483b7708e7c48ff9060f9022b8a9888c0ada3103a976fdbe8c98f4a35943f9317b91405fd91ff52df17b84ec83fac5745fab10987f125a33 SHA512 6a56a83d9ac2c410a80f0bd95572804ab720b368d1933e7d21b021374c8b33e3fc315855c2f374a85c656746d5b4863615747531ba1de3be7eda18b2963934bd
+EBUILD uniqueid-0.1.1.ebuild 581 BLAKE2B 686c9d445fc7ad98c7a302d0a8cf827c2761ab5202caf71d53fc0589a7982461fcb3ab3cabc7741ab711401a9e13e0a63d45e1141e0bd23abb1f72e9e3145769 SHA512 44f22b9a1b0942385d6725a2a89584a1f52db423df52112263c3e47dc586afcb0cbe2ce106fba952b11c30149f540374dff49c4b53c6d61fe3875bc228c7d8f3
MISC metadata.xml 628 BLAKE2B 57879a83e3a6279bde5c6061154b7c35f62ff4bb0e6272c8b3f31fde6fadcc5673c19dfd74e5220ea4e0f448b316f76feb4a0e1bfb594ca35d216ca4b86ea758 SHA512 1f422717c439530df37fcad80a491643d1f9754eb130acdff4991a1f0e98a87db6c43bea2eea5ad1837aefe251a492085730773aae68f2a3de9c7a48aaa43e83
diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
index 45f27b3410da..e229c4991267 100644
--- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
+++ b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
# ebuild generated by hackport 0.3.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
+inherit haskell-cabal
DESCRIPTION="Splittable Unique Identifier Supply"
HOMEPAGE="https://github.com/sebfisch/uniqueid/wikis"
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index d63f373b34c3..d46a4f66256d 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,5 +1,3 @@
-DIST vault-0.3.1.3.tar.gz 5314 BLAKE2B 99b98c771075c38e9ad11dfced093556af020dd03f4549ed9eca2f2e8066b69a2e3c3c6ea8ff27488c5c3c2a3c4fa62f4b03dd2b4a899ccc8dfacabb0e219d1d SHA512 70773be0f9c6fc9db290b633e663cdaad3e4d30dee5a6754415d475b40adf1bb20aca61c80b2971570c411ebc6644e646f5908fe7149e8698d38270e1f3f409b
DIST vault-0.3.1.4.tar.gz 5375 BLAKE2B 6ba8dc1132d9e188cbfd65e5c1246df18399d08b614bf32f162e2aa4127bf324af6856198c7e32a8f6bbc6dce9f5c8b2cc393f3b3b3869d0731fd7de45a3a52c SHA512 70bebabce76b5e56b3d5cd4f95590ecef7a41f4de7f943932713fbb3eb17ac4d615a25b6503773a532b36649cf4a7b595be3b4222a15ca7d0756b2bee8aa0792
-EBUILD vault-0.3.1.3.ebuild 993 BLAKE2B 080bc1df4e3ab364e6b15477624c9aaea105c41ce4e07587d881e9ef2e50710cf5b625efe23acd8e5d2286c2cd5c2293a6e6d8fb328ae0544761092b5d4eede8 SHA512 56d844b4c8b81bb8642f97bcc22d73be4a2ec058c9ceeb6b015d3f61356d71ff9fe62ee1c2310e7bd6b2d4256d314d8f3d772dabf7b156472e1b174480e73e0b
EBUILD vault-0.3.1.4.ebuild 995 BLAKE2B c2e1ddad9089a1bd1f102585b59de6f6b147aff20f394db04d498b225a80da06582104c49c532dea2799cf21c25890875b1feae06a87af752ebfca68ea5e1c54 SHA512 df5c58ec5d7555bcb06dc2fc22f522e977d1e9b84c12dbe02f12aba6259f2f8c1d9d220659a19a6062050ef4464d63b1f77883934919a23833416692f6b1bfb2
MISC metadata.xml 658 BLAKE2B 9dd8c71a6edeb66e554b41232200643af326c4d89c8ce87f187462b46abdb52a2275c4f19b9679fb6ee0e038dc7589f02b19636f19df42f6d3a8242796e62d27 SHA512 e76c19492190a13feb99f15f8cfb283ed55525dbdfe786bd33fe9e123b1fb344d45d8751da292d10dbdc906b8348b6840810aac2c871c9c39f5b4fc3823dc169
diff --git a/dev-haskell/vault/vault-0.3.1.3.ebuild b/dev-haskell/vault/vault-0.3.1.3.ebuild
deleted file mode 100644
index f3506a9f6106..000000000000
--- a/dev-haskell/vault/vault-0.3.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=useghc
-}
diff --git a/dev-haskell/wx/Manifest b/dev-haskell/wx/Manifest
index d02527f03b3f..ca4888c450db 100644
--- a/dev-haskell/wx/Manifest
+++ b/dev-haskell/wx/Manifest
@@ -1,3 +1,3 @@
-DIST wx-0.92.2.0.tar.gz 50938 BLAKE2B 3a1b8c4391c73c78d8aa635e48ebd135671bbec4c5312de715966f6596e2201c50c8284c69fd8f873c65e72a654944374c757de4e8c4afe81939e9771a318d77 SHA512 f8bbb2598fc1555030ebe3084737d6f8c0691a3e2fddd9b979c4694442b458937a9bb6afe347b2a5661b7d70339194087ce083ad6efc01173bc0f62b72bf1134
-EBUILD wx-0.92.2.0.ebuild 986 BLAKE2B 5fe3cc526ab7a6ab26579b37f8ce344f9440df5fc16acced5f876dd749ea14c9d697a0a1c3608518c7bebbb563a2c93186b3feed9c37f2c42ac0aace5834bd9d SHA512 534d870cbc9696b0620c2a5477864946c2b96d058625e6f581cd922491cdfbff8aa4cce3240087fddae2d6e8ca6cd9c8e7e07ffa2d5190e928624a92a1d620f3
+DIST wx-0.92.3.0.tar.gz 50940 BLAKE2B fd74eb5119c0e6324f2c8af2d6b9d69a21f06d4d45b31e426606f7350c0f5cea98fb7f5e89fa94017340bb8aa4806a9982f70e505b146bd5cee95114836c3e20 SHA512 904eedeb4c518e9b07076124aa46588c0ac78fc68a34491a535540242fade37239f0a2f692efeeb6d396d6d724e0fe2fd257580ad7d78f2d3f4c204d4dd01293
+EBUILD wx-0.92.3.0-r1.ebuild 718 BLAKE2B df38fa1e699ade1b08a64e16899bb67e16d5b8a68a9a5908a0a0d5a2c0c859af28089333722b1a48f5631438293857b622cdd21bbe6245a41e68865723937e60 SHA512 a2c4829393989d69147da1428cd7923b03a78124237486d4b6843254025c71b58b3f31942a17ce35d9dd8d72763da1514772db0b75545988dc0ff0f045854e6e
MISC metadata.xml 549 BLAKE2B 7645a80403b4176584de8783c6bbf36df125a59aeb27867d88e048d35de11f8f69df2b80a88ceeefdc200156c81a5b3d0db8288a2afb0e2c7219efd5eced2fb9 SHA512 5914f30a0be778084cb801fc3521cf85490a67b9f5a0ee1c5cadb9bd44441c8d1a1840275944d8d1deee334289fd86b7b71bb4b4ab73700e25333f2658ce0d26
diff --git a/dev-haskell/wx/wx-0.92.2.0.ebuild b/dev-haskell/wx/wx-0.92.3.0-r1.ebuild
index 5788c33b8ef5..248029702ded 100644
--- a/dev-haskell/wx/wx-0.92.2.0.ebuild
+++ b/dev-haskell/wx/wx-0.92.3.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.4.7.9999
+# ebuild generated by hackport 0.5.3.9999
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
-DESCRIPTION="Portable and native GUI library built on wxWidgets"
+DESCRIPTION="A portable and native GUI library for Haskell built on top of wxWidgets"
HOMEPAGE="https://wiki.haskell.org/WxHaskell"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
@@ -22,17 +22,8 @@ IUSE=""
RDEPEND="dev-haskell/stm:=[profile?]
>=dev-haskell/wxcore-0.92:${WX_GTK_VER}=[profile?]
>=dev-lang/ghc-7.6.1:=
+ !!dev-haskell/wx:3.0
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.16.0
"
-
-src_configure() {
- # ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
- [[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
- # ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9303
- [[ $(ghc-version) == 7.8.3 ]] && replace-hcflags -O[2-9] -O1
-
- haskell-cabal_src_configure \
- --flag=newbase
-}
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
index 856b48c84c26..962451dec997 100644
--- a/dev-haskell/wxc/Manifest
+++ b/dev-haskell/wxc/Manifest
@@ -1,5 +1,6 @@
AUX wxc-0.92.3.0-cabal-2.2.patch 1645 BLAKE2B 37ac4733ff8d98b02974561e6ac9ab2e6de618ea351ff8da345c6d4fe75024124f5018439b0b572ecefdbdade4ae7949c4ce272cbabd4b96b378db68dd913d10 SHA512 8c339132c304473393624c918147e048b25bdc1705aeb19b1d55d4fc3879d08827f80e600fa327795e993b47b37e2c74554028ee7f39f3936eef9103a403425f
+AUX wxc-0.92.3.0-cabal-3.2.patch 1410 BLAKE2B 46c4b3a44a762cfbf8e3b975ff82fea3c5bb0d4d6d38b9374d8bfd6f2027b8a1854a081b74864034049c5ef55a85a6c27de53fbbfcb404546eaa17f4769fc5cd SHA512 ba3f2d2c9017ac36435145c20e54fa6b357d734127123512291ce0829dcabcbbf812109cb697629c460318fa20bc5b7efef153a4152b144189eb70177f01e8de
AUX wxc-0.92.3.0-cabal-3.patch 698 BLAKE2B d7a7aaa83842e1f18919281bad58f36936bc93dc6c7c3a4eeb660c14a9225b6186c65b14af147a01e8a013a09a213415a3d839b633056f1c429243cd22354d70 SHA512 a77e6e8bc655e2143bd73a534427d2df5bcd2bd0cad4982774ecaae2d4d939cafae55acdae9bc31a03b63c3706314ab78c53e81f13bc6d9894ad06a51c82aeb4
DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2 SHA512 60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
-EBUILD wxc-0.92.3.0.ebuild 1827 BLAKE2B f1bee4fae91786f64b21cfe9cb82ac54542103d88e7e436a38fdf44b38671318eaa6a776eb2abc84587c8f130a2da677dc874c46da7daf1c71293c677044115f SHA512 040787fcd5cbc26ed021c0c4e6e45ecde7dae4f39dd020820684a29ed0cdbf7fa47c5deff3c328110a90f3d5013dd0203f682f55f3978b3a4a9c771fe69cee90
+EBUILD wxc-0.92.3.0-r1.ebuild 1889 BLAKE2B fc69f48aac388ab3d814a337cbe0893629fd7f95ec3e9b4457566be45fd4b61f4f1e49b9ecc985f2ac3cf6638dc903a300e1e83f7e67e8ea1a996d02f9a266be SHA512 b95bee39390202b0b9d72518892b2747a37852258294cc0c140b42568a0c14b8920345c59ed4e1c3d404dc76cbdaa1c8b7ac8bc7a77d9bf35701d37a4b6b92b6
MISC metadata.xml 796 BLAKE2B 3cb8acb5020436e15b3310fb974d1707af624d9a01aa64d66550bd64d17906870aadd01ecaa90bfe04b02564db169688c2774bd62df48501544467461cb333b3 SHA512 47ffc15e1167354eebbbeecfe9557d01dc832a67c2b7d213528f8be73846dab272351670f5b45be9098713c4ec3106753d8fa1cffdbb2844d0a9d8cd3146cd94
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
new file mode 100644
index 000000000000..096e971de4b7
--- /dev/null
+++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
@@ -0,0 +1,27 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -81,7 +81,12 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level
+ -> FilePath -- Path to command
+ -> [String] -- Command arguments
+ -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status)
+-#if MIN_VERSION_Cabal(2,2,0)
++
++#if MIN_VERSION_Cabal(3,2,0)
++rawShellSystemStdInOut v f as = do
++ (so, se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
++ return (so, se, c)
++#elif MIN_VERSION_Cabal(2,2,0)
+ rawShellSystemStdInOut v f as = do
+ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
+ return (so, se, c)
+@@ -444,7 +449,9 @@ deMsysPaths bi = do
+ if b
+ then do
+ let cor ph = do
+-#if MIN_VERSION_Cabal(2,2,0)
++#if MIN_VERSION_Cabal(3,2,0)
++ (r, e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
++#elif MIN_VERSION_Cabal(2,2,0)
+ (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
+ #else
+ (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False
diff --git a/dev-haskell/wxc/wxc-0.92.3.0.ebuild b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
index a704fc0cd19e..d9c666dfccae 100644
--- a/dev-haskell/wxc/wxc-0.92.3.0.ebuild
+++ b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# ebuild generated by hackport 0.5.3.9999
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
-inherit haskell-cabal multilib versionator wxwidgets
+inherit haskell-cabal multilib wxwidgets
DESCRIPTION="wxHaskell C++ wrapper"
HOMEPAGE="https://wiki.haskell.org/WxHaskell"
@@ -23,6 +23,7 @@ RDEPEND=">dev-haskell/split-0:=[profile?]
>=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
>=dev-lang/ghc-7.6.1:=
+ !!dev-haskell/wxc:3.0
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.23
@@ -31,6 +32,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.patch
)
src_prepare() {
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
index 0f51a8540ec4..193d7b6ac800 100644
--- a/dev-haskell/wxcore/Manifest
+++ b/dev-haskell/wxcore/Manifest
@@ -1,5 +1,5 @@
AUX wxcore-0.92.2.0-ghc-8.4.patch 182 BLAKE2B caf297ccf8d04e9f6751dbf47e6ef9a8dab77e50aedd8612640a477f234041815afc499da4194172e3806f721669fe272c0366c085671af2051e266f3b4e33cb SHA512 2989283b7ba0b700bb9be6f0b5648e0332b9900c36900740653da861a7a81328efcfdabb28d5d11000a5eb3d742c77fa3c3e866eba5f8afbb5b1bd8a5e18bee2
AUX wxcore-0.92.3.0-cabal-3.patch 714 BLAKE2B fa8590e575386ed6e1efce2a5221693d497a1243f715acdbc99986c19272b5d9b6a8e49dbed94761c81a375890b42d4f44dc76ad8bb819ab7944954315dcc0bf SHA512 cb7ed7541dcff3c44cd5476a73cbe1c65d35bf8c2cd8ce9235edd6e04bafccce88183e18ff30d9f4963ae058278aa244431fe14dd528860d99be774d8feaa6e5
DIST wxcore-0.92.3.0.tar.gz 400300 BLAKE2B ce7ea6e2ec71935001d0b1fd347d5aa57de5d9f7cab9cf9fa87879c8dfd6291e76811899aeaccf8c227d54e6b0499ea5420dabac84014cbbf6373f8dd8a60f0f SHA512 199eb8afa9b568637c8d1fb2ab8b98a73d4ea9f03df088a855a88f17728997ed1044fb7c1c69d732530d7b24ae312e8dfc3f6ffc0396765d583531524d10a442
-EBUILD wxcore-0.92.3.0.ebuild 1204 BLAKE2B cf7e5c5516f6ed70a99fa5289f163c554952b82f64a5fffc94770d18a710d37c6994633b36c3b9d6b93a3e37f9ba13df40242a68e228e8612ee163d9832e044f SHA512 a6b3ad3bc03c96d6ceb6aaaf5dc9031c8d90f6be422fd6a855174c81bdd5f608c13fcdd8b6c14d6464b277292b0ff2127bb1ed30b70e6d2100617c2439c03df4
+EBUILD wxcore-0.92.3.0-r1.ebuild 1235 BLAKE2B 10a65142015127626510a4df24d62777f859d0c9715447b13282fb671b7a1c0854b3de6aea6a6d5d19c2b634002b70767dbe355ca2c792786aea879691b4cade SHA512 deee4fb885f9e7932f7e46a795d6428ac5b8fea67b3932c6ea8e3a990f35b7bf68475a94d33239a4f74ef0e95e99ed7117fa54a74dc5c89a81da83c63fd6146c
MISC metadata.xml 552 BLAKE2B ee833f6c1a6469ecb6e1ae439a4b049fbd30af28f7a671f64687da3fbc4ac3ec5c0cba933364fd7f00933940d2462e107a62978f65fe6379dd587dac68f5c2a7 SHA512 2fc1a19d4fece7df270b76dc9aec6003f67f1a2a2adc7beb8999f9938762487fbda660734eddcbed33ae8472f748ba5079108d3806c844283696711ecd288f18
diff --git a/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild
index 45fad5cbefe2..6ec00209026f 100644
--- a/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild
+++ b/dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# ebuild generated by hackport 0.5.3.9999
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal wxwidgets
@@ -25,6 +25,7 @@ RDEPEND="dev-haskell/parsec:=[profile?]
>=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
>=dev-lang/ghc-7.4.1:=
x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
+ !!dev-haskell/wxcore:3.0
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.23
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
index 615ac5c44d6c..5765d00f3787 100644
--- a/dev-haskell/wxdirect/Manifest
+++ b/dev-haskell/wxdirect/Manifest
@@ -1,3 +1,3 @@
DIST wxdirect-0.92.3.0.tar.gz 30586 BLAKE2B cb174838000a39b0067338297adb7c1e0b96bd524297950f5d3ede244ec914d2a1b3c717669b5af53f29b55266473c7042b7c90990b70c6177e85fc11d76bc34 SHA512 02dfd9496f1a36480c82a4cf03e3a0ded0a45ede984b70e923b2289323f9c4561b7c0a2ab2db34ee2021b7b5fe62c25ea4a8b61bcbbe3414f821dacb14190f8b
-EBUILD wxdirect-0.92.3.0-r1.ebuild 1229 BLAKE2B 7311522de81f44ac7eb732e2cff5d602d58638b5ebc9f0911fd734f9419ed26b39b73ce86a2a7c80392f7266f205850fa07707a3ad1845318583681c54a95b3d SHA512 bef8dfceae85bb8ec2bc11dcdd1eafe59f8badc138c2e0cb9deca6cc367a278fa70dd36fd701d172d60609eea75794bfbbfb1ff7618b5fcd61ed43753e2e3d53
+EBUILD wxdirect-0.92.3.0-r2.ebuild 1262 BLAKE2B 1e1c8d08eaff9414169fdf280e249c3b8c878887dbb539ca18920555004501b4f755be645708094cdf3f5a31ea8d5ad191a7bdfe666c73eccbf033585ccbd931 SHA512 cd4f542c18e298bb7f40c8982db1b14fcc262ae659fa8870499223df465d5e311a06059f39f02ce9425b957034f4f8cd7ef7e21ad530f30c86a7b983eeb5ef4a
MISC metadata.xml 552 BLAKE2B 5917920410ec46e81b2af4b10c160023658612e85a79b163c169dca57f7adeb65b5dae7b95f425297d7cb7f622d5b9868bffa2db66dee520768831848b2fbede SHA512 330e53423fa37d149fd7ba27e3e8895c5e2a234d62b5fd7afa60eafd1f482c44ef8ae64bccba670a8090e0899d796ddc01595abda056ce9e35368ac496fb353b
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild
index 1fdef5bfeffb..0e8ca99f46db 100644
--- a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild
+++ b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.5.3.9999
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -22,6 +22,7 @@ IUSE=""
RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
dev-haskell/strict:=[profile?]
>=dev-lang/ghc-7.4.1:=
+ !!dev-haskell/wxdirect:3.0
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index 8dea9c83f7cd..15cbc612c360 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -1,3 +1,3 @@
-DIST xml-conduit-1.9.0.0.tar.gz 40139 BLAKE2B b82fc11cc1ff1e63dc8638eb5da3506cf2ca755d94aa98fa0c5db16d17c676396e1d3e747037ba846e959b9883465d090bdb036809cb542453980c52ecb4ada9 SHA512 a6348233d99db2987289448c7320820abb9ed897b389d0a275e92c4a1e8055e9fa60a422b306f2bb1289b85f83545effe00d07c9ca1ecc7f2893d74b812cca23
-EBUILD xml-conduit-1.9.0.0.ebuild 1192 BLAKE2B d38b4a569f615b83765f27b8fe660467fd63b6d3909ceaa643e49686db0145ad1a0dae714d2783f864f37193c27dd8bae0c30e0d7a4b42b862bb34dae765c824 SHA512 94d968e5a04e88c9d75ee10a3745d06a9558704d6e43f89c2fa3c3fa2eeaae7468612b86094de8af138bcff8bdfa429b4c95f17642e49f3cab92df768412ee17
+DIST xml-conduit-1.9.1.1.tar.gz 42901 BLAKE2B 2dacf27f6373827b779492130b837d3b5bc7adce599820b310cebedc8b1cf525ef300c5d6e65acafb5579a6f0922a47c749fbd8c49bbb623950d08dff63079c0 SHA512 4d75960eb400a4ac8cb13bb70f59b554659fa2a6165906f73097a2bc564505a1efa78e72b121d9ed0fd8b424ff25cd1d8368e6c1f2b6ffa4b0aa36f584727687
+EBUILD xml-conduit-1.9.1.1.ebuild 1298 BLAKE2B 2af83e1196ae46ee50052c38e83ebb72a42a87af5adac6433e47ead16b63291da65b7930305e0d56a00d092669011ffbb4f13d73b9ba312f9339f91bf532c0be SHA512 0284a823ac4eba6fc3f5d530b6056193dbf7f35b774b1060a4e60d9f1a01d198ea711fd18823342cd7d6edea8706687f86e786cc2732b06b56e61a278691065e
MISC metadata.xml 1536 BLAKE2B 45a099c2f789592d1b52f7d765de3e1e474dd2135f26795fe9f4c31319d2e58d1329f137eed0646570c7c819878fe96eb44c680e1d30e68f40108b8271aca537 SHA512 b165bc569011782102739b645d1d8c5e36ba248967732dd8faac80aeebf56122ffa5ebef474d9a43cd37cb725ef94fa6f57bf104224a5905eb6672e05cd891db
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
index 043022e12e7a..b644b8d8cf08 100644
--- a/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.1
+# ebuild generated by hackport 0.6.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES+=" rebuild-after-doc-workaround"
inherit haskell-cabal
DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
@@ -15,7 +16,6 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?]
@@ -26,10 +26,11 @@ RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
>=dev-haskell/text-0.7:=[profile?]
>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
test? ( >=dev-haskell/doctest-0.8
>=dev-haskell/hspec-1.3
dev-haskell/hunit )