gentoo resync : 18.12.2020

25 files changed, 170 insertions, 101 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 5f002f5b5698..030f9e27e752 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 27a56e0b6a80..1fb3128d1f7e 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,3 +1,3 @@
-DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
-EBUILD comonad-5.0.6.ebuild 1303 BLAKE2B 0a561e6b58aef3d9c3ad4371a07b61a2de76bc8b4016a28b5f2b921ddcb8933b0eb9be5cfc2d911e5fa424e94a29b360eb1a4143d28d2425a00830f435639ae0 SHA512 c07f01b14525fae0b2678a6a6601e0779c3a14179a2db15b0661566bf4c72ea5618c279149c6aea57b2803cddf9d9428e537f78e1b4fb153ff4d268d86a83794
-MISC metadata.xml 971 BLAKE2B 7c93a2a5f46470f854849bc69ce7bf737bb853f5fbe7d83a3a3bf93e7db484cc22917518fb6ad79e102464b96f41d3ad3d029a84f90da53a2eecb540669ccd04 SHA512 0d491b3a8aa8812e264f9f6946a939048560c20679cc10850b701c769ae3e37218d2075aed02bca11dcfd01030da8aeae5d884d0244448a56b2dd46abb560860
+DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
+EBUILD comonad-5.0.7.ebuild 1448 BLAKE2B 27a498b27e7dbeb84a37c6e428de4afdc92e4f958f4976a9eb4edc4c016f2ca51959d8f278b9e665ce189f114b5db8f2668c9351b0455ebf5c067b04a7e7f3fc SHA512 5e7a19291c8336d3a3e266abff528d14f9296295c9fd3c921f648e0209c4e943e70ab74d05786bfc07c9d6d54f6c9ff6b86a68de6bcfbac303ca6daa3ba21a1e
+MISC metadata.xml 588 BLAKE2B eca11a9b96f2d0a128b79b5ee3d0df7bfd204845fb6be99a596a11ccdccb7d49800fb92c97e43478e5c337cf6281fb48c90b8314995cfe6bf8f4d0cbe54db73a SHA512 bb9cb0e3c2b9c135f6413549f3853ea75d26313e7032fe7564ce2aba22523f980d65c93ddac4c566f04a9af2c7f48d627c18a870e955019e77a6d9dcad06c662
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
index 553ea56cb38e..3480cf6e57e2 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.7.ebuild
@@ -3,37 +3,40 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#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="+containers +distributive +test-doctests"
+IUSE="+indexed-traversable"
 
-RESTRICT=test # broken on USE=doc
+RESTRICT=test # fails on USE=doc
 
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+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:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+	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.17 ) )
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
+		--flag=containers \
+		--flag=distributive \
+		$(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 6dc7bb65e52c..a8afd1054366 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,22 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. 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 `Distributive`
-		</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>
-	<upstream>
-		<remote-id type="github">ekmett/comonad</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 57a3de9b49e7..cde07920debe 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD cpphs-1.20.8.ebuild 673 BLAKE2B c205975691d2d6f7aad241a50b17935703861669a2c8fa679ac9cd36fe8b17fdd09d4c26a72cf4815255d000c95040a1e6b7f0411e73f756bc9bda78c29754e1 SHA512 97d1974d04c80c43cac995a6e324dd96cf992c7a24fe827edbccf8dcbd6fc894e905302af515df60ca0c4bc728e86c52ab7f514e551b27d16b40e24912871513
+EBUILD cpphs-1.20.9.1.ebuild 730 BLAKE2B 69402ad22c90e8a13bf0b3af94d6cb8cf49eef4c28b0a322c70d98716b00784996bfb8faac510f243c68df8422578cee42e24267b7aa7446ddb8128564431423 SHA512 ffd0cf05f07645cf5b1d8e2e0b71194f9b81787b191920e962f02f7bd0780b871c823180e98f30b4148aaa22de653b94ff73ec83c0c5c12c512b160adfcc74df
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
new file mode 100644
index 000000000000..3a05d030dc34
--- /dev/null
+++ b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
@@ -0,0 +1,26 @@
+# 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="A liberalised re-implementation of cpp, the C pre-processor"
+HOMEPAGE="http://projects.haskell.org/cpphs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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.8
+"
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
new file mode 100644
index 000000000000..beaf5df2e11d
--- /dev/null
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -0,0 +1,3 @@
+DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
+EBUILD indexed-traversable-0.1.ebuild 931 BLAKE2B 847cab458f19c947ff211eda8385ebd980cfd47a62aa352ef443cf2f2b5a9c7529f2926f02594d1cf84dfdc1d7c3bb29c2ae9bcb3cf933490098ca93a73fa648 SHA512 a65f0c0a63efad4f6accbec70640c22d373ed39f7ac623dceae4829a5cad2d020042fc98fb684d7ad867355d3fa7cc98138a17af40e89cff7ea9f617e40fc8ee
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
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..b7878815d80d
--- /dev/null
+++ b/dev-haskell/indexed-traversable/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index d50157f21615..75e1904e84f6 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD transformers-compat-0.5.1.4.ebuild 929 BLAKE2B f4a90457d4eb899f7be2d80906741bc8d98c0222cfe2895b6ccf37221f3c4c63af43933fa57c6fd2c38ebf94bcd0c6ac145c0c934f59e9e26e1814a49279d4f6 SHA512 4845e19b8b6591c2af5768ec3fe1b63ff4f7ee87914ca1924e94a12779e466f23db1c6d9082428bade694f8ec360b716fe28665068fd82d864f64a0347949e9c
-EBUILD transformers-compat-0.6.5.ebuild 1501 BLAKE2B 5edcdbbe10fd4e7f7373e91e5b52d0821b43b1e6f7cf30be8cdb8e5666ccb09423dc33a4e4d0aa5481e3cae26a10b87273d146e945abf84bb230c8d06f354ecd SHA512 145064625386656ba68628b032b32f6df0295c20f2c2aca45e8de08036d3f658077bfac69524a7a356ecd383c51fa08473394123c5ba7b309fce9ba85fdc52a0
+DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
+EBUILD transformers-compat-0.6.6.ebuild 1554 BLAKE2B 78c47d71ba3f58ebdd3cd3916c11901ab1dcd3c3f7d9cc6174c4d2d8d21cba3bcaf5abe8c94e81b8f7f10c517d70109f864e4f889203748dc084720c87066f1c SHA512 d96d049c1b777f22b034a6c0f4d6dc97f09957915259dbc55683055cdae45af5df66bd313798a9f4b00b33c805b8696150f383fb481728e40e5d2dfd5a96621e
 MISC metadata.xml 812 BLAKE2B 56376ba85c38bf223334fdd52801f7fbb19d14a451166e4315a803da2401a6f04b328f96fc822f101bd6cece987ff31e717e2f29d5497dade8edde5870c9bd5a SHA512 9b7109fa74ac8b60851cad5a47001754d00ca9faa93d00d579c7ee236dd313839f52212d2fc2bd561f0330a2277a726c54f2afdb2f601785041b5b107c099d1b
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..ef25215f9d8b
--- /dev/null
+++ b/dev-haskell/uri-encode/Manifest
@@ -0,0 +1,3 @@
+DIST uri-encode-1.5.0.5.tar.gz 3447 BLAKE2B cdd8449651a28dfcdd21d0745d928b340aa9d6c13c8ce1b9c9da7d13cc51670df8d35b65f9c82b46649566f67014441f1b8e124b70469a1d2e654551d1726a03 SHA512 1ad0fb5144b93dce50ffaf99a84ba2fe8c05508866fb374d62b75c4a32b58f3c97d7ec30257eec29973ad15fde4e902286e86a41ee36e62b00e00d941e181885
+EBUILD uri-encode-1.5.0.5.ebuild 982 BLAKE2B ae848a1e400e5dda4c658bd8c53d4128aa8a2d9c6f034e4ec557f75d672ae421cbeaa6561fcc117d931ab1c71a925270fd4c67217ed658af1775416c911528d9 SHA512 07887918750304441ab046eb52c4ceb58c777bd86d00cc55c77aa97b3371dca42d6a983a932f7a09bb95bf543882ffc433caa1cdac9beb9eb0b3760372472d4c
+MISC metadata.xml 391 BLAKE2B 047b27d511268e6bd11e93914bf54cf3a451d2ed6e6f5cdb357be2c7981871e27bde40161694c419d7e7fcc38e76c82dd2c4eb544c47996cd54ebd20328c869c SHA512 aa130874716a9568b803e19d14554eed77aca2d248e757876487bce54a32135336f7c4e5bd965d89a60086216224a9154a4081a376ab4e9f0528953752b21f52
diff --git a/dev-haskell/uri-encode/metadata.xml b/dev-haskell/uri-encode/metadata.xml
new file mode 100644
index 000000000000..dd850c2aa122
--- /dev/null
+++ b/dev-haskell/uri-encode/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+</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/wai-app-static/Manifest b/dev-haskell/wai-app-static/Manifest
index 0ee1ba22a22c..dc9f454e686f 100644
--- a/dev-haskell/wai-app-static/Manifest
+++ b/dev-haskell/wai-app-static/Manifest
@@ -1,3 +1,3 @@
 DIST wai-app-static-3.1.7.2.tar.gz 22843 BLAKE2B 777a25ac71c24fa850b214d18096396dd03809c125aab8197d2621f0943bfc6bbae0f8f25dbfe19dd93bb835dbb39487ee89689ca3ef49e8c9580f102d1a9df9 SHA512 e073d85efc201eab94b9c8be4e40ee71567d07ed2e2907504a946477211bc21aaf2250213cac67525ae58be499b164b09880600c0a6f62b0b1742fb9d730d6d9
-EBUILD wai-app-static-3.1.7.2.ebuild 1616 BLAKE2B 16d968fa7541e7c68c3465f15532cde6ceecd27da35204248849663e168842a7dee493a555f12b94d07b1e7418842bf4e6ef6f0093debad16ff95d7c062b6299 SHA512 2907be994ab62a5766ac69fd7733932ba60d56eda2c5a274cbfbba67a3a0d755a6a463f806695ef5164f3559cc730efb9fe263340262c50d722dbf820e8d789c
+EBUILD wai-app-static-3.1.7.2-r1.ebuild 1747 BLAKE2B 12ea8f91929c0f877b30a7984915d57d64c83765ed33f51a98fbd595b96a25e41fd7e31ed6d63458bd592341d28b2dcbdfc006ca0a6addeb0a224a4f06931afb SHA512 a51e76beaef1afbe0ad5087685f5f6a13d63cac3529288b14e68fddb54982f10c02d45aa303e924da9f3088cdeac67878eb207a5e4d95010a377084e163af120
 MISC metadata.xml 310 BLAKE2B 81a54a34d953f4bfefd6895c26a9cfc2593fa72b16f32729541f954d55a01625dc917f3749b0a8abdc9b3b19e457ecbec6e8216ae86ac5dc3f57a38c31f5230e SHA512 efe656ebadf198b9ea416e631fe032dbb2e65b8359fb3bce58196fa0451fdaab2cc4aba6167499dd643bc0a16eea896677e092667b3a01e3130f89bdddee8ee6
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
index b122e00e7f0c..d29aea060d12 100644
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?]
 	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
+	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?]
 	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
@@ -44,6 +44,13 @@ DEPEND="${RDEPEND}
 		dev-haskell/temporary )
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'wai-extra                 >= 3.0      && < 3.1' 'wai-extra                 >= 3.0'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag print print)
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 0533ad31e1f0..f5b13221c34b 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -1,3 +1,3 @@
-DIST wai-extra-3.0.31.tar.gz 63975 BLAKE2B e705142e48bac00d13d9ec42ecc02a646a081e69a5996794db34bea77b193dccfe9de2f9b89518b234adf226cfc79765c1d8eabcf7c990494e0d206f6a8de080 SHA512 71635f9acc44ffd19b76d7f1a5e43fa079dffe6e447be1c9df4b491cf96c226346788eb773923cf702d44d4620f2a5e7478be1c625b4c2332b9bed7e6e5391d2
-EBUILD wai-extra-3.0.31.ebuild 1799 BLAKE2B 80d9f43e1975417f11977858055777f174419ed2453820c00a9b14afa66f285f90e37cbf39a19c0475af69eaa1e61fffbaddc7669a8ed2d7a832e88a10469386 SHA512 32c4360cc58f24e55e448097f65d2cf91f79c6a02d8611583bcb71530f2a5e48c5e85dde4e59eab230ed23a152751497f45f176532d9d2258041ed6f0ef7d555
+DIST wai-extra-3.1.4.1.tar.gz 67063 BLAKE2B d75f1425cf4c75596adb65c152c954a6005b085f3a290d7dea279a4417d85e359f6948fc8282cee63f2057b4dfe3e33b7a364667544c925582024e4255e71462 SHA512 c33b513bd6e627361007f285167235535ac4065e7198749c14d05cfcd89c5017b54896064c64ffdda9875d6363b684b9beed4098fdbefaba1058045ba3245af5
+EBUILD wai-extra-3.1.4.1.ebuild 1808 BLAKE2B f6bfccf1117ac3eebf209d8407f6267b36a3c78d4a14b4b275380d69584d8ade001867c01a0e88dfaeb7c21ecd83071e1c405b64945ede056c970d4e810d768a SHA512 e3021edbb18578d73a4903d247924ced88e303f749fb824d454348c937be57a05e4a8553bfec943ca4c7577dce496b62e2ed7cdc9da4c6d32a632cfa888baf17
 MISC metadata.xml 326 BLAKE2B 26be8d6c32c1cd0a7c0f608f5546ea3139adeef7aeb7e4bf22e2f944ab0571946e98b0239796a6956a6c169f026646dfa9fdebe71a6bec079c7ba6cd6fe175d9 SHA512 58194255acaf42f3f0d725291259a745219fedce1146c74a994ce413a6b7f34c186b036b14bacc753aab2585dd4957e2f4d5be9cd0af80f7ad07feceeed9bec5
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
index c4c729cde5bb..c923228ad142 100644
--- a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/fast-logger-2.4.5:=[profile?]
 	>=dev-haskell/http-types-0.7:=[profile?]
 	dev-haskell/http2:=[profile?]
+	dev-haskell/hunit:=[profile?]
 	dev-haskell/iproute:=[profile?]
 	>=dev-haskell/network-2.6.1.0:=[profile?]
 	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
@@ -41,13 +42,12 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/wai-logger-2.3.2:=[profile?]
 	dev-haskell/word8:=[profile?]
 	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.2.1:=
 	examples? ( dev-haskell/warp:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-1.3 )
 "
 
 src_configure() {
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 6197c8410676..0880b342a870 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1,3 +1,3 @@
-DIST yesod-core-1.6.18.7.tar.gz 100141 BLAKE2B 0d00fffcc4371868f02ec5ec1fe4f5af15369f62b7bf88562e8c092b3988824cbbe26defd574f2514d23fca983f81cc951b75f564213f568d244069e352cc198 SHA512 fde155df74588d2eb9824e0f423b666228a1b681a83c4f30e194c8816667cd6e4fefb7cddcd66f6ff2ca745ad3ef8daee439a133b017d8583167b54a698a12a1
-EBUILD yesod-core-1.6.18.7.ebuild 2259 BLAKE2B f0d07b0936656494a299188cb715cd1d81cc0a387733e5b84064302357ff9b3365df2ceeb5827ddce1aabc93bc0a134e4cc74a57affd6e1f30a91405f6ca0f0c SHA512 88014380c1addddb673fec2d076e94e4b30db63684e1d513e7a259d5624a5b9cef287037eec662dcaf3848d9196126d6494e17a2b117064284dd5a5a58e2bea0
+DIST yesod-core-1.6.18.8.tar.gz 100016 BLAKE2B 117535cc875be850011b357ebf3bb89e6d854870cefe26e20001e70b93247d85a3bd190e2f889626819f8bc80211b2c64b5d8dac7e9606229ed07c03d8926c2e SHA512 1774281bf8de190995360bcf461adc46b65bac5fa2200aada0b511f73b3bc7bab8365fa4737b4de4723481f7b76c0cb440d68b118c15c46e3d455ea9126bffa7
+EBUILD yesod-core-1.6.18.8.ebuild 2259 BLAKE2B f0d07b0936656494a299188cb715cd1d81cc0a387733e5b84064302357ff9b3365df2ceeb5827ddce1aabc93bc0a134e4cc74a57affd6e1f30a91405f6ca0f0c SHA512 88014380c1addddb673fec2d076e94e4b30db63684e1d513e7a259d5624a5b9cef287037eec662dcaf3848d9196126d6494e17a2b117064284dd5a5a58e2bea0
 MISC metadata.xml 722 BLAKE2B 8f4f6d4c278f92f847046b4c85c35c78e2a114b17766bdb24e7b7f2b48a48f9b7aca69c4eac626dd27b5b3eda92b18f0cd11f2fd39db2f8c348f030ce1d5da07 SHA512 a0a229d4867993c1256e99c804f503bdb9461a11003b9f616d2f8985d700aaa6821949316faf5e18a202a05f802f34a0c42ea237a86cbbde076c6279d7be5135
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
index 8398bc10dcff..8398bc10dcff 100644
--- a/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild
+++ b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index 8c196acd7093..db256f3e6008 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -1,3 +1,3 @@
-DIST yesod-static-1.6.0.1.tar.gz 25463 BLAKE2B 98b5a317a2d8c91d5ef9628422dd7ce8627f7f47c88722e2732aac23705f44f449ebee4bf179c2c7e429026b52920df487c257aefd75a18efe6be1717e50dd94 SHA512 2e1e4873248d435a9d58f3075b6c06cde2edcdd520f700dc7f0427039c236d28787f62a643a8cf57b74d85a885625474a5662b91a56c25e8f4d1737be525bc2f
-EBUILD yesod-static-1.6.0.1.ebuild 1618 BLAKE2B 9de2bbc3431b1113024301569318c247ccde3b9fea30d91eab28f7ed23a6d26ed69ef3f614b1f9e73e6ea5532e55e8498c6d6d74f60134eecece4f4bb14637c8 SHA512 4db56fd7600c8c896b1425324d454fa0465075468a725e92136c91b59c356d1c95ae9543020340112e0f3305005b5606a8f26ce6b5a99f510ff57044b056456c
+DIST yesod-static-1.6.1.0.tar.gz 25613 BLAKE2B 6619169b5c745f215174cb7f3544dcc0eb5b32cb58059a87b1c1e8edae4e2e53e994c9d7afc60fd523be8aa5e33b996daebeae89063030861fa3b049b2e2c2d1 SHA512 66037ec28eac83e374161c1b306a4d20805ecb35ccfc4878e7894d961daaf30d9936c6e209641ff323d7e3dd5626f5a24a12915d4205417c496e272a2e969f6e
+EBUILD yesod-static-1.6.1.0.ebuild 1635 BLAKE2B 0de8bbc6698e74505cfd0cef8c8b7efb67e4e12d43cbe8562872ef21ec559e4cd4bfd6896be89ea20bdbc256bb8bff414e60cc82b9a051f09ada1563076d9331 SHA512 e70edc69e3116f610047a4f55418bac2c86b13f3b04b08203ce0cefe36db6c21acfa905d0e3ecf5ae00275c6a8635f8f7fd095c39a9e41d72f1e4e6602e55f8b
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
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 9f67cb8cecb7..d87b829b12cf 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1,3 +1,3 @@
-DIST yesod-test-1.6.10.tar.gz 27593 BLAKE2B ed6b5be35032246a0e233a985cc7a739a38cd4b81db42ac000c823ff0975ed642d6e4dc7e8dafb6679d6acb53c8cfb2f438f84d4e73c9ab79ecac4c7d3adb681 SHA512 badbd76b9a345c86f9dcf8b5d6043f173eec60bf6f39bdcb4a60d17d95ad693991a1c7b4061a1e86d61fb9efe3f2f29b3129e6b9ffef4b07d5b563116959b016
-EBUILD yesod-test-1.6.10.ebuild 1508 BLAKE2B 5cfe40446ddcfbd2720daca265f576ab9246035a4e3852489e0bbd9797d57433a1c66d31650c9aa13176c7bde5960fb7e50e8549dcc4af42986a21021fe951c2 SHA512 80d3978706c2470e4aed127090da310baece9289528a5d178cb8537387815965684898543095e0e18b465d9564591178e797abe490ca3d1fbc0563b49f59176c
+DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
+EBUILD yesod-test-1.6.12.ebuild 1509 BLAKE2B 467e0fc3888c9cd6094dbf2394c1d22890633e87c7f9309166dace51660983a635f8cd1e5c1a2effb0d4a8556077cc661b8e530dabd45aaea160e65750fee8c1 SHA512 2117b91e63eaa5775e29a82ea3b9367849e6d990c441ac708f692b6e99e5c16d122b642f232cc00da835129af9189c1804604a96ee538556c9b5c8cb65032c31
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
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?]