7 files changed, 33 insertions, 19 deletions
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 1ced814cff48..664839b588e4 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/hexpat-0.20.13 b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
index 45af49702fa6..20c62dd0608f 100644
--- a/metadata/md5-cache/dev-haskell/hexpat-0.20.13
+++ b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/expat >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=XML parser/formatter based on expat
-EAPI=6
-HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
-IUSE=bundled-expat doc hscolour profile
+EAPI=7
+HOMEPAGE=https://haskell.org/haskellwiki/Hexpat/
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat )
+RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/expat
 SLOT=0/0.20.13
 SRC_URI=https://hackage.haskell.org/package/hexpat-0.20.13/hexpat-0.20.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71d351063480c098ae92befbce5dae6c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2a1e54c0a2e6a571d775a6b0b9988dba
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.10.5 b/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
index 56aefc37eab5..49994426839d 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.10.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=~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?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DEPEND=~dev-haskell/skylighting-core-0.10.5:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
 IUSE=executable doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-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?] )
+RDEPEND=~dev-haskell/skylighting-core-0.10.5:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
 SLOT=0/0.10.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-0.10.5/skylighting-0.10.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a2dcb469f7939b7082185ca13b55d20
+_md5_=ea0a9b433e0f81152b43cce377769c59
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.8.5 b/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
index 5d409e0bb2d8..6a68efa4ab49 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.8.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
+DEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
 IUSE=executable doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
+RDEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= dev-libs/libpcre:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-0.8.5/skylighting-0.8.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cebaaa0058af933f31dd71cbb7872c77
+_md5_=06d3303a7cd9690cd51352189a9dceeb
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5 b/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
index be32fceae603..85a154507552 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/diff dev-haskell/pretty-show dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/diff dev-haskell/pretty-show dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
 IUSE=executable doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:=
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/libpcre:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.10.5/skylighting-core-0.10.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7f43b19cf10063e5e671978b4d959ef
+_md5_=db4b3dd860daee2db90b5ab5c2bc3491
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5 b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
index 535f87da02a1..ae178537d9cf 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[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/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 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 dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[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/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/libpcre:= >=dev-haskell/cabal-1.24.0.0 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 dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
 IUSE=executable doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[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/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:=
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[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/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/libpcre:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.8.5/skylighting-core-0.8.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b5e7a62fc9ad4fea866b1352d8adc4f
+_md5_=f5e7802d187cd3ab1bbb8df80a6a6377
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
new file mode 100644
index 000000000000..cfced9939c5b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode normalization
+EAPI=7
+HOMEPAGE=https://github.com/composewell/unicode-transforms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.7.1
+SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.7.1/unicode-transforms-0.3.7.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3863ae04dbcdbef5180ead63cd7d647a