gentoo auto-resync : 24:07:2022 - 08:52:43

24 files changed, 76 insertions, 235 deletions

diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 40ded2238a97..f09f651ad90b 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/aws-0.22-r1 b/metadata/md5-cache/dev-haskell/aws-0.22-r1
deleted file mode 100644
index 844d1c062491..000000000000
--- a/metadata/md5-cache/dev-haskell/aws-0.22-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/aeson-0.7 >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7 >=dev-haskell/lifted-base-0.2 >=dev-haskell/mtl-2.1 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-haskell/text-1.1 >=dev-haskell/transformers-base-0.4 !examples? ( >=dev-haskell/errors-2.0 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Amazon Web Services (AWS) for Haskell
-EAPI=7
-HOMEPAGE=https://github.com/aristidb/aws
-INHERIT=haskell-cabal
-IUSE=+network-3 examples doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
-RESTRICT=test
-SLOT=0/0.22
-SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=71201f1b01f2da3c5d45220ff40f5da7
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1 b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r2
index e961f10c7c4a..f98f07fd9022 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3 hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=AES and common modes using AES-NI when available
 EAPI=7
 HOMEPAGE=https://github.com/TomMD/cipher-aes128
@@ -12,4 +12,4 @@ RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?]
 SLOT=0/0.7.0.5
 SRC_URI=https://hackage.haskell.org/package/cipher-aes128-0.7.0.5/cipher-aes128-0.7.0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8df3e3492c5ee1807964093cc53a306b
+_md5_=6808638c5eebe11d0768a89467935517
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
deleted file mode 100644
index 1e6713df0269..000000000000
--- a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17 >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Email address validation
-EAPI=7
-HOMEPAGE=https://github.com/Porges/email-validate-hs
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.3.2.13
-SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.13/email-validate-2.3.2.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9dfbbb3d91fad6e576650d5c689e05e1
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
index 98697cc1de9d..3d57a7a32b33 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3 hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A platform independent entropy source
 EAPI=7
 HOMEPAGE=https://github.com/TomMD/entropy
@@ -12,4 +12,4 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 SLOT=0/0.4.1.6
 SRC_URI=https://hackage.haskell.org/package/entropy-0.4.1.6/entropy-0.4.1.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a6f61a7a50a124189cf9da3a27961ff9
+_md5_=dbdbdd784b53774e6e3c0e031a09a711
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.0.1 b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
deleted file mode 100644
index 02b279972d22..000000000000
--- a/metadata/md5-cache/dev-haskell/feed-1.3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
-EAPI=7
-HOMEPAGE=https://github.com/bergmark/feed
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/1.3.0.1
-SRC_URI=https://hackage.haskell.org/package/feed-1.3.0.1/feed-1.3.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ac79d2be9fe0115c69b327e2ad2cc4b7
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-2.23.1
deleted file mode 100644
index e003be789a25..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-2.23.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/haddock-api-2.23.1:= >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=~dev-haskell/haddock-api-2.23.1:= >=dev-lang/ghc-8.8.1:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haddock-2.23.1/haddock-2.23.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3f9d5e11f871660dade42fa6993ade91
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.24.0-r1 b/metadata/md5-cache/dev-haskell/haddock-2.24.0-r1
deleted file mode 100644
index 7d6f8e39fcac..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-2.24.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haddock-2.24.0/haddock-2.24.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef1068ba3a7cb9904f579ff161b775c9
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.25.1 b/metadata/md5-cache/dev-haskell/haddock-2.25.1
index cb01ca9e3b25..1a09f329d7a3 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.25.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.25.1
@@ -5,11 +5,11 @@ DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=8
 HOMEPAGE=https://www.haskell.org/haddock/
 INHERIT=haskell-cabal
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=~dev-haskell/haddock-api-2.25.1:= >=dev-lang/ghc-8.8.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haddock-2.25.1/haddock-2.25.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ae1aae68127c1fea5861e203b70dfff
+_md5_=065c9b901a15c15a983ea816db1d002b
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
deleted file mode 100644
index a94d23568a98..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2 >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:=
-RESTRICT=!test? ( test )
-SLOT=0/2.23.1
-SRC_URI=https://hackage.haskell.org/package/haddock-api-2.23.1/haddock-api-2.23.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1f02aedd14ad49c4eedc3b146f5d532b
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
deleted file mode 100644
index 4eae719d732e..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2 >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-IUSE=hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.24.0
-SRC_URI=https://hackage.haskell.org/package/haddock-api-2.24.0/haddock-api-2.24.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ae0e73c3d5843468481953cd1c9da092
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0-r1 b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0-r1
deleted file mode 100644
index bde44a7d0627..000000000000
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2 >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.11 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A documentation-generation tool for Haskell libraries
-EAPI=7
-HOMEPAGE=https://www.haskell.org/haddock/
-INHERIT=haskell-cabal
-IUSE=hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.9.0:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/2.24.0
-SRC_URI=https://hackage.haskell.org/package/haddock-api-2.24.0/haddock-api-2.24.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4d1a188e22873a68c42757f0c59c80fe
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.25.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.25.1
index fb40d3aaa015..917ae533cff0 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.25.1
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.25.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/haddock/
 INHERIT=haskell-cabal
 IUSE=hscolour profile test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.10.0:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-9.0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/2.25.1
 SRC_URI=https://hackage.haskell.org/package/haddock-api-2.25.1/haddock-api-2.25.1.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d3f57ab847d76e93855f38f70054184a
+_md5_=9fff4fc32b473ef8690cd400c8765b3c
diff --git a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4 b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
deleted file mode 100644
index 09f1bfed82a5..000000000000
--- a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Automatic generation of record lenses for microlens
-EAPI=7
-HOMEPAGE=https://github.com/monadfix/microlens
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.4.3.4
-SRC_URI=https://hackage.haskell.org/package/microlens-th-0.4.3.4/microlens-th-0.4.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5c8e9bc49470d696a9ef38cc9d218110
diff --git a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2 b/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
deleted file mode 100644
index 97dea555c3ba..000000000000
--- a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.3:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/exceptions dev-haskell/hedgehog dev-haskell/hspec dev-haskell/quickcheck dev-haskell/raw-strings-qq ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Content addressable Haskell package management
-EAPI=7
-HOMEPAGE=https://github.com/commercialhaskell/pantry#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.3:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.2.1:=
-RESTRICT=test
-SLOT=0/0.4.0.2
-SRC_URI=https://hackage.haskell.org/package/pantry-0.4.0.2/pantry-0.4.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=035556bc9eee4074b335e7c8c5fb4abc
diff --git a/metadata/md5-cache/dev-haskell/pantry-0.5.4 b/metadata/md5-cache/dev-haskell/pantry-0.5.4
new file mode 100644
index 000000000000..bab14acdb41c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pantry-0.5.4
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-3 <dev-haskell/cabal-3.5 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Content addressable Haskell package management
+EAPI=8
+HOMEPAGE=https://github.com/commercialhaskell/pantry#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.4.3:=
+RESTRICT=test
+SLOT=0/0.5.4
+SRC_URI=https://hackage.haskell.org/package/pantry-0.5.4/pantry-0.5.4.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e0fb359c799581c94deda49bc447ed60
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.18.0 b/metadata/md5-cache/dev-haskell/rio-0.1.18.0
deleted file mode 100644
index 21c7fee91d9d..000000000000
--- a/metadata/md5-cache/dev-haskell/rio-0.1.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A standard library for Haskell
-EAPI=7
-HOMEPAGE=https://github.com/commercialhaskell/rio#readme
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.2.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.1.18.0
-SRC_URI=https://hackage.haskell.org/package/rio-0.1.18.0/rio-0.1.18.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=89a2261c545120e256040b2accc47dd1
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.21.0 b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
new file mode 100644
index 000000000000..a42c7ea11555
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.14:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A standard library for Haskell
+EAPI=8
+HOMEPAGE=https://github.com/commercialhaskell/rio#readme
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.14:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.21.0
+SRC_URI=https://hackage.haskell.org/package/rio-0.1.21.0/rio-0.1.21.0.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=76dcdd6a40aee3dc4ebf76fd7993f958
diff --git a/metadata/md5-cache/dev-haskell/stack-2.3.3 b/metadata/md5-cache/dev-haskell/stack-2.3.3
deleted file mode 100644
index 889fb5c8897e..000000000000
--- a/metadata/md5-cache/dev-haskell/stack-2.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9.1:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] >=dev-haskell/attoparsec-0.13.2.3:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.3:=[profile?] >=dev-haskell/cabal-3.0.0.0:=[profile?] >=dev-haskell/casa-client-0.0.1:=[profile?] >=dev-haskell/casa-types-0.0.1:=[profile?] >=dev-haskell/colour-2.3.5:=[profile?] >=dev-haskell/conduit-1.3.1.2:=[profile?] >=dev-haskell/conduit-extra-1.3.4:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] >=dev-haskell/cryptonite-conduit-0.2.2:=[profile?] >=dev-haskell/echo-0.1.3:=[profile?] >=dev-haskell/exceptions-0.10.4:=[profile?] >=dev-haskell/extra-1.6.19:=[profile?] >=dev-haskell/file-embed-0.0.11.1:=[profile?] >=dev-haskell/filelock-0.1.1.5:=[profile?] >=dev-haskell/fsnotify-0.3.0.1:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] >=dev-haskell/githash-0.1.3.3:=[profile?] >=dev-haskell/hackage-security-0.5.3.0:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/hi-file-parser-0.1.0.0:=[profile?] >=dev-haskell/hpack-0.33.0:=[profile?] >=dev-haskell/http-client-0.6.4:=[profile?] >=dev-haskell/http-client-tls-0.3.5.3:=[profile?] >=dev-haskell/http-conduit-2.3.7.3:=[profile?] >=dev-haskell/http-download-0.2.0.0:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-haskell/microlens-0.4.10:=[profile?] >=dev-haskell/mintty-0.1.2:=[profile?] >=dev-haskell/mono-traversable-1.0.15.1:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/mustache-2.3.1:=[profile?] >=dev-haskell/neat-interpolation-0.3.2.6:=[profile?] >=dev-haskell/network-uri-2.6.2.0:=[profile?] >=dev-haskell/open-browser-0.2.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] >=dev-haskell/optparse-simple-0.1.1.2:=[profile?] >=dev-haskell/pantry-0.4:=[profile?] <dev-haskell/pantry-0.5:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/path-io-1.4.2:=[profile?] >=dev-haskell/persistent-2.9.2:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] >=dev-haskell/persistent-template-2.6.0:=[profile?] >=dev-haskell/primitive-0.6.4.0:=[profile?] >=dev-haskell/project-template-0.2.0.1:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] >=dev-haskell/retry-0.8.1.0:=[profile?] >=dev-haskell/rio-0.1.14.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/split-0.2.3.3:=[profile?] >=dev-haskell/stm-2.5.0.0:=[profile?] >=dev-haskell/streaming-commons-0.2.1.2:=[profile?] >=dev-haskell/tar-0.5.1.1:=[profile?] >=dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] >=dev-haskell/th-reify-many-0.1.9:=[profile?] >=dev-haskell/tls-1.4.1:=[profile?] >=dev-haskell/typed-process-0.2.6.0:=[profile?] >=dev-haskell/unicode-transforms-0.3.6:=[profile?] >=dev-haskell/unix-compat-0.5.2:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] >=dev-haskell/yaml-0.11.2.0:=[profile?] >=dev-haskell/zip-archive-0.4.1:=[profile?] >=dev-haskell/zlib-0.6.2.1:=[profile?] >=dev-lang/ghc-8.6.5:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.7.1 >=dev-haskell/quickcheck-2.13.2 >=dev-haskell/raw-strings-qq-1.1 >=dev-haskell/smallcheck-1.1.5 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=The Haskell Tool Stack
-EAPI=7
-HOMEPAGE=https://haskellstack.org
-INHERIT=haskell-cabal
-IUSE=developer-mode doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9.1:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] >=dev-haskell/attoparsec-0.13.2.3:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.3:=[profile?] >=dev-haskell/cabal-3.0.0.0:=[profile?] >=dev-haskell/casa-client-0.0.1:=[profile?] >=dev-haskell/casa-types-0.0.1:=[profile?] >=dev-haskell/colour-2.3.5:=[profile?] >=dev-haskell/conduit-1.3.1.2:=[profile?] >=dev-haskell/conduit-extra-1.3.4:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] >=dev-haskell/cryptonite-conduit-0.2.2:=[profile?] >=dev-haskell/echo-0.1.3:=[profile?] >=dev-haskell/exceptions-0.10.4:=[profile?] >=dev-haskell/extra-1.6.19:=[profile?] >=dev-haskell/file-embed-0.0.11.1:=[profile?] >=dev-haskell/filelock-0.1.1.5:=[profile?] >=dev-haskell/fsnotify-0.3.0.1:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] >=dev-haskell/githash-0.1.3.3:=[profile?] >=dev-haskell/hackage-security-0.5.3.0:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/hi-file-parser-0.1.0.0:=[profile?] >=dev-haskell/hpack-0.33.0:=[profile?] >=dev-haskell/http-client-0.6.4:=[profile?] >=dev-haskell/http-client-tls-0.3.5.3:=[profile?] >=dev-haskell/http-conduit-2.3.7.3:=[profile?] >=dev-haskell/http-download-0.2.0.0:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-haskell/microlens-0.4.10:=[profile?] >=dev-haskell/mintty-0.1.2:=[profile?] >=dev-haskell/mono-traversable-1.0.15.1:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/mustache-2.3.1:=[profile?] >=dev-haskell/neat-interpolation-0.3.2.6:=[profile?] >=dev-haskell/network-uri-2.6.2.0:=[profile?] >=dev-haskell/open-browser-0.2.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] >=dev-haskell/optparse-simple-0.1.1.2:=[profile?] >=dev-haskell/pantry-0.4:=[profile?] <dev-haskell/pantry-0.5:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/path-io-1.4.2:=[profile?] >=dev-haskell/persistent-2.9.2:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] >=dev-haskell/persistent-template-2.6.0:=[profile?] >=dev-haskell/primitive-0.6.4.0:=[profile?] >=dev-haskell/project-template-0.2.0.1:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] >=dev-haskell/retry-0.8.1.0:=[profile?] >=dev-haskell/rio-0.1.14.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/split-0.2.3.3:=[profile?] >=dev-haskell/stm-2.5.0.0:=[profile?] >=dev-haskell/streaming-commons-0.2.1.2:=[profile?] >=dev-haskell/tar-0.5.1.1:=[profile?] >=dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] >=dev-haskell/th-reify-many-0.1.9:=[profile?] >=dev-haskell/tls-1.4.1:=[profile?] >=dev-haskell/typed-process-0.2.6.0:=[profile?] >=dev-haskell/unicode-transforms-0.3.6:=[profile?] >=dev-haskell/unix-compat-0.5.2:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] >=dev-haskell/yaml-0.11.2.0:=[profile?] >=dev-haskell/zip-archive-0.4.1:=[profile?] >=dev-haskell/zlib-0.6.2.1:=[profile?] >=dev-lang/ghc-8.6.5:=
-RESTRICT=test
-SLOT=0/2.3.3
-SRC_URI=https://hackage.haskell.org/package/stack-2.3.3/stack-2.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fa1f6420a7eaf660c10130c55cbc534
diff --git a/metadata/md5-cache/dev-haskell/stack-2.7.6_pre20220421 b/metadata/md5-cache/dev-haskell/stack-2.7.6_pre20220421
new file mode 100644
index 000000000000..c1664b753f3f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/stack-2.7.6_pre20220421
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/echo:=[profile?] dev-haskell/extra:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/fsnotify:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/githash:=[profile?] dev-haskell/hackage-security:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/hi-file-parser:=[profile?] dev-haskell/hpack:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/mintty:=[profile?] dev-haskell/mono-traversable:=[profile?] dev-haskell/mustache:=[profile?] dev-haskell/neat-interpolation:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/open-browser:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] dev-haskell/optparse-simple:=[profile?] >=dev-haskell/pantry-0.5.3:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/persistent-sqlite:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/project-template:=[profile?] dev-haskell/retry:=[profile?] >=dev-haskell/rio-0.1.21.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.1.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/split:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/tar:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/th-reify-many:=[profile?] dev-haskell/tls:=[profile?] dev-haskell/typed-process:=[profile?] dev-haskell/unicode-transforms:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( dev-haskell/hspec dev-haskell/quickcheck dev-haskell/raw-strings-qq dev-haskell/smallcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Haskell Tool Stack
+EAPI=8
+HOMEPAGE=https://haskellstack.org
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/echo:=[profile?] dev-haskell/extra:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/fsnotify:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/githash:=[profile?] dev-haskell/hackage-security:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/hi-file-parser:=[profile?] dev-haskell/hpack:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/mintty:=[profile?] dev-haskell/mono-traversable:=[profile?] dev-haskell/mustache:=[profile?] dev-haskell/neat-interpolation:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/open-browser:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] dev-haskell/optparse-simple:=[profile?] >=dev-haskell/pantry-0.5.3:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/persistent-sqlite:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/project-template:=[profile?] dev-haskell/retry:=[profile?] >=dev-haskell/rio-0.1.21.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.1.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/split:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/tar:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/th-reify-many:=[profile?] dev-haskell/tls:=[profile?] dev-haskell/typed-process:=[profile?] dev-haskell/unicode-transforms:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.7.6_pre20220421
+SRC_URI=https://github.com/commercialhaskell/stack/archive/dcf7bb31815c7505e809a1707909832e02614501.tar.gz -> stack-dcf7bb31815c7505e809a1707909832e02614501.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=53ad5fe98e12c2366e49629d0e317a9f
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
deleted file mode 100644
index 302e4ab9738b..000000000000
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/bytestring-handle >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Reading, writing and manipulating tar files
-EAPI=7
-HOMEPAGE=https://hackage.haskell.org/package/tar
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.5.1.1
-SRC_URI=https://hackage.haskell.org/package/tar-0.5.1.1/tar-0.5.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b4c5a6c94ff2e569e4fd6deb58fcc621
diff --git a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1 b/metadata/md5-cache/dev-haskell/unliftio-0.2.18
index 7166ec6bda36..d31b6ccecfac 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
+++ b/metadata/md5-cache/dev-haskell/unliftio-0.2.18
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)
 EAPI=7
 HOMEPAGE=https://github.com/fpco/unliftio/tree/master/unliftio#readme
@@ -8,9 +8,9 @@ INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-7.10.1:=
+RDEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
-SLOT=0/0.2.12.1
-SRC_URI=https://hackage.haskell.org/package/unliftio-0.2.12.1/unliftio-0.2.12.1.tar.gz
+SLOT=0/0.2.18
+SRC_URI=https://hackage.haskell.org/package/unliftio-0.2.18/unliftio-0.2.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	23cb2d46c80c12aa8b25973b4cdcb257	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f118aa4c76af7eca53b162b8fe811f68
+_md5_=6b0f5f1496967ff1178093dbad312be2
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1 b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
deleted file mode 100644
index 582defbe6348..000000000000
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=For creating, comparing, parsing and printing Universally Unique Identifiers
-EAPI=8
-HOMEPAGE=https://github.com/hvr/uuid
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.6.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.3.13
-SRC_URI=https://hackage.haskell.org/package/uuid-1.3.13/uuid-1.3.13.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7cfb67dd88cc389f6e2af3dcca07fec8
diff --git a/metadata/md5-cache/dev-haskell/x11-1.10-r1 b/metadata/md5-cache/dev-haskell/x11-1.10-r1
new file mode 100644
index 000000000000..b57368eb2bb9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x11-1.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the X11 graphics library
+EAPI=8
+HOMEPAGE=https://github.com/xmonad/X11
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver
+SLOT=0/1.10
+SRC_URI=https://hackage.haskell.org/package/X11-1.10/X11-1.10.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f69510894bb30c4fcec9492b05a3fa9c