Updating liguros repo21.1.2

56 files changed, 235 insertions, 173 deletions

diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
index 47206fbe4a64..5755eb819db0 100644
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depend: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -21,17 +21,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
 "
-DEPEND="${RDEPEND}"
-# 	test? ( >=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.9
-# 		>=dev-haskell/random-1.0.1.0
-# 		dev-haskell/test-framework
-# 		>=dev-haskell/test-framework-quickcheck2-0.3 )
-# "
+DEPEND="${RDEPEND}
+"
 
 CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
index ddbea6669cfa..f70319a436df 100644
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
index c48c74d40c4f..4e3ef6605f6d 100644
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 220ee8187a53..b788a5425abd 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
index de5558e4a3a9..b2818d3ca188 100644
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index 15fd12acb3a9..e9344803aa79 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test
diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
index 8174b449767e..b55efde6e140 100644
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.24.2.0.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=6
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular dependencies
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
index b88e01493733..e46b1a1e7a60 100644
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 #not keyworded yet: many packages are broken
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular dependencies
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index ee39489573f7..3cf62699328d 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 # ebuild generated by hackport 0.4.7.9999
 #hackport: flags: -llvm
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
 inherit haskell-cabal
 
 DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
@@ -24,8 +24,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
 "
 
 src_configure() {
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 2ef36941b150..f9254d2aff45 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1 +1 @@
-DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
+DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
index a7adcec857d8..3480cf6e57e2 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.7.ebuild
@@ -4,37 +4,39 @@
 EAPI=7
 
 # ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +distributive,+containers
+#hackport: flags: +distributive,+containers,test-doctests:test
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Haskell 98 compatible comonads"
+DESCRIPTION="Haskell package providing comonads"
 HOMEPAGE="https://github.com/ekmett/comonad/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
+IUSE="+indexed-traversable"
 
-RESTRICT=test # broken on USE=doc
+RESTRICT=test # fails on USE=doc
 
 RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
 	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
+	indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 ) )
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=containers \
 		--flag=distributive \
-		$(cabal_flag test-doctests test-doctests)
+		$(cabal_flag indexed-traversable indexed-traversable) \
+		$(cabal_flag test test-doctests)
 }
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 6b5e0f255558..4b131d92c1aa 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="test-doctests">Run the doctests test suite</flag>
+		<flag name="indexed-traversable">You can disable the use of the `indexed-traversable` package using `-f-indexed-traversable`.  Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.  If disabled we will not supply instances of `FunctorWithIndex`</flag>
 	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 4259acd87c97..74070c97b96a 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1 +1 @@
-DIST cpphs-1.20.8.tar.gz 45108 BLAKE2B 8e373db64d0d2a21e123eb136aadfd45cb373411e0684c445e25eb6062ecf4c29ccce3214986680ab886a71bccade3ac381f8f82916002388af3103bc38e797d SHA512 ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
+DIST cpphs-1.20.9.1.tar.gz 45496 BLAKE2B 1a964c011628f260d1c7ad6653c03776a36a014ff6717f877796de0d0139dcd3454bd8d935e3fffda2d6dd9823fd5fc5be58b73bb9590de248381755b446148e SHA512 bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
diff --git a/dev-haskell/cpphs/cpphs-1.20.8.ebuild b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
index 7cb9100adc3c..424fec8c25b7 100644
--- a/dev-haskell/cpphs/cpphs-1.20.8.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,11 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
+RDEPEND=">=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.8
 "
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index 3a89b18c2688..536a1c74f483 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index ae922f958a10..70b160ff2813 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
index 27d5d6d099dc..051ea38ca58e 100644
--- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -32,6 +32,7 @@ src_configure() {
 src_install() {
 	cabal_src_install
 	if use doc; then
-		dohtml hscolour.css
+		docinto html
+		dodoc hscolour.css
 	fi
 }
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
index 68429f049389..cac8822ead5d 100644
--- a/dev-haskell/hscolour/metadata.xml
+++ b/dev-haskell/hscolour/metadata.xml
@@ -1,8 +1,20 @@
 <?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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		hscolour is a small Haskell script to colourise Haskell code. It currently
+		has six output formats:
+		ANSI terminal codes (optionally XTerm-256colour codes),
+		HTML 3.2 with &lt;font&gt; tags,
+		HTML 4.01 with CSS,
+		HTML 4.01 with CSS and mouseover annotations,
+		XHTML 1.0 with inline CSS styling,
+		LaTeX,
+		and mIRC chat codes.
+	</longdescription>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index aeb69575b4aa..47616a4c9b8c 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
index f8c9ac78be3f..d0bd0600aae0 100644
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ b/dev-haskell/hunit/hunit-1.2.5.2-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
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
new file mode 100644
index 000000000000..319126617c37
--- /dev/null
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -0,0 +1 @@
+DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
new file mode 100644
index 000000000000..5c2c92466fbe
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
@@ -0,0 +1,28 @@
+# 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"
+inherit haskell-cabal
+
+DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/indexed-traversable/metadata.xml b/dev-haskell/indexed-traversable/metadata.xml
new file mode 100644
index 000000000000..bd664ac1426b
--- /dev/null
+++ b/dev-haskell/indexed-traversable/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
new file mode 100644
index 000000000000..c497de0b36a4
--- /dev/null
+++ b/dev-haskell/linear/files/linear-1.20.9-base-orphans-0.8.3.patch
@@ -0,0 +1,13 @@
+--- a/src/Linear/Instances.hs
++++ b/src/Linear/Instances.hs
+@@ -21,8 +21,10 @@ import Control.Monad.Zip
+ import Data.Complex
+ import Data.Orphans ()
+ 
++#if ! MIN_VERSION_base_orphans(0,8,3)
+ instance MonadZip Complex where
+   mzipWith = liftA2
+ 
+ instance MonadFix Complex where
+   mfix f = (let a :+ _ = f a in a) :+ (let _ :+ a = f a in a)
++#endif
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.20.9.ebuild
index ebf29418bf02..2a04c9081129 100644
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ b/dev-haskell/linear/linear-1.20.9.ebuild
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-hunit-0.3 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-herbie \
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index 60050c7eae9a..8e77a9cad041 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
index b59256306480..c9885eb4351f 100644
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
index 4f45f27b1eec..5c57b210fa22 100644
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.5.0.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
index 7a25e4569cbd..b5f4686252ff 100644
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ b/dev-haskell/network/network-2.4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
index b1e5665f725e..0bf78717bbcb 100644
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ b/dev-haskell/network/network-2.4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
index 76338626607e..12eb7390366c 100644
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ b/dev-haskell/network/network-2.5.0.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
index 1af7b932e621..4a93655738cd 100644
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ b/dev-haskell/network/network-2.6.2.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index e7882fccbfd9..49ff518f7369 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -1,11 +1,17 @@
 <?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>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aslatter/parsec</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Parsec is designed from scratch as an industrial-strength parser
+		library.  It is simple, safe, well documented (on the package
+		homepage), has extensive libraries and good error messages,
+		and is also fast.  It is defined as a monad transformer that can be
+		stacked on arbitrary monads, and it is also parametric in the
+		input stream type.
+	</longdescription>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
index 9999fac242a9..0a7c5b66927a 100644
--- a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.5.5.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circulare depends: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -17,11 +17,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-#keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # circular dependencies
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
@@ -29,12 +28,7 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
-DEPEND="${RDEPEND}
-	test? ( >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		|| ( ( >=dev-haskell/hunit-1.3.1.2 <dev-haskell/hunit-1.4 )
-			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-"
+DEPEND="${RDEPEND}"
 
 CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:9999"
 
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
index fde0a720b3b4..7cebba59ce2d 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depens: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RESTRICT=test # circular dependencies
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
@@ -30,10 +30,5 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
 "
 DEPEND="${RDEPEND}"
-# 	test? ( >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-# 		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-# 		|| ( ( >=dev-haskell/hunit-1.3.1.2 <dev-haskell/hunit-1.4 )
-# 			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-# "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:9999"
diff --git a/dev-haskell/primitive/primitive-0.7.1.0.ebuild b/dev-haskell/primitive/primitive-0.7.1.0.ebuild
index 127196afe010..318fc14a0b8f 100644
--- a/dev-haskell/primitive/primitive-0.7.1.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.7.1.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
index cac919075a6a..3bafae5494bf 100644
--- a/dev-haskell/random/random-1.1.ebuild
+++ b/dev-haskell/random/random-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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
index 2714a28f0916..e4d7ed28a87b 100644
--- a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.94.0.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
index ff80ebe0524c..517f29f00542 100644
--- a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.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
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/split/split-0.2.3.4.ebuild b/dev-haskell/split/split-0.2.3.4.ebuild
index bb17cd9cac4f..108abc90a696 100644
--- a/dev-haskell/split/split-0.2.3.4.ebuild
+++ b/dev-haskell/split/split-0.2.3.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
index 0c341acd6d27..a8ba70e43c28 100644
--- a/dev-haskell/tar/tar-0.5.1.1.ebuild
+++ b/dev-haskell/tar/tar-0.5.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
diff --git a/dev-haskell/texmath/texmath-0.12.0.3.ebuild b/dev-haskell/texmath/texmath-0.12.0.3.ebuild
index 9ac897e1ba4e..53bc6fb956d6 100644
--- a/dev-haskell/texmath/texmath-0.12.0.3.ebuild
+++ b/dev-haskell/texmath/texmath-0.12.0.3.ebuild
@@ -23,7 +23,7 @@ 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-7.10.1:=
+	>=dev-lang/ghc-8.8.1:=
 	executable? ( dev-haskell/aeson:=[profile?]
 			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
 			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
diff --git a/dev-haskell/text/text-1.2.4.0.ebuild b/dev-haskell/text/text-1.2.4.0-r1.ebuild
index ea35335337f4..32cb6fed33fa 100644
--- a/dev-haskell/text/text-1.2.4.0.ebuild
+++ b/dev-haskell/text/text-1.2.4.0-r1.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 # break cyclic dependencies, test suite requires porting to >=QC-2.11
 RESTRICT=test
 
-RDEPEND=">=dev-lang/ghc-8.8.1:="
+RDEPEND=">=dev-lang/ghc-8.8.1:= <dev-lang/ghc-8.10:="
 
 DEPEND="${RDEPEND}
 "
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index 9e282af460b9..381d35948b36 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,2 +1 @@
-DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
-DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
+DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
deleted file mode 100644
index 547747d38deb..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.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.4.7.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	if has_version '=dev-haskell/transformers-0.3*'; then
-		tf_arg+=(--flag=three)
-	else
-		tf_arg+=(--flag=-three)
-	fi
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
index 5ac53b6cbadc..f547bb95cb47 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -two,+mtl,-generic-deriving"
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -two,+mtl,-generic-deriving
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 # break circular dependencies:
@@ -12,13 +12,13 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 CABAL_FEATURES+=" nocabaldep"
 inherit haskell-cabal
 
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
+DESCRIPTION="A small compatibility shim for the transformers library"
 HOMEPAGE="https://github.com/ekmett/transformers-compat/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
@@ -26,7 +26,8 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/transformers-0.3:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+"
 
 src_configure() {
 	local tf3_arg=()
@@ -58,6 +59,7 @@ src_configure() {
 	fi
 
 	haskell-cabal_src_configure \
+		--flag=-generic-deriving \
 		--flag=mtl \
 		--flag=-two \
 		${tf3_arg[@]} \
diff --git a/dev-haskell/uri-encode/Manifest b/dev-haskell/uri-encode/Manifest
new file mode 100644
index 000000000000..e94cba5250ed
--- /dev/null
+++ b/dev-haskell/uri-encode/Manifest
@@ -0,0 +1 @@
+DIST uri-encode-1.5.0.5.tar.gz 3447 BLAKE2B cdd8449651a28dfcdd21d0745d928b340aa9d6c13c8ce1b9c9da7d13cc51670df8d35b65f9c82b46649566f67014441f1b8e124b70469a1d2e654551d1726a03 SHA512 1ad0fb5144b93dce50ffaf99a84ba2fe8c05508866fb374d62b75c4a32b58f3c97d7ec30257eec29973ad15fde4e902286e86a41ee36e62b00e00d941e181885
diff --git a/dev-haskell/uri-encode/metadata.xml b/dev-haskell/uri-encode/metadata.xml
new file mode 100644
index 000000000000..1314c336abdf
--- /dev/null
+++ b/dev-haskell/uri-encode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="tools">Build executables.</flag>
+	</use>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild b/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
new file mode 100644
index 000000000000..d1b052679fe3
--- /dev/null
+++ b/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode aware uri-encoding"
+HOMEPAGE="https://hackage.haskell.org/package/uri-encode"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri tools"
+
+RDEPEND=">=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag tools tools)
+}
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 3d4360870a3c..fb5e89962dca 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.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
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index ece7168f2868..b54f6b9259f1 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -1 +1 @@
-DIST yesod-static-1.6.0.1.tar.gz 25463 BLAKE2B 98b5a317a2d8c91d5ef9628422dd7ce8627f7f47c88722e2732aac23705f44f449ebee4bf179c2c7e429026b52920df487c257aefd75a18efe6be1717e50dd94 SHA512 2e1e4873248d435a9d58f3075b6c06cde2edcdd520f700dc7f0427039c236d28787f62a643a8cf57b74d85a885625474a5662b91a56c25e8f4d1737be525bc2f
+DIST yesod-static-1.6.1.0.tar.gz 25613 BLAKE2B 6619169b5c745f215174cb7f3544dcc0eb5b32cb58059a87b1c1e8edae4e2e53e994c9d7afc60fd523be8aa5e33b996daebeae89063030861fa3b049b2e2c2d1 SHA512 66037ec28eac83e374161c1b306a4d20805ecb35ccfc4878e7894d961daaf30d9936c6e209641ff323d7e3dd5626f5a24a12915d4205417c496e272a2e969f6e
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
index b264567dbfa6..d02fc54423dc 100644
--- a/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
+++ b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -38,12 +38,13 @@ RDEPEND="dev-haskell/async:=[profile?]
 	>=dev-haskell/wai-1.3:=[profile?]
 	>=dev-haskell/wai-app-static-3.1:=[profile?]
 	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.2.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.0.0.2
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/hunit
+		dev-haskell/rio
 		dev-haskell/wai-extra
 		>=dev-haskell/yesod-test-1.6 )
 "
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index 958e7c959cf6..fcd6d48b93f8 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1 +1 @@
-DIST yesod-test-1.6.10.tar.gz 27593 BLAKE2B ed6b5be35032246a0e233a985cc7a739a38cd4b81db42ac000c823ff0975ed642d6e4dc7e8dafb6679d6acb53c8cfb2f438f84d4e73c9ab79ecac4c7d3adb681 SHA512 badbd76b9a345c86f9dcf8b5d6043f173eec60bf6f39bdcb4a60d17d95ad693991a1c7b4061a1e86d61fb9efe3f2f29b3129e6b9ffef4b07d5b563116959b016
+DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
index 8e3c91fc2713..60de493bb0df 100644
--- a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -29,9 +29,9 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/http-types-0.7:=[profile?]
 	>=dev-haskell/hunit-1.2:=[profile?]
 	dev-haskell/memory:=[profile?]
+	>=dev-haskell/mtl-2.0.0:=[profile?]
 	>=dev-haskell/network-2.2:=[profile?]
 	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/semigroups:=[profile?]
 	dev-haskell/text:=[profile?]
 	>=dev-haskell/wai-3.0:=[profile?]
 	dev-haskell/wai-extra:=[profile?]
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
index 87c943585775..df1644803e2a 100644
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/zlib/zlib-0.6.2.2.ebuild b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
index 0ec5d7b0d4a6..9a74ff0657ef 100644
--- a/dev-haskell/zlib/zlib-0.6.2.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
 IUSE="bundled-c-zlib non-blocking-ffi"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=