2023-03-17 18:32:08 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2023-03-17 18:32:08 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2023-03-17 18:32:08 +0000
commit: bb5a0198979909b50a41ad2acb0e9c50e2ae6c53 (patch)
tree: b16172f218d4e5c3feb8b371c7287c92c41aee68 /metadata
parent: Merge updates from master (diff)
download: gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.tar.gz
gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.tar.bz2
gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.zip
491 files changed, 1017 insertions, 1016 deletions
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.2-r1 b/metadata/md5-cache/app-admin/haskell-updater-1.3.2-r1
index b11f1860e62d..8fd2076b35d1 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2-r1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=8
 HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
 INHERIT=haskell-cabal
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.2/haskell-updater-1.3.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1f9c5abee2b4b1a61d1639e44a86f0ce
+_md5_=67015870d24c0b7ca86f20305e331983
diff --git a/metadata/md5-cache/app-arch/pack-0.0.0.1 b/metadata/md5-cache/app-arch/pack-0.0.0.1
index 720e4146a9d3..5d8f7f10209b 100644
--- a/metadata/md5-cache/app-arch/pack-0.0.0.1
+++ b/metadata/md5-cache/app-arch/pack-0.0.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell implementation of pack compression from the early 1980s
 EAPI=8
 HOMEPAGE=https://github.com/koalaman/pack/
 INHERIT=haskell-cabal
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-lang/ghc:=
 SLOT=0
 SRC_URI=https://github.com/koalaman/pack/archive/0bd29ccae2662ef9ae1fabe707d84e4f84b36d53.tar.gz -> pack-0bd29ccae2662ef9ae1fabe707d84e4f84b36d53.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=967c3e087a720341154a8329f4874e95
+_md5_=e5084ea91341eb4920b5cb4a7a15a806
diff --git a/metadata/md5-cache/app-portage/hackport-0.7.2.2 b/metadata/md5-cache/app-portage/hackport-0.7.2.2
index 6f689ebd8e57..3c999a16048e 100644
--- a/metadata/md5-cache/app-portage/hackport-0.7.2.2
+++ b/metadata/md5-cache/app-portage/hackport-0.7.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/hackport
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-haskell/async-2.0:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/base64-bytestring-1.0:= >=dev-haskell/cryptohash-sha256-0.11:= >=dev-haskell/echo-0.1.3:= >=dev-haskell/ed25519-0.0:= >=dev-haskell/edit-distance-0.2.2:= dev-haskell/extensible-exceptions:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= >=dev-haskell/network-3.0:= >=dev-haskell/network-uri-2.6.0.2:= >=dev-haskell/parallel-3.2.1.0:= dev-haskell/quickcheck:2= >=dev-haskell/random-1:= >=dev-haskell/regex-base-0.94.0.0:= >=dev-haskell/regex-posix-0.96.0.0:= >=dev-haskell/resolv-0.1.1:= dev-haskell/split:= >=dev-haskell/stm-2.0:= >=dev-haskell/tar-0.5.0.3:= dev-haskell/xml:= >=dev-haskell/zlib-0.5.3:= >=dev-lang/ghc-8.4.3:= dev-util/pkgcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hackport-0.7.2.2/hackport-0.7.2.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b6681325196f928baa29093f302bc666
+_md5_=48acbc20bec9776ec7fc67e08fa363ad
diff --git a/metadata/md5-cache/app-text/pandoc-2.18-r2 b/metadata/md5-cache/app-text/pandoc-2.18-r2
index 6d4ea6111bd6..47a8b864ba48 100644
--- a/metadata/md5-cache/app-text/pandoc-2.18-r2
+++ b/metadata/md5-cache/app-text/pandoc-2.18-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pandoc.org
 INHERIT=haskell-cabal
 IUSE=embed-data-files trypandoc doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/2.18
 SRC_URI=https://hackage.haskell.org/package/pandoc-2.18/pandoc-2.18.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f4cbac52d1b83ba7516539972bf43280
+_md5_=d0376431d3373880d74e7e4a120b3a48
diff --git a/metadata/md5-cache/app-text/tesseract-5.3.0 b/metadata/md5-cache/app-text/tesseract-5.3.0
index 86ab650233a9..390589c6c74e 100644
--- a/metadata/md5-cache/app-text/tesseract-5.3.0
+++ b/metadata/md5-cache/app-text/tesseract-5.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/tesseract-ocr
 INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=doc float32 jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0/5
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/5.3.0.tar.gz -> tesseract-5.3.0.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=bad99440b428b8769110c0fcdb61dbbe
+_md5_=b963f3be812c3c29ae833e40aed6fefa
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
index 39bde5ba6417..4847723aac2e 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dbmx.net/kyotocabinet/
 INHERIT=autotools toolchain-funcs
 IUSE=debug doc examples +lzma +lzo static-libs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib[static-libs?] lzma? ( app-arch/xz-utils:=[static-libs?] ) lzo? ( dev-libs/lzo:=[static-libs?] )
 SLOT=0
 SRC_URI=https://dbmx.net/kyotocabinet/pkg/kyotocabinet-1.2.79.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc
-_md5_=1aa3a8a98ccec3c895b6c1f7b8814e25
+_md5_=7fb868c7b51a4b38127b7e57362df9a8
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
index 39575bd8e436..842898bb4116 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=usecas doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-0.3/abstract-deque-0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1a6e257c989ddd15eee5f157d3ecb0c5
+_md5_=cbc47fdf9fc3a6a86d3b99ffac38459c
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
index 92a1a68a2b21..44372fa07ea5 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/abstract-par-0.3.3/abstract-par-0.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=059b4642cad9e1fd8ca63292ddda809d
+_md5_=b9791bbe09d734ca1faa96261cd3ca72
diff --git a/metadata/md5-cache/dev-haskell/adjunctions-4.4 b/metadata/md5-cache/dev-haskell/adjunctions-4.4
index f083fce5b754..54201d411155 100644
--- a/metadata/md5-cache/dev-haskell/adjunctions-4.4
+++ b/metadata/md5-cache/dev-haskell/adjunctions-4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/adjunctions/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[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-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/4.4
 SRC_URI=https://hackage.haskell.org/package/adjunctions-4.4/adjunctions-4.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=360cfaeac538ad586566c01581f16560
+_md5_=46dac7067ca21ccdd232b00d15a06cec
diff --git a/metadata/md5-cache/dev-haskell/aeson-2.0.3.0 b/metadata/md5-cache/dev-haskell/aeson-2.0.3.0
index accd6826cc6c..38abbb86d4f3 100644
--- a/metadata/md5-cache/dev-haskell/aeson-2.0.3.0
+++ b/metadata/md5-cache/dev-haskell/aeson-2.0.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/aeson
 INHERIT=haskell-cabal
 IUSE=cffi +ordered-keymap doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?] >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?] >=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.3:=[profile?] >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?] >=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.3.0
 SRC_URI=https://hackage.haskell.org/package/aeson-2.0.3.0/aeson-2.0.3.0.tar.gz https://hackage.haskell.org/package/aeson-2.0.3.0/revision/1.cabal -> aeson-2.0.3.0-rev1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f68a44c99f0e2befbe973ac27d016696
+_md5_=94cb58704799543634ba6cf95e40fae7
diff --git a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.9 b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.9
index 8596feb342fd..dcd69e355d67 100644
--- a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.9
+++ b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/informatikr/aeson-pretty
 INHERIT=haskell-cabal
 IUSE=lib-only doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2.14.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] !lib-only? ( >=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
 SLOT=0/0.8.9
 SRC_URI=https://hackage.haskell.org/package/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz https://hackage.haskell.org/package/aeson-pretty-0.8.9/revision/1.cabal -> aeson-pretty-0.8.9.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1a2b7feff6cb6c21f0968070e5758ad4
+_md5_=269de08cae1202b2583e425b0abd0b26
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.7.1 b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
index b2866751462d..4d5645fbc83c 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.2.7.1
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/alex/
 INHERIT=autotools haskell-cabal
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/alex-3.2.7.1/alex-3.2.7.1.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=95407d520fa56402da14d42918ff5e62
+_md5_=7296eadb3d5308ac450fbdb0667024e9
diff --git a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2 b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
index 85acbd90915a..01c4cb1230a7 100644
--- a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/ALSA
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/alsa-core-0.5.0.1/alsa-core-0.5.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2ea2720acbbdcc8cfa3646823a9cd4ca
+_md5_=f56bc2a336d28a6b8adc2025d5e44996
diff --git a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0 b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
index 5507bd696823..7d0d89271bc3 100644
--- a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
+++ b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ttuegel/alsa-mixer
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/alsa-mixer-0.3.0/alsa-mixer-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5efe1f3c07969e1db4ab337db0575b9c
+_md5_=c394f13926c95dc9dd0cbd03b6726c43
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
index 12d03d53db93..2994add18d30 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/UnkindPartition/ansi-terminal
 INHERIT=haskell-cabal
 IUSE=example doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/colour-2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.3
 SRC_URI=https://hackage.haskell.org/package/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e3cf5bd149d381614ce6a5d16d5512ef
+_md5_=5ee2d8a446d5b4676e3289408d7ac4b0
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.9 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.9
index 93c04159a743..0c4e4b5e8199 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.9
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/ansi-wl-pprint
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.6.9
 SRC_URI=https://hackage.haskell.org/package/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz https://hackage.haskell.org/package/ansi-wl-pprint-0.6.9/revision/3.cabal -> ansi-wl-pprint-0.6.9-rev3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8dd67ae36e031eccf3f5f2b66b626930
+_md5_=25eb6017f16db0ed2ba128fb8b647edc
diff --git a/metadata/md5-cache/dev-haskell/appar-0.1.8 b/metadata/md5-cache/dev-haskell/appar-0.1.8
index f71503a9bab3..60b6f2d37699 100644
--- a/metadata/md5-cache/dev-haskell/appar-0.1.8
+++ b/metadata/md5-cache/dev-haskell/appar-0.1.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/appar
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.8
 SRC_URI=https://hackage.haskell.org/package/appar-0.1.8/appar-0.1.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9dad9ebff715e5a00ae582fedd6e7c2a
+_md5_=c66eedc79399c79a8156cdb1fd7b000b
diff --git a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6 b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
index 1491548993d5..41e7faedabc2 100644
--- a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
+++ b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://hackage.haskell.org/package/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=23580b7e278ab820f7b84fb4ca71a779
+_md5_=d506203f7fa31acdb58d41eb98dd3f00
diff --git a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5 b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
index 4ebaca7ed9bd..dacca99a5a98 100644
--- a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
+++ b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.5
 SRC_URI=https://hackage.haskell.org/package/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1f9e424cd32f1347b1659883913a8f31
+_md5_=477a0274ec87f89bdf73c14e621f8cd3
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3 b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
index 05c4c110f7ec..4871f2fb91ac 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/asn1-types-0.3.3/asn1-types-0.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7559e0879d5b3185db0bb201b506ce44
+_md5_=f798a2e856f0f016ad97bef32f70a076
diff --git a/metadata/md5-cache/dev-haskell/assoc-1.0.2 b/metadata/md5-cache/dev-haskell/assoc-1.0.2
index 5563061f968a..752472cf0043 100644
--- a/metadata/md5-cache/dev-haskell/assoc-1.0.2
+++ b/metadata/md5-cache/dev-haskell/assoc-1.0.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/assoc
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-5.5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/assoc-1.0.2/assoc-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a6a54382a6ba154ae976cfbd49e8949b
+_md5_=5c2c9ec7af8e55c326bec9a206b57089
diff --git a/metadata/md5-cache/dev-haskell/async-2.2.4 b/metadata/md5-cache/dev-haskell/async-2.2.4
index 6f611706b337..c757db5e3ec6 100644
--- a/metadata/md5-cache/dev-haskell/async-2.2.4
+++ b/metadata/md5-cache/dev-haskell/async-2.2.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/simonmar/async
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.4
 SRC_URI=https://hackage.haskell.org/package/async-2.2.4/async-2.2.4.tar.gz https://hackage.haskell.org/package/async-2.2.4/revision/1.cabal -> async-2.2.4.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6665d00c73d6bb430dfc2ce46f473a64
+_md5_=19b3e0fa72b1599f16e2a0a2cabdee65
diff --git a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4 b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
index d87edd724033..f6e91c9cf79f 100644
--- a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
+++ b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
 INHERIT=haskell-cabal
 IUSE=debug doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.8.4
 SRC_URI=https://hackage.haskell.org/package/atomic-primops-0.8.4/atomic-primops-0.8.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c6bd51a9b496d5a47b2302c567050a53
+_md5_=1472ca6998ec2e28ee0fd51abbf9c134
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.14.4 b/metadata/md5-cache/dev-haskell/attoparsec-0.14.4
index 1a2f59ff52c7..450b2e25e955 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.14.4
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.14.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bgamari/attoparsec
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.14.4
 SRC_URI=https://hackage.haskell.org/package/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8857dff39d599376d380154fc93ba2ca
+_md5_=1e4dbe72711ed8c1038df902b1be1409
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.2.1 b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.2.1
index ebd0d014417d..6cad184ff2fd 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.2.1
+++ b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.2.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/aeson
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.0.2.1
 SRC_URI=https://hackage.haskell.org/package/attoparsec-iso8601-1.0.2.1/attoparsec-iso8601-1.0.2.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3c48d4893d75b26a6a7b535f08842e61
+_md5_=2d5c9d8bcb5df37b2c03366809085972
diff --git a/metadata/md5-cache/dev-haskell/auto-update-0.1.6 b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
index 5f1cf2a911a4..34d34ca0f116 100644
--- a/metadata/md5-cache/dev-haskell/auto-update-0.1.6
+++ b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://hackage.haskell.org/package/auto-update-0.1.6/auto-update-0.1.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=01bced72b92527ed12277c1409d07f68
+_md5_=86c87d868cc72f22215800574af44b40
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r5 b/metadata/md5-cache/dev-haskell/aws-0.22-r5
index b99a11b4ee7e..d25644836e0f 100644
--- a/metadata/md5-cache/dev-haskell/aws-0.22-r5
+++ b/metadata/md5-cache/dev-haskell/aws-0.22-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/aristidb/aws
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[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/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/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[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/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[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-8.10.1:= examples? ( >=dev-haskell/errors-2.0:=[profile?] )
 RESTRICT=test
 SLOT=0/0.22
 SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz https://hackage.haskell.org/package/aws-0.22/revision/3.cabal -> aws-0.22-rev3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9ea02cde87e40395296f64af1c4b34e8
+_md5_=3f90b36df0089b6b662acd8eb88cbfec
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.12.1 b/metadata/md5-cache/dev-haskell/base-compat-0.12.1
index 89146e940550..256bc9ca29d7 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.12.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.12.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/base-compat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.12.1
 SRC_URI=https://hackage.haskell.org/package/base-compat-0.12.1/base-compat-0.12.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=32ded7988955e6320c23b1d2cd187fe8
+_md5_=f26aff4782e75c4783d4360be0a771ab
diff --git a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.12.1 b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.12.1
index 64d4cb867e61..af8a205d1569 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.12.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.12.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/base-compat-batteries
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=~dev-haskell/base-compat-0.12.1:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.12.1
 SRC_URI=https://hackage.haskell.org/package/base-compat-batteries-0.12.1/base-compat-batteries-0.12.1.tar.gz https://hackage.haskell.org/package/base-compat-batteries-0.12.1/revision/2.cabal -> base-compat-batteries-0.12.1-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7abd6f9468932c1d216a9b046a49d0eb
+_md5_=d330447375e02144a588e2801245580b
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.8.6 b/metadata/md5-cache/dev-haskell/base-orphans-0.8.6
index 358d5647ab06..42b4734ec1b7 100644
--- a/metadata/md5-cache/dev-haskell/base-orphans-0.8.6
+++ b/metadata/md5-cache/dev-haskell/base-orphans-0.8.6
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backwards-compatible orphan instances for base
 EAPI=8
 HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0/0.8.6
 SRC_URI=https://hackage.haskell.org/package/base-orphans-0.8.6/base-orphans-0.8.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6ad79e0656a695862d50c753bcafcf86
+_md5_=62e81a9613073ddda9801da996ee9064
diff --git a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7 b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
index 2ac08d227cc0..64066cdbb407 100644
--- a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
+++ b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/base16-bytestring
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.7
 SRC_URI=https://hackage.haskell.org/package/base16-bytestring-0.1.1.7/base16-bytestring-0.1.1.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=009dc282770b76e98c045450cf0c3376
+_md5_=50e077ac370343bbe65e8d3221679297
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3 b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
index 95d173c18d19..7e72395c947a 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/base64-bytestring
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.3
 SRC_URI=https://hackage.haskell.org/package/base64-bytestring-1.0.0.3/base64-bytestring-1.0.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=516a8e17fce4b22fba3dc749c112884b
+_md5_=d4a897007129dbe42061b7073217c89c
diff --git a/metadata/md5-cache/dev-haskell/basement-0.0.12 b/metadata/md5-cache/dev-haskell/basement-0.0.12
index 523ed5ef720b..869bff05f2af 100644
--- a/metadata/md5-cache/dev-haskell/basement-0.0.12
+++ b/metadata/md5-cache/dev-haskell/basement-0.0.12
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell-foundation/foundation#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.0.12
 SRC_URI=https://hackage.haskell.org/package/basement-0.0.12/basement-0.0.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d90b4860c5d32161d714a1dd795ba41b
+_md5_=1c5fe1aceefbed19a425e2f0413a0613
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
index 5cb7975f4428..657f23ffdb53 100644
--- a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bencode
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.1
 SRC_URI=https://hackage.haskell.org/package/bencode-0.6.1.1/bencode-0.6.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=18b0111d67de1132667a022494eadbb4
+_md5_=ce90ade44dcc848b1688a9121bf987ab
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-5.5.11 b/metadata/md5-cache/dev-haskell/bifunctors-5.5.11
index 37278193dde1..e558087761e8 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-5.5.11
+++ b/metadata/md5-cache/dev-haskell/bifunctors-5.5.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/bifunctors/
 INHERIT=haskell-cabal
 IUSE=+semigroups +tagged doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-8.4.3:= tagged? ( >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/5.5.11
 SRC_URI=https://hackage.haskell.org/package/bifunctors-5.5.11/bifunctors-5.5.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d62fc8c52ac081f2cae5e8ec333de3a0
+_md5_=0f529f3843e2ad24106c0256509657c4
diff --git a/metadata/md5-cache/dev-haskell/binary-0.8.8.0 b/metadata/md5-cache/dev-haskell/binary-0.8.8.0
index d705ef60f57d..8f2346677cd9 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.8.8.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kolmodin/binary
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/0.8.8.0
 SRC_URI=https://hackage.haskell.org/package/binary-0.8.8.0/binary-0.8.8.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=16874e32629fd32d2c883189e5bbc539
+_md5_=91868b244ee77a95f819f9c28e773de3
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2
index c5771441a9f2..0c38a5fcabb8 100644
--- a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/binary-orphans
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.2/binary-orphans-1.0.2.tar.gz https://hackage.haskell.org/package/binary-orphans-1.0.2/revision/1.cabal -> binary-orphans-1.0.2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a4be583e1b1f3fc4d1d413d6f88e5644
+_md5_=b49254b78e31ff6edd05cca7d4254ef2
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.2.1 b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.2.1
index fe426996986c..277f56a0fe84 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.2.1
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/lpsmith/blaze-builder
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2.1
 SRC_URI=https://hackage.haskell.org/package/blaze-builder-0.4.2.1/blaze-builder-0.4.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b237d7536c3aca051237188e1e0e7ddc
+_md5_=2865fc89b8110508b507d5fbc057c292
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2-r1 b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2-r1
index 928cb0b22e52..15637b9d2acb 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://jaspervdj.be/blaze/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2668a756c5249b83ad2d65018a6b0f31
+_md5_=dc0013869705dc7ab79d75976be28c72
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.8 b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.8
index 3e0be56f2cd8..60ad2e78faf2 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.8
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://jaspervdj.be/blaze
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2.8
 SRC_URI=https://hackage.haskell.org/package/blaze-markup-0.8.2.8/blaze-markup-0.8.2.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b391846b7fd06a31373e6386862e8a24
+_md5_=f9dc2eeae1e7a267e0464961390d4021
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0 b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
index 50484dae6752..f9cc2e80df95 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/bloomfilter
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1.0
 SRC_URI=https://hackage.haskell.org/package/bloomfilter-2.0.1.0/bloomfilter-2.0.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=921916c39688da7de43d807406a0260e
+_md5_=55b52ffe6fe25b1bf2f6cb580c9bd1e8
diff --git a/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4 b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
index 5d40c6a45c06..6d4429a5c9d7 100644
--- a/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
+++ b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/sjakobi/bsb-http-chunked
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.0.4
 SRC_URI=https://hackage.haskell.org/package/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ecd0f9571fe65e40c39669d6d9e264b0
+_md5_=23853c682b4444b6b860adc7e9c07a3e
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index ad47ae60c96e..8db65e1f2765 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-byteable
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/byteable-0.1.1/byteable-0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=92535a4c19bc173ec98c95236dfabd58
+_md5_=ed7006073ffb50226f36988cfc914c1e
diff --git a/metadata/md5-cache/dev-haskell/byteorder-1.0.4 b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
index 369da0526e95..0ccafb894d9b 100644
--- a/metadata/md5-cache/dev-haskell/byteorder-1.0.4
+++ b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://community.haskell.org/~aslatter/code/byteorder
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/byteorder-1.0.4/byteorder-1.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9420369c910ab1cb7efdca0d436c7fad
+_md5_=bb303bef924941e8cec78b388f0412c1
diff --git a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0 b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
index 6bdcbfc05336..4ef029322da7 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
+++ b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bytestring-builder
 INHERIT=haskell-cabal
 IUSE=profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.8.2.0
 SRC_URI=https://hackage.haskell.org/package/bytestring-builder-0.10.8.2.0/bytestring-builder-0.10.8.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a4d59e14878cfd3c4deb5736264d3ad7
+_md5_=736d85eaae7eb3e48653d70b23b1712c
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.8 b/metadata/md5-cache/dev-haskell/c2hs-0.28.8
index cd091b0faa91..fabd95c3cb29 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.28.8
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.28.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/c2hs
 INHERIT=haskell-cabal
 IUSE=regression test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-haskell/dlist:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.10:= >=dev-lang/ghc-8.4.3:= regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.8/c2hs-0.28.8.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b8b49aab5fe8d5c754dd0590b3fa492e
+_md5_=b8472096298214696cf0550a2b2ca59f
diff --git a/metadata/md5-cache/dev-haskell/cabal-3.4.1.0 b/metadata/md5-cache/dev-haskell/cabal-3.4.1.0
index 70424bbcc607..4061af3198e3 100644
--- a/metadata/md5-cache/dev-haskell/cabal-3.4.1.0
+++ b/metadata/md5-cache/dev-haskell/cabal-3.4.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/cabal/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/3.4.1.0
 SRC_URI=https://hackage.haskell.org/package/Cabal/Cabal-3.4.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4f367017351657876d4e75bd434307b6
+_md5_=f87973ad4d9e59c7813496093509e94d
diff --git a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.9 b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.9
index 123c2ce76448..e1e987a37caf 100644
--- a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.9
+++ b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/cabal-doctest
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.0.9
 SRC_URI=https://hackage.haskell.org/package/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=725809a45f6172120ef05857a5485f0b
+_md5_=ec025d097eeba9b78094cfae7389ef2e
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2 b/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
index 49e7c6ec9c51..237ce2cbccb0 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.4.1.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/cabal/
 INHERIT=haskell-cabal ghc-package
 IUSE=debug +lukko +native-dns
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:= >=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:= >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:= >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= ) native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/cabal-install-3.4.1.0/cabal-install-3.4.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=325993f389bd7c105ad690c7028f3a39
+_md5_=f33fa1c0b13cdac125941750ac035d64
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.3.0 b/metadata/md5-cache/dev-haskell/call-stack-0.3.0
index 436efd9c9f1a..b4795a9e32f1 100644
--- a/metadata/md5-cache/dev-haskell/call-stack-0.3.0
+++ b/metadata/md5-cache/dev-haskell/call-stack-0.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/sol/call-stack#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/call-stack-0.3.0/call-stack-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=245bb3c48e201fc54dc909c949809266
+_md5_=617d456484070dd07a63173614a6edea
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0 b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
index 0df29c751313..4441a3b0e9ac 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/basvandijk/case-insensitive
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/text-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1.0
 SRC_URI=https://hackage.haskell.org/package/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1ddc51699dab9c3b4aa6b17d731ef14a
+_md5_=4afc310fd52817e4898e8b3d92af286a
diff --git a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1 b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1
index e980407a6f09..004351c507af 100644
--- a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1
+++ b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cassava
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2.0
 SRC_URI=https://hackage.haskell.org/package/cassava-0.5.2.0/cassava-0.5.2.0.tar.gz https://hackage.haskell.org/package/cassava-0.5.2.0/revision/7.cabal -> cassava-0.5.2.0-rev7.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=159bd4cfdc759fb88ad709e3d79cff43
+_md5_=eec2f8503159358982e797ab70b930d0
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1 b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
index de883158be39..9b12777c1670 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
+++ b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/GaloisInc/cereal
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.8.1
 SRC_URI=https://hackage.haskell.org/package/cereal-0.5.8.1/cereal-0.5.8.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b024ecae447a3c05a8d86ef910735580
+_md5_=86902003ed62e551eec2ab3c016b3fb0
diff --git a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1 b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
index 960cf84db65b..e9ce81dfa643 100644
--- a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/charset
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.7.1
 SRC_URI=https://hackage.haskell.org/package/charset-0.3.7.1/charset-0.3.7.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d4fd16e4aa78645e3ca7f9a517c89f3d
+_md5_=9a4cda16cb3200467178de7ef2de6109
diff --git a/metadata/md5-cache/dev-haskell/chell-0.4.0.2 b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
index 45c9bd337194..398240bf0559 100644
--- a/metadata/md5-cache/dev-haskell/chell-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://john-millikin.com/software/chell/
 INHERIT=haskell-cabal
 IUSE=+color-output doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] )
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/chell-0.4.0.2/chell-0.4.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=219c7a328b1ae1921e3e827cb9dc58c8
+_md5_=902ad718587a63f616fa1dd46a0fbc88
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
index cc940f79e927..32a51d8300c7 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cipher-aes
 INHERIT=haskell-cabal
 IUSE=cpu_flags_x86_aes cpu_flags_x86_ssse3 doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.11
 SRC_URI=https://hackage.haskell.org/package/cipher-aes-0.2.11/cipher-aes-0.2.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=486eee8708847cc5a0dbb23ef952794b
+_md5_=89f5979f9c68d3ae6d64d9ce41f6b890
diff --git a/metadata/md5-cache/dev-haskell/citeproc-0.7 b/metadata/md5-cache/dev-haskell/citeproc-0.7
index 88d34dba325b..46362da58a61 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-0.7
+++ b/metadata/md5-cache/dev-haskell/citeproc-0.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/citeproc
 INHERIT=haskell-cabal
 IUSE=executable icu doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/base-compat-0.10:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] >=dev-haskell/unicode-collation-0.1.3:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] dev-haskell/uniplate:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/xml-conduit:=[profile?] >=dev-lang/ghc-8.6.5:= executable? ( dev-haskell/aeson-pretty:=[profile?] ) icu? ( >=dev-haskell/text-icu-0.7.1.0:=[profile?] )
 RESTRICT=test !test? ( test )
 SLOT=0/0.7
 SRC_URI=https://hackage.haskell.org/package/citeproc-0.7/citeproc-0.7.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b0b45465f6ce74ba790fd837c2bf2de8
+_md5_=d6b6786ec6740513d539b71362d51543
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2 b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
index a21253c4ee9e..b26dfb8d9e5e 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/clientsession/tree/master
 INHERIT=haskell-cabal
 IUSE=test doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/clientsession-0.9.1.2/clientsession-0.9.1.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c040cd090bb5d5b21cf445b6fdf65a45
+_md5_=af30dbf17faf0ca9034234d1ca26e727
diff --git a/metadata/md5-cache/dev-haskell/clock-0.7.2 b/metadata/md5-cache/dev-haskell/clock-0.7.2
index 6eefdf69fca5..9fc933baa4ac 100644
--- a/metadata/md5-cache/dev-haskell/clock-0.7.2
+++ b/metadata/md5-cache/dev-haskell/clock-0.7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/corsis/clock
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.7.2
 SRC_URI=https://hackage.haskell.org/package/clock-0.7.2/clock-0.7.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e0a2dc53955714ac138c98927cfe5b80
+_md5_=58aebc1fe0555917a26f128adea6c04a
diff --git a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20 b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
index be924e38c807..d837e91287c2 100644
--- a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
+++ b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ndmitchell/cmdargs#readme
 INHERIT=haskell-cabal
 IUSE=+quotation testprog doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.10.20
 SRC_URI=https://hackage.haskell.org/package/cmdargs-0.10.20/cmdargs-0.10.20.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f71b10d2c0e8a7ce900ea2db7037abed
+_md5_=f1fd77c063f57196fdfd07799e409d82
diff --git a/metadata/md5-cache/dev-haskell/code-page-0.1.3 b/metadata/md5-cache/dev-haskell/code-page-0.1.3
index 14fa5d84ba0c..beb1683407a4 100644
--- a/metadata/md5-cache/dev-haskell/code-page-0.1.3
+++ b/metadata/md5-cache/dev-haskell/code-page-0.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/RyanGlScott/code-page
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/code-page-0.1.3/code-page-0.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9f26ce877c297eb41d4ea37c5b03b6f7
+_md5_=ae2d40c41b7c9c2b6686c2401c24b12e
diff --git a/metadata/md5-cache/dev-haskell/colour-2.3.5 b/metadata/md5-cache/dev-haskell/colour-2.3.5
index 5565c08f19c0..b6926ae89e31 100644
--- a/metadata/md5-cache/dev-haskell/colour-2.3.5
+++ b/metadata/md5-cache/dev-haskell/colour-2.3.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Colour
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/2.3.5
 SRC_URI=https://hackage.haskell.org/package/colour-2.3.5/colour-2.3.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1690bb102fda5433a55023f5d73db010
+_md5_=cdfe15a0fdce50d143780e3d648c6641
diff --git a/metadata/md5-cache/dev-haskell/commonmark-0.2.2 b/metadata/md5-cache/dev-haskell/commonmark-0.2.2
index 5434d1031036..b28c18e5e969 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-0.2.2
+++ b/metadata/md5-cache/dev-haskell/commonmark-0.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/commonmark-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/unicode-data-0.3:=[profile?] dev-haskell/unicode-transforms:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/commonmark-0.2.2/commonmark-0.2.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c1ce0cc0ce7c93a9a208adb37c7ba0cd
+_md5_=4228dbc2dabd2a3d7029339b09975b86
diff --git a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.3.2 b/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.3.2
index 1c6a7b9cde6d..d1d6b0da73f4 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/commonmark-extensions-0.2.3.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/commonmark-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] dev-haskell/network-uri:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.2
 SRC_URI=https://hackage.haskell.org/package/commonmark-extensions-0.2.3.2/commonmark-extensions-0.2.3.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=21dda8b41f69429761563f26435af025
+_md5_=db1b8e44c37bbee904a21b9b7a543ac5
diff --git a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.1.2 b/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.1.2
index 69658ed9dde4..b1efbb11ea82 100644
--- a/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.1.2
+++ b/metadata/md5-cache/dev-haskell/commonmark-pandoc-0.2.1.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/commonmark-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/commonmark-0.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] >=dev-haskell/commonmark-extensions-0.2.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.2.1.2
 SRC_URI=https://hackage.haskell.org/package/commonmark-pandoc-0.2.1.2/commonmark-pandoc-0.2.1.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=69f4614d3ef1ec223d759c052c59d8e8
+_md5_=83f9c7790a8b2a6f1252401fee9222ce
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.8 b/metadata/md5-cache/dev-haskell/comonad-5.0.8
index 22513ef79d0d..4bd85ee69858 100644
--- a/metadata/md5-cache/dev-haskell/comonad-5.0.8
+++ b/metadata/md5-cache/dev-haskell/comonad-5.0.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/comonad/
 INHERIT=haskell-cabal
 IUSE=+indexed-traversable doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
 SLOT=0/5.0.8
 SRC_URI=https://hackage.haskell.org/package/comonad-5.0.8/comonad-5.0.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b80302bbb86e7743ebe97ed9a9e63824
+_md5_=168f59a0ea99dd4e41d42f7a303b88cc
diff --git a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11 b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
index ba554f7d17dd..9c5320f51595 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+++ b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/concurrent-output
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.11.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.10.11
 SRC_URI=https://hackage.haskell.org/package/concurrent-output-1.10.11/concurrent-output-1.10.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a9d97d7026a4d75d0209e88880dfea91
+_md5_=1bd8a9f28e17fa4bcf575f84b3f42ae2
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.3.4.2 b/metadata/md5-cache/dev-haskell/conduit-1.3.4.2
index 6687c0cc7627..dd03bc7bbb30 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.3.4.2
+++ b/metadata/md5-cache/dev-haskell/conduit-1.3.4.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.6.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.4.2
 SRC_URI=https://hackage.haskell.org/package/conduit-1.3.4.2/conduit-1.3.4.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=206f82735064b40c71bde1fe46f70859
+_md5_=c1f2870f013269bf4037f475aa358f96
diff --git a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
index 64f2b93fb680..e42db3b538ca 100644
--- a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+++ b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.3.0
 SRC_URI=https://hackage.haskell.org/package/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e90a080171716ea60b5a143ec3d1a75e
+_md5_=3581f7a293e5c1a896c8a6026ed585aa
diff --git a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
index 9a3f5372102a..0c42479f141d 100644
--- a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
+++ b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.16:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.6:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/conduit-extra-1.3.4/conduit-extra-1.3.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=34ce8867e18c72520796ffebaf6145b2
+_md5_=96385869acb92bc44ddcadf8e63ebf83
diff --git a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1 b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
index 976c52eb5615..c5d171cff750 100644
--- a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bos/configurator
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.0
 SRC_URI=https://hackage.haskell.org/package/configurator-0.3.0.0/configurator-0.3.0.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ca2345f5f7f69c75e0fcb82be28e2d8b
+_md5_=5e2642e40034594c5d8e21894ce815ab
diff --git a/metadata/md5-cache/dev-haskell/connection-0.3.1 b/metadata/md5-cache/dev-haskell/connection-0.3.1
index db52491cdf53..c36b74e79949 100644
--- a/metadata/md5-cache/dev-haskell/connection-0.3.1
+++ b/metadata/md5-cache/dev-haskell/connection-0.3.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-connection
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.6.3:=[profile?] >=dev-haskell/socks-0.6:=[profile?] >=dev-haskell/tls-1.4:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/connection-0.3.1/connection-0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8e8eaea1dd68940fc625058c0c182e16
+_md5_=ec74f66dfe37fb1a60e78ecc49cca8bb
diff --git a/metadata/md5-cache/dev-haskell/constraints-0.13.3 b/metadata/md5-cache/dev-haskell/constraints-0.13.3
index cd09763f04ed..dce9ba6ccd40 100644
--- a/metadata/md5-cache/dev-haskell/constraints-0.13.3
+++ b/metadata/md5-cache/dev-haskell/constraints-0.13.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/constraints/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/constraints-0.13.3/constraints-0.13.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0230ba369cae3a9e70395072c34ae85b
+_md5_=68894876d88bd8c8b76aa0e99f9a92e6
diff --git a/metadata/md5-cache/dev-haskell/contravariant-1.5.3 b/metadata/md5-cache/dev-haskell/contravariant-1.5.3
index 0989d7a60fdd..9b62ba25c8b9 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-1.5.3
+++ b/metadata/md5-cache/dev-haskell/contravariant-1.5.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/contravariant/
 INHERIT=haskell-cabal
 IUSE=+semigroups +statevar +tagged doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.2.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
 SLOT=0/1.5.3
 SRC_URI=https://hackage.haskell.org/package/contravariant-1.5.3/contravariant-1.5.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=259a5c6fcc97f485226f0e5bd4f2251f
+_md5_=9a1b1c0aeff2e8e892ae4f740e5a9434
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0 b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
index 8f165e4103dd..45a7830091a9 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/convertible
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/convertible-1.1.1.0/convertible-1.1.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1367c85aba381fe9e84e1d08ee37544d
+_md5_=bb91f51c35bea4bfc1daecdf4233df98
diff --git a/metadata/md5-cache/dev-haskell/cookie-0.4.4 b/metadata/md5-cache/dev-haskell/cookie-0.4.4
index 72294294abe6..b853292410a0 100644
--- a/metadata/md5-cache/dev-haskell/cookie-0.4.4
+++ b/metadata/md5-cache/dev-haskell/cookie-0.4.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/cookie
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/cookie-0.4.4/cookie-0.4.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3937e6bb57e46bf4e49ad6730db5f188
+_md5_=6e13b12c8a0e7780207df68223c422cf
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1 b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
index 92c5f46a69f6..554d8678be5e 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cprng-aes
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/cprng-aes-0.6.1/cprng-aes-0.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=36cbbd693aa1e8604ff0b7f7469a03b1
+_md5_=1103c7337218c29da7dad56634f03885
diff --git a/metadata/md5-cache/dev-haskell/criterion-1.5.11.0 b/metadata/md5-cache/dev-haskell/criterion-1.5.11.0
index 37700215678a..db11f8a26721 100644
--- a/metadata/md5-cache/dev-haskell/criterion-1.5.11.0
+++ b/metadata/md5-cache/dev-haskell/criterion-1.5.11.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.serpentine.com/criterion
 INHERIT=haskell-cabal
 IUSE=embed-data-files doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-8.4.3:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.5.11.0
 SRC_URI=https://hackage.haskell.org/package/criterion-1.5.11.0/criterion-1.5.11.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5428c566c246af568469fe34f700e27b
+_md5_=099d34954867e5599e9453370e1c035c
diff --git a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0 b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
index 92173bf73a6f..b4bef20c0340 100644
--- a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/criterion
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/criterion-measurement-0.1.2.0/criterion-measurement-0.1.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2b9011587cb43ba54e9dd3f77f1243db
+_md5_=07037ba88f69ff0bb5a2719fc7cd52a6
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3 b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
index 4ca358f3a985..59303a688e01 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
+++ b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/TomMD/crypto-api
 INHERIT=haskell-cabal
 IUSE=all-cpolys doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-0.13.3/crypto-api-0.13.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=11b018987088639eefb542489c606a9c
+_md5_=c5fd5b79adb677f27afcf08ab54c39df
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1 b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
index 554870934028..4f7eaf7102bf 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://trac.haskell.org/crypto-api/wiki
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-tests-0.3/crypto-api-tests-0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fbabce1ec07a2bfcb6e3c117bd57bd8a
+_md5_=51f7c27511c44362bf8d1001555aa31e
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
index a917760dca66..0ad1ccad4ac1 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-tests-0.0.11/crypto-cipher-tests-0.0.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=033796b27e5e9bd6f3e6e967e4a71544
+_md5_=7a4075bab5b631c86687ab1defff6366
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
index 698008fc9fa1..5e6b346a4751 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-types-0.0.9/crypto-cipher-types-0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9b000bf47f51381e158d38051758a00b
+_md5_=812a0ac20309d4c6569eb08a22902dcc
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
index 290bf77c1266..035787494f92 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-random
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-random-0.0.9/crypto-random-0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9e7b0048e986b167ce36c6be3916fae5
+_md5_=034188b666ec12dc0e88b3d3cb97543b
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
index 0ca618dab1a8..f9db7592cae5 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-md5
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ceee438eebfc78f19ca9e9a1041564a0
+_md5_=8cf594ca09e9bf77a942b377c7f34a5a
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
index 0b165db6dfc6..57d875bc40dd 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-sha1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.100.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5faa8a7b703c9c9854a07bce68cc3324
+_md5_=66f1f7d17cbd7c61f07894f7d91a2fbd
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0 b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
index 911d33fec023..7a1ca3bb35d6 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hvr/cryptohash-sha256
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.101.0
 SRC_URI=https://hackage.haskell.org/package/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ca69275bc1779836b8f49d727f7bbf8b
+_md5_=f5a522debf086ca36db8abeff16fb6a0
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.28 b/metadata/md5-cache/dev-haskell/cryptonite-0.28
index 813d01114236..a9250401cee5 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.28
+++ b/metadata/md5-cache/dev-haskell/cryptonite-0.28
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite
 INHERIT=flag-o-matic haskell-cabal
 IUSE=cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp +target-attributes doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-lang/ghc-8.4.3:= virtual/libc
 RESTRICT=!test? ( test )
 SLOT=0/0.28
 SRC_URI=https://hackage.haskell.org/package/cryptonite-0.28/cryptonite-0.28.tar.gz https://github.com/haskell-crypto/cryptonite/pull/338.patch -> cryptonite-338.patch
 _eclasses_=toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e851ed7dd48e8581e8c20d3b341a24b5
+_md5_=b280fc9973d7fe9c9bd8ad30fbc59f8b
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2 b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
index eadcfe56df76..1cffe26c527d 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+++ b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite-conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=14c9119806850e118f83e8c197d4ff09
+_md5_=d117ffe0e358f70b5e429f1f04d235bb
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0 b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
index b6f45f96ba18..31e2dc6243fe 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/css-text.git#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.1.3.0
 SRC_URI=https://hackage.haskell.org/package/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=737330efe40508782952112aa5cfeda8
+_md5_=1dfc03f3cafebf31c3f1ecab2c4a20c7
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1 b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
index d0541e2fed0f..5855e8ea1207 100644
--- a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
+++ b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.1.1
 SRC_URI=https://hackage.haskell.org/package/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=781e15b0500b64ad940fc6d8fe3a24d7
+_md5_=0590964df9e6ca34d7832df78c729cc8
diff --git a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0 b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
index b7bf659c3bc1..7223b7fad285 100644
--- a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/data-default-class
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2a88d58c8081ec9c8010e097acec381e
+_md5_=4f556957e117850407641e16bf5ad54a
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
index ff8a500fe5f2..315aa6c950d6 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-containers
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=59ac1d99eee4769a8f6b0345d16deafc
+_md5_=92917a1333ef544e45d8136e78860f31
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
index 4d154c4577d3..9534c70cd1ef 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-dlist
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1206493533bd6fdd5ea8d5327e0c96cb
+_md5_=f968b9d51087b7911bb12896f32fe5bd
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
index 4081b24e3ed5..9194e0d28ddd 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-old-locale
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3796952af37acc4bb5ee5f52e56442a8
+_md5_=30d6791bd8a57867a2272ae4cb94636a
diff --git a/metadata/md5-cache/dev-haskell/data-fix-0.3.2 b/metadata/md5-cache/dev-haskell/data-fix-0.3.2
index 91ee6e0caad4..aa96bb83764b 100644
--- a/metadata/md5-cache/dev-haskell/data-fix-0.3.2
+++ b/metadata/md5-cache/dev-haskell/data-fix-0.3.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/spell-music/data-fix
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/data-fix-0.3.2/data-fix-0.3.2.tar.gz https://hackage.haskell.org/package/data-fix-0.3.2/revision/2.cabal -> data-fix-0.3.2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ac402123e0caa24003b2078278f4caef
+_md5_=f8548cf1c42686671739e27fdaa193e3
diff --git a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0 b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
index aaa42e7a804b..ed80ee3a60cf 100644
--- a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+++ b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-ordlist
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.0
 SRC_URI=https://hackage.haskell.org/package/data-ordlist-0.4.7.0/data-ordlist-0.4.7.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5d27636dba19131dfa8faf90199cc147
+_md5_=94afa9cb47862bebeefab7e4c693c754
diff --git a/metadata/md5-cache/dev-haskell/dav-1.3.4 b/metadata/md5-cache/dev-haskell/dav-1.3.4
index 18dd814d19bb..83b83979bb6c 100644
--- a/metadata/md5-cache/dev-haskell/dav-1.3.4
+++ b/metadata/md5-cache/dev-haskell/dav-1.3.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://floss.scru.org/hDAV
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/network-2.6.10:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/DAV-1.3.4/DAV-1.3.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d7a68c96592ad655af856b7a80207b51
+_md5_=dc2c14685c5fa9e655289a250255ab79
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.27 b/metadata/md5-cache/dev-haskell/dbus-1.2.27
index 20cba5467977..cd02d0ddee0a 100644
--- a/metadata/md5-cache/dev-haskell/dbus-1.2.27
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/lens-5.3:=[profile?] >=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.27
 SRC_URI=https://hackage.haskell.org/package/dbus-1.2.27/dbus-1.2.27.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2c533a2e225144210e89dde1839de23b
+_md5_=9aac88f48e40a2abeb5f43e152ef81b7
diff --git a/metadata/md5-cache/dev-haskell/dec-0.0.3 b/metadata/md5-cache/dev-haskell/dec-0.0.3
index 0d74a8a1bfe7..7abc3916a9bf 100644
--- a/metadata/md5-cache/dev-haskell/dec-0.0.3
+++ b/metadata/md5-cache/dev-haskell/dec-0.0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/phadej/vec
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/dec-0.0.3/dec-0.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=842f92044f0b3b40e1ebb7b8225f22d8
+_md5_=63de6afd9edc0f7ce66be12ffd586184
diff --git a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0 b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
index a8b88da44c8c..03d102e88fd3 100644
--- a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dense-linear-algebra
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dense-linear-algebra-0.1.0.0/dense-linear-algebra-0.1.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1bd277b58b12ea6f99c5c55b5f79f5cf
+_md5_=94c67988cf82775ad51e208a3b002d48
diff --git a/metadata/md5-cache/dev-haskell/deriving-compat-0.6 b/metadata/md5-cache/dev-haskell/deriving-compat-0.6
index 47bdc230c9b9..f665b0d90a01 100644
--- a/metadata/md5-cache/dev-haskell/deriving-compat-0.6
+++ b/metadata/md5-cache/dev-haskell/deriving-compat-0.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-compat/deriving-compat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/deriving-compat-0.6/deriving-compat-0.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4edc40e09f4497e5cfe9abba9ed6704f
+_md5_=935272bf2fcb154d84da17a7e2805c8c
diff --git a/metadata/md5-cache/dev-haskell/diff-0.4.0 b/metadata/md5-cache/dev-haskell/diff-0.4.0
index d1f8f0ffe778..489f5c7337f6 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.4.0
+++ b/metadata/md5-cache/dev-haskell/diff-0.4.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Diff
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://hackage.haskell.org/package/Diff-0.4.0/Diff-0.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=54b95c2e7936cfb5260f424e968f96f6
+_md5_=63f1d5f007e9d5396e1d65631bee3fdd
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index 1e7a2c61ab9a..8b58c4f06ab3 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/digest
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=https://hackage.haskell.org/package/digest-0.0.1.2/digest-0.0.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a101173499d5245b8b508ae55d81d26b
+_md5_=f1b9b672764e8570f04053d5dc571e5d
diff --git a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1 b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
index 39b7ebe2ebc5..66fd358172e7 100644
--- a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/redneb/disk-free-space
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/disk-free-space-0.1.0.1/disk-free-space-0.1.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a2f3d06655ca82b36115af0d8d3f5f8e
+_md5_=061a4fe5e4b05d66fffb2deded15afdb
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.6.2.1 b/metadata/md5-cache/dev-haskell/distributive-0.6.2.1
index 78b0f71b022d..799f74dec49e 100644
--- a/metadata/md5-cache/dev-haskell/distributive-0.6.2.1
+++ b/metadata/md5-cache/dev-haskell/distributive-0.6.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/distributive/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.2.1
 SRC_URI=https://hackage.haskell.org/package/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9560eb4071eaaa502c61421e0f2a1519
+_md5_=7712991035f1d34e3ff17633c170cf20
diff --git a/metadata/md5-cache/dev-haskell/dlist-1.0 b/metadata/md5-cache/dev-haskell/dlist-1.0
index c00f0fbbe1f6..03f1efaaa420 100644
--- a/metadata/md5-cache/dev-haskell/dlist-1.0
+++ b/metadata/md5-cache/dev-haskell/dlist-1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/spl/dlist
 INHERIT=haskell-cabal
 IUSE=werror doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/dlist-1.0/dlist-1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b9a66bce20eec4a4ce76c990a0af463a
+_md5_=0423929b16f313577e2148735a817203
diff --git a/metadata/md5-cache/dev-haskell/dns-4.0.1 b/metadata/md5-cache/dev-haskell/dns-4.0.1
index 9bfd0050e515..c03635205bdb 100644
--- a/metadata/md5-cache/dev-haskell/dns-4.0.1
+++ b/metadata/md5-cache/dev-haskell/dns-4.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dns
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/auto-update:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/psqueues:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/4.0.1
 SRC_URI=https://hackage.haskell.org/package/dns-4.0.1/dns-4.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=14630347ad7208b7c4f64f17eb6e2b64
+_md5_=d7d48e319fccc3dd096058527ae2d5e4
diff --git a/metadata/md5-cache/dev-haskell/doclayout-0.4 b/metadata/md5-cache/dev-haskell/doclayout-0.4
index 0d7cd4b129e0..c07cba70faac 100644
--- a/metadata/md5-cache/dev-haskell/doclayout-0.4
+++ b/metadata/md5-cache/dev-haskell/doclayout-0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/doclayout
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/emojis-0.1.2:=[profile?] dev-haskell/safe:=[profile?] >=dev-lang/ghc-8.6.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://hackage.haskell.org/package/doclayout-0.4/doclayout-0.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=48abda173358aa4e642d0bd9aa6316c0
+_md5_=091305ea0fbd521f44ed183842a8afcb
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.10.0.2 b/metadata/md5-cache/dev-haskell/doctemplates-0.10.0.2
index 8690651caf43..6519cfa07d92 100644
--- a/metadata/md5-cache/dev-haskell/doctemplates-0.10.0.2
+++ b/metadata/md5-cache/dev-haskell/doctemplates-0.10.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/doctemplates#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text-conversions:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.0.2
 SRC_URI=https://hackage.haskell.org/package/doctemplates-0.10.0.2/doctemplates-0.10.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=32e23f7d2b60c9d671f45026e6555949
+_md5_=12eb63583f744ca1fb31bcdc7baffe66
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.20.0 b/metadata/md5-cache/dev-haskell/doctest-0.20.0
index 55f910940343..872608552d55 100644
--- a/metadata/md5-cache/dev-haskell/doctest-0.20.0
+++ b/metadata/md5-cache/dev-haskell/doctest-0.20.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/sol/doctest#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=test
 SLOT=0/0.20.0
 SRC_URI=https://hackage.haskell.org/package/doctest-0.20.0/doctest-0.20.0.tar.gz https://hackage.haskell.org/package/doctest-0.20.0/revision/5.cabal -> doctest-0.20.0.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5d7e1d478802198b43df3850415f857b
+_md5_=dc2325917c90d0fa3adc5004c6169021
diff --git a/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4 b/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4
index 96d8086194e3..ba287489f4d8 100644
--- a/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4
+++ b/metadata/md5-cache/dev-haskell/doctest-parallel-0.2.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/martijnbastiaan/doctest-parallel#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] dev-haskell/glob:=[profile?] >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=test
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/doctest-parallel-0.2.4/doctest-parallel-0.2.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=03032dcac0990a9361a6294e4658efff
+_md5_=0858153427464e0fcf6eabf985f9e898
diff --git a/metadata/md5-cache/dev-haskell/easy-file-0.2.2 b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
index 0cd7e2e7be75..e5802b335229 100644
--- a/metadata/md5-cache/dev-haskell/easy-file-0.2.2
+++ b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/easy-file
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/easy-file-0.2.2/easy-file-0.2.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fd44d3f933f62d9fd7ed9678db81626e
+_md5_=f0b968fdadbb0445088bf8d1469dee2c
diff --git a/metadata/md5-cache/dev-haskell/echo-0.1.3 b/metadata/md5-cache/dev-haskell/echo-0.1.3
index 599049b105af..06f68072d2f5 100644
--- a/metadata/md5-cache/dev-haskell/echo-0.1.3
+++ b/metadata/md5-cache/dev-haskell/echo-0.1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/RyanGlScott/echo
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/echo-0.1.3/echo-0.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1c6f7822a6467e3cf45eaf220d13c25d
+_md5_=ba836a93e3a6dbaf810f860e27b0bf68
diff --git a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0 b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
index 01f35a3f8bf8..7fd51df88c94 100644
--- a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+++ b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://thoughtpolice.github.com/hs-ed25519
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.5.0
 SRC_URI=https://hackage.haskell.org/package/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2243c2f3268ea0b3dd6abf4e2496a76c
+_md5_=14f15c01795f100ed15d3506a5588d79
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
index 32ec8948b288..0e3a021f3317 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/phadej/edit-distance
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=63a0634d6f910b20d75d3d82d538f507
+_md5_=60b227392b7085ac43ab1af1bb450a57
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
index cfd488f790de..5dbe5386646c 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Porges/email-validate-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.3.2.15
 SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.15/email-validate-2.3.2.15.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=73b1e1ec257b3c9ff5a5c0f9a89cdc7d
+_md5_=c1501df0dc787490f6cb12d5fd48fffd
diff --git a/metadata/md5-cache/dev-haskell/emojis-0.1.2 b/metadata/md5-cache/dev-haskell/emojis-0.1.2
index 757695508c40..e9ce5649d639 100644
--- a/metadata/md5-cache/dev-haskell/emojis-0.1.2
+++ b/metadata/md5-cache/dev-haskell/emojis-0.1.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/emojis#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/emojis-0.1.2/emojis-0.1.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=837419206516c2b328864bce40bdd650
+_md5_=debe76f9246008013794acb718c862f8
diff --git a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3 b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
index fec1cce2099b..b4688ecb26b1 100644
--- a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
+++ b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jcristovao/enclosed-exceptions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/enclosed-exceptions-1.0.3/enclosed-exceptions-1.0.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6779762ac666149ec5b8f545770c3945
+_md5_=11f979b6ac7cf17ddc76facd269b8a92
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
index bda9f61e2641..65a5135aa19e 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/TomMD/entropy
 INHERIT=haskell-cabal
 IUSE=halvm doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=255b8011b6499c4f9430dc189ee0e154
+_md5_=d4bdee6010f1a24cc5e387c2a19c2f17
diff --git a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1 b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
index 65d742064eaf..b8945875baf7 100644
--- a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/erf
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.0.0.0
 SRC_URI=https://hackage.haskell.org/package/erf-2.0.0.0/erf-2.0.0.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7fda20d7fbf722847505bded224154bd
+_md5_=18ad0b72723f935c821238c3baea1920
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
index 6901df257ef4..b18f009d79ac 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errorcall-eq-instance
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2a40f1eaa78855e79b31fabfa951dcf3
+_md5_=0e2d28dd1f3f31cb6647c3bbfec31df4
diff --git a/metadata/md5-cache/dev-haskell/errors-2.3.0 b/metadata/md5-cache/dev-haskell/errors-2.3.0
index 143fb4716409..8595e6f057fd 100644
--- a/metadata/md5-cache/dev-haskell/errors-2.3.0
+++ b/metadata/md5-cache/dev-haskell/errors-2.3.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errors
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/2.3.0
 SRC_URI=https://hackage.haskell.org/package/errors-2.3.0/errors-2.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b27316020bc5fa00d1d0e4d4c53640cd
+_md5_=fad6dbae79c1c959118268abe5acdfcf
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.10.4-r1 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4-r1
index c3b83bba8f7a..8e1c2dc9e387 100644
--- a/metadata/md5-cache/dev-haskell/exceptions-0.10.4-r1
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.10.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/exceptions/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.4
 SRC_URI=https://hackage.haskell.org/package/exceptions-0.10.4/exceptions-0.10.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4b80d32bd14a5d813aa2775334462d91
+_md5_=6573ac5012cb88bae6a1bee998b5f643
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index 6fe96fa63c0f..0325000fcb79 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/extensible-exceptions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.4
 SRC_URI=https://hackage.haskell.org/package/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c04160860428f017962ca0bfe6d52b5e
+_md5_=cb8540028b3dbf1fbe6db04209382976
diff --git a/metadata/md5-cache/dev-haskell/extra-1.7.10 b/metadata/md5-cache/dev-haskell/extra-1.7.10
index a633c6e2091a..09ca47433b15 100644
--- a/metadata/md5-cache/dev-haskell/extra-1.7.10
+++ b/metadata/md5-cache/dev-haskell/extra-1.7.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ndmitchell/extra#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=2/1.7.10
 SRC_URI=https://hackage.haskell.org/package/extra-1.7.10/extra-1.7.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=36595c17d8f4398e7b9138136fa79b19
+_md5_=ccdbb75ac17a5baf073ea92a781a13af
diff --git a/metadata/md5-cache/dev-haskell/fail-4.9.0.0 b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
index f4aaee7b96e6..29b364ef1aec 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
 INHERIT=haskell-cabal
 IUSE=profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/4.9.0.0
 SRC_URI=https://hackage.haskell.org/package/fail-4.9.0.0/fail-4.9.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e1829e0565e1996aa9b416dd9f5e7c02
+_md5_=b5dc886e673e06d409f5f0ad175f6f09
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1 b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
index 9967cca6baa2..d8fde3f1853a 100644
--- a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
+++ b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/logger
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unix-time-0.4.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.1
 SRC_URI=https://hackage.haskell.org/package/fast-logger-3.0.1/fast-logger-3.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=91a52b94279567e70fa474837ea61c97
+_md5_=7eae6d39aac4c738bc226a06840d0c8b
diff --git a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1 b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
index 43634eeebe0b..1d82a227d17e 100644
--- a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+++ b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://bitbucket.org/taejo/fdo-notify/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/fdo-notify-0.3.1/fdo-notify-0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=05130f672fc34f6ebd0072b2fb05d538
+_md5_=22bae1dc195212fed36630da3d906895
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.2.1 b/metadata/md5-cache/dev-haskell/feed-1.3.2.1
index a796650e976f..2e802e1a21e9 100644
--- a/metadata/md5-cache/dev-haskell/feed-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/feed-1.3.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-party/feed
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.13:=[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/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-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/feed-1.3.2.1/feed-1.3.2.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=beb040f681531984ebb049c696d01628
+_md5_=43ae3544d7e87682af053b1cdfcad1f3
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.3 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.3
index d446e6a24914..cc590528d72c 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.7.0.3
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/fgl
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/5.7.0.3
 SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.3/fgl-5.7.0.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8f73dbb87c80241ff9f3d2a0d2f93480
+_md5_=1fcd5d924a2b59c9a2bbb930c9643276
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2 b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
index ed568ca25a29..9880043292cd 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/file-embed
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11.2
 SRC_URI=https://hackage.haskell.org/package/file-embed-0.0.11.2/file-embed-0.0.11.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=288922b05016d190f86cc44d67c1cedf
+_md5_=b976d6943a6e2480b5bba391b97eda6a
diff --git a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3 b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
index 95345223cac2..cc5d92bb64f5 100644
--- a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+++ b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/filemanip
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.3
 SRC_URI=https://hackage.haskell.org/package/filemanip-0.3.6.3/filemanip-0.3.6.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a44a47255b2cae735ef2ec6b89319c10
+_md5_=6c1cdfdfb13a6709fd0fb4477ad21fde
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9
index 732e42e1cf35..3e235b2215a3 100644
--- a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9
+++ b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/filepath-bytestring
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.2.1.9
 SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.9/filepath-bytestring-1.4.2.1.9.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cd745deb4b7fe7210b37da8ea28bed8b
+_md5_=05776a34b02dfa66928c0f78a9957086
diff --git a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1 b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
index 3c2a3f20e5f8..539a1b1aa138 100644
--- a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/audreyt/findbin
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.5
 SRC_URI=https://hackage.haskell.org/package/FindBin-0.0.5/FindBin-0.0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5e00b8e3c823ccbdf81813d344a9fc78
+_md5_=93ffe1d959d2ac4cfb501e53045f3e37
diff --git a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2 b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
index a34e59d95426..444ca730fb11 100644
--- a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
+++ b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/fingertree
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4.2
 SRC_URI=https://hackage.haskell.org/package/fingertree-0.1.4.2/fingertree-0.1.4.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=77f0047ca7b7acad7d5456fe0c0a844f
+_md5_=8213570cf8ae32aec6b0b5c603b73725
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1 b/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1
index 0661f615471d..e9f56990c016 100644
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.12-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/foldl
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.7:=[profile?] >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.12
 SRC_URI=https://hackage.haskell.org/package/foldl-1.4.12/foldl-1.4.12.tar.gz https://hackage.haskell.org/package/foldl-1.4.12/revision/5.cabal -> foldl-1.4.12-rev5.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=30c2d4cd9a518f31bfb75bc2c857c862
+_md5_=15b6dd44a1d249c585cd728e93517a41
diff --git a/metadata/md5-cache/dev-haskell/foundation-0.0.26.1 b/metadata/md5-cache/dev-haskell/foundation-0.0.26.1
index ff231903a9d0..70d169a7492e 100644
--- a/metadata/md5-cache/dev-haskell/foundation-0.0.26.1
+++ b/metadata/md5-cache/dev-haskell/foundation-0.0.26.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell-foundation/foundation
 INHERIT=haskell-cabal
 IUSE=experimental doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=~dev-haskell/basement-0.0.12:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.0.26.1
 SRC_URI=https://hackage.haskell.org/package/foundation-0.0.26.1/foundation-0.0.26.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d30ecb61113ff1f3d58abcfae55fdea9
+_md5_=1b5061e3abd5aaf71afe784244306f4a
diff --git a/metadata/md5-cache/dev-haskell/free-5.1.9 b/metadata/md5-cache/dev-haskell/free-5.1.9
index 2776e53189d0..575258447ce9 100644
--- a/metadata/md5-cache/dev-haskell/free-5.1.9
+++ b/metadata/md5-cache/dev-haskell/free-5.1.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/free/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/profunctors-5.6.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-5.3.5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-8.10.1:=
 SLOT=0/5.1.9
 SRC_URI=https://hackage.haskell.org/package/free-5.1.9/free-5.1.9.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3cad0ea42581b8a4c77d60f25175381e
+_md5_=c616294234e7f6a7214892b60b4a5e02
diff --git a/metadata/md5-cache/dev-haskell/generic-deriving-1.14.1 b/metadata/md5-cache/dev-haskell/generic-deriving-1.14.1
index e37e848a68fa..3a6908722f82 100644
--- a/metadata/md5-cache/dev-haskell/generic-deriving-1.14.1
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.14.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/dreixel/generic-deriving
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.14.1
 SRC_URI=https://hackage.haskell.org/package/generic-deriving-1.14.1/generic-deriving-1.14.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=62cb8cd686d97b1d6623e71fcf3caa29
+_md5_=1bbbb3d35af99ef949bef4f003382f08
diff --git a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.1 b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.1
index b42ca017b896..a281bf2b61d9 100644
--- a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/generics-sop
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?] >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.1
 SRC_URI=https://hackage.haskell.org/package/generics-sop-0.5.1.1/generics-sop-0.5.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a1a742936077e2d868a3f7904f845acc
+_md5_=dd9e8e59fe0f8768b95f529b7f3637fc
diff --git a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4 b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
index dc8c177af49c..9b54055f6643 100644
--- a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
+++ b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/soenkehahn/getopt-generics#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.2.3:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0.4
 SRC_URI=https://hackage.haskell.org/package/getopt-generics-0.13.0.4/getopt-generics-0.13.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=917c36ff756f8c6b10068a49005545ab
+_md5_=b89e3d6a38e29c0c3fc8d801862cd20a
diff --git a/metadata/md5-cache/dev-haskell/ghc-byteorder-4.11.0.0.10 b/metadata/md5-cache/dev-haskell/ghc-byteorder-4.11.0.0.10
index 7ff9c800cdb7..dd00bb2720af 100644
--- a/metadata/md5-cache/dev-haskell/ghc-byteorder-4.11.0.0.10
+++ b/metadata/md5-cache/dev-haskell/ghc-byteorder-4.11.0.0.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://hackage.haskell.org/package/ghc-byteorder
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/4.11.0.0.10
 SRC_URI=https://hackage.haskell.org/package/ghc-byteorder-4.11.0.0.10/ghc-byteorder-4.11.0.0.10.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0cfc8d6ddd807faff0e566f6c36d2b70
+_md5_=4e8e57e1959dba97da23bb59e34a509c
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
index 0faba5b11e65..13a630e8ba81 100644
--- a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/ghc-paths
 INHERIT=haskell-cabal
 IUSE=profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.12
 SRC_URI=https://hackage.haskell.org/package/ghc-paths-0.1.0.12/ghc-paths-0.1.0.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ca58a5371a33939d9144118e6157dc85
+_md5_=de297be8f18db4683f8df64cb3aba888
diff --git a/metadata/md5-cache/dev-haskell/git-lfs-1.2.0 b/metadata/md5-cache/dev-haskell/git-lfs-1.2.0
index 87b7b27e306f..58d8bad3c915 100644
--- a/metadata/md5-cache/dev-haskell/git-lfs-1.2.0
+++ b/metadata/md5-cache/dev-haskell/git-lfs-1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/git-lfs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/aeson-1.3:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/git-lfs-1.2.0/git-lfs-1.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ad1f96f28749f94467fdf263771a6e72
+_md5_=a8c29d761d3b2d9d8ba62ab8ae93ad89
diff --git a/metadata/md5-cache/dev-haskell/glob-0.10.2 b/metadata/md5-cache/dev-haskell/glob-0.10.2
index df447ef2458f..6302c4527bcc 100644
--- a/metadata/md5-cache/dev-haskell/glob-0.10.2
+++ b/metadata/md5-cache/dev-haskell/glob-0.10.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://iki.fi/matti.niemenmaa/glob/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.2
 SRC_URI=https://hackage.haskell.org/package/Glob-0.10.2/Glob-0.10.2.tar.gz https://hackage.haskell.org/package/Glob-0.10.2/revision/3.cabal -> Glob-0.10.2-rev3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a9ec06e5729cea553edcd0767fc5b844
+_md5_=d163edcbb751604ad08dd8733eeb6de7
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0 b/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
index 9f50dcb01865..e517a6dc0f2e 100644
--- a/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.6.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/hackage-security
 INHERIT=haskell-cabal
 IUSE=+lukko doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.8:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.0
 SRC_URI=https://hackage.haskell.org/package/hackage-security-0.6.1.0/hackage-security-0.6.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6b7206f6a9ec680600832c0a8277da00
+_md5_=a3acd334b6c70518032731206138bdf2
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.10.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.10.0
index e6d9838b7238..6a7d357d8875 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.10.0
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.10.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.haskell.org/haddock/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.10.0
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.10.0/haddock-library-1.10.0.tar.gz https://hackage.haskell.org/package/haddock-library-1.10.0/revision/3.cabal -> haddock-library-1.10.0-rev3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=89cf5a3b0f14a3094c1e538a2fd54830
+_md5_=d9a6f271af561e7bddd7165f54f6e040
diff --git a/metadata/md5-cache/dev-haskell/happy-1.19.12 b/metadata/md5-cache/dev-haskell/happy-1.19.12
index c78f3bc2c2a3..2441a974ecbd 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.19.12
+++ b/metadata/md5-cache/dev-haskell/happy-1.19.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.haskell.org/happy/
 INHERIT=haskell-cabal autotools
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/mtl-2.2.1:= >=dev-lang/ghc-7.4.1:= test? ( !dev-lang/ghc[llvm(-)] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/happy-1.19.12/happy-1.19.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc
-_md5_=c4096c6ad9197b54842b5717368569f3
+_md5_=f1001aa2e7018ca14287bc14c60b03e2
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.4.0.2-r1 b/metadata/md5-cache/dev-haskell/hashable-1.4.0.2-r1
index 8b2a24774283..9dee063f476a 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.4.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/hashable-1.4.0.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-unordered-containers/hashable
 INHERIT=haskell-cabal
 IUSE=random-initial-seed doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.6:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.4.0.2
 SRC_URI=https://hackage.haskell.org/package/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c954ea7a0e4219b847ce404a6c82e88d
+_md5_=f900c92678367b1ecb7df7e83b46aba4
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.8.2 b/metadata/md5-cache/dev-haskell/haskeline-0.8.2
index 4a4a9b330a91..f725d0e08e20 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.8.2
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/judah/haskeline
 INHERIT=haskell-cabal
 IUSE=+terminfo doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-8.4.3:= terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 RESTRICT=test !test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://hackage.haskell.org/package/haskeline-0.8.2/haskeline-0.8.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a92e25d04ccbf7887e5215c1c9c9bda6
+_md5_=5a666a858ae178fbfc6769a9bf67aa01
diff --git a/metadata/md5-cache/dev-haskell/haskell-lexer-1.1 b/metadata/md5-cache/dev-haskell/haskell-lexer-1.1
index 1d1ab148002c..09bf973dd9c0 100644
--- a/metadata/md5-cache/dev-haskell/haskell-lexer-1.1
+++ b/metadata/md5-cache/dev-haskell/haskell-lexer-1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/yav/haskell-lexer
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/haskell-lexer-1.1/haskell-lexer-1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1bf7d5e35a829ad814f3251cb31f74c2
+_md5_=4032181102089440693b1ab3f85d2e65
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1
index c709e200af56..a8b225e7bfa1 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.23.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.23.1
 SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.23.1/haskell-src-exts-1.23.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=26dbb02465a2400044f3ae5e9b55749f
+_md5_=c30251db580165b9c32affbb305ac57b
diff --git a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3 b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
index 0d10f48762b9..4a6f15cea35d 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
+++ b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=2/2.4.0.3
 SRC_URI=https://hackage.haskell.org/package/HDBC-2.4.0.3/HDBC-2.4.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=acd7939139319ddead66b77560cd1136
+_md5_=b694b9cf52663b055b60f77dab6e1fa5
diff --git a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.5.0.0 b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.5.0.0
index 0dc4cee1e59b..0adc066037ff 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.5.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc-postgresql
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=2/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/HDBC-postgresql-2.5.0.0/HDBC-postgresql-2.5.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9f567ec87b56f8ee66d5fa58577a0e1f
+_md5_=c64d325ad3ff1dea564e02d6dcd14233
diff --git a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1 b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
index 6b49c06eeb8f..7babfd01dd62 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc-sqlite3
 INHERIT=haskell-cabal
 IUSE=+splitbase doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.3.3.1
 SRC_URI=https://hackage.haskell.org/package/HDBC-sqlite3-2.3.3.1/HDBC-sqlite3-2.3.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5f207b9513e3107a9bd57aaabf1f8bc9
+_md5_=1212a80536e08c73d99fc9feebcf3895
diff --git a/metadata/md5-cache/dev-haskell/hedgehog-1.0.5 b/metadata/md5-cache/dev-haskell/hedgehog-1.0.5
index 11018e217629..9d5f98540600 100644
--- a/metadata/md5-cache/dev-haskell/hedgehog-1.0.5
+++ b/metadata/md5-cache/dev-haskell/hedgehog-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hedgehog.qa
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.5
 SRC_URI=https://hackage.haskell.org/package/hedgehog-1.0.5/hedgehog-1.0.5.tar.gz https://hackage.haskell.org/package/hedgehog-1.0.5/revision/1.cabal -> hedgehog-1.0.5.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b618abd6d5fd6514a68fb14b2ee84cfe
+_md5_=80e7505ec9b6a6abab1f2fc9736b41ed
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.10 b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
index 99a67f65271c..9d3af205605a 100644
--- a/metadata/md5-cache/dev-haskell/hinotify-0.3.10
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kolmodin/hinotify
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.10
 SRC_URI=https://hackage.haskell.org/package/hinotify-0.3.10/hinotify-0.3.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e65c34b8f04051e82040d3559663e911
+_md5_=3b0a5ee2859136433340005c120f5659
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4 b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
index de850a154fab..d98f885db355 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/erikd/hjsmin
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=test
 SLOT=0/0.2.0.4
 SRC_URI=https://hackage.haskell.org/package/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7bdbaa58ac28c03d0a000a87ed6a56c0
+_md5_=49d2169a65d089d323c86d4420e0e9f4
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0-r1 b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
index 3c2cc8706b32..8e7712b692b3 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/hostname
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/hostname-1.0/hostname-1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ad19fad8439d2617130c8598edb6b5b1
+_md5_=62a3f5a87e81bb21d198e3750396bcf6
diff --git a/metadata/md5-cache/dev-haskell/hourglass-0.2.12 b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
index bc2451e22927..56dc0370343d 100644
--- a/metadata/md5-cache/dev-haskell/hourglass-0.2.12
+++ b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-hourglass
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.12
 SRC_URI=https://hackage.haskell.org/package/hourglass-0.2.12/hourglass-0.2.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=771a09f79ceeea96c0f9e66814d0d58c
+_md5_=96bedf2df9a248884a4a7a1c1a8089e6
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.24.4 b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
index ebbb63a27365..f5f769df7a35 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.24.4
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 INHERIT=haskell-cabal
 IUSE=doc profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.24.4
 SRC_URI=https://hackage.haskell.org/package/hscolour-1.24.4/hscolour-1.24.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8213084becac44c5b2bfc3751b1fed1f
+_md5_=d1b3e9a278348667cf5aace709fd26e5
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2 b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2
index 35b42f02898d..028cda46775d 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hvr/hslogger/wiki
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1.0
 SRC_URI=https://hackage.haskell.org/package/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9c20a97a849f624d40809c864c82e601
+_md5_=b129094f237c8be024630214d32ed94d
diff --git a/metadata/md5-cache/dev-haskell/hslua-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-2.2.0
index d70be775f230..23314da8f2f2 100644
--- a/metadata/md5-cache/dev-haskell/hslua-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-aeson-2.2:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?] >=dev-haskell/hslua-classes-2.2:=[profile?] <dev-haskell/hslua-classes-2.3:=[profile?] >=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?] >=dev-haskell/hslua-packaging-2.2:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-2.2.0/hslua-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8a56f5a34911ee2e16b3b10ea8a7dc79
+_md5_=016f70a7501080dd4aed80e852875d29
diff --git a/metadata/md5-cache/dev-haskell/hslua-aeson-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-aeson-2.2.0
index 19f8dfac5b7f..84956877cf3d 100644
--- a/metadata/md5-cache/dev-haskell/hslua-aeson-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-aeson-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-aeson-2.2.0/hslua-aeson-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6ee9d50f07ffe30fd9e2488207e6938a
+_md5_=e331f927e1f7a2ea3907c3b71875488a
diff --git a/metadata/md5-cache/dev-haskell/hslua-classes-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-classes-2.2.0
index 1c0933919590..bb5710d1ff1d 100644
--- a/metadata/md5-cache/dev-haskell/hslua-classes-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-classes-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-classes-2.2.0/hslua-classes-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fab88d0e1931cadc0d989ea1305a31de
+_md5_=2606ee89a4ed0a311b97d89ad67a26ac
diff --git a/metadata/md5-cache/dev-haskell/hslua-core-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-core-2.2.0
index 920890a4ee7e..3df3baaa0d6d 100644
--- a/metadata/md5-cache/dev-haskell/hslua-core-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-core-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/lua-2.2:=[profile?] <dev-haskell/lua-2.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-core-2.2.0/hslua-core-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3fca8577226d8e6704c2af39a50b4b3a
+_md5_=fb53e6694cb51e3da4ac6278e08ab18b
diff --git a/metadata/md5-cache/dev-haskell/hslua-marshalling-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-marshalling-2.2.0
index 01028cef1be8..3f22f1532e24 100644
--- a/metadata/md5-cache/dev-haskell/hslua-marshalling-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-marshalling-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-marshalling-2.2.0/hslua-marshalling-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fc1e43c9f7298f7016cde90f88e93f3c
+_md5_=f002c7ee40da9dd7ccddee0ce7a13fa8
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-doclayout-1.0.4 b/metadata/md5-cache/dev-haskell/hslua-module-doclayout-1.0.4
index 9a7fc7cb006c..7d97e41bbcb8 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-doclayout-1.0.4
+++ b/metadata/md5-cache/dev-haskell/hslua-module-doclayout-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hslua/hslua-module-doclayout
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/doclayout-0.2:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] >=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/hslua-module-doclayout-1.0.4/hslua-module-doclayout-1.0.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1835f274d9c6af2adcb0636821090165
+_md5_=1a5527bdc5c7ea93bba1882e384a405b
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-path-1.0.2 b/metadata/md5-cache/dev-haskell/hslua-module-path-1.0.2
index 14396eba4493..7d234229d371 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-path-1.0.2
+++ b/metadata/md5-cache/dev-haskell/hslua-module-path-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/hslua-module-path-1.0.2/hslua-module-path-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5b0be4ea11678301bda775fe2c26efd6
+_md5_=131c6be1ba53ca443ae53a3a4eb57171
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-system-1.0.2 b/metadata/md5-cache/dev-haskell/hslua-module-system-1.0.2
index 5e1edfe87e88..a94a20b3a993 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-system-1.0.2
+++ b/metadata/md5-cache/dev-haskell/hslua-module-system-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hslua/hslua
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?] >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/hslua-module-system-1.0.2/hslua-module-system-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d3ed95355c3713139a209a4ab82cd2d6
+_md5_=9c66ae9468d11605636e22d2a70cfa72
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-1.0.2 b/metadata/md5-cache/dev-haskell/hslua-module-text-1.0.2
index b5668843da92..da832b55512b 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-1.0.2
+++ b/metadata/md5-cache/dev-haskell/hslua-module-text-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hslua/hslua
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/hslua-module-text-1.0.2/hslua-module-text-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1030259538e5c671eb7e018c09d0535d
+_md5_=9f258a456753445e06c272b3d3ca79b2
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-version-1.0.2 b/metadata/md5-cache/dev-haskell/hslua-module-version-1.0.2
index d3095966ee1a..477081b058fe 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-version-1.0.2
+++ b/metadata/md5-cache/dev-haskell/hslua-module-version-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/hslua-module-version-1.0.2/hslua-module-version-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=54d84b0149f236bbf12483c8a4b06559
+_md5_=d728e4387ec57c524d8259f9c5b961e5
diff --git a/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.2.0
index 676afabfb6d2..4fea76dc6195 100644
--- a/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-objectorientation-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-objectorientation-2.2.0/hslua-objectorientation-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=83a4418372c0aa0a62c4671141e655bb
+_md5_=923c9a17ceb4304b6119f41263ff4b84
diff --git a/metadata/md5-cache/dev-haskell/hslua-packaging-2.2.0 b/metadata/md5-cache/dev-haskell/hslua-packaging-2.2.0
index 54be35b37444..2f2b33009f11 100644
--- a/metadata/md5-cache/dev-haskell/hslua-packaging-2.2.0
+++ b/metadata/md5-cache/dev-haskell/hslua-packaging-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/hslua-packaging-2.2.0/hslua-packaging-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=15d8aee246a5b475ad88094a4789db04
+_md5_=46fed5fefd32f22c1ddc1f7625d916b5
diff --git a/metadata/md5-cache/dev-haskell/hspec-2.9.4 b/metadata/md5-cache/dev-haskell/hspec-2.9.4
index 0da36bbb8501..4334418cd768 100644
--- a/metadata/md5-cache/dev-haskell/hspec-2.9.4
+++ b/metadata/md5-cache/dev-haskell/hspec-2.9.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hspec.github.io/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=~dev-haskell/hspec-core-2.9.4:=[profile?] ~dev-haskell/hspec-discover-2.9.4:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/2.9.4
 SRC_URI=https://hackage.haskell.org/package/hspec-2.9.4/hspec-2.9.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b632132ce4890beaa1462a37939ba47c
+_md5_=b849f4a970b39310eea40b7ca62ac511
diff --git a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1 b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
index 15e502e70b35..c0710747fe3e 100644
--- a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
+++ b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://hspec.github.io/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/hspec-contrib-0.5.1/hspec-contrib-0.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cf386d40d7f61d65e4a135c14e9f538f
+_md5_=7f734a6aa50ad5b0ca4c28132bc24ce7
diff --git a/metadata/md5-cache/dev-haskell/hspec-core-2.9.4 b/metadata/md5-cache/dev-haskell/hspec-core-2.9.4
index 44b535b440d3..ea7e85cc70f2 100644
--- a/metadata/md5-cache/dev-haskell/hspec-core-2.9.4
+++ b/metadata/md5-cache/dev-haskell/hspec-core-2.9.4
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/base-orphans ~dev-haskell/hspec-meta-2.9.3 >=dev-haskell/quickcheck-2.14 >=dev-haskell/silently-1.2.4 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Testing Framework for Haskell
 EAPI=8
 HOMEPAGE=https://hspec.github.io/
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0/2.9.4
 SRC_URI=https://hackage.haskell.org/package/hspec-core-2.9.4/hspec-core-2.9.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e059c572013c2d5a2541107ecaa6fd99
+_md5_=45617d223faf88f1029206824aad15c6
diff --git a/metadata/md5-cache/dev-haskell/hspec-discover-2.9.4 b/metadata/md5-cache/dev-haskell/hspec-discover-2.9.4
index fd7baace50e9..74ac9b94dace 100644
--- a/metadata/md5-cache/dev-haskell/hspec-discover-2.9.4
+++ b/metadata/md5-cache/dev-haskell/hspec-discover-2.9.4
@@ -1,16 +1,16 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( ~dev-haskell/hspec-meta-2.9.3 >=dev-haskell/mockery-0.3.5 >=dev-haskell/quickcheck-2.7 ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatically discover and run Hspec tests
 EAPI=8
 HOMEPAGE=https://hspec.github.io/
 INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+IUSE=doc hscolour profile
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0/2.9.4
 SRC_URI=https://hackage.haskell.org/package/hspec-discover-2.9.4/hspec-discover-2.9.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e95ae2fcd6207d55e6501e79ca2c332d
+_md5_=1dd3e26cc27f55fa0d8b38affc49190d
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
index 398c8f14132e..4aa8500763bf 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hspec/hspec-expectations#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/call-stack:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://hackage.haskell.org/package/hspec-expectations-0.8.2/hspec-expectations-0.8.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=af0bc6ee1aec78f9fc58edb0fdf907ce
+_md5_=4521fa337af1ec3493d57d07467df4c1
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-2.9.3 b/metadata/md5-cache/dev-haskell/hspec-meta-2.9.3
index 8ec83286dede..bd275b1a9dbf 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-2.9.3
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-2.9.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hspec.github.io/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/2.9.3
 SRC_URI=https://hackage.haskell.org/package/hspec-meta-2.9.3/hspec-meta-2.9.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b29d1b00aa6680c22d6984647a7d1f6d
+_md5_=9eec6bea5b3ea78e6d70877d44666f19
diff --git a/metadata/md5-cache/dev-haskell/hspec-wai-0.10.1 b/metadata/md5-cache/dev-haskell/hspec-wai-0.10.1
index 8bfc7eb7eecf..6dfe3746a9d5 100644
--- a/metadata/md5-cache/dev-haskell/hspec-wai-0.10.1
+++ b/metadata/md5-cache/dev-haskell/hspec-wai-0.10.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hspec/hspec-wai#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/hspec-expectations-0.8.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/quickcheck:2=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3:=[profile?] >=dev-haskell/wai-extra-3:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1
 SRC_URI=https://hackage.haskell.org/package/hspec-wai-0.10.1/hspec-wai-0.10.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d30cb98b20a52d7f6562c130c8316a71
+_md5_=ca707bf302e99e1b5220ecd45565c486
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0 b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
index 96d3f2910566..6a69f7dbf762 100644
--- a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell-hvr/HsYAML
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/HsYAML-0.2.1.0/HsYAML-0.2.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0905f04c91bc54cda8f86caae5c9b9fc
+_md5_=77c36d0a22a65f9d94204492382f7e4a
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1 b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
index 3036b8f2e43c..40571b3021d2 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/html
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.2
 SRC_URI=https://hackage.haskell.org/package/html-1.0.1.2/html-1.0.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e0cb28b63efb27661d754e95440fefb6
+_md5_=e8148eee89b4d49a9c20658229df9910
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1 b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
index 9e7dd647a650..f070bb6dea81 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/xml
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/html-conduit-1.3.2.1/html-conduit-1.3.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e2c65eac12914c3885f8ecfddfdf73b4
+_md5_=814fa1539278abe1d5397ceb26889a99
diff --git a/metadata/md5-cache/dev-haskell/http-4000.4.1 b/metadata/md5-cache/dev-haskell/http-4000.4.1
index 1f35494d1479..080beb447333 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.4.1
+++ b/metadata/md5-cache/dev-haskell/http-4000.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/HTTP
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/4000.4.1
 SRC_URI=https://hackage.haskell.org/package/HTTP-4000.4.1/HTTP-4000.4.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0026d4574cc09550826d8c117fbfecaf
+_md5_=64b0f2c7b9df29235bfdc01fb9f2c132
diff --git a/metadata/md5-cache/dev-haskell/http-api-data-0.4.3 b/metadata/md5-cache/dev-haskell/http-api-data-0.4.3
index 4c959546d379..0cfff812cf06 100644
--- a/metadata/md5-cache/dev-haskell/http-api-data-0.4.3
+++ b/metadata/md5-cache/dev-haskell/http-api-data-0.4.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fizruk/https-api-data
 INHERIT=haskell-cabal
 IUSE=text-show doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.2.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/time-compat-1.9.5:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-lang/ghc-8.4.3:= text-show? ( >=dev-haskell/text-show-3.8.2:=[profile?] <dev-haskell/text-show-3.10:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/http-api-data-0.4.3/http-api-data-0.4.3.tar.gz https://hackage.haskell.org/package/http-api-data-0.4.3/revision/6.cabal -> http-api-data-0.4.3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=94d63b6172a8230c65de6ad4815a557e
+_md5_=4a61ca5815699dc7cb47b9187e52488f
diff --git a/metadata/md5-cache/dev-haskell/http-client-0.7.11 b/metadata/md5-cache/dev-haskell/http-client-0.7.11
index 890f9522ba17..41ac94cb14d7 100644
--- a/metadata/md5-cache/dev-haskell/http-client-0.7.11
+++ b/metadata/md5-cache/dev-haskell/http-client-0.7.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/http-client
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/iproute-1.7.5:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.11
 SRC_URI=https://hackage.haskell.org/package/http-client-0.7.11/http-client-0.7.11.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0f54084a9ff1f2b7214973c5885e840d
+_md5_=77094960f0d8019e866652ed51f939c4
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5
index da8308dd8142..0c2f899c8142 100644
--- a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5
+++ b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/http-client-restricted
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.0.5
 SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.5/http-client-restricted-0.0.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cfdd59af9763b13d41e3a9d8bb826a15
+_md5_=a8d34ebc920285b13d6bb818b1254792
diff --git a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1 b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1
index 334ebc4ef50f..7ee25d929ca2 100644
--- a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1
+++ b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/http-client
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.7.11:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.3.6.1
 SRC_URI=https://hackage.haskell.org/package/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e107c52cf5d177f15f9667b40f0821f9
+_md5_=e8dd49bda7dd02702d330dd681866974
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-2.3.8 b/metadata/md5-cache/dev-haskell/http-conduit-2.3.8
index 48af57e08a48..b5b7a2ce3db5 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-2.3.8
+++ b/metadata/md5-cache/dev-haskell/http-conduit-2.3.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/https-conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/aeson-0.8:=[profile?]
 RESTRICT=test
 SLOT=0/2.3.8
 SRC_URI=https://hackage.haskell.org/package/http-conduit-2.3.8/http-conduit-2.3.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=05088d99c7a111c2e3d5ff2da4de7ada
+_md5_=47be00e50cc9bee2e5c4f71389f05d0c
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.8 b/metadata/md5-cache/dev-haskell/http-date-0.0.8
index ec8bcfb41a3b..fdbba5c0f1af 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.8
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/http-date
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.8
 SRC_URI=https://hackage.haskell.org/package/http-date-0.0.8/http-date-0.0.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4ba5a1cc2b851e60a2a6abc596fe526d
+_md5_=c411b4a756b3bcfc89e4893460140a06
diff --git a/metadata/md5-cache/dev-haskell/http-media-0.8.0.0 b/metadata/md5-cache/dev-haskell/http-media-0.8.0.0
index cf7da93bc0c5..c464ee5016e0 100644
--- a/metadata/md5-cache/dev-haskell/http-media-0.8.0.0
+++ b/metadata/md5-cache/dev-haskell/http-media-0.8.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/zmthy/http-media
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/case-insensitive-1.0:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.0.0
 SRC_URI=https://hackage.haskell.org/package/http-media-0.8.0.0/http-media-0.8.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=784ede0200d3ff37544cea65aaf17a85
+_md5_=758db11f7e10d242c78122b4bc61e111
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.12.3 b/metadata/md5-cache/dev-haskell/http-types-0.12.3
index 2826a0347be2..82d690d631d5 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.12.3
+++ b/metadata/md5-cache/dev-haskell/http-types-0.12.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/aristidb/http-types
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.12.3
 SRC_URI=https://hackage.haskell.org/package/http-types-0.12.3/http-types-0.12.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0226db7e2d81bd324c0ae88601ae9075
+_md5_=9d2c63dbacdba948bd66519b1604b866
diff --git a/metadata/md5-cache/dev-haskell/http2-3.0.1 b/metadata/md5-cache/dev-haskell/http2-3.0.1
index bdb42d7dc91e..a429cd44e18d 100644
--- a/metadata/md5-cache/dev-haskell/http2-3.0.1
+++ b/metadata/md5-cache/dev-haskell/http2-3.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/http2
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.5:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] dev-haskell/unix-time:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/3.0.1
 SRC_URI=https://hackage.haskell.org/package/http2-3.0.1/http2-3.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=823e8c5765c3635185d28b5910e8b94c
+_md5_=3548e60f58eb7578d2fa45f06fdd4eb1
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1
index 4f27041a61f5..d8447b28ca33 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/httpd-shed
 INHERIT=haskell-cabal
 IUSE=buildexamples doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?]
 SLOT=0/0.4.1.1
 SRC_URI=https://hackage.haskell.org/package/httpd-shed-0.4.1.1/httpd-shed-0.4.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fb02ba89c9368120c03886552a7568af
+_md5_=680dcf6ed019a35f050de997e7e2eaf4
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.6.2.0 b/metadata/md5-cache/dev-haskell/hunit-1.6.2.0
index 729d1a5def01..c98163fbd172 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.6.2.0
+++ b/metadata/md5-cache/dev-haskell/hunit-1.6.2.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hspec/HUnit#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/call-stack-0.3.0:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.2.0
 SRC_URI=https://hackage.haskell.org/package/HUnit-1.6.2.0/HUnit-1.6.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=08f5e42fdc5e2acf97cccec0c0343a5a
+_md5_=56162217873a6d77f3293e1db0189e03
diff --git a/metadata/md5-cache/dev-haskell/ieee754-0.7.8 b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
index bd42bd3831e5..e4b8046725ee 100644
--- a/metadata/md5-cache/dev-haskell/ieee754-0.7.8
+++ b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/patperry/hs-ieee754
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.8
 SRC_URI=https://hackage.haskell.org/package/ieee754-0.7.8/ieee754-0.7.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fe00ea024610559161006b9da7d02418
+_md5_=a06985f28562152931f6391de40cbe87
diff --git a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1 b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
index e95836af8801..0395e4fafe38 100644
--- a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
+++ b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/IfElse
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.85
 SRC_URI=https://hackage.haskell.org/package/IfElse-0.85/IfElse-0.85.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c5898076cfe11f446ee41d0e5850bdbf
+_md5_=a648c77e9c3073d7a257782357bfb8be
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.2 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.2
index d5de70192624..37173ef55270 100644
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.2
+++ b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/indexed-traversable
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5f77752a8f62fc16c32486359e8c57a0
+_md5_=e70e85e40f86759025db1bcd253f9d1b
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-instances-0.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-instances-0.1
index ed665aaeace6..d3437ea5bd8d 100644
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-instances-0.1
+++ b/metadata/md5-cache/dev-haskell/indexed-traversable-instances-0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/indexed-traversable-instances
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/indexed-traversable-instances-0.1/indexed-traversable-instances-0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9e9514980632460d1fcc7f3a37203707
+_md5_=41d0895593e0b96af7a7ab208b0195f8
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1-r1 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1-r1
index 51a3fb836f4e..1d616558bec3 100644
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskellari/integer-logarithms
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.0.3.1
 SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=30f5a985a93103b0a109f7c402a65e88
+_md5_=b8ef0093dc06c166a7bb15fb624c2859
diff --git a/metadata/md5-cache/dev-haskell/invariant-0.5.5 b/metadata/md5-cache/dev-haskell/invariant-0.5.5
index 429f6b29b6f7..b0f6f43dfc7f 100644
--- a/metadata/md5-cache/dev-haskell/invariant-0.5.5
+++ b/metadata/md5-cache/dev-haskell/invariant-0.5.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/nfrisby/invariant-functors
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.5
 SRC_URI=https://hackage.haskell.org/package/invariant-0.5.5/invariant-0.5.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2d080bd75826ea83fa44d7c2926d6c64
+_md5_=16528ec499dc5e3773e40e9311f0d0aa
diff --git a/metadata/md5-cache/dev-haskell/iproute-1.7.8 b/metadata/md5-cache/dev-haskell/iproute-1.7.8
index c8f88f9e0254..0f42147fcb7d 100644
--- a/metadata/md5-cache/dev-haskell/iproute-1.7.8
+++ b/metadata/md5-cache/dev-haskell/iproute-1.7.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.6.2:=
 RESTRICT=test
 SLOT=0/1.7.8
 SRC_URI=https://hackage.haskell.org/package/iproute-1.7.8/iproute-1.7.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c6178491fd9d6c8f7e3be97ae62d1bd3
+_md5_=9a70aab7f1ff49acc0f58fd3dfcc010b
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.2 b/metadata/md5-cache/dev-haskell/ipynb-0.2
index e59805595631..9678deb3e516 100644
--- a/metadata/md5-cache/dev-haskell/ipynb-0.2
+++ b/metadata/md5-cache/dev-haskell/ipynb-0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/ipynb
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.5.2.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/ipynb-0.2/ipynb-0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9acae9de57e767b38a78691c1e7b6c9b
+_md5_=0f3d2da491251312df52154750db06e7
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.4.0 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.4.0
index f0245906af52..c663790846ee 100644
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.4.0
+++ b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tarleb/jira-wiki-markup
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.0
 SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.4.0/jira-wiki-markup-1.4.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fea9f76fe33d633f0b52b97089e94af4
+_md5_=9bd19bd5caa87026f346908142ea4c0e
diff --git a/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1 b/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1
index 817b9dacb213..4176d760b2bc 100644
--- a/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1
+++ b/metadata/md5-cache/dev-haskell/js-chart-2.9.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jonascarpay/js-chart#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.9.4.1
 SRC_URI=https://hackage.haskell.org/package/js-chart-2.9.4.1/js-chart-2.9.4.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ba4fa3a903b57d80e912d27b7092643a
+_md5_=fed55b6a703c723ecd1ed2cd25d4e1b2
diff --git a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5 b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
index 663a0f03feef..136d4088b923 100644
--- a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
+++ b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/Twinside/Juicy.Pixels
 INHERIT=haskell-cabal
 IUSE=mmap doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/3.3.5
 SRC_URI=https://hackage.haskell.org/package/JuicyPixels-3.3.5/JuicyPixels-3.3.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=095ad7690caa4b6faff70c9fb045667b
+_md5_=095cc16e0fc7f1c3c4d2b718140bfc18
diff --git a/metadata/md5-cache/dev-haskell/kan-extensions-5.2.5 b/metadata/md5-cache/dev-haskell/kan-extensions-5.2.5
index ee2b470ad31e..8554b22e4a41 100644
--- a/metadata/md5-cache/dev-haskell/kan-extensions-5.2.5
+++ b/metadata/md5-cache/dev-haskell/kan-extensions-5.2.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/kan-extensions/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/5.2.5
 SRC_URI=https://hackage.haskell.org/package/kan-extensions-5.2.5/kan-extensions-5.2.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=795a91c6f928d83d7099070ba9db565f
+_md5_=f5809076fcdc06b27d1aecb7611de6ff
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1 b/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
index 011de2a125c8..50744775df59 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.8.3-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://visq.github.io/language-c/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/language-c-0.8.3/language-c-0.8.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=590e27bfad08c2d496defbd156d48abf
+_md5_=e9853fedae548249910bcb4368dec217
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
index fe793772e3cf..08a44578447c 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/finnsson/template-helper
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/language-haskell-extract-0.2.4/language-haskell-extract-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=03b040c8a97f21f5ab84984033048bcd
+_md5_=7b01941581149a343d034d22fb2c411c
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14 b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
index 611a2042b595..8447ed778506 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/erikd/language-javascript
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.0.14
 SRC_URI=https://hackage.haskell.org/package/language-javascript-0.6.0.14/language-javascript-0.6.0.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=10c0b142c5c6c40f482f09c124461ab0
+_md5_=4c4b5e1c1fed0e5062d29d70ede316a1
diff --git a/metadata/md5-cache/dev-haskell/leancheck-0.9.3 b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
index a8666adfa0fd..686bac83dff3 100644
--- a/metadata/md5-cache/dev-haskell/leancheck-0.9.3
+++ b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rudymatela/leancheck#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/leancheck-0.9.3/leancheck-0.9.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=905c35b7d3c0685cd0e746c15a508b18
+_md5_=32f0383910ed818f7b94790ca8fc23c9
diff --git a/metadata/md5-cache/dev-haskell/lens-5.1.1 b/metadata/md5-cache/dev-haskell/lens-5.1.1
index b11d6b6ef5e6..fd75fd374e8f 100644
--- a/metadata/md5-cache/dev-haskell/lens-5.1.1
+++ b/metadata/md5-cache/dev-haskell/lens-5.1.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/lens/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/assoc-1.0.2:=[profile?] <dev-haskell/assoc-1.1:=[profile?] >=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.7:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.5:=[profile?] >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.4:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-5.1.5:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/parallel-3.2.1.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5.5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.0.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.10:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/5.1.1
 SRC_URI=https://hackage.haskell.org/package/lens-5.1.1/lens-5.1.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1f15262b9b9c049dd2abe1fa1c910431
+_md5_=68d36081237388654697eb67a189919e
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0 b/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
index 94657c887893..8acd79fceead 100644
--- a/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.9.2.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.6.3.5:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.2.0
 SRC_URI=https://hackage.haskell.org/package/libmpd-0.9.2.0/libmpd-0.9.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=55b0ffb3e3e3990e1aff1006b05cf950
+_md5_=1e58aba122f578af43e77a2b6f364024
diff --git a/metadata/md5-cache/dev-haskell/libyaml-0.1.2 b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
index d3b85b1454d8..cd258db17a89 100644
--- a/metadata/md5-cache/dev-haskell/libyaml-0.1.2
+++ b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/yaml#readme
 INHERIT=haskell-cabal
 IUSE=no-unicode system-libyaml doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-lang/ghc-8.0.2:= system-libyaml? ( dev-libs/libyaml )
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/libyaml-0.1.2/libyaml-0.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3583b40462506c4b6af7fb674e834bdc
+_md5_=66a8564e69b208dcf3aca222e036cdab
diff --git a/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1 b/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
index 3990886f72ab..8441a07d4d14 100644
--- a/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/lift-type-0.1.0.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/parsonsmatt/lift-type#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/lift-type-0.1.0.1/lift-type-0.1.0.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3a809c6f0eddcb78e60ffebf372e6879
+_md5_=7acf25183c633622fa8962240ca520e2
diff --git a/metadata/md5-cache/dev-haskell/lifted-async-0.10.2 b/metadata/md5-cache/dev-haskell/lifted-async-0.10.2
index 9c2cd1a1c387..2c553ef1ad07 100644
--- a/metadata/md5-cache/dev-haskell/lifted-async-0.10.2
+++ b/metadata/md5-cache/dev-haskell/lifted-async-0.10.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/maoe/lifted-async
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.2
 SRC_URI=https://hackage.haskell.org/package/lifted-async-0.10.2/lifted-async-0.10.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3c123b417b1165984188f573a77733a3
+_md5_=ee81abc5465dc6035583833749a4d944
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
index e54a4b5c8bc4..235bf0aefa39 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/basvandijk/lifted-base
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.12
 SRC_URI=https://hackage.haskell.org/package/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=40ed862e96402a844e53fa3a7418d44c
+_md5_=cf3d0f185f472756ab4895fba21e82cb
diff --git a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0 b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
index 06e69d7f9beb..db69c66e05de 100644
--- a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
+++ b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/sol/logging-facade#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/logging-facade-0.3.0/logging-facade-0.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4b553349f6ac0184176772c969a2276d
+_md5_=17ab9cd41a4c46912c29c19bbe577273
diff --git a/metadata/md5-cache/dev-haskell/logict-0.7.0.3 b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
index da6d621f4258..38478048cd17 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.7.0.3
+++ b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/logict#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0.3
 SRC_URI=https://hackage.haskell.org/package/logict-0.7.0.3/logict-0.7.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4e4b0478c2824016f6e2e0b6d17d8a2f
+_md5_=9d4d2483a4aa0a8585e296ab0b99d440
diff --git a/metadata/md5-cache/dev-haskell/lpeg-1.0.3 b/metadata/md5-cache/dev-haskell/lpeg-1.0.3
index 710562036e5d..a767570440f3 100644
--- a/metadata/md5-cache/dev-haskell/lpeg-1.0.3
+++ b/metadata/md5-cache/dev-haskell/lpeg-1.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=rely-on-shared-lpeg-library doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/lpeg-1.0.3/lpeg-1.0.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6905ea6a5f2bc845a47f83896718d632
+_md5_=fbcdf40b240150237ff68fe1e6f59d0e
diff --git a/metadata/md5-cache/dev-haskell/lua-2.2.0 b/metadata/md5-cache/dev-haskell/lua-2.2.0
index 3b85678a4298..2ff4001e8477 100644
--- a/metadata/md5-cache/dev-haskell/lua-2.2.0
+++ b/metadata/md5-cache/dev-haskell/lua-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=system-lua doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:= system-lua? ( dev-lang/lua:5.4 )
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://hackage.haskell.org/package/lua-2.2.0/lua-2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ff3aaa92dfc9835fbe0b639412603984
+_md5_=0dbb92e3a26d489e4fb2cb27b9d69218
diff --git a/metadata/md5-cache/dev-haskell/lua-arbitrary-1.0.1 b/metadata/md5-cache/dev-haskell/lua-arbitrary-1.0.1
index 436a1fb48f90..4cca5c2439f2 100644
--- a/metadata/md5-cache/dev-haskell/lua-arbitrary-1.0.1
+++ b/metadata/md5-cache/dev-haskell/lua-arbitrary-1.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/lua-2.0:=[profile?] <dev-haskell/lua-2.3:=[profile?] >=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.0.1
 SRC_URI=https://hackage.haskell.org/package/lua-arbitrary-1.0.1/lua-arbitrary-1.0.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=de9ad38d94229255f915eddc612a7780
+_md5_=c141c5cd70149591e7d9bbb3cd2f20db
diff --git a/metadata/md5-cache/dev-haskell/lukko-0.1.1.3 b/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
index 81742b5f52ba..5ab07b61b1bd 100644
--- a/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/lukko
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/lukko-0.1.1.3/lukko-0.1.1.3.tar.gz https://hackage.haskell.org/package/lukko-0.1.1.3/revision/2.cabal -> lukko-0.1.1.3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8b6b1af2971f03cb0f94b304b8c8ea81
+_md5_=76b6b6b2f14dc95c2b4204874a8e1817
diff --git a/metadata/md5-cache/dev-haskell/magic-1.1 b/metadata/md5-cache/dev-haskell/magic-1.1
index 15959f726b7e..ac9578a5dd7e 100644
--- a/metadata/md5-cache/dev-haskell/magic-1.1
+++ b/metadata/md5-cache/dev-haskell/magic-1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/magic
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/magic-1.1/magic-1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f93a596a68db1a10788359a0440dd5d3
+_md5_=7ad54ccdf7371b17b6e9434c9dee0fd0
diff --git a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0 b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
index d2035d39332d..fcbfca959f61 100644
--- a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
+++ b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/sol/markdown-unlit#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/markdown-unlit-0.5.0/markdown-unlit-0.5.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7beed1fbe37c60190acc902ad3e4dd7c
+_md5_=791f2a8eae7356031a087d47a36c898a
diff --git a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0 b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
index d6af439e0408..cdf804603f75 100644
--- a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/math-functions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/math-functions-0.3.3.0/math-functions-0.3.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e34171ac5c48e19ac2d136eaf3695788
+_md5_=d2baba49a5f492c1c23a05a7db426ffc
diff --git a/metadata/md5-cache/dev-haskell/memory-0.15.0-r1 b/metadata/md5-cache/dev-haskell/memory-0.15.0-r1
index 3cfcac1a4fcd..7961eec0a5b5 100644
--- a/metadata/md5-cache/dev-haskell/memory-0.15.0-r1
+++ b/metadata/md5-cache/dev-haskell/memory-0.15.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-memory
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.0
 SRC_URI=https://hackage.haskell.org/package/memory-0.15.0/memory-0.15.0.tar.gz https://patch-diff.githubusercontent.com/raw/vincenthz/hs-memory/pull/81.patch -> memory-81.patch
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=067b9162aab6fda2c651bfe6ca9e0789
+_md5_=0221410da56a70821d6e8ad071148ab4
diff --git a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2 b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
index cbc7e9614dfa..c3d97724077c 100644
--- a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
+++ b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/stevenfontanella/microlens
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.11.2
 SRC_URI=https://hackage.haskell.org/package/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1d3eb64251e1ae4214a33bacf940eaa5
+_md5_=b27d7af71550b4b3103e91e5c6729c4f
diff --git a/metadata/md5-cache/dev-haskell/microlens-aeson-2.5.0 b/metadata/md5-cache/dev-haskell/microlens-aeson-2.5.0
index 78a871bf37fd..49ca2f9a4edf 100644
--- a/metadata/md5-cache/dev-haskell/microlens-aeson-2.5.0
+++ b/metadata/md5-cache/dev-haskell/microlens-aeson-2.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fosskers/microlens-aeson/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-2.0:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/microlens-0.3:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.5.0
 SRC_URI=https://hackage.haskell.org/package/microlens-aeson-2.5.0/microlens-aeson-2.5.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ec9b22427ced3a839f6e9129c9dd0e84
+_md5_=4126074800a6eaa867b3f0e7fdcb166f
diff --git a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1 b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
index b4ba4441c0dd..ad7d57e93b09 100644
--- a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/monadfix/microlens
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e039b1577fa8067e1a147718be5c3907
+_md5_=c7c9684984ef3fff5d1735270869553e
diff --git a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10 b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
index eae12d6c7c98..b42b56d985b4 100644
--- a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
+++ b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/stevenfontanella/microlens
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.10
 SRC_URI=https://hackage.haskell.org/package/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5fc08776acdb8a6f15a6bc649da5f56d
+_md5_=95c98b4630843bb0629a70f7caa00e26
diff --git a/metadata/md5-cache/dev-haskell/microstache-1.0.2 b/metadata/md5-cache/dev-haskell/microstache-1.0.2
index 20706b53084c..72244c4d2d2c 100644
--- a/metadata/md5-cache/dev-haskell/microstache-1.0.2
+++ b/metadata/md5-cache/dev-haskell/microstache-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/microstache
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/microstache-1.0.2/microstache-1.0.2.tar.gz https://hackage.haskell.org/package/microstache-1.0.2/revision/3.cabal -> microstache-1.0.2-rev3.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=07d3660e5970967eaab9928e36d98119
+_md5_=eb3f27bf2058ba89372c6c7b0572169c
diff --git a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9 b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
index f1e1b2a644af..23ca5a7fe9cb 100644
--- a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4f9eea2bca6ef33f9e7e71490b89e7d8
+_md5_=6f8f60c43a20d86995d2be483b14d0f9
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1 b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1
index b8f96cba7a14..0dd90cfd140d 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/MissingH
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] dev-haskell/random >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 RESTRICT=test
 SLOT=0/1.4.3.0
 SRC_URI=https://hackage.haskell.org/package/MissingH-1.4.3.0/MissingH-1.4.3.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8b564da26574563b5a4a309097838b9b
+_md5_=5f78e0d451f787189c96d55636ff2bc7
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index 998b8f3b837c..bf6866aa04e4 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mmap
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=https://hackage.haskell.org/package/mmap-0.5.9/mmap-0.5.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1caf97c8c347bda9f7fbd67b8d92e4c9
+_md5_=d67e8dd607f9783a04b8904dab0b8e17
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.1.3 b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
index ded086e3ba33..cc4410a1b1f8 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.1.3
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mmorph
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.3
 SRC_URI=https://hackage.haskell.org/package/mmorph-1.1.3/mmorph-1.1.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8d39b766bb47a7626e3582c5bbda5297
+_md5_=2352cad193ffbbaf7bf73a3a08a691f3
diff --git a/metadata/md5-cache/dev-haskell/mockery-0.3.5 b/metadata/md5-cache/dev-haskell/mockery-0.3.5
index 20c80530c1d5..7b01e5ef6fe0 100644
--- a/metadata/md5-cache/dev-haskell/mockery-0.3.5
+++ b/metadata/md5-cache/dev-haskell/mockery-0.3.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/mockery
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/mockery-0.3.5/mockery-0.3.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=98c5c26fbf232fd6f407cbd1cf434fb6
+_md5_=c23c27627be202f06d99dff0f7dbecfb
diff --git a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3 b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
index b9b85956c45e..49d7c97ed9d1 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
+++ b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/basvandijk/monad-control
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.2.3
 SRC_URI=https://hackage.haskell.org/package/monad-control-1.0.2.3/monad-control-1.0.2.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4422c57301c90a94d0df832a6a9f560f
+_md5_=d726749a889720359389a0d5833fd3ec
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
index 5567bc56be79..d0189e499751 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/monad-logger#readme
 INHERIT=haskell-cabal
 IUSE=+template-haskell doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.32
 SRC_URI=https://hackage.haskell.org/package/monad-logger-0.3.32/monad-logger-0.3.32.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9c52d73bdb1cd6ccaded215c82147c3c
+_md5_=3e8a980b0fa43ee09a653b12dfadd7a1
diff --git a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3 b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
index fba770ae1509..ca277a3deae0 100644
--- a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
+++ b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/mokus0/monad-loops
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3a5b53c28b870f731f9bd0ce2e552998
+_md5_=db2f0d80e1c5b59405e6c00853bde29f
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1 b/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
index acf298dbb1cf..0aed7d197efa 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
 IUSE=chaselev doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/monad-par-0.3.5/monad-par-0.3.5.tar.gz https://hackage.haskell.org/package/monad-par-0.3.5/revision/2.cabal -> monad-par-0.3.5-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fee0fde90b821367dffa756e8b142e4b
+_md5_=72066f5ffba4c908652e0087d8eff2af
diff --git a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1 b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
index 6d9c7222c4e3..f27e4cc9581d 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/monad-par-extras-0.3.3/monad-par-extras-0.3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=70aae6e2418ba36713cebfddd6a1c15b
+_md5_=6aac9da45930f09ac049936fc9ca54cf
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
index 756fe7c4bc48..ea2398a20e14 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/monads-tf
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/monads-tf-0.1.0.3/monads-tf-0.1.0.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d538f0b0162ef1e522448bf6d0e7afa2
+_md5_=99096e08cb2d6bcf8e58a756e7d7fc69
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1 b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
index 556fe1ca3768..b79afa6ca5ac 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] >=dev-lang/ghc-8.2.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.15.1
 SRC_URI=https://hackage.haskell.org/package/mono-traversable-1.0.15.1/mono-traversable-1.0.15.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fab376455cf3dfc4d0ce92ef8cfb49fb
+_md5_=020d89f339b84c45d7f2f874b37adfaa
diff --git a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2 b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
index 5bf21f1b77e2..d910e9f43d7e 100644
--- a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
+++ b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mountpoints
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/mountpoints-1.0.2/mountpoints-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4f3b8ad5f69d4ed9c76f00916584deae
+_md5_=c6aa5143df0f07143e2f8826189f3f98
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
index ec261e19d277..75278f07f5e6 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/mtl
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 SLOT=0/2.2.2
 SRC_URI=https://hackage.haskell.org/package/mtl-2.2.2/mtl-2.2.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=99c5e08e419e57d65da614d08d3517c3
+_md5_=7744ddbf77a661bf66ae6a4c66b20cac
diff --git a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0 b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
index 8dca7fb5e3db..188ee259b8db 100644
--- a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
+++ b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/mwc-random
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/math-functions-0.2.1.0:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.14.0.0
 SRC_URI=https://hackage.haskell.org/package/mwc-random-0.14.0.0/mwc-random-0.14.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4bef7e485d077d299a9ddab3b9adc5d0
+_md5_=924136a2f59b002da42be8db9c4a5404
diff --git a/metadata/md5-cache/dev-haskell/nanospec-0.2.2 b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
index 1159449222f1..0f42033b98a5 100644
--- a/metadata/md5-cache/dev-haskell/nanospec-0.2.2
+++ b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hspec/nanospec#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/nanospec-0.2.2/nanospec-0.2.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2927a3fbe1055de86aaa7883b5fa285e
+_md5_=f1b7a91d21a446a7c17424657088050a
diff --git a/metadata/md5-cache/dev-haskell/nats-1.1.2-r1 b/metadata/md5-cache/dev-haskell/nats-1.1.2-r1
index 95a5bab40512..e216d0a70d0d 100644
--- a/metadata/md5-cache/dev-haskell/nats-1.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/nats-1.1.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/nats/
 INHERIT=haskell-cabal
 IUSE=+binary +hashable +template-haskell profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.2.0:=[profile?] )
 SLOT=0/1.1.2
 SRC_URI=https://hackage.haskell.org/package/nats-1.1.2/nats-1.1.2.tar.gz https://hackage.haskell.org/package/nats-1.1.2/revision/3.cabal -> nats-1.1.2-r1.cabal
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1348ef0ae29d3c653a9bc8095c733a85
+_md5_=e79181328abc0617df30f3f4393804f6
diff --git a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1 b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1
index 61d8bb817983..3564a36b3671 100644
--- a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/Ongy/netlink-hs
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/netlink-1.1.1.0/netlink-1.1.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5db30e5ea0b961af81cea3a484125198
+_md5_=50150ea5394a0748faa32c52a95f3387
diff --git a/metadata/md5-cache/dev-haskell/network-3.1.2.5 b/metadata/md5-cache/dev-haskell/network-3.1.2.5
index 98f0f0f96151..3f8a985f1cb5 100644
--- a/metadata/md5-cache/dev-haskell/network-3.1.2.5
+++ b/metadata/md5-cache/dev-haskell/network-3.1.2.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/network
 INHERIT=haskell-cabal
 IUSE=devel doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/3.1.2.5
 SRC_URI=https://hackage.haskell.org/package/network-3.1.2.5/network-3.1.2.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=67a0830396b3de73436fab954b336552
+_md5_=59e98cbff8093c51cb113712a99b6f34
diff --git a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1 b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1
index 48aaf1d24961..9f8cc8f4a234 100644
--- a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/network-bsd
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
 SLOT=0/2.8.1.0
 SRC_URI=https://hackage.haskell.org/package/network-bsd-2.8.1.0/network-bsd-2.8.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0645c5262e24dd0079fd8b737adb7b27
+_md5_=20dc2000b12ad072afa539eba9c4ad32
diff --git a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6 b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6
index dd49d8025ffa..51d19888bccd 100644
--- a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6
+++ b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-byte-order
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.6/network-byte-order-0.1.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c7d5a4569041961580ddf9f7b82d838c
+_md5_=2ddea976f4b00da93204ee9439bbe3bd
diff --git a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10 b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
index cb9b7711e83b..0ba34fb3b125 100644
--- a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
+++ b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jystic/network-info
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.10
 SRC_URI=https://hackage.haskell.org/package/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=308b61e97039c373a5cc42e3b37be770
+_md5_=6dab8705cd6c506874d3e3239216acdd
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
index 8ef2216fd4b3..e1c056a94be6 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-multicast
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=public-domain
 RDEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8a2d5f488c2044ab0b1dfe79c96c119d
+_md5_=a30fdc2193795ce27612a593673bc0b1
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.4.1 b/metadata/md5-cache/dev-haskell/network-uri-2.6.4.1
index 1df366f6d966..8bbfd6d4033f 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.4.1
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.4.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell/network-uri
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/2.6.4.1
 SRC_URI=https://hackage.haskell.org/package/network-uri-2.6.4.1/network-uri-2.6.4.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=86715239649776754df7b771c2bfa525
+_md5_=ddadd21d0501d00506337def0d5cfe09
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index adddb099cabf..7eca5e11f17c 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/old-locale
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8443c2a73e0f3517a74733937ddef8ce
+_md5_=4424a7138410ebadccf0e5d1029f314e
diff --git a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1 b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
index 4a289936e386..9a8b7acc3877 100644
--- a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/old-time
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.3
 SRC_URI=https://hackage.haskell.org/package/old-time-1.1.0.3/old-time-1.1.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7f86f166b63d8c289ef0337540822619
+_md5_=f7fedc75795d86a021ff67e981ffd749
diff --git a/metadata/md5-cache/dev-haskell/onetuple-0.3.1 b/metadata/md5-cache/dev-haskell/onetuple-0.3.1
index 91b3deee0e29..14cbe456c38b 100644
--- a/metadata/md5-cache/dev-haskell/onetuple-0.3.1
+++ b/metadata/md5-cache/dev-haskell/onetuple-0.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/OneTuple
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.6:=[profile?] >=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz -> onetuple-0.3.1.tar.gz https://hackage.haskell.org/package/OneTuple-0.3.1/revision/2.cabal -> onetuple-0.3.1-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5d1dba8af349377c410484369ec4f425
+_md5_=55debd029fea2106622cf01e5710421d
diff --git a/metadata/md5-cache/dev-haskell/only-0.1 b/metadata/md5-cache/dev-haskell/only-0.1
index c7620b326c9b..de8b60d38a0f 100644
--- a/metadata/md5-cache/dev-haskell/only-0.1
+++ b/metadata/md5-cache/dev-haskell/only-0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Only
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/Only-0.1/Only-0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e274bef46dfdcffe066f97bdba2d0cda
+_md5_=694b32ccbfc2c383a0049ecab1282d00
diff --git a/metadata/md5-cache/dev-haskell/options-1.2.1.1 b/metadata/md5-cache/dev-haskell/options-1.2.1.1
index cf92044b08c2..01a6b7f883da 100644
--- a/metadata/md5-cache/dev-haskell/options-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/options-1.2.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-options/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.1.1
 SRC_URI=https://hackage.haskell.org/package/options-1.2.1.1/options-1.2.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=217dd136fa206c5dc76f1e4cd4eba87d
+_md5_=3da8ab7c7bc6014a9ff1ec528839fe3e
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.16.1.0 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.16.1.0
index 725c255a7070..0f5c2abb36fe 100644
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.16.1.0
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.16.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.16.1.0
 SRC_URI=https://hackage.haskell.org/package/optparse-applicative-0.16.1.0/optparse-applicative-0.16.1.0.tar.gz https://hackage.haskell.org/package/optparse-applicative-0.16.1.0/revision/2.cabal -> optparse-applicative-0.16.1.0.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ca3673b7606ad0687cb19ebb5ad04ff9
+_md5_=020b8e5b6e653c9a4a1cbadd78903ca3
diff --git a/metadata/md5-cache/dev-haskell/pandoc-lua-marshal-0.1.6 b/metadata/md5-cache/dev-haskell/pandoc-lua-marshal-0.1.6
index e5e42d25a0bb..6e40c69cf172 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-lua-marshal-0.1.6
+++ b/metadata/md5-cache/dev-haskell/pandoc-lua-marshal-0.1.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pandoc/pandoc-lua-marshal
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?] >=dev-haskell/pandoc-types-1.22.1:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://hackage.haskell.org/package/pandoc-lua-marshal-0.1.6/pandoc-lua-marshal-0.1.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=12370d6449e3ec57523c38972628276b
+_md5_=c349e189fd4f766b8957fc52734665f9
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.22.2 b/metadata/md5-cache/dev-haskell/pandoc-types-1.22.2
index 533ea24f2fb6..97a29151e1cc 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.22.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.22.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pandoc.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.22.2
 SRC_URI=https://hackage.haskell.org/package/pandoc-types-1.22.2/pandoc-types-1.22.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8ff98e94b7f07241e0445c62391b0aaa
+_md5_=35c606eb19332121e0f5988a8b86c92a
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0 b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
index d43c62ad7b68..74f555a27964 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/parallel
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=3/3.2.2.0
 SRC_URI=https://hackage.haskell.org/package/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=bdb35582fb1c03b308c56e27386e6ae2
+_md5_=533f2292d0cbf4a84d1d2798eae62a1f
diff --git a/metadata/md5-cache/dev-haskell/parallel-io-0.3.5 b/metadata/md5-cache/dev-haskell/parallel-io-0.3.5
index 35f2b1c6dec9..22af17b08c74 100644
--- a/metadata/md5-cache/dev-haskell/parallel-io-0.3.5
+++ b/metadata/md5-cache/dev-haskell/parallel-io-0.3.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://batterseapower.github.com/parallel-io
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/parallel-io-0.3.5/parallel-io-0.3.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=004fb627ab1f644fb536f0bcca6de011
+_md5_=34e581c3b322b4eb6e0895861d44a093
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0-r1 b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0-r1
index 96c5a9c32ea0..910afe15252c 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0-r1
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/parsec
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
 RESTRICT=test
 SLOT=0/3.1.14.0
 SRC_URI=https://hackage.haskell.org/package/parsec-3.1.14.0/parsec-3.1.14.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=381bb2fa90bc0be40c064902626856b2
+_md5_=16f39e2c1b2571578ad481b5b9906b26
diff --git a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0 b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
index 308b63150eff..f3647c24dc17 100644
--- a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
+++ b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/parsec-numbers
 INHERIT=haskell-cabal
 IUSE=parsec1 doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= parsec1? ( dev-haskell/parsec1:=[profile?] ) !parsec1? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/parsec-numbers-0.1.0/parsec-numbers-0.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d544dfe7cc741d064116810da601220b
+_md5_=881d235880e3fb6f566c210dce780ada
diff --git a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7 b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
index c17489b37c29..e4f5b9ced8e3 100644
--- a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/parsec1
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/parsec1-1.0.0.7/parsec1-1.0.0.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=700a28269ebf5cfa32e6f8b7cbeef05f
+_md5_=64ba6b12773c9478bb3db5f0113ee319
diff --git a/metadata/md5-cache/dev-haskell/parsers-0.12.10-r1 b/metadata/md5-cache/dev-haskell/parsers-0.12.10-r1
index 87d3b78a0f66..222b7087218a 100644
--- a/metadata/md5-cache/dev-haskell/parsers-0.12.10-r1
+++ b/metadata/md5-cache/dev-haskell/parsers-0.12.10-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/parsers/
 INHERIT=haskell-cabal
 IUSE=+attoparsec +binary +parsec doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:= attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.12.10
 SRC_URI=https://hackage.haskell.org/package/parsers-0.12.10/parsers-0.12.10.tar.gz https://hackage.haskell.org/package/parsers-0.12.10/revision/2.cabal -> parsers-0.12.10-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=dc55a4f517b3771bcdd9bb78c2b51d56
+_md5_=e2f3fd6f81af16f49613b61421c2753c
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1 b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
index 15274075f662..827eb9bca1ff 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/path-pieces
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=92a54cb25941ed2dcc9506d9c5206a22
+_md5_=25e8e3c32c0b681959487c83fbdd502e
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
index e5efa7c7f202..477f2cac4ae5 100644
--- a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/patience
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/patience-0.1.1/patience-0.1.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=01d84c0346a9f2c3e9d006016675801f
+_md5_=ca1ff056a5fe2712287948d33aefdbe4
diff --git a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0 b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
index 99e4b8cfc055..141d961421e4 100644
--- a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/Daniel-Diaz/pcre-light
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1.0
 SRC_URI=https://hackage.haskell.org/package/pcre-light-0.4.1.0/pcre-light-0.4.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=50e91b7f8140723e48555a256b264ee1
+_md5_=4088096b45c7eec5069ca185e44da5f4
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.4 b/metadata/md5-cache/dev-haskell/pem-0.2.4
index 386b130a1113..75e41cb065ae 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.4
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-pem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/pem-0.2.4/pem-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=beeccc492917a3ae2bf6bdf668dd38b9
+_md5_=09ba2992ef9d564ef401027eadd7dc1c
diff --git a/metadata/md5-cache/dev-haskell/persistent-2.14.0.3 b/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
index c59dc0ab6cf8..31bd9f41c3bb 100644
--- a/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
+++ b/metadata/md5-cache/dev-haskell/persistent-2.14.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/fast-logger-2.4:=[profile?] >=dev-haskell/http-api-data-0.3:=[profile?] >=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?] >=dev-haskell/monad-logger-0.3.28:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/resource-pool-0.2.3:=[profile?] >=dev-haskell/resourcet-1.1.10:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vault:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.14.0.3
 SRC_URI=https://hackage.haskell.org/package/persistent-2.14.0.3/persistent-2.14.0.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cab16e4b36c21785260c4e9f427c1bc7
+_md5_=6297347e81e999d581fb6b9b11582a8e
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0 b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0
index fb0b4e2ea8e6..5e2bdb098fcb 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.13.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=build-sanity-exe doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.4.3:= virtual/libc
 RESTRICT=!test? ( test )
 SLOT=0/2.13.1.0
 SRC_URI=https://hackage.haskell.org/package/persistent-sqlite-2.13.1.0/persistent-sqlite-2.13.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9be6a1480c24095eaf4977045593ec58
+_md5_=cacea1c5bcf607d667deaff2bd4cf2ad
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0 b/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
index 1e9a76adc1ff..7bfd88240e2a 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
+++ b/metadata/md5-cache/dev-haskell/persistent-template-2.12.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/2.12.0.0
 SRC_URI=https://hackage.haskell.org/package/persistent-template-2.12.0.0/persistent-template-2.12.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1f404ce46c594afa7d083a2a25979e37
+_md5_=68fc2c9be4ee2471b98f13003b773f32
diff --git a/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3 b/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
index 10a15b4b3fd0..783ee5ec8b59 100644
--- a/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
+++ b/metadata/md5-cache/dev-haskell/persistent-test-2.13.1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/persistent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/hspec-2.4:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/http-api-data:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/persistent-2.14:=[profile?] <dev-haskell/persistent-2.15:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.10.1:=
 SLOT=0/2.13.1.3
 SRC_URI=https://hackage.haskell.org/package/persistent-test-2.13.1.3/persistent-test-2.13.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=077868f672ee71e9a33a3affb47d500f
+_md5_=8789e304d598cc35e18d9efb6df35456
diff --git a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3 b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
index a23e72aaf54c..136023d15eaa 100644
--- a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/quchen/pgp-wordlist
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/pgp-wordlist-0.1.0.3/pgp-wordlist-0.1.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=88c89767af8b6beb3a9cba0e6c52461c
+_md5_=7cbaa158d85d6dfc263e139658d55d47
diff --git a/metadata/md5-cache/dev-haskell/pretty-hex-1.0 b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
index 87e0bb90d9c7..4ffdaa7278f6 100644
--- a/metadata/md5-cache/dev-haskell/pretty-hex-1.0
+++ b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/pretty-hex
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/pretty-hex-1.0/pretty-hex-1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7067a3785acc7c77d88efd2a57ef0c22
+_md5_=8eeae4ddac56e902744c82a606da670e
diff --git a/metadata/md5-cache/dev-haskell/pretty-show-1.10 b/metadata/md5-cache/dev-haskell/pretty-show-1.10
index d75960b63b69..f540ee815191 100644
--- a/metadata/md5-cache/dev-haskell/pretty-show-1.10
+++ b/metadata/md5-cache/dev-haskell/pretty-show-1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.github.com/yav/pretty-show
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/haskell-lexer-1.1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.10
 SRC_URI=https://hackage.haskell.org/package/pretty-show-1.10/pretty-show-1.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4f1231dc68bd9cae684469b5553511c5
+_md5_=b6945e202ed1736cda19c9e9575c638b
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.7.0 b/metadata/md5-cache/dev-haskell/prettyprinter-1.7.0
index 53aa8b148762..7e1a8530bd2b 100644
--- a/metadata/md5-cache/dev-haskell/prettyprinter-1.7.0
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-1.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/quchen/prettyprinter
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.7.0
 SRC_URI=https://hackage.haskell.org/package/prettyprinter-1.7.0/prettyprinter-1.7.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a0158a35330a740b50a91d74a9967e13
+_md5_=04ac43b82e2de09fdbf57ba3b681ecfa
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.2 b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.2
index b62e02575b26..c1c0b1dd71ac 100644
--- a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.2
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/quchen/prettyprinter
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinter-1.1.1:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.2
 SRC_URI=https://hackage.haskell.org/package/prettyprinter-ansi-terminal-1.1.2/prettyprinter-ansi-terminal-1.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=95e0745e23d2d2a5d24e8be06be0286b
+_md5_=a01c98d1d1384d789d70b2f0198c93ee
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.7.3.0 b/metadata/md5-cache/dev-haskell/primitive-0.7.3.0
index 5a106a4c781b..72272bff1ea7 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.7.3.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.7.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/primitive
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.7.3.0
 SRC_URI=https://hackage.haskell.org/package/primitive-0.7.3.0/primitive-0.7.3.0.tar.gz https://hackage.haskell.org/package/primitive-0.7.3.0/revision/2.cabal -> primitive-0.7.3.0-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6bf986ad1177939f11f2c7bfdf5f282a
+_md5_=0d9dce8ac91641f387380b49cffa3d6f
diff --git a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2 b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
index cc240023ad45..4099f4511d6c 100644
--- a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
+++ b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/andrewthad/primitive-addr
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-7.4.2:=
 SLOT=0/0.1.0.2
 SRC_URI=https://hackage.haskell.org/package/primitive-addr-0.1.0.2/primitive-addr-0.1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0025e82468c8b1e51c720e3495d3f2b2
+_md5_=69dbf2f0baa076847ac62ff5fd21cb56
diff --git a/metadata/md5-cache/dev-haskell/profunctors-5.6.2 b/metadata/md5-cache/dev-haskell/profunctors-5.6.2
index cd28ce28f14d..59906fee5052 100644
--- a/metadata/md5-cache/dev-haskell/profunctors-5.6.2
+++ b/metadata/md5-cache/dev-haskell/profunctors-5.6.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/profunctors/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/5.6.2
 SRC_URI=https://hackage.haskell.org/package/profunctors-5.6.2/profunctors-5.6.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=feb25f08cb4d75fd352fd2db1d65b603
+_md5_=3f85da981e206900cce7ae3633512e04
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.3 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.3
index 693e076725c1..e9a7de578d35 100644
--- a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.3
+++ b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/psqueues
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.7.3
 SRC_URI=https://hackage.haskell.org/package/psqueues-0.2.7.3/psqueues-0.2.7.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=aba7f0938fc6279d821facc64b70ff54
+_md5_=ce4dbf3ac2cb987c369192094c1cca8e
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.3 b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
index 0e731f983058..276e6881824a 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.3
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/pureMD5
 INHERIT=haskell-cabal
 IUSE=test doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/pureMD5-2.1.3/pureMD5-2.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a1ea80069b5acd5e6a4b4657720d99fe
+_md5_=7a7d2a3fde84b188c98433a1ba400604
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.14.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.14.2
index 0318465e0ff4..859a717d42c4 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.14.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.14.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/nick8325/quickcheck
 INHERIT=haskell-cabal
 IUSE=+template-haskell doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=2/2.14.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=adc3f4f8f1cea998815676ecfef98b48
+_md5_=ed05fa82c97bb49b133cc0c25d172801
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
index e80035fd78cc..79e773c628ca 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
 INHERIT=haskell-cabal
 IUSE=+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?] >=dev-haskell/quickcheck-classes-base-0.6:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= aeson? ( >=dev-haskell/aeson-0.9:=[profile?] ) binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) semigroupoids? ( dev-haskell/semigroupoids:=[profile?] ) semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) vector? ( >=dev-haskell/vector-0.12:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.4.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-0.6.4.0/quickcheck-classes-0.6.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=da86f74c9845c3e11199acb3c874b9a1
+_md5_=730ef24a82b26360361cacd7965b0967
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0
index fbf590b9b8f6..d9bb9eaa4b76 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
 INHERIT=haskell-cabal
 IUSE=+binary-laws +unary-laws doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/contravariant:=[profile?] >=dev-lang/ghc-8.4.3:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
 SLOT=0/0.6.2.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-base-0.6.2.0/quickcheck-classes-base-0.6.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1dbc6d84b664101817d88a60e4060717
+_md5_=b258c4779e649420aec743914e61825a
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.27 b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.27
index c08a6d03bdcb..eba01bad77bf 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.27
+++ b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/qc-instances
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/data-fix-0.3:=[profile?] <dev-haskell/data-fix-0.4:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/integer-logarithms-1.0.3:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?] >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?] >=dev-haskell/quickcheck-2.14.1:2=[profile?] <dev-haskell/quickcheck-2.14.3:2=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.2:=[profile?] >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-short-0.1.3:=[profile?] <dev-haskell/text-short-0.2:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.27
 SRC_URI=https://hackage.haskell.org/package/quickcheck-instances-0.3.27/quickcheck-instances-0.3.27.tar.gz https://hackage.haskell.org/package/quickcheck-instances-0.3.27/revision/1.cabal -> quickcheck-instances-0.3.27.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=57e4c4ba1b6c00934b6b959986d18337
+_md5_=e511d827abc67fd57046af2982f371d5
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0 b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
index d525bbebbe2f..75053113e334 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/hspec/quickcheck-io#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6febfee5b2d8cc373643b26e6fcebba0
+_md5_=52ac5f909bc8586cb49c3e6d1db3936e
diff --git a/metadata/md5-cache/dev-haskell/random-1.2.1 b/metadata/md5-cache/dev-haskell/random-1.2.1
index 59646d3dab85..79d5d8933138 100644
--- a/metadata/md5-cache/dev-haskell/random-1.2.1
+++ b/metadata/md5-cache/dev-haskell/random-1.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/random
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.2.1
 SRC_URI=https://hackage.haskell.org/package/random-1.2.1/random-1.2.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9e872030d2d0b764cb0d9a2304609b7b
+_md5_=b8aab98cf1bf43936edfa2eddc4962a0
diff --git a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1 b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
index de1e16e7548f..79e8e5b9fa5d 100644
--- a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
+++ b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/23Skidoo/raw-strings-qq
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/raw-strings-qq-1.1/raw-strings-qq-1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c2ad7ce3b80bae919d23b33f6c241b08
+_md5_=40a724bf1f646ca700ae0ae2de987d8a
diff --git a/metadata/md5-cache/dev-haskell/reducers-3.12.3-r1 b/metadata/md5-cache/dev-haskell/reducers-3.12.3-r1
index 2f72aaa253a6..17d0103169e4 100644
--- a/metadata/md5-cache/dev-haskell/reducers-3.12.3-r1
+++ b/metadata/md5-cache/dev-haskell/reducers-3.12.3-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/reducers/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.12.3
 SRC_URI=https://hackage.haskell.org/package/reducers-3.12.3/reducers-3.12.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=21b87bfd666fafa91fcd96066c7458f0
+_md5_=ca978fd37dc3f97bd074a68503622588
diff --git a/metadata/md5-cache/dev-haskell/reflection-2.1.6 b/metadata/md5-cache/dev-haskell/reflection-2.1.6
index 099b5fe22851..569eda527db3 100644
--- a/metadata/md5-cache/dev-haskell/reflection-2.1.6
+++ b/metadata/md5-cache/dev-haskell/reflection-2.1.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/reflection
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.6
 SRC_URI=https://hackage.haskell.org/package/reflection-2.1.6/reflection-2.1.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f40e864eb6469d0dc2b436f7f96df1d8
+_md5_=7afa3a47a9ec6c8c2c0ce4545eaea331
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1 b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
index b69cf7d9226f..cad9b2b177a6 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/feuerbach/regex-applicative
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.1
 SRC_URI=https://hackage.haskell.org/package/regex-applicative-0.3.3.1/regex-applicative-0.3.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=000450bee00a82b61b7634f8aa8de3cf
+_md5_=4d3401d2f7138cdcbf4605e631df29f6
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.1 b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.1
index 140a03d5e681..fcfaf02d8ade 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.1
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Regular_expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.94.0.1
 SRC_URI=https://hackage.haskell.org/package/regex-base-0.94.0.1/regex-base-0.94.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8d7d17892c747b3c699d09363b26789d
+_md5_=e8a0bf36bfb870a1d90b8d5ca4a9f4c6
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
index d603131b2b2e..34d8dd947eab 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Regular_expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.95.2.1
 SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.1/regex-compat-0.95.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b096c7da4c2502676d625022bb5b1dc2
+_md5_=3dd4c9e493f73f7041b6703e0ccb240d
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0 b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
index fb279d7aaf61..ed5ccaa0e5a8 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-posix
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.96.0.0
 SRC_URI=https://hackage.haskell.org/package/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7c52f17fa6a5d0f54a2e63b6f7c02a3f
+_md5_=d8c375d211b8b7f9abdf240d3c2b3055
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
index ef95661be0e6..9e7b0633381d 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.haskell.org/Regular_expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2
 SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.3.2/regex-tdfa-1.3.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=69a9a8d8c4f20157d28dc176bb9c2aa1
+_md5_=76be596eb2ce1cf404d5ec170f987325
diff --git a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1 b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
index c622713d7575..b5e237ae8122 100644
--- a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/resolv
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=test
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a38284be9ebe64d037c1d6236de40838
+_md5_=4575d013fad73c0e2a232b8887732c4e
diff --git a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2 b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
index 6a93fa472022..78dde8e03b7f 100644
--- a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/pool
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.2
 SRC_URI=https://hackage.haskell.org/package/resource-pool-0.2.3.2/resource-pool-0.2.3.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ef64a29f01be12c66af248a0fbcba31c
+_md5_=638e4107c567dce7a45c75eda42ebc05
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2 b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
index af890732d930..6ff100d57afa 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.2.4.2
 SRC_URI=https://hackage.haskell.org/package/resourcet-1.2.4.2/resourcet-1.2.4.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c57837d488ce770c56faefde3272965d
+_md5_=35164915624e882918c2e013025fc897
diff --git a/metadata/md5-cache/dev-haskell/retry-0.9.0.0 b/metadata/md5-cache/dev-haskell/retry-0.9.0.0
index 767d392e4efe..faf5825adeaf 100644
--- a/metadata/md5-cache/dev-haskell/retry-0.9.0.0
+++ b/metadata/md5-cache/dev-haskell/retry-0.9.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Soostone/retry
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.0.0
 SRC_URI=https://hackage.haskell.org/package/retry-0.9.0.0/retry-0.9.0.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=bbf7cd54eda0144f8e4ff5c09008776b
+_md5_=661670e928e0a1bffc8ccca3af7cf7e6
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.21.0 b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
index 2c495c49bf97..7d54ebf6b61c 100644
--- a/metadata/md5-cache/dev-haskell/rio-0.1.21.0
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.21.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/commercialhaskell/rio#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b0566d53ee99f411a849dd761b372c0b
+_md5_=3daee6270fc1703cdb63c2b794e2c43d
diff --git a/metadata/md5-cache/dev-haskell/safe-0.3.19 b/metadata/md5-cache/dev-haskell/safe-0.3.19
index 088c85ca95d3..95ac11263df0 100644
--- a/metadata/md5-cache/dev-haskell/safe-0.3.19
+++ b/metadata/md5-cache/dev-haskell/safe-0.3.19
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/safe#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.19
 SRC_URI=https://hackage.haskell.org/package/safe-0.3.19/safe-0.3.19.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=aacc72729b28fe8dd83eca7d93c334fa
+_md5_=f0ff741f628eb22db77b1f5d1797ee8a
diff --git a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0 b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
index fefe27d399bb..45734817bd78 100644
--- a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
+++ b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/safe-exceptions#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7.0
 SRC_URI=https://hackage.haskell.org/package/safe-exceptions-0.1.7.0/safe-exceptions-0.1.7.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=45d77bf5fe36716db6e9752f631b77a6
+_md5_=91a3824749c1d89a6ab2b372f30a88e4
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1 b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
index e509352180ec..209b018a40f2 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ChrisKuklewicz/SafeSemaphore
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1
 SRC_URI=https://hackage.haskell.org/package/SafeSemaphore-0.10.1/SafeSemaphore-0.10.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=528d7ff0cafb5e3830cd4c43e9e46d02
+_md5_=de08b38c47504b1d7a7c2438792f8413
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
index bd34dbb4c6bd..d61c37a0f79f 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.5
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/sandi
 INHERIT=haskell-cabal
 IUSE=+conduit doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=61a6177e7a51ad4c4cd57321be461769
+_md5_=778e44fc631e5bbc00deb690bb55fabc
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.7.0-r1 b/metadata/md5-cache/dev-haskell/scientific-0.3.7.0-r1
index f30f7186dfd6..e923dfb5bdaf 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.7.0-r1
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.7.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/basvandijk/scientific
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/integer-logarithms-1.0.3.1:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?] >=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.3.7.0
 SRC_URI=https://hackage.haskell.org/package/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz https://hackage.haskell.org/package/scientific-0.3.7.0/revision/2.cabal -> scientific-0.3.7.0-r1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9d88a648e3a4a144ee13fd724118456c
+_md5_=4654e73308c323b4273bee5279f744bc
diff --git a/metadata/md5-cache/dev-haskell/securemem-0.1.10 b/metadata/md5-cache/dev-haskell/securemem-0.1.10
index ad5ed397e8f9..4be21acbeb10 100644
--- a/metadata/md5-cache/dev-haskell/securemem-0.1.10
+++ b/metadata/md5-cache/dev-haskell/securemem-0.1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/vincenthz/hs-securemem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.10
 SRC_URI=https://hackage.haskell.org/package/securemem-0.1.10/securemem-0.1.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=dd1dcfe14f2e723bcb52bd608c0baf27
+_md5_=ac7a506637dd1ff08ad42241886902be
diff --git a/metadata/md5-cache/dev-haskell/semialign-1.2.0.1 b/metadata/md5-cache/dev-haskell/semialign-1.2.0.1
index 8ac9a8a34848..cc9cbae89bb6 100644
--- a/metadata/md5-cache/dev-haskell/semialign-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/semialign-1.2.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/these
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?] >=dev-haskell/semigroupoids-5.3.2:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.2.0.1
 SRC_URI=https://hackage.haskell.org/package/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz https://hackage.haskell.org/package/semialign-1.2.0.1/revision/1.cabal -> semialign-1.2.0.1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cb79ccacd5898a3241cdda5ec32503a5
+_md5_=4003279e7635960bc61a03f64f809260
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1
index 0070772cc4a9..b948e37e7d18 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/semigroupoids
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/5.3.7
 SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3ccc4f5a986a60f582617e6526b55039
+_md5_=dfdcbc44b2fc366e331c20035060bb64
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.20 b/metadata/md5-cache/dev-haskell/semigroups-0.20
index 59e871789f20..30d8f01cab59 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.20
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/semigroups/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.20
 SRC_URI=https://hackage.haskell.org/package/semigroups-0.20/semigroups-0.20.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=67c1f8645bb932ba90e8c429f641b458
+_md5_=2ad1223a5e100e33ca9876d8835a5b23
diff --git a/metadata/md5-cache/dev-haskell/semirings-0.6 b/metadata/md5-cache/dev-haskell/semirings-0.6
index 97995132c6a1..33a6509db0ed 100644
--- a/metadata/md5-cache/dev-haskell/semirings-0.6
+++ b/metadata/md5-cache/dev-haskell/semirings-0.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/chessai/semirings
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/base-compat-batteries:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/semirings-0.6/semirings-0.6.tar.gz https://hackage.haskell.org/package/semirings-0.6/revision/1.cabal -> semirings-0.6.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0332052f33170f0bc0108d227b508bbe
+_md5_=c3cead226d3e096f1c78ba2b38506875
diff --git a/metadata/md5-cache/dev-haskell/servant-0.19 b/metadata/md5-cache/dev-haskell/servant-0.19
index ea4eb6ad39be..b2334eac777c 100644
--- a/metadata/md5-cache/dev-haskell/servant-0.19
+++ b/metadata/md5-cache/dev-haskell/servant-0.19
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.servant.dev/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?] >=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?] >=dev-haskell/bifunctors-5.5.3:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?] >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?] >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/mmorph-1.1.2:=[profile?] <dev-haskell/mmorph-1.3:=[profile?] >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/quickcheck-2.12.6.1:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/singleton-bool-0.1.4:=[profile?] <dev-haskell/singleton-bool-0.1.7:=[profile?] >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?] >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vault-0.3.1.2:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.19
 SRC_URI=https://hackage.haskell.org/package/servant-0.19/servant-0.19.tar.gz https://hackage.haskell.org/package/servant-0.19/revision/4.cabal -> servant-0.19-rev4.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f21906d6b818eadfdffde34f69ebfa71
+_md5_=1971fa3a7e90325c3ab18439706e5444
diff --git a/metadata/md5-cache/dev-haskell/servant-server-0.19.1 b/metadata/md5-cache/dev-haskell/servant-server-0.19.1
index fc7a581c2cec..e7a4c85935f8 100644
--- a/metadata/md5-cache/dev-haskell/servant-server-0.19.1
+++ b/metadata/md5-cache/dev-haskell/servant-server-0.19.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.servant.dev/
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?] >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?] >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?] >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/monad-control-1.0.2.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/network-2.8:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/resourcet-1.2.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/servant-0.19:=[profile?] >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?] >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wai-3.2.1.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-app-static-3.1.6.2:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?] >=dev-haskell/word8-0.1.3:=[profile?] <dev-haskell/word8-0.2:=[profile?] >=dev-lang/ghc-8.10.1:= examples? ( >=dev-haskell/warp-3.2.25:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1
 SRC_URI=https://hackage.haskell.org/package/servant-server-0.19.1/servant-server-0.19.1.tar.gz https://hackage.haskell.org/package/servant-server-0.19.1/revision/1.cabal -> servant-server-0.19.1-rev1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=787f76602a02af08e9b92d56c5d63874
+_md5_=26ee4445fde287b36265157490dc80cb
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3 b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
index 15964e760d32..014e1f220be4 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/setenv
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=936dedfc281f29cf28911e977a578cbe
+_md5_=386c106bf2c2dc6a44c61377eb7cd504
diff --git a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9 b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
index 3c64797f7f95..c2a9892a43be 100644
--- a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
+++ b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/Kritzefitz/haskell-setlocale
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.0.0.9
 SRC_URI=https://hackage.haskell.org/package/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b257a7a6f1a2e5e7e4ad7d0e0f28bc83
+_md5_=8756a791887c852bef2f2d03e15dfdb1
diff --git a/metadata/md5-cache/dev-haskell/sha-1.6.4.4 b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
index dbfca05d2aa5..56dc2e5125ab 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.6.4.4
+++ b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/SHA
 INHERIT=haskell-cabal
 IUSE=exe doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.4.4
 SRC_URI=https://hackage.haskell.org/package/SHA-1.6.4.4/SHA-1.6.4.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8356d094954b7721e7a2e731b66185b1
+_md5_=6eb659884adc79f090b321b92f1596c1
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.30 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
index ad898a1fd6ed..d1b9788d95ca 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.30
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=<dev-haskell/aeson-3:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] >=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.30
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.30/shakespeare-2.0.30.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b8aecf0b9e1fcae000ef869e24b124b8
+_md5_=3d075bf1c83e427317184496f0133792
diff --git a/metadata/md5-cache/dev-haskell/shelly-1.9.0 b/metadata/md5-cache/dev-haskell/shelly-1.9.0
index 4ee811d5f0c1..47e33614a5c2 100644
--- a/metadata/md5-cache/dev-haskell/shelly-1.9.0
+++ b/metadata/md5-cache/dev-haskell/shelly-1.9.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/gregwebs/Shelly.hs
 INHERIT=haskell-cabal
 IUSE=examples lifted doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-lang/ghc-8.0.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://hackage.haskell.org/package/shelly-1.9.0/shelly-1.9.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9fc995e1c1eb7fc0a1d63b833d4e28bc
+_md5_=f6292b100d31b1dbdd083d41ee558e0f
diff --git a/metadata/md5-cache/dev-haskell/should-not-typecheck-2.1.0 b/metadata/md5-cache/dev-haskell/should-not-typecheck-2.1.0
index 8bf5e984105c..3d36d036c7e6 100644
--- a/metadata/md5-cache/dev-haskell/should-not-typecheck-2.1.0
+++ b/metadata/md5-cache/dev-haskell/should-not-typecheck-2.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/CRogers/should-not-typecheck
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hunit-1.2:=[profile?] >=dev-lang/ghc-7.6.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.0
 SRC_URI=https://hackage.haskell.org/package/should-not-typecheck-2.1.0/should-not-typecheck-2.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=647a1a8a91cfceaef97e18ce55418631
+_md5_=c21972814bd2ecf5b27a9f27713b0f87
diff --git a/metadata/md5-cache/dev-haskell/silently-1.2.5.1 b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
index 205b5b0fb7c1..7fc4c91f6c44 100644
--- a/metadata/md5-cache/dev-haskell/silently-1.2.5.1
+++ b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hspec/silently
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.5.1
 SRC_URI=https://hackage.haskell.org/package/silently-1.2.5.1/silently-1.2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=98c1debde9d1aba9accf7e4fb32dcf6a
+_md5_=b11debc65471e18574e4f05bd6b5e4d5
diff --git a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3 b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
index c0711d82bb3b..48533a6afc13 100644
--- a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
+++ b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://twanvl.nl/blog/haskell/simple-reflection-of-expressions
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/simple-reflect-0.3.3/simple-reflect-0.3.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a654ed165d2ecc455fab717fa43fa6da
+_md5_=90ed9577b523361cd90c5a4e96797b06
diff --git a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28 b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
index 613b01b0edeb..3ef6d669f637 100644
--- a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
+++ b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/simple-sendfile
 INHERIT=haskell-cabal
 IUSE=+allow-bsd doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.28
 SRC_URI=https://hackage.haskell.org/package/simple-sendfile-0.2.28/simple-sendfile-0.2.28.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=414d3e70a0e16e5e3e25faca10bc0221
+_md5_=092766cd64d9c07c521d7b81baa6a078
diff --git a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1 b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
index db0b2bf4cfb1..23e133657b79 100644
--- a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/phadej/singleton-bool#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/dec-0.0.3 <dev-haskell/dec-0.1
 SLOT=0/0.1.5
 SRC_URI=https://hackage.haskell.org/package/singleton-bool-0.1.5/singleton-bool-0.1.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c44dc3593e8383e3b604d752a19ca217
+_md5_=21892bc03601dfef6a1088caa9cfed50
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.9.4 b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
index 520dca59a22e..b5b4a38f0bc7 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.9.4
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/meteficha/skein
 INHERIT=haskell-cabal
 IUSE=big-endian force-endianness reference doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.9.4
 SRC_URI=https://hackage.haskell.org/package/skein-1.0.9.4/skein-1.0.9.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b3fcdff43b4f7671b3e643df9ccddeca
+_md5_=9b421aa3b2d698c2a43e736665fe4755
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.12.3.1 b/metadata/md5-cache/dev-haskell/skylighting-0.12.3.1
index d0840a88c9bb..1dc093fb04ee 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.12.3.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/skylighting
 INHERIT=haskell-cabal
 IUSE=executable doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=~dev-haskell/skylighting-core-0.12.3.1:=[profile?] >=dev-lang/ghc-8.4.3:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] )
 SLOT=0/0.12.3.1
 SRC_URI=https://hackage.haskell.org/package/skylighting-0.12.3.1/skylighting-0.12.3.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=016250eac893a5f56c2e6b22c1a8f81b
+_md5_=9b7e70c20a485f886e7b5a62db1c6f49
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.12.3.1 b/metadata/md5-cache/dev-haskell/skylighting-core-0.12.3.1
index 20095a4d9f60..05fc6c297c65 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.12.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/skylighting
 INHERIT=haskell-cabal
 IUSE=executable doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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/safe:=[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.6.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.12.3.1
 SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.12.3.1/skylighting-core-0.12.3.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=689605452e7e709d3b75c49d14c627c8
+_md5_=a7b8400d58865dfc7d7d0d0d96730089
diff --git a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0 b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
index 2d254771bb91..aabab3557123 100644
--- a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
+++ b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/smallcheck
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/nats:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/smallcheck-1.2.0/smallcheck-1.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d034a8a79311c39fd150ee6762678bcc
+_md5_=c7aa2929a6962d1b58bc554041f93cf4
diff --git a/metadata/md5-cache/dev-haskell/socks-0.6.1 b/metadata/md5-cache/dev-haskell/socks-0.6.1
index 543dc6bed280..a19ad9dd1210 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.6.1
+++ b/metadata/md5-cache/dev-haskell/socks-0.6.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-socks
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/socks-0.6.1/socks-0.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=68aae3a64c6ecc51db817246a4fcffd4
+_md5_=2442794166c50315877d601d756aef6c
diff --git a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.2 b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.2
index 8331618c74ff..2359202bdd0f 100644
--- a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.2
+++ b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/sop-core
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.5.0.2
 SRC_URI=https://hackage.haskell.org/package/sop-core-0.5.0.2/sop-core-0.5.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4f9b38529ca7f057e9f7927408595334
+_md5_=7c0120d0189bbcf7dba1d512943dcf1a
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.4 b/metadata/md5-cache/dev-haskell/split-0.2.3.4
index fb5bfd87f63d..de5351aef9f2 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3.4
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/split
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.4
 SRC_URI=https://hackage.haskell.org/package/split-0.2.3.4/split-0.2.3.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=002766bc8ad5c8a3890a4d4a83b44049
+_md5_=606a1f2311feec7e1dde52e216206fd0
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.1.0.3 b/metadata/md5-cache/dev-haskell/splitmix-0.1.0.3
index 9648a5408ef9..ab6b9ac1928a 100644
--- a/metadata/md5-cache/dev-haskell/splitmix-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/splitmix-0.1.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/splitmix
 INHERIT=haskell-cabal
 IUSE=optimised-mixer doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/splitmix-0.1.0.3/splitmix-0.1.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ffb9a68ba6d697af3e5d00b509ad66ab
+_md5_=a4762ce564175182f0822083cd9f8b31
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.2.1 b/metadata/md5-cache/dev-haskell/statevar-1.2.1
index 90b47ef869ad..f474dc622dff 100644
--- a/metadata/md5-cache/dev-haskell/statevar-1.2.1
+++ b/metadata/md5-cache/dev-haskell/statevar-1.2.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/haskell-opengl/StateVar
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.1
 SRC_URI=https://hackage.haskell.org/package/StateVar-1.2.1/StateVar-1.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8b5306f3be120c3cf6bd78ce5c9e9601
+_md5_=63cb2a190f83d0bfe9f99bedaf586f97
diff --git a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0 b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
index 753212d147a7..1ceef083bbcc 100644
--- a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
+++ b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/statistics
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/base-orphans-0.6:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/data-default-class-0.1.2:=[profile?] >=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?] >=dev-haskell/math-functions-0.3:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.2.0
 SRC_URI=https://hackage.haskell.org/package/statistics-0.15.2.0/statistics-0.15.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a393a9dceed302487a4f69d02bb3a6b4
+_md5_=80562268956051e0e2c929a030779684
diff --git a/metadata/md5-cache/dev-haskell/stm-2.5.0.1 b/metadata/md5-cache/dev-haskell/stm-2.5.0.1
index 3913b13b56f4..9043d5e75a56 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.5.0.1
+++ b/metadata/md5-cache/dev-haskell/stm-2.5.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.haskell.org/Software_transactional_memory
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/2.5.0.1
 SRC_URI=https://hackage.haskell.org/package/stm-2.5.0.1/stm-2.5.0.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9ca9395a7e818621d55851586e0e8794
+_md5_=051d3bfa28f53b90e2b1c36f8717c666
diff --git a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4 b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
index 1561a2616e66..2db442c126f8 100644
--- a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://code.haskell.org/~wren/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/stm-chans-3.0.0.4/stm-chans-3.0.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e6bb84ee715908adb5ff5647b99976c3
+_md5_=3c2559915371495ecc4874e613605e84
diff --git a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4 b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4
index 73cfe09e5a54..9ee068dbb0c8 100644
--- a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4
+++ b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/streaming-commons
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.6.3:=
 RESTRICT=test !test? ( test )
 SLOT=0/0.2.2.4
 SRC_URI=https://hackage.haskell.org/package/streaming-commons-0.2.2.4/streaming-commons-0.2.2.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=86d1e397faa5912b549cf3b187553b2e
+_md5_=7b9c51374d9f1ca8d40ac89be1f7bf64
diff --git a/metadata/md5-cache/dev-haskell/strict-0.4.0.1 b/metadata/md5-cache/dev-haskell/strict-0.4.0.1
index caf5e2f9ce32..271e91d4f043 100644
--- a/metadata/md5-cache/dev-haskell/strict-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/strict-0.4.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/strict
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/assoc-1.0.1:=[profile?] <dev-haskell/assoc-1.1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.4.0.1
 SRC_URI=https://hackage.haskell.org/package/strict-0.4.0.1/strict-0.4.0.1.tar.gz https://hackage.haskell.org/package/strict-0.4.0.1/revision/4.cabal -> strict-0.4.0.1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d0fdb972e95a7da14dc9833efb96c2e4
+_md5_=13801928c63d27f0f0dbaa73fd8fcd32
diff --git a/metadata/md5-cache/dev-haskell/string-conversions-0.4.0.1 b/metadata/md5-cache/dev-haskell/string-conversions-0.4.0.1
index 0f1c10078515..16c7cefecd9d 100644
--- a/metadata/md5-cache/dev-haskell/string-conversions-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/string-conversions-0.4.0.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/soenkehahn/string-conversions#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0.1
 SRC_URI=https://hackage.haskell.org/package/string-conversions-0.4.0.1/string-conversions-0.4.0.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=31c5e24accca569bb05dd765631fbdf2
+_md5_=7e9e21574b3a8714cc103cee5356731f
diff --git a/metadata/md5-cache/dev-haskell/string-qq-0.0.4 b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
index 7a8cc9a707a3..3364a21d0ccf 100644
--- a/metadata/md5-cache/dev-haskell/string-qq-0.0.4
+++ b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/string-qq
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.4
 SRC_URI=https://hackage.haskell.org/package/string-qq-0.0.4/string-qq-0.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=61bc48049815c14f624b9a9c473618c2
+_md5_=ccc4fe4ff209fefed36903d2d2962b0a
diff --git a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1 b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
index f36839c740d2..a0e51c00b7a8 100644
--- a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
+++ b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/stringbuilder
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/stringbuilder-0.5.1/stringbuilder-0.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6021125e4bf1ced12bfd2cc6a708e28e
+_md5_=e84f8bfbb9c5400739ac5e4091eb2439
diff --git a/metadata/md5-cache/dev-haskell/syb-0.7.2.1 b/metadata/md5-cache/dev-haskell/syb-0.7.2.1
index afe010a42b46..622bb6b2922e 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.7.2.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.7.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.cs.uu.nl/wiki/GenericProgramming/SYB
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2.1
 SRC_URI=https://hackage.haskell.org/package/syb-0.7.2.1/syb-0.7.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ba79848f23b1354f0fca8b168b3ee8ef
+_md5_=c2e552049719e4b492f558cff5071327
diff --git a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4 b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
index 0c3f7e694a02..4413bf9053c4 100644
--- a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
+++ b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.16.4
 SRC_URI=https://hackage.haskell.org/package/system-fileio-0.3.16.4/system-fileio-0.3.16.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e05b0f5d45db4b3a0adc2405e5e0c828
+_md5_=8783e60579fb26155b2cdb4494eae8fe
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1
index ca53751b2223..40c2ab98fad2 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.4.14
 SRC_URI=https://hackage.haskell.org/package/system-filepath-0.4.14/system-filepath-0.4.14.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=799119b695232e4e49e26e143bf6917c
+_md5_=aa3397cb52a766d7e4691a8130fd95c3
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.8.6.1 b/metadata/md5-cache/dev-haskell/tagged-0.8.6.1
index 42808c64996f..9bb7acc541ae 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.8.6.1
+++ b/metadata/md5-cache/dev-haskell/tagged-0.8.6.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/tagged
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.6.1
 SRC_URI=https://hackage.haskell.org/package/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e11d0a54a2e54f18abf28851c9876867
+_md5_=806f5ca47b399c6dc68ce12e3ca4389d
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8 b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
index ca04c3a13a91..9164a034195c 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/tagsoup#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.8
 SRC_URI=https://hackage.haskell.org/package/tagsoup-0.14.8/tagsoup-0.14.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0e3da45a039c72edac6ed9715a33efb9
+_md5_=518b08743d24ffe41a56e712492df172
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
index 6fe3b8a3b346..26b4c57df4f1 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/tar
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=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 https://hackage.haskell.org/package/tar-0.5.1.1/revision/4.cabal -> tar-0.5.1.1-rev4.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=726ce046900aef50cffdfd57a6941812
+_md5_=79d796072ccd7dd2ead582468b2a73f0
diff --git a/metadata/md5-cache/dev-haskell/tasty-1.4.2.3 b/metadata/md5-cache/dev-haskell/tasty-1.4.2.3
index 01bc1e1408a2..9cd71a860fc4 100644
--- a/metadata/md5-cache/dev-haskell/tasty-1.4.2.3
+++ b/metadata/md5-cache/dev-haskell/tasty-1.4.2.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/UnkindPartition/tasty
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/clock-0.4.4.0:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.4.2.3
 SRC_URI=https://hackage.haskell.org/package/tasty-1.4.2.3/tasty-1.4.2.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e2ae7c5aa6893a25d30be6b611cf4414
+_md5_=0c88eb5ede8da55a4487040472166d06
diff --git a/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2 b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
index 830cade05bdc..89b2957c8657 100644
--- a/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
+++ b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
@@ -6,10 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/nomeata/tasty-expected-failure
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
 SLOT=0/0.11.1.2
 SRC_URI=https://hackage.haskell.org/package/tasty-expected-failure-0.11.1.2/tasty-expected-failure-0.11.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d7e73bafe90913b3a52c720c5caa31a2
+_md5_=05e88613b1fff8e136f86d4b2d8c3a2c
diff --git a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1 b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
index f9a97453c8fe..e7e90fda2c14 100644
--- a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/UnkindPartition/tasty-golden
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.3.1.1
 SRC_URI=https://hackage.haskell.org/package/tasty-golden-2.3.1.1/tasty-golden-2.3.1.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e6f4904fbe71b5bfbb3922033d7f4db4
+_md5_=81521b36467945b0a190dc5e397ff4a8
diff --git a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.1.0.0 b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.1.0.0
index 69a906c398bd..855b429f0889 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.1.0.0
+++ b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.1.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/qfpl/tasty-hedgehog
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0.0
 SRC_URI=https://hackage.haskell.org/package/tasty-hedgehog-1.1.0.0/tasty-hedgehog-1.1.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=60a8f0aa6079dd792df36d0e57848302
+_md5_=4fd176a6dd8f7489c9f46d6888c2d1b7
diff --git a/metadata/md5-cache/dev-haskell/tasty-hslua-1.0.2 b/metadata/md5-cache/dev-haskell/tasty-hslua-1.0.2
index 9d50beee213d..159be2c2ae2f 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hslua-1.0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-hslua-1.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hslua.org/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] >=dev-haskell/tasty-hunit-0.9:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/tasty-hslua-1.0.2/tasty-hslua-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a1aa3ce3d49828afb6124f6a23fcfc37
+_md5_=10d4021a8e04bb486a3ef4276a1423a0
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.3 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.3
index a3ea877e5e11..4c972b27d205 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.3
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/UnkindPartition/tasty
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.0.3
 SRC_URI=https://hackage.haskell.org/package/tasty-hunit-0.10.0.3/tasty-hunit-0.10.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3e6a917d22eb535e1fbedbf2787bcd68
+_md5_=6ddcd4aa6b9fecf44de187f1d0d0d60b
diff --git a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3 b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
index 161c0007af49..bf68be172d6a 100644
--- a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
+++ b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/tasty-kat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/tasty-kat-0.0.3/tasty-kat-0.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ee98f568e1f97c2ff1748bfc38e79bb5
+_md5_=1ea308907c12e3d347e1deaeb0067e8d
diff --git a/metadata/md5-cache/dev-haskell/tasty-lua-1.0.2 b/metadata/md5-cache/dev-haskell/tasty-lua-1.0.2
index 21ae00431350..6047cadf4d07 100644
--- a/metadata/md5-cache/dev-haskell/tasty-lua-1.0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-lua-1.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/hslua/hslua
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?] >=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?] >=dev-haskell/lua-arbitrary-1.0:=[profile?] <dev-haskell/lua-arbitrary-1.1:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/tasty-lua-1.0.2/tasty-lua-1.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=550fbc2c8236f8f499cc06db12894d54
+_md5_=fa9a719f224d39e63a5f1fc248fe1211
diff --git a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1 b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
index 83eaddbd02bb..14681d13f773 100644
--- a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/UnkindPartition/tasty
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-1.0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1.1
 SRC_URI=https://hackage.haskell.org/package/tasty-quickcheck-0.10.1.1/tasty-quickcheck-0.10.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9d02a0f0d23e8b7fc91b0348cb91b739
+_md5_=b08b5c6e50a717ffbeb6d968ebae237f
diff --git a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18 b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18
index 3a5bb4e4615b..ce93e9305fc2 100644
--- a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18
+++ b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.18
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ocharles/tasty-rerun
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.18
 SRC_URI=https://hackage.haskell.org/package/tasty-rerun-1.1.18/tasty-rerun-1.1.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=95f289e1bcf2c0fff5c62533fe6b14d7
+_md5_=ba66fc4911701c74ef20f3a9b8acfec8
diff --git a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1 b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
index 7cf79b6dd9f2..87838302f128 100644
--- a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
+++ b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://documentup.com/feuerbach/tasty
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/tasty-smallcheck-0.8.1/tasty-smallcheck-0.8.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=65f81b9eb5b10612cd6026389ab0bf81
+_md5_=d4067b907be9083e6af4c080f3327b45
diff --git a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7 b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
index 2b46d52d6386..862f7b562442 100644
--- a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
+++ b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bennofs/tasty-th
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/haskell-src-exts-1.18.0:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7
 SRC_URI=https://hackage.haskell.org/package/tasty-th-0.1.7/tasty-th-0.1.7.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9f25d77cf70fc5f35aaa8775b98c0513
+_md5_=c4cc09cf903983bd7030d46c33edd5e4
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.3 b/metadata/md5-cache/dev-haskell/temporary-1.3
index e9a2c541a43c..d0e61ff5361c 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.3
+++ b/metadata/md5-cache/dev-haskell/temporary-1.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/UnkindPartition/temporary
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://hackage.haskell.org/package/temporary-1.3/temporary-1.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9228153511d45996ca00b777957c2a69
+_md5_=a5aae58b7c32f5bc20a10bd7ca3c282a
diff --git a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3 b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
index c370f2111db6..2da73a660762 100644
--- a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
+++ b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/UnkindPartition/temporary
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0.3
 SRC_URI=https://hackage.haskell.org/package/temporary-rc-1.2.0.3/temporary-rc-1.2.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7d549e781e3ba12d1f9194877e45803b
+_md5_=522e89ecdddf7aa65f57c056a0e61563
diff --git a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1 b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
index 039acba5f223..918174dba4ed 100644
--- a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
+++ b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/terminal-size
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2.1
 SRC_URI=https://hackage.haskell.org/package/terminal-size-0.3.2.1/terminal-size-0.3.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=362a9b592f98fa3fe783bf62b9376f13
+_md5_=313c079b61f3a3d93775bc504bb11758
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.5 b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.5
index 7fe3e99bbe3e..6858f2198363 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.5
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/judah/terminfo
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 SLOT=0/0.4.1.5
 SRC_URI=https://hackage.haskell.org/package/terminfo-0.4.1.5/terminfo-0.4.1.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d20ea89c737ebfe555b901830fd15158
+_md5_=f76354614e7c97ef318e0d3fe8b85839
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r3 b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r3
index f33296080938..01469e1b369c 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r3
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://haskell.github.io/test-framework/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-orphans-0.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.8.2.0
 SRC_URI=https://hackage.haskell.org/package/test-framework-0.8.2.0/test-framework-0.8.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=00b9849a922e35619f4548526cc049e9
+_md5_=0df72ee8208eee465c65a7d229d6b927
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
index 7750388aa11c..93241aa7695b 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://batterseapower.github.io/test-framework/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/test-framework-hunit-0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4a4b4eebda52112e251abc7f5a569de7
+_md5_=0df3497fb5f6e47f6b3f5630305f4829
diff --git a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1 b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
index 17b350721ae0..d8940be66080 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rudymatela/test-framework-leancheck#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/leancheck:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/test-framework-leancheck-0.0.1/test-framework-leancheck-0.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=33fac90557708f46a386c15c4db2892d
+_md5_=7c966b716e6717b44b4cb597be2367ae
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r2
index 1c86e332b3e6..6f14095e7a0e 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://haskell.github.io/test-framework/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.5
 SRC_URI=https://hackage.haskell.org/package/test-framework-quickcheck2-0.3.0.5/test-framework-quickcheck2-0.3.0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=048115535e6ef938d7ca6d29c30d779e
+_md5_=43341d4301049a4fcb6f4388f6e6717f
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
index 8234166fdd52..d0aafe945336 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/finnsson/test-generator
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/test-framework-th-0.2.4/test-framework-th-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=36595c71184b781b3d17c17e2f1221a0
+_md5_=2f69c04769413bfe1df59e45daf3b012
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.12.5.1 b/metadata/md5-cache/dev-haskell/texmath-0.12.5.1
index 742d9af09190..96175ea61191 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.12.5.1
+++ b/metadata/md5-cache/dev-haskell/texmath-0.12.5.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/texmath
 INHERIT=haskell-cabal
 IUSE=executable server doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] dev-haskell/split:=[profile?] >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-8.4.3:= executable? ( dev-haskell/aeson:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/pretty-show:=[profile?] ) !executable? ( server? ( dev-haskell/aeson:=[profile?] ) ) server? ( dev-haskell/optparse-applicative:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/servant-server:=[profile?] dev-haskell/wai:=[profile?] dev-haskell/wai-logger:=[profile?] dev-haskell/warp:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.12.5.1
 SRC_URI=https://hackage.haskell.org/package/texmath-0.12.5.1/texmath-0.12.5.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3e7b00702d15431f0802a0edd429faeb
+_md5_=dd886be7d9ca51a27f55ab5f894fec9b
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.5.0 b/metadata/md5-cache/dev-haskell/text-1.2.5.0
index d1d9db4cdc71..ed87c10abe29 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.5.0
+++ b/metadata/md5-cache/dev-haskell/text-1.2.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/text
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/1.2.5.0
 SRC_URI=https://hackage.haskell.org/package/text-1.2.5.0/text-1.2.5.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=68b2018c39b9457e9e4351d173ac1f4b
+_md5_=6c79a2b8bc1b6d32f3ed915728e55038
diff --git a/metadata/md5-cache/dev-haskell/text-conversions-0.3.1 b/metadata/md5-cache/dev-haskell/text-conversions-0.3.1
index efc3841ac8f2..37f6316769ff 100644
--- a/metadata/md5-cache/dev-haskell/text-conversions-0.3.1
+++ b/metadata/md5-cache/dev-haskell/text-conversions-0.3.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/cjdev/text-conversions#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=<dev-haskell/base16-bytestring-2:=[profile?] <dev-haskell/base64-bytestring-2:=[profile?] <dev-haskell/errors-3:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/text-conversions-0.3.1/text-conversions-0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c2129a3cf1a61bb3464743bcbd490a35
+_md5_=d2243a2c32380080c1b0c81e97192439
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.7.1.0 b/metadata/md5-cache/dev-haskell/text-icu-0.7.1.0
index 3fa5f8e78953..812e837eb12e 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.7.1.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/text-icu
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-8.4.3:= dev-libs/icu
 RESTRICT=test
 SLOT=0/0.7.1.0
 SRC_URI=https://hackage.haskell.org/package/text-icu-0.7.1.0/text-icu-0.7.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=21639f8641e1588d75c26126df23699d
+_md5_=d65baafb8b989037407e8d9e29e0e994
diff --git a/metadata/md5-cache/dev-haskell/text-short-0.1.5 b/metadata/md5-cache/dev-haskell/text-short-0.1.5
index 5290497673ab..00c7104b65af 100644
--- a/metadata/md5-cache/dev-haskell/text-short-0.1.5
+++ b/metadata/md5-cache/dev-haskell/text-short-0.1.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/text-short
 INHERIT=haskell-cabal
 IUSE=asserts doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.5
 SRC_URI=https://hackage.haskell.org/package/text-short-0.1.5/text-short-0.1.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ef9c68e79868ff2971b52be2bf7c11b8
+_md5_=c981e031e04478666fed729d1917a3bd
diff --git a/metadata/md5-cache/dev-haskell/text-show-3.9.7 b/metadata/md5-cache/dev-haskell/text-show-3.9.7
index ee5b420cf0d6..7ca732021661 100644
--- a/metadata/md5-cache/dev-haskell/text-show-3.9.7
+++ b/metadata/md5-cache/dev-haskell/text-show-3.9.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/RyanGlScott/text-show
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/generic-deriving-1.14.1:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/3.9.7
 SRC_URI=https://hackage.haskell.org/package/text-show-3.9.7/text-show-3.9.7.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=927fd8ade209b6d3888b1c7eab9dfa64
+_md5_=9f13a11e03c6c0322d6e552cd50b62e1
diff --git a/metadata/md5-cache/dev-haskell/tf-random-0.5 b/metadata/md5-cache/dev-haskell/tf-random-0.5
index a3dce1669abf..0d7db7fc2850 100644
--- a/metadata/md5-cache/dev-haskell/tf-random-0.5
+++ b/metadata/md5-cache/dev-haskell/tf-random-0.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/tf-random
 INHERIT=haskell-cabal
 IUSE=profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/tf-random-0.5/tf-random-0.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1b69e26711f23e8268304d88b3cbc48a
+_md5_=c401be97e69aed5bbbd0689e23b8f796
diff --git a/metadata/md5-cache/dev-haskell/th-abstraction-0.4.3.0 b/metadata/md5-cache/dev-haskell/th-abstraction-0.4.3.0
index d1378f28da60..260c4a66527d 100644
--- a/metadata/md5-cache/dev-haskell/th-abstraction-0.4.3.0
+++ b/metadata/md5-cache/dev-haskell/th-abstraction-0.4.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/glguy/th-abstraction
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.0
 SRC_URI=https://hackage.haskell.org/package/th-abstraction-0.4.3.0/th-abstraction-0.4.3.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2248642f351c2bed7a771ad913cd496d
+_md5_=11dfebc288cd629d41c2443556ce5f20
diff --git a/metadata/md5-cache/dev-haskell/th-compat-0.1.3 b/metadata/md5-cache/dev-haskell/th-compat-0.1.3
index 5fd0cc70fa6d..066744315940 100644
--- a/metadata/md5-cache/dev-haskell/th-compat-0.1.3
+++ b/metadata/md5-cache/dev-haskell/th-compat-0.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-compat/th-compat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/th-compat-0.1.3/th-compat-0.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3db76a3c54a4c0e24644672c26f60feb
+_md5_=740a3104f62dd443e6918f6cb87fe912
diff --git a/metadata/md5-cache/dev-haskell/th-lift-0.8.2 b/metadata/md5-cache/dev-haskell/th-lift-0.8.2
index 9da369b68417..682659bfff86 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-0.8.2
+++ b/metadata/md5-cache/dev-haskell/th-lift-0.8.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/RyanGlScott/th-lift
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://hackage.haskell.org/package/th-lift-0.8.2/th-lift-0.8.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e866cfd7ed36ec3c44aef2341a242fcd
+_md5_=def6a39765fe3957ad49bf649f4e8caa
diff --git a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.19 b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.19
index 61fe32ec56ec..262758ea4988 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.19
+++ b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.19
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bennofs/th-lift-instances/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.19
 SRC_URI=https://hackage.haskell.org/package/th-lift-instances-0.1.19/th-lift-instances-0.1.19.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=a08746a4a0303de6a674cf48f784c069
+_md5_=243a3bfa53def3b8e0896a65930b8681
diff --git a/metadata/md5-cache/dev-haskell/these-1.1.1.1 b/metadata/md5-cache/dev-haskell/these-1.1.1.1
index 0c6ec66f0151..8bce29d66608 100644
--- a/metadata/md5-cache/dev-haskell/these-1.1.1.1
+++ b/metadata/md5-cache/dev-haskell/these-1.1.1.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/these
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/assoc-1:=[profile?] <dev-haskell/assoc-1.1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.1.1.1
 SRC_URI=https://hackage.haskell.org/package/these-1.1.1.1/these-1.1.1.1.tar.gz https://hackage.haskell.org/package/these-1.1.1.1/revision/5.cabal -> these-1.1.1.1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=cc3310b85489602b80792ede2f2e87c7
+_md5_=ae142aa1921617f2af90a060742740b5
diff --git a/metadata/md5-cache/dev-haskell/time-compat-1.9.6.1 b/metadata/md5-cache/dev-haskell/time-compat-1.9.6.1
index f054c21efea8..ed76d309695f 100644
--- a/metadata/md5-cache/dev-haskell/time-compat-1.9.6.1
+++ b/metadata/md5-cache/dev-haskell/time-compat-1.9.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/time-compat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.6.1
 SRC_URI=https://hackage.haskell.org/package/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz https://hackage.haskell.org/package/time-compat-1.9.6.1/revision/3.cabal -> time-compat-1.9.6.1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4fb1652c846da9b690ec749a6f8f73b1
+_md5_=9fc487e58495c5f66457dd6c5c729644
diff --git a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5 b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
index 983774a5b90b..b223fcde7886 100644
--- a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/khibino/haskell-time-locale-compat
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=063049843d21d9b73fdf432e1f2f9ca0
+_md5_=1ce872b3b8b22093da54145c329361d7
diff --git a/metadata/md5-cache/dev-haskell/time-manager-0.0.0 b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
index 296667cadbeb..5553aa935c05 100644
--- a/metadata/md5-cache/dev-haskell/time-manager-0.0.0
+++ b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/auto-update:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.0.0
 SRC_URI=https://hackage.haskell.org/package/time-manager-0.0.0/time-manager-0.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1b08a50e908201911437a7bebe52f9d7
+_md5_=aa3e1a11c4ab09fd8dfc2b80061f6fa5
diff --git a/metadata/md5-cache/dev-haskell/timeit-2.0 b/metadata/md5-cache/dev-haskell/timeit-2.0
index a8670c93d753..88403468c3a9 100644
--- a/metadata/md5-cache/dev-haskell/timeit-2.0
+++ b/metadata/md5-cache/dev-haskell/timeit-2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/merijn/timeit
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/2.0
 SRC_URI=https://hackage.haskell.org/package/timeit-2.0/timeit-2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8bd7a10d06943ed607b493bdb8c2ddd6
+_md5_=7e1cdd9763762af7df7a18da945bac09
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0 b/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
index 5d460fa96d99..c8384891776a 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://projects.haskell.org/time-ng/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/timezone-olson-0.2.0/timezone-olson-0.2.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d344b8f175fddf6444c472f362f59be2
+_md5_=55997b2c6eb62ab18fffd2551990e1a3
diff --git a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9 b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
index c55d400a4df2..2f933eeb62ff 100644
--- a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
+++ b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://projects.haskell.org/time-ng/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/timezone-series-0.1.9/timezone-series-0.1.9.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=bc8d8e380a87ed91d9a7451d879451c9
+_md5_=ac9cacb0e3c6bfc6e6bc38cc4e359961
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.8 b/metadata/md5-cache/dev-haskell/tls-1.5.8
index 16c39487ec8c..b2ade46de6a9 100644
--- a/metadata/md5-cache/dev-haskell/tls-1.5.8
+++ b/metadata/md5-cache/dev-haskell/tls-1.5.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/vincenthz/hs-tls
 INHERIT=haskell-cabal
 IUSE=+compat +network doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.27:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.4.3:= network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.5.8
 SRC_URI=https://hackage.haskell.org/package/tls-1.5.8/tls-1.5.8.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6239332793fa6c91c0b27b97d6c510ae
+_md5_=4bd0b86e77ee87da3d67f8ba403a93b6
diff --git a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4 b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
index 115352daf7c3..367c56dd7a46 100644
--- a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+++ b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/tls-session-manager
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev-haskell/clock:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/psqueues-0.2.3:=[profile?] dev-haskell/tls:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.4
 SRC_URI=https://hackage.haskell.org/package/tls-session-manager-0.0.4/tls-session-manager-0.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6b4192204bc01e29b4dd7dba06481011
+_md5_=0e1f08fd32c258cf81625a35fb2e6d1f
diff --git a/metadata/md5-cache/dev-haskell/torrent-10000.1.1 b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
index df9a70cc8605..5d72db88e164 100644
--- a/metadata/md5-cache/dev-haskell/torrent-10000.1.1
+++ b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/torrent
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/10000.1.1
 SRC_URI=https://hackage.haskell.org/package/torrent-10000.1.1/torrent-10000.1.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4ba29c2f0317f80116c282f885c617cf
+_md5_=a8843adc09d5a0359a35db3f034ae8cd
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2 b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
index 6126b3c83e34..fd572ab89262 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/transformers
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.6.2
 SRC_URI=https://hackage.haskell.org/package/transformers-0.5.6.2/transformers-0.5.6.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1e4bab5b57b61fa3a8656cfa28a9ef7b
+_md5_=b5bfb6986e5e08afaced069fc8386d0a
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
index 94773ab104cc..337071230e89 100644
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mvv/transformers-base
 INHERIT=haskell-cabal
 IUSE=+orphaninstances doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-compat-0.6.1:=[profile?] >=dev-lang/ghc-7.8.2:= orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
 SLOT=0/0.4.5.2
 SRC_URI=https://hackage.haskell.org/package/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0fc3967b89fad31bb80422918c2ed07a
+_md5_=6c79ad7dac9cff329aab95e3fda509e6
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6 b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
index b1f488ac1fc7..bf8e957a1440 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/transformers-compat/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.6.6
 SRC_URI=https://hackage.haskell.org/package/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fe93de37e4675923ec903fdcb98f712a
+_md5_=caacce5a6852e34a554c363befb88e08
diff --git a/metadata/md5-cache/dev-haskell/tree-diff-0.2.1.1 b/metadata/md5-cache/dev-haskell/tree-diff-0.2.1.1
index 2d06b18a81d0..477b97defa40 100644
--- a/metadata/md5-cache/dev-haskell/tree-diff-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/tree-diff-0.2.1.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskellari/tree-diff
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?] >=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semialign-1.1:=[profile?] <dev-haskell/semialign-1.3:=[profile?] >=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/aeson-1.5.6.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/tree-diff-0.2.1.1/tree-diff-0.2.1.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=99ff3a1b1ef56394a2bc2dcc7b097abd
+_md5_=f4811908fe011b3ebcc41f538c240af7
diff --git a/metadata/md5-cache/dev-haskell/trifecta-2.1.2 b/metadata/md5-cache/dev-haskell/trifecta-2.1.2
index 906e0cbdce15..c39672817b4d 100644
--- a/metadata/md5-cache/dev-haskell/trifecta-2.1.2
+++ b/metadata/md5-cache/dev-haskell/trifecta-2.1.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ekmett/trifecta/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/lens-4.14:=[profile?] <dev-haskell/lens-6:=[profile?] >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?] >=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-2:=[profile?] >=dev-haskell/prettyprinter-ansi-terminal-1.1.2:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?] >=dev-haskell/profunctors-5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reducers-3.12.1:=[profile?] <dev-haskell/reducers-4:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.2
 SRC_URI=https://hackage.haskell.org/package/trifecta-2.1.2/trifecta-2.1.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fed12c090352efc7da4020c419ea637d
+_md5_=ba7908a2603690397c6c711da1f30a60
diff --git a/metadata/md5-cache/dev-haskell/type-equality-1 b/metadata/md5-cache/dev-haskell/type-equality-1
index 587b25b0e4e1..45836ed96dd5 100644
--- a/metadata/md5-cache/dev-haskell/type-equality-1
+++ b/metadata/md5-cache/dev-haskell/type-equality-1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/hesselink/type-equality
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1
 SRC_URI=https://hackage.haskell.org/package/type-equality-1/type-equality-1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b92c4719948c520bd0683d96ef8f60cc
+_md5_=e6ac4865fa9fd87512945c77b9dddd4e
diff --git a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0 b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
index aac32766ca78..ea6d64241196 100644
--- a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
+++ b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/fpco/typed-process
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.6.0
 SRC_URI=https://hackage.haskell.org/package/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b9bb32c761eb35907991e23778fb0b18
+_md5_=1097d230cb36b281e9f29f5cfdab2679
diff --git a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0 b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
index 8a0c2f3766fd..894c0b4d1efb 100644
--- a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/basvandijk/unbounded-delays
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/unbounded-delays-0.1.1.0/unbounded-delays-0.1.1.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=661be7a26f55732ff8d07d25201f8693
+_md5_=af5dab3c98ec2c4e4fcf508fa4ea3b6a
diff --git a/metadata/md5-cache/dev-haskell/unicode-collation-0.1.3.3 b/metadata/md5-cache/dev-haskell/unicode-collation-0.1.3.3
index cf6c799ef250..2b10a418e8e5 100644
--- a/metadata/md5-cache/dev-haskell/unicode-collation-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/unicode-collation-0.1.3.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jgm/unicode-collation
 INHERIT=haskell-cabal
 IUSE=doctests executable doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=dev-haskell/th-lift-instances:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3.3
 SRC_URI=https://hackage.haskell.org/package/unicode-collation-0.1.3.3/unicode-collation-0.1.3.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=bb3b92541bd85109d3a7f36068927e9b
+_md5_=9acfd6d2b1200feb860c1d8d2eb247f1
diff --git a/metadata/md5-cache/dev-haskell/unicode-data-0.3.0 b/metadata/md5-cache/dev-haskell/unicode-data-0.3.0
index 5c349504915a..26fdb56cdb05 100644
--- a/metadata/md5-cache/dev-haskell/unicode-data-0.3.0
+++ b/metadata/md5-cache/dev-haskell/unicode-data-0.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/composewell/unicode-data
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/unicode-data-0.3.0/unicode-data-0.3.0.tar.gz https://hackage.haskell.org/package/unicode-data-0.3.0/revision/1.cabal -> unicode-data-0.3.0.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=84575d7aebd2e51c8633ef0a57532520
+_md5_=cda6a5d6276178de03a114d949f9b82f
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1-r1 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1-r1
index 9490dc2445b7..efb9d55c7c04 100644
--- a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/composewell/unicode-transforms
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=27dd01f21567b95f066cb8b335ac5820
+_md5_=b3fc3aad556a1cfdef73d74ec015f139
diff --git a/metadata/md5-cache/dev-haskell/uniplate-1.6.13 b/metadata/md5-cache/dev-haskell/uniplate-1.6.13
index 4291c5202aff..e5983eb86e47 100644
--- a/metadata/md5-cache/dev-haskell/uniplate-1.6.13
+++ b/metadata/md5-cache/dev-haskell/uniplate-1.6.13
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/uniplate#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.6.13
 SRC_URI=https://hackage.haskell.org/package/uniplate-1.6.13/uniplate-1.6.13.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d8f5faf3118effd2358a9674a4620a95
+_md5_=b3446d002b57a964f477bed78ceda76a
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2 b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
index e173aefce70c..95476c3ce44b 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/jacobstanley/unix-compat
 INHERIT=haskell-cabal
 IUSE=old-time doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/unix-compat-0.5.2/unix-compat-0.5.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fce61c24c9ed3b3e63c1ad31d1c19e78
+_md5_=22de28cf370e8fcf4c7723a0224481b7
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.4.7 b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
index 0c87dff10b39..e2c112008dc0 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.4.7
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/unix-time
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.4.7
 SRC_URI=https://hackage.haskell.org/package/unix-time-0.4.7/unix-time-0.4.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=54590f0487433f96f73a29f21d168aab
+_md5_=137b05a317e603732c77076dfee0cc40
diff --git a/metadata/md5-cache/dev-haskell/unliftio-0.2.18 b/metadata/md5-cache/dev-haskell/unliftio-0.2.18
index d5326dd7b34b..498eeaf2aa06 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-0.2.18
+++ b/metadata/md5-cache/dev-haskell/unliftio-0.2.18
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/fpco/unliftio/tree/master/unliftio#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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-8.4.3:=
 RESTRICT=!test? ( test )
 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	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=0dbe01cb78b630449b99c4ff230a4be7
+_md5_=ed5abb9b92a66106990dc5f709c29d41
diff --git a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0 b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
index b43e5c7c32b2..94fd8964f17a 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/fpco/unliftio/tree/master/unliftio-core#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ff2403b43ee3eb1b144d28bcce0e6fda
+_md5_=d1391ab414301652cca99eb9a4a907d6
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.17.0 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.17.0
index ac361e9a9dc7..73ff57b49392 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.17.0
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-unordered-containers/unordered-containers
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test
 SLOT=0/0.2.17.0
 SRC_URI=https://hackage.haskell.org/package/unordered-containers-0.2.17.0/unordered-containers-0.2.17.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=8c5271fad8f6491086d99f29f9d89510
+_md5_=e3b916ebb898d68dfe56ce2fe3382110
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
index a203c0d2f5ed..d93bc6872898 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/utf8-light
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.2
 SRC_URI=https://hackage.haskell.org/package/utf8-light-0.4.2/utf8-light-0.4.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=03a28c4416de12c25e73b1c9ca7a9b11
+_md5_=9dad340c5f95a7e5a96a73d7d5cf09b5
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1 b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
index d84d27d98d83..df7f8507029d 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/glguy/utf8-string/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.1
 SRC_URI=https://hackage.haskell.org/package/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ddeb586f0f48511d3b7284a0fbc6446a
+_md5_=eb5113b08d1dfa961503889fb0c20100
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.15 b/metadata/md5-cache/dev-haskell/uuid-1.3.15
index 143e4b62fa3f..deb79ad8979c 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.15
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-hvr/uuid
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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/entropy-0.5:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.0.6:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
 RESTRICT=test
 SLOT=0/1.3.15
 SRC_URI=https://hackage.haskell.org/package/uuid-1.3.15/uuid-1.3.15.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1622fb80144ca08443f011793f796a49
+_md5_=3950ffa315ba27ec4ecc4d8829ed3c77
diff --git a/metadata/md5-cache/dev-haskell/uuid-types-1.0.5 b/metadata/md5-cache/dev-haskell/uuid-types-1.0.5
index 0e7a1462216e..515832b77349 100644
--- a/metadata/md5-cache/dev-haskell/uuid-types-1.0.5
+++ b/metadata/md5-cache/dev-haskell/uuid-types-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell-hvr/uuid
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.5
 SRC_URI=https://hackage.haskell.org/package/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz https://hackage.haskell.org/package/uuid-types-1.0.5/revision/2.cabal -> uuid-types-1.0.5.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=1e8189153cd206fdb132d8bc749393d6
+_md5_=345b22fd5fc9879047df65d024e54723
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.1.5 b/metadata/md5-cache/dev-haskell/vault-0.3.1.5
index 7f386c47734f..36ef54073570 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.1.5
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.1.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/HeinrichApfelmus/vault
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.3.1.5
 SRC_URI=https://hackage.haskell.org/package/vault-0.3.1.5/vault-0.3.1.5.tar.gz https://hackage.haskell.org/package/vault-0.3.1.5/revision/1.cabal -> vault-0.3.1.5.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9f95b5e8204f3ce7373ed102663bbb4e
+_md5_=41bdc3cddaa30b7f710699eb0f53f0c1
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.3.1 b/metadata/md5-cache/dev-haskell/vector-0.12.3.1
index 1c0ffd4b92d6..f0ffc973d06c 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/vector-0.12.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haskell/vector
 INHERIT=haskell-cabal
 IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.12.3.1
 SRC_URI=https://hackage.haskell.org/package/vector-0.12.3.1/vector-0.12.3.1.tar.gz https://hackage.haskell.org/package/vector-0.12.3.1/revision/1.cabal -> vector-0.12.3.1-rev1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b0f0f7bf1b20ca55d4dc735a48073e76
+_md5_=dbbf2ec018de302d530f8b372696b318
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.4 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.4
index ed03d9cbf461..df1916978010 100644
--- a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.4
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/erikd/vector-algorithms/
 INHERIT=haskell-cabal
 IUSE=+bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.0.4
 SRC_URI=https://hackage.haskell.org/package/vector-algorithms-0.8.0.4/vector-algorithms-0.8.0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5874dd4aa8996c74ad2d65258e2aa8a5
+_md5_=228ec34adf62a48ff9838b67b5f94a86
diff --git a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1 b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
index 735d3bf80097..3d7120807cad 100644
--- a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
+++ b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/bos/vector-binary-instances
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.5.1
 SRC_URI=https://hackage.haskell.org/package/vector-binary-instances-0.2.5.1/vector-binary-instances-0.2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=ca4f23a4ee6c25ac045f6a2af5f80148
+_md5_=836d2e15778c0e4f73b4dd5c4679088e
diff --git a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7 b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
index 459e2dd7db46..4e57c95e3502 100644
--- a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
+++ b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/vector-th-unbox
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.7
 SRC_URI=https://hackage.haskell.org/package/vector-th-unbox-0.2.1.7/vector-th-unbox-0.2.1.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=749c9e9a5812154057f79d0cb3663009
+_md5_=b69824a065cd82f23c6e9977122272f6
diff --git a/metadata/md5-cache/dev-haskell/void-0.7.3 b/metadata/md5-cache/dev-haskell/void-0.7.3
index 1fccd3e6b5ad..acb0663a47ce 100644
--- a/metadata/md5-cache/dev-haskell/void-0.7.3
+++ b/metadata/md5-cache/dev-haskell/void-0.7.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ekmett/void
 INHERIT=haskell-cabal
 IUSE=safe doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.3
 SRC_URI=https://hackage.haskell.org/package/void-0.7.3/void-0.7.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d4b3bfe1b63d08ea74ba037d79639835
+_md5_=bac9ef12701c76d2322a3edbfebb0200
diff --git a/metadata/md5-cache/dev-haskell/wai-3.2.3 b/metadata/md5-cache/dev-haskell/wai-3.2.3
index b7a54a0f64df..61a1d2ccadef 100644
--- a/metadata/md5-cache/dev-haskell/wai-3.2.3
+++ b/metadata/md5-cache/dev-haskell/wai-3.2.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/3.2.3
 SRC_URI=https://hackage.haskell.org/package/wai-3.2.3/wai-3.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=e1fc94b6ef21cba9d373282b3460313e
+_md5_=e17be5a7212ab2932494dc2c97ba9adc
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1 b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
index af1889db0f13..43340a91817a 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
 INHERIT=haskell-cabal
 IUSE=print doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[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.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:=
 RESTRICT=!test? ( test )
 SLOT=0/3.1.7.2
 SRC_URI=https://hackage.haskell.org/package/wai-app-static-3.1.7.2/wai-app-static-3.1.7.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=2eb2dc0517f78d85ba2489857e6d0c4f
+_md5_=d9c486fc5c9ebc26a3930c3d97a1a825
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1 b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
index 94003badc17f..dac869988f9a 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
+++ b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=examples doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[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?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.2.1:= examples? ( dev-haskell/warp:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/3.1.4.1
 SRC_URI=https://hackage.haskell.org/package/wai-extra-3.1.4.1/wai-extra-3.1.4.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=09a5284a476cd82987400d549660b72c
+_md5_=b6a06e10d737473961430b1966a90469
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6 b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
index 1dd2629f9e75..d7b5a16e5cfe 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/wai-logger
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/2.3.6
 SRC_URI=https://hackage.haskell.org/package/wai-logger-2.3.6/wai-logger-2.3.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=486e8f140405904eec34cd87c9771af5
+_md5_=bb1867fbb99808e809cb3f1e09587a72
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.21 b/metadata/md5-cache/dev-haskell/warp-3.3.21
index 0c5ed96855f2..eea2d9527210 100644
--- a/metadata/md5-cache/dev-haskell/warp-3.3.21
+++ b/metadata/md5-cache/dev-haskell/warp-3.3.21
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=+allow-sendfilefd debug +x509 doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.6.3:= x509? ( dev-haskell/x509:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/3.3.21
 SRC_URI=https://hackage.haskell.org/package/warp-3.3.21/warp-3.3.21.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=5e3f94067cca3eabaed5a560551d5a55
+_md5_=4afad0340b7c56f750b597301efe9d4a
diff --git a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12 b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
index d9596cc9ebec..f8b2f4eae120 100644
--- a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
+++ b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.5.3:=[profile?] >=dev-haskell/tls-session-manager-0.0.4:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.3.6:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/3.2.12
 SRC_URI=https://hackage.haskell.org/package/warp-tls-3.2.12/warp-tls-3.2.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=80e6e3926dcfa4705b1b165eb1d5cfd8
+_md5_=df150e396c75e361c031986c3d4daef9
diff --git a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2 b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
index 17e75e112ba2..1b5d13766219 100644
--- a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+++ b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/solidsnack/wcwidth/
 INHERIT=haskell-cabal
 IUSE=cli doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?] >=dev-haskell/setlocale-0.0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] )
 SLOT=0/0.0.2
 SRC_URI=https://hackage.haskell.org/package/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4ec7b7d2f424183f477ab1a54b817e15
+_md5_=b8394808d1e0888a376ab8675f6c8189
diff --git a/metadata/md5-cache/dev-haskell/witherable-0.4.2 b/metadata/md5-cache/dev-haskell/witherable-0.4.2
index 51598f14fcdb..17cbcc151494 100644
--- a/metadata/md5-cache/dev-haskell/witherable-0.4.2
+++ b/metadata/md5-cache/dev-haskell/witherable-0.4.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fumieval/witherable
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.12.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.2.0:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://hackage.haskell.org/package/witherable-0.4.2/witherable-0.4.2.tar.gz https://hackage.haskell.org/package/witherable-0.4.2/revision/2.cabal -> witherable-0.4.2-rev2.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=08d8ff3e92426624760af8aac2a53699
+_md5_=6476b9a66b228a4420d054d70dd2d45e
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
index 1678edde42ba..5d0c525e600b 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/minad/wl-pprint-annotated#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/wl-pprint-annotated-0.1.0.1/wl-pprint-annotated-0.1.0.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b16f9f13e54968260a8e9b817252f102
+_md5_=7004c54a760f4d6b76cf1f98bd5d8409
diff --git a/metadata/md5-cache/dev-haskell/word8-0.1.3 b/metadata/md5-cache/dev-haskell/word8-0.1.3
index 372ed21253e0..b1132e2b9782 100644
--- a/metadata/md5-cache/dev-haskell/word8-0.1.3
+++ b/metadata/md5-cache/dev-haskell/word8-0.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/word8
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/word8-0.1.3/word8-0.1.3.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b6130fe5659c6c0c53d3eebca1757989
+_md5_=8aa50be77a06ea5bffa1ff1bb83761d9
diff --git a/metadata/md5-cache/dev-haskell/x11-1.10.2 b/metadata/md5-cache/dev-haskell/x11-1.10.2
index 91ca04ff309a..ea4ea32d001e 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.10.2
+++ b/metadata/md5-cache/dev-haskell/x11-1.10.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/xmonad/X11
 INHERIT=haskell-cabal
 IUSE=+xinerama doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~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 xinerama? ( x11-libs/libXinerama )
 SLOT=0/1.10.2
 SRC_URI=https://hackage.haskell.org/package/X11-1.10.2/X11-1.10.2.tar.gz -> x11-1.10.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=44217e5e3e3c62f02a26465a34cd937e
+_md5_=ad56c6a64f034c1fbbebda2f91ade6fd
diff --git a/metadata/md5-cache/dev-haskell/x11-xft-0.3.4 b/metadata/md5-cache/dev-haskell/x11-xft-0.3.4
index 83982f35be95..3fead302ee2b 100644
--- a/metadata/md5-cache/dev-haskell/x11-xft-0.3.4
+++ b/metadata/md5-cache/dev-haskell/x11-xft-0.3.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hackage.haskell.org/package/X11-xft
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[xinerama,profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXft
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/X11-xft-0.3.4/X11-xft-0.3.4.tar.gz -> x11-xft-0.3.4.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3380a49ab9dc6c2c3080cdca38e22c8c
+_md5_=cb5b0550a2905a37851946a52c6fbb0e
diff --git a/metadata/md5-cache/dev-haskell/x509-1.7.5 b/metadata/md5-cache/dev-haskell/x509-1.7.5
index 3969443c3936..f36b95e7a4c0 100644
--- a/metadata/md5-cache/dev-haskell/x509-1.7.5
+++ b/metadata/md5-cache/dev-haskell/x509-1.7.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.7.5
 SRC_URI=https://hackage.haskell.org/package/x509-1.7.5/x509-1.7.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=9e193be2cb28968bcaf0b8b3a947b898
+_md5_=56631de998dac9b872fa14222723b81c
diff --git a/metadata/md5-cache/dev-haskell/x509-store-1.6.7 b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
index e8ff9e33b526..27702c474559 100644
--- a/metadata/md5-cache/dev-haskell/x509-store-1.6.7
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.7
 SRC_URI=https://hackage.haskell.org/package/x509-store-1.6.7/x509-store-1.6.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f0cc8c4cfcf9931d295469abecf592b9
+_md5_=d1e084c877c37bf4a9c90e5ad5dac29a
diff --git a/metadata/md5-cache/dev-haskell/x509-system-1.6.6 b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
index aa38b8faa30d..e3ecb2d8cd6e 100644
--- a/metadata/md5-cache/dev-haskell/x509-system-1.6.6
+++ b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.6.6
 SRC_URI=https://hackage.haskell.org/package/x509-system-1.6.6/x509-system-1.6.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c2fca49315aa2312783868ff466c2725
+_md5_=fe38431d50866d6235974b9c075a6557
diff --git a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11 b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
index eb769d6d924e..108f47df0614 100644
--- a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
+++ b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.11
 SRC_URI=https://hackage.haskell.org/package/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c16214ea8f2df6a1340b3177fb4cd8fe
+_md5_=e94fc9fae9c8b433d1907c7e8228bd37
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.14 b/metadata/md5-cache/dev-haskell/xml-1.3.14
index 59bd653b9fab..255c47345cbe 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.14
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.14
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://code.galois.com
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.14
 SRC_URI=https://hackage.haskell.org/package/xml-1.3.14/xml-1.3.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=d18ded07be43511ffd91ba477bb57024
+_md5_=d77e6ed978213424b5bb7e70951ad72f
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1 b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
index 31cdd151b3d4..f4018bc680f0 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/snoyberg/xml
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[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/data-default-class:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.1.1
 SRC_URI=https://hackage.haskell.org/package/xml-conduit-1.9.1.1/xml-conduit-1.9.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=df5738e173c288f3bf450c71fe3bab99
+_md5_=1bda563d4c56a87b7280b317e805de94
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
index b397b6ebcfab..bc1b90ecbc3e 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/xml-hamlet-0.5.0.1/xml-hamlet-0.5.0.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=33d5d7ae99af11a1e964b250a818d76b
+_md5_=2a4d3e75e481e0d137b11b593a229628
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3.8 b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
index 8ca8fdc81f57..848ed9baddc9 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3.8
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://git.singpolyma.net/xml-types-haskell
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=https://hackage.haskell.org/package/xml-types-0.3.8/xml-types-0.3.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=95c74965b1401b974fdb98082ef2c306
+_md5_=f55618f0c486e931342069e9afcc4f93
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
index 4ff1301b2ff7..bc9180094cbf 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/yesodweb/haskell-xss-sanitize#readme
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://hackage.haskell.org/package/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=59984e7d3693aef8efcef1bf121803ca
+_md5_=a9c3ca42d2aa0b2deabd8aa01e5cf83f
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.11.8.0 b/metadata/md5-cache/dev-haskell/yaml-0.11.8.0
index d086a4ebc2c5..dfde5a2880b0 100644
--- a/metadata/md5-cache/dev-haskell/yaml-0.11.8.0
+++ b/metadata/md5-cache/dev-haskell/yaml-0.11.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/snoyberg/yaml#readme
 INHERIT=haskell-cabal
 IUSE=examples executable doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.4.3:= examples? ( dev-haskell/raw-strings-qq:=[profile?] ) executable? ( dev-haskell/optparse-applicative:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.11.8.0
 SRC_URI=https://hackage.haskell.org/package/yaml-0.11.8.0/yaml-0.11.8.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=06e9321785d6aee89ebcaecac4403e5a
+_md5_=f841aefa14cac126e44474a7f615c8d9
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.6.2 b/metadata/md5-cache/dev-haskell/yesod-1.6.2
index b975d3f60dc0..7b6ed47d9dcb 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.6.2
+++ b/metadata/md5-cache/dev-haskell/yesod-1.6.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/1.6.2
 SRC_URI=https://hackage.haskell.org/package/yesod-1.6.2/yesod-1.6.2.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f0226fc471aad9c733c42bd8a1af0d68
+_md5_=d915ecfb1f15d9d6c04f1c247e91f9e5
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
index dde5b0ed4cac..fb178f379c39 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.23.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=test !test? ( test )
 SLOT=0/1.6.23.1
 SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.23.1/yesod-core-1.6.23.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=3cfe52db9f1393a40dbfd240e4888072
+_md5_=5c4e8cccac65966f1c82b2be339a952a
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.7.0 b/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
index 5fb206b42454..de5d74388cad 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=+network-uri doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.4.3:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.7.0
 SRC_URI=https://hackage.haskell.org/package/yesod-form-1.7.0/yesod-form-1.7.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=10a755a7080f8c7671929e8d0dbbc3f6
+_md5_=8ae1842fc8f4db23f1d289fb606ad731
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
index 76ea80abdf12..6a47301341e5 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.0.8
 SRC_URI=https://hackage.haskell.org/package/yesod-persistent-1.6.0.8/yesod-persistent-1.6.0.8.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=b7c0a3cce2a823509b5f11b68bcf251a
+_md5_=9939d86451c23579bcd2428db1e1688d
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
index 4fcdf2d2878d..420726dc0e33 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/cryptonite-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[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-8.2.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-static-1.6.1.0/yesod-static-1.6.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=dc16a2ea00a6461342b65b6ad3bb9284
+_md5_=85b916f3f6aa85b7262e000ac6903e89
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12 b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
index cbe0e8ae3c74..faa9ada493df 100644
--- a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.yesodweb.com
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[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/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.6.17:=[profile?] >=dev-lang/ghc-8.2.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/yesod-test-1.6.12/yesod-test-1.6.12.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=f7b99ffae8d27034a162e3a717446de2
+_md5_=4212e7bda58261a1f7f4d5c5cf652ceb
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1 b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
index 6fb65973e57e..f2d29b836f07 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/jgm/zip-archive
 INHERIT=haskell-cabal
 IUSE=executable doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1
 SRC_URI=https://hackage.haskell.org/package/zip-archive-0.4.1/zip-archive-0.4.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=4a847835c8cba41974a4a971c1ad2156
+_md5_=9e3ec34ddec62a6e7d83854590822a95
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.2.3 b/metadata/md5-cache/dev-haskell/zlib-0.6.2.3
index af73472df282..86e177d4db40 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.2.3
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.2.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/zlib
 INHERIT=haskell-cabal
 IUSE=bundled-c-zlib non-blocking-ffi doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.4.3:= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/0.6.2.3
 SRC_URI=https://hackage.haskell.org/package/zlib-0.6.2.3/zlib-0.6.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=775c19754e104117133e02de48072e81
+_md5_=1685689bd8155374bfa5ee5fff45e554
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.6-r3 b/metadata/md5-cache/dev-lang/ghc-8.10.6-r3
index e648855c807f..a5cd31012c06 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.6-r3
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.6-r3
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
 DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:=[-exec-static-trampoline] ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
-INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic ghc-package multilib multiprocessing pax-utils toolchain-funcs prefix check-reqs
+INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic ghc-package multiprocessing pax-utils toolchain-funcs prefix check-reqs unpacker
 IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -13,6 +13,6 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elf
 REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.6
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-testsuite.tar.xz ) ) !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c
-_md5_=870eeff55144e71798438bfbe8548c94
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-testsuite.tar.xz ) ) !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://eidetic.codes/ghc-bin-8.10.6-r3-x86_64-pc-linux-gnu.gpkg.tar ) x86? ( https://eidetic.codes/ghc-bin-8.10.6-r3-i686-pc-linux-gnu.gpkg.tar ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=f8890f51be8e9f1dcfdd2d97c40e1007
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.2-r4 b/metadata/md5-cache/dev-lang/ghc-9.0.2-r4
index 7e3df5859c2a..129b48d95ce9 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.2-r4
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.2-r4
@@ -1,18 +1,18 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
 DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) llvm? ( <sys-devel/llvm-15:= || ( sys-devel/llvm:14 ) ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) !!sys-devel/llvm:0
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
-INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic ghc-package multiprocessing pax-utils toolchain-funcs prefix check-reqs llvm
+INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic ghc-package multiprocessing pax-utils toolchain-funcs prefix check-reqs llvm unpacker
 IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised binary
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) llvm? ( <sys-devel/llvm-15:= || ( sys-devel/llvm:14 ) ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary ) ?? ( llvm unregisterised )
 RESTRICT=!test? ( test )
 SLOT=0/9.0.2
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu-r4.tbz2 ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu-r4.tbz2 ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	llvm	4cc6f8e29d24a8011266413e74c728bb
-_md5_=346637fbbdb2fe5713ced815a86e88b0
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-r4-x86_64-pc-linux-gnu.gpkg.tar ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-r4-i686-pc-linux-gnu.gpkg.tar ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	llvm	4cc6f8e29d24a8011266413e74c728bb	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=5371df0ffa490eaa98efbe59c3802817
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.4 b/metadata/md5-cache/dev-lang/whitespace-0.4
index 45d9c6564b06..b1fb44af8841 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.4
+++ b/metadata/md5-cache/dev-lang/whitespace-0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Whitespace, an esoteric programming language
 EAPI=7
 HOMEPAGE=https://github.com/haroldl/whitespace-nd
 INHERIT=haskell-cabal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-haskell/random:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/whitespace-0.4/whitespace-0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=696b0342495caaca35fd79e304cef540
+_md5_=3a94289a7ba5aee467ab2e34a3acadf0
diff --git a/metadata/md5-cache/dev-libs/log4cxx-1.0.0 b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
index 2d8480024cf8..71d554d5caf6 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-1.0.0
+++ b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4cxx/
 INHERIT=cmake
 IUSE=odbc smtp test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/libfmt:= odbc? ( dev-db/unixODBC ) smtp? ( net-libs/libesmtp )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=mirror://apache/logging/log4cxx/1.0.0/apache-log4cxx-1.0.0.tar.gz
 _eclasses_=toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	flag-o-matic	69394e25812406faa1f90edaf4969395	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	xdg-utils	ac0e315a3688929e34ac75b139e7349a	cmake	b2e109b7341cd993b8bdfcc60652a14d
-_md5_=eba26be646c78cbf875b34ef598a604f
+_md5_=cad377dabd1241405e8a6adc2c006be2
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.21-r1 b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
index dcbe09efa4d5..ca0c9701d584 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=8
 HOMEPAGE=https://xapian.org/
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
-_md5_=fda573a0ff1b45de6b6e9d77e0f9a964
+_md5_=9a2c11960cd85e38788dbe0f6e43def8
diff --git a/metadata/md5-cache/dev-python/zope-component-5.1.0 b/metadata/md5-cache/dev-python/zope-component-5.1.0
index 61444d83aef2..0c8de840443f 100644
--- a/metadata/md5-cache/dev-python/zope-component-5.1.0
+++ b/metadata/md5-cache/dev-python/zope-component-5.1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope Component Architecture
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.component/ https://github.com/zopefoundation/zope.component/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zope-event[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.component/zope.component-5.1.0.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=e381fce77307277550a8e32f7b1194ad
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.component/zope.component-5.1.0.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=c769b3be949b70eeeaf0c000ca572d40
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.1-r2 b/metadata/md5-cache/dev-python/zope-configuration-4.4.1-r2
index 733ff270eb0f..f26bae044fc1 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.1-r2
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.4.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope Configuration Architecture
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.configuration/ https://github.com/zopefoundation/zope.configuration/ https://zopeconfiguration.readthedocs.io/en/latest/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_9(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.4.1.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=56b6a9b29a64db001145d5fe555eeac5
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.configuration/zope.configuration-4.4.1.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=8b02305376c7e141d30438d3ddd77ba5
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0-r2 b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0-r2
index 0b24d7401101..8a87b1f3e93d 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0-r2
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope Deprecation Infrastructure
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.deprecation/ https://github.com/zopefoundation/zope.deprecation/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.4.0.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=f8273d181100f666a16319114c7fe1ad
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.deprecation/zope.deprecation-4.4.0.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=04e2061ee87bbd118212fd17894ba7db
diff --git a/metadata/md5-cache/dev-python/zope-event-4.6 b/metadata/md5-cache/dev-python/zope-event-4.6
index 27dbbe698502..1376521c7ca2 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.6
+++ b/metadata/md5-cache/dev-python/zope-event-4.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.event/ https://github.com/zopefoundation/zope.event/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.event/zope.event-4.6.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=e53f03bd2ee4444514d76577aa1aed25
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.event/zope.event-4.6.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=acbe0d7a104b8cb2e7b88cd12cfad69c
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.6 b/metadata/md5-cache/dev-python/zope-exceptions-4.6
index 8cde4a54fa73..7bb0c09eb72e 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.6
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=General purpose exceptions for Zope packages
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.6.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=174ab5d7ebac6cb7c7f08069529f0e01
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.exceptions/zope.exceptions-4.6.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=dee666e15d4654e96b92afa05d8b93d7
diff --git a/metadata/md5-cache/dev-python/zope-hookable-5.4 b/metadata/md5-cache/dev-python/zope-hookable-5.4
index 865b8ac35dd9..85e6af019ab8 100644
--- a/metadata/md5-cache/dev-python/zope-hookable-5.4
+++ b/metadata/md5-cache/dev-python/zope-hookable-5.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Efficient creation of 'hookable' objects
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.hookable/ https://github.com/zopefoundation/zope.hookable/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/zopefoundation/zope.hookable/archive/5.4.tar.gz -> zope-hookable-5.4.gh.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=0ad281eb47eec0e662e7c95a7bf3381d
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.hookable/zope.hookable-5.4.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=98d7b3bfb04901844943e1361f18fd06
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1
index cbc1f266e23e..0586c0f6c8b1 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope support for i18nmessageid (tagging source of i18n strings)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.i18nmessageid/ https://github.com/zopefoundation/zope.i18nmessageid/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/zopefoundation/zope.i18nmessageid/archive/5.1.1.tar.gz -> zope-i18nmessageid-5.1.1.gh.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=0ebbc2e543e35b50f5a9af8d9d5f1e4c
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-5.1.1.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=8fe844a98d3ba25696279bc3f02f3f3f
diff --git a/metadata/md5-cache/dev-python/zope-schema-7.0.1 b/metadata/md5-cache/dev-python/zope-schema-7.0.1
index e834a54fda75..14ff7fd28a52 100644
--- a/metadata/md5-cache/dev-python/zope-schema-7.0.1
+++ b/metadata/md5-cache/dev-python/zope-schema-7.0.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope schema Architecture
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.schema/ https://github.com/zopefoundation/zope.schema/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.schema/zope.schema-7.0.1.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=69d3e1bf05f149026fb0b4c150accde4
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.schema/zope.schema-7.0.1.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=b152b8e1dbabded3eb84b1bd5708df7e
diff --git a/metadata/md5-cache/dev-python/zope-testing-5.0.1 b/metadata/md5-cache/dev-python/zope-testing-5.0.1
index da7ee3b682cb..b1042980e163 100644
--- a/metadata/md5-cache/dev-python/zope-testing-5.0.1
+++ b/metadata/md5-cache/dev-python/zope-testing-5.0.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope testing helpers
 EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
@@ -11,6 +11,6 @@ RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/z/zope.testing/zope.testing-5.0.1.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46
-_md5_=d994ec29f92940fe234044c26efc7e5b
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.testing/zope.testing-5.0.1.tar.gz
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-r1	666be58f658d6b32affe30f80e39a49e	distutils-r1	3929d88685167435c587b740fdb5ec46	pypi	1bc874ed4adb7d785e7201acbbb8347a
+_md5_=3bfe1d19b0dc8dfdb355961f492bcf2f
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.9.0 b/metadata/md5-cache/dev-util/shellcheck-0.9.0
index 91485987a277..cdecb2f8b6ab 100644
--- a/metadata/md5-cache/dev-util/shellcheck-0.9.0
+++ b/metadata/md5-cache/dev-util/shellcheck-0.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.shellcheck.net/
 INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-haskell/aeson-1.4.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?] >=dev-haskell/diff-0.4.0:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/fgl-5.7.0:=[profile?] <dev-haskell/fgl-5.8.1.0:=[profile?] >=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/regex-tdfa-1.2.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-lang/ghc-8.8.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.0
 SRC_URI=https://hackage.haskell.org/package/ShellCheck-0.9.0/ShellCheck-0.9.0.tar.gz -> shellcheck-0.9.0.tar.gz https://hackage.haskell.org/package/ShellCheck-0.9.0/revision/1.cabal -> shellcheck-0.9.0-rev1.cabal
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=864084f337325ac4aa074fa4081d9a26
+_md5_=9cc06ea12c15904c877dea2380483fa1
diff --git a/metadata/md5-cache/dev-util/shelltestrunner-1.9 b/metadata/md5-cache/dev-util/shelltestrunner-1.9
index 244af29ff8d9..4858947814af 100644
--- a/metadata/md5-cache/dev-util/shelltestrunner-1.9
+++ b/metadata/md5-cache/dev-util/shelltestrunner-1.9
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://github.com/simonmichael/shelltestrunner
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-haskell/cmdargs-0.7:= >=dev-haskell/diff-0.2.0:= >=dev-haskell/filemanip-0.3:= dev-haskell/hunit:= dev-haskell/parsec:= >=dev-haskell/pretty-show-1.6.5:= >=dev-haskell/regex-tdfa-1.1:= dev-haskell/safe:= >=dev-haskell/test-framework-0.3.2:= >=dev-haskell/test-framework-hunit-0.2:= >=dev-haskell/utf8-string-0.3.5:= >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/shelltestrunner-1.9/shelltestrunner-1.9.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	ltprune	97143780d341cc8d8f1d4c6187a36d29	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=fe857ba9135f9b42a2dd3273d6bf9764
+_md5_=a55ac5ccc34c24dd2aab3944762272d7
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.16.5-r2 b/metadata/md5-cache/dev-vcs/darcs-2.16.5-r2
index fbf160f9a36a..8610b3ad70b6 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.16.5-r2
+++ b/metadata/md5-cache/dev-vcs/darcs-2.16.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://darcs.net/
 INHERIT=haskell-cabal
 IUSE=curl +terminfo +threaded doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.7:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/constraints-0.11:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.30:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] >=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?] >=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.17:=[profile?] >=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] >=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-base-0.94.0.1:=[profile?] <dev-haskell/regex-base-0.94.1:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/unix-compat-0.5:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-8.4.3:= curl? ( net-misc/curl )
 RESTRICT=!test? ( test )
 SLOT=0/2.16.5
 SRC_URI=https://hackage.haskell.org/package/darcs-2.16.5/darcs-2.16.5.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=60f9b0b375e0847234e6de3749cf490e
+_md5_=d1d7b9109cdb3ae8c73df5ec1c6d73bd
diff --git a/metadata/md5-cache/dev-vcs/git-annex-10.20220624 b/metadata/md5-cache/dev-vcs/git-annex-10.20220624
index 5c0a2a165bff..674ca079a384 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-10.20220624
+++ b/metadata/md5-cache/dev-vcs/git-annex-10.20220624
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://git-annex.branchable.com/
 INHERIT=haskell-cabal bash-completion-r1 desktop
 IUSE=+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=AGPL-3
 RDEPEND=dev-haskell/aeson:= >=dev-haskell/ansi-terminal-0.9:= dev-haskell/async:= >=dev-haskell/attoparsec-0.13.2.2:= >=dev-haskell/aws-0.20:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= >=dev-haskell/dav-1.0:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= >=dev-haskell/http-client-0.5.3:= >=dev-haskell/http-client-restricted-0.0.2:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= >=dev-haskell/monad-logger-0.3.10:= >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-1.2:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.10.1:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= ) magicmime? ( dev-haskell/magic:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) dev-vcs/git
 REQUIRED_USE=webapp? ( assistant )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/git-annex-10.20220624/git-annex-10.20220624.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=af44901e4efbb78bced64b97c0c6751a
+_md5_=486949a3a215443f7a50908af2d26059
diff --git a/metadata/md5-cache/dev-vcs/git-repair-1.20220404 b/metadata/md5-cache/dev-vcs/git-repair-1.20220404
index f420d73d09a8..da87c93cf7b6 100644
--- a/metadata/md5-cache/dev-vcs/git-repair-1.20220404
+++ b/metadata/md5-cache/dev-vcs/git-repair-1.20220404
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://git-repair.branchable.com/
 INHERIT=haskell-cabal
 IUSE=doc profile
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/filepath-bytestring-1.4.2.1.4:=[profile?] dev-haskell/hslogger:=[profile?] dev-haskell/ifelse:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.14.1:=[profile?] dev-haskell/quickcheck:2=[profile?] dev-haskell/split:=[profile?] >=dev-haskell/unix-compat-0.5:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.10.1:=[profile?]
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/git-repair-1.20220404/git-repair-1.20220404.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=6d960e4f16ff0a80435db6f023455d95
+_md5_=a666441a51cee16abfb78d2539ad2d70
diff --git a/metadata/md5-cache/media-gfx/converseen-0.9.10.0 b/metadata/md5-cache/media-gfx/converseen-0.9.10.0
index 5ba02616d41f..82158a155b56 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.9.10.0
+++ b/metadata/md5-cache/media-gfx/converseen-0.9.10.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://converseen.fasterland.net/ https://github.com/Faster3ck/Converseen/
 INHERIT=cmake xdg-utils
 IUSE=debug
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-gfx/imagemagick:=[cxx]
 SLOT=0
 SRC_URI=https://github.com/Faster3ck/Converseen/archive/v0.9.10.0.tar.gz -> converseen-0.9.10.0.tar.gz
 _eclasses_=toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	flag-o-matic	69394e25812406faa1f90edaf4969395	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	xdg-utils	ac0e315a3688929e34ac75b139e7349a	cmake	b2e109b7341cd993b8bdfcc60652a14d
-_md5_=595ff63caf659212dc1f81de9fce00b2
+_md5_=41907e72ce119b59a2727ec5ae7f878a
diff --git a/metadata/md5-cache/media-gfx/librecad-2.2.0 b/metadata/md5-cache/media-gfx/librecad-2.2.0
index 03836832a0eb..4c1d113ca02f 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.2.0
+++ b/metadata/md5-cache/media-gfx/librecad-2.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.librecad.org/
 INHERIT=desktop edo plocale qmake-utils
 IUSE=debug doc tools
-KEYWORDS=~amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/freetype:2
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.2.0.tar.gz -> librecad-2.2.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707
-_md5_=a4464a3e0fc635248b25d1f83eb68388
+_md5_=469bd7c980a55db31be033fe6619d8a3
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.12 b/metadata/md5-cache/net-im/pidgin-2.14.12
index 707b4a3ce200..7d6303fcf808 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.12
+++ b/metadata/md5-cache/net-im/pidgin-2.14.12
@@ -7,7 +7,7 @@ HOMEPAGE=https://pidgin.im/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl test tk v4l +xscreensaver zephyr zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) idn? ( net-dns/libidn:= ) meanwhile? ( net-libs/meanwhile ) ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ) networkmanager? ( net-misc/networkmanager ) perl? ( >=dev-lang/perl-5.16:= ) sasl? ( dev-libs/cyrus-sasl:2 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) v4l? ( media-plugins/gst-plugins-v4l2 ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) v4l? ( gstreamer )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.12.tar.bz2
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	xdg-utils	ac0e315a3688929e34ac75b139e7349a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	flag-o-matic	69394e25812406faa1f90edaf4969395	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	perl-module	8c55459fea879ccdec282839a3b22f78	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	python-single-r1	75118e916668a74c660a13b0ecb22562	xdg	6024fbc93167fad782e2032933654857
-_md5_=a0b3796683ad7065ca3d267e924af309
+_md5_=aa3eb2c5c5177711efd3b38f8894cd7b
diff --git a/metadata/md5-cache/net-libs/libgssglue-0.7 b/metadata/md5-cache/net-libs/libgssglue-0.7
index 8796f205b6ef..4be4f4b314bf 100644
--- a/metadata/md5-cache/net-libs/libgssglue-0.7
+++ b/metadata/md5-cache/net-libs/libgssglue-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
 EAPI=8
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue
 INHERIT=autotools readme.gentoo-r1
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=virtual/krb5
 SLOT=0
 SRC_URI=https://gitlab.com/gsasl/libgssglue/-/archive/libgssglue-0.7/libgssglue-libgssglue-0.7.tar.bz2
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=7e783dd0995778464b4baccaad0743b8
+_md5_=f762e8fa7141ebb6476145dd09031b88
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.3 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.3
index 8af3cc6afdad..cdf1e008e325 100644
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.3
+++ b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/list-remote-forwards
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.3/list-remote-forwards-0.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=05112a507d68584e7bb3a8125d9256eb
+_md5_=2dd918c4ab3951ea6aa58deb1260121e
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.6 b/metadata/md5-cache/net-mail/mailbox-count-0.0.6
index 7494f3eac787..1c6763cbe2cc 100644
--- a/metadata/md5-cache/net-mail/mailbox-count-0.0.6
+++ b/metadata/md5-cache/net-mail/mailbox-count-0.0.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mailbox-count
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite3-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-lang/ghc-9.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.6/mailbox-count-0.0.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=7563d9efe385fd0a1f987f2512cf1776
+_md5_=444e822e51a865eefc4af4bfab6dd526
diff --git a/metadata/md5-cache/net-misc/haeredes-0.5.3 b/metadata/md5-cache/net-misc/haeredes-0.5.3
index 8e59d92bd094..925c7c4b3e4b 100644
--- a/metadata/md5-cache/net-misc/haeredes-0.5.3
+++ b/metadata/md5-cache/net-misc/haeredes-0.5.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://michael.orlitzky.com/code/haeredes.xhtml
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/dns-1.4:= >=dev-haskell/iproute-1.2:= >=dev-haskell/parallel-io-0.3:= >=dev-lang/ghc-9.0.0:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haeredes-0.5.3/haeredes-0.5.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=13aaf18ebcb36ee91524a25da18dc878
+_md5_=67a498f5abdb0422d4516388cd6caa0e
diff --git a/metadata/md5-cache/net-misc/hath-0.5.7 b/metadata/md5-cache/net-misc/hath-0.5.7
index 16179ffa0a77..caf572bcd4ba 100644
--- a/metadata/md5-cache/net-misc/hath-0.5.7
+++ b/metadata/md5-cache/net-misc/hath-0.5.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://michael.orlitzky.com/code/hath.xhtml
 INHERIT=haskell-cabal
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= >=dev-lang/ghc-9.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hath-0.5.7/hath-0.5.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c	eutils	8f942ebdcf04334697649d4a0bf65a32	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=02ae142833672769ec5af307807de076
+_md5_=c302c09245c82f5215631f7764f01d53
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.9 b/metadata/md5-cache/net-vpn/strongswan-5.9.9
index 997afcb0b464..bab213c835b9 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.9
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=linux-info systemd
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.9.tar.bz2
 _eclasses_=toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	multilib	5ca4e49abed8e3a2f7b56920eadee157	linux-info	4b552625ebd741dfd2ac08637fd2436e	systemd	5f4bb0758df2e483babf68cd517078ca
-_md5_=0bcf977eee8f5443ff06ddabbc26b711
+_md5_=e0bed7fd9b3131d3b914b07f1ee8d83a
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1 b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
index d73842e71428..507442cef596 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=HP Lights-Out Online Configuration Utility (HPONCFG)
 EAPI=8
 HOMEPAGE=https://support.hpe.com/hpesc/public/docDisplay?docId=emr_na-a00007610en_us
 INHERIT=pax-utils rpm
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.6.0-0.x86_64.rpm
 _eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8	estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
-_md5_=a9c3c40b72931e1123056fc0fe8b2d46
+_md5_=b3c1543b59e2e566459b35452de2fd46
diff --git a/metadata/md5-cache/virtual/pandoc-0 b/metadata/md5-cache/virtual/pandoc-0
index 9dfd80d9cc1f..aeeb07870a35 100644
--- a/metadata/md5-cache/virtual/pandoc-0
+++ b/metadata/md5-cache/virtual/pandoc-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for pandoc
 EAPI=8
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 RDEPEND=|| ( app-text/pandoc-bin[pandoc-symlink] app-text/pandoc )
 SLOT=0
-_md5_=413347b09fd3d7ad80cc04a34c355296
+_md5_=caa106fd9bbda122903bf0529a8fbc00
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.44.1 b/metadata/md5-cache/x11-misc/xmobar-0.44.1
index b5e50321b4cc..a242231bff3c 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.44.1
+++ b/metadata/md5-cache/x11-misc/xmobar-0.44.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://codeberg.org/xmobar/xmobar
 INHERIT=haskell-cabal
 IUSE=alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.4.7.1:=[profile?] dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.44.1
 SRC_URI=https://hackage.haskell.org/package/xmobar-0.44.1/xmobar-0.44.1.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=00d4d6448e1da92907be5d6a6907dc9a
+_md5_=1e09fbe991cc4193f5f3c7579d4b19ee
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.17.0 b/metadata/md5-cache/x11-wm/xmonad-0.17.0
index bafd8828cd63..1e18cbae1020 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.17.0
+++ b/metadata/md5-cache/x11-wm/xmonad-0.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xmonad.org
 INHERIT=haskell-cabal ghc-package
 IUSE=no-autorepeat-keys doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/setlocale:=[profile?] >=dev-haskell/x11-1.10:=[profile?] <dev-haskell/x11-1.11:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.17.0
 SRC_URI=https://hackage.haskell.org/package/xmonad-0.17.0/xmonad-0.17.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=52d878bed955efb5a5700ad14e0ba773
+_md5_=54d8c016c4c78335c7f1e2d2256f5125
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.17.0 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.17.0
index 7f8f3d4217c3..40d57a4f4d5f 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.17.0
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xmonad.org/
 INHERIT=haskell-cabal
 IUSE=+xft doc hscolour profile test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.10:=[profile?] <dev-haskell/x11-1.11:=[profile?] >=dev-lang/ghc-8.4.3:= >=x11-wm/xmonad-0.16.99999:=[profile?] <x11-wm/xmonad-0.18:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 RESTRICT=!test? ( test )
 SLOT=0/0.17.0
 SRC_URI=https://hackage.haskell.org/package/xmonad-contrib-0.17.0/xmonad-contrib-0.17.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	haskell-cabal	05d8a4fa4d20422c724fc38b4b9f15c0
-_md5_=c2dfc76ef4a6c47b4c029cce9e4211d8
+_md5_=f0dbb0364d8af586df24bc7388536f4f
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
index 7b9e7c528c15..650aee634a7b 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.2:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4836f34359e0073b8a6beac2f2613096
+_md5_=8c9c24af821a4a3a3dc735bfa37f8460
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.1-r1
index ef1d0270229d..faf971ab4152 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
 INHERIT=xdg-utils
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
 SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.1.tar.bz2
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.1.tar.bz2 https://gitlab.xfce.org/xfce/xfce4-session/-/commit/911f5b8101dec6a6d28f7601768588a2f0fd4aaf.patch -> xfce4-session-4.18.1-mem1.patch https://gitlab.xfce.org/xfce/xfce4-session/-/commit/cff23d0fadd502f7db9230f9ebbc02c00853f825.patch -> xfce4-session-4.18.1-mem2.patch
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc38bbebfe3395420c9550328e588bd6
+_md5_=88c750b057d9169cc3e63fb10914679d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0-r1
index b182d99d63f8..d2564f2e615e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0-r1
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2 https://gitlab.xfce.org/apps/xfce4-screensaver/-/commit/7aeced1f6fb39fd8887fc441b4ff491ba5bfcf35.patch -> xfce4-screensaver-4.16.0-mem.patch
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=acbfcb2b3066ded85178342b6adf11f2
+_md5_=aa6d5f01a2f4cd3db62c165cb5c65b10
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 658ef98bf78f..5294cb8281d1 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -18684,7 +18684,7 @@ xfce-base/xfce4-appfinder 4.18.0: A tool to find and launch installed applicatio
 xfce-base/xfce4-meta 4.18: The Xfce Desktop Environment (meta package)
 xfce-base/xfce4-panel 4.18.2 4.19.0: Panel for the Xfce desktop environment
 xfce-base/xfce4-power-manager 4.18.0 4.18.1: Power manager for the Xfce desktop environment
-xfce-base/xfce4-session 4.18.0 4.18.1: A session manager for the Xfce desktop environment
+xfce-base/xfce4-session 4.18.0 4.18.1-r1: A session manager for the Xfce desktop environment
 xfce-base/xfce4-settings 4.18.2: Configuration system for the Xfce desktop environment
 xfce-base/xfconf 4.18.0: A configuration management system for Xfce
 xfce-base/xfdesktop 4.18.1 4.19.0: Desktop manager for the Xfce desktop environment
@@ -18717,7 +18717,7 @@ xfce-extra/xfce4-notifyd 0.6.5 0.8.0 0.8.1 0.8.2: Notification daemon for the Xf
 xfce-extra/xfce4-panel-profiles 1.0.13: Simple application to manage Xfce panel layouts
 xfce-extra/xfce4-places-plugin 1.8.3: A panel plug-in to provide quick access to files, folders and removable media
 xfce-extra/xfce4-pulseaudio-plugin 0.4.5: A panel plug-in for PulseAudio volume control
-xfce-extra/xfce4-screensaver 4.16.0: Screen saver and locker (port of MATE screensaver)
+xfce-extra/xfce4-screensaver 4.16.0-r1: Screen saver and locker (port of MATE screensaver)
 xfce-extra/xfce4-screenshooter 1.10.3: Xfce4 screenshooter application and panel plugin
 xfce-extra/xfce4-sensors-plugin 1.4.4: A panel plug-in for acpi, lm-sensors and hddtemp sensors
 xfce-extra/xfce4-smartbookmark-plugin 0.5.2: Smart bookmark plug-in for the Xfce desktop environment
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6010182717c8..a98798e9770c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 18:16:52 +0000
+Fri, 17 Mar 2023 18:32:08 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2023-03-17 18:32:08 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2023-03-17 18:32:08 +0000
commit	bb5a0198979909b50a41ad2acb0e9c50e2ae6c53 (patch)
tree	b16172f218d4e5c3feb8b371c7287c92c41aee68 /metadata
parent	Merge updates from master (diff)
download	gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.tar.gz gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.tar.bz2 gentoo-bb5a0198979909b50a41ad2acb0e9c50e2ae6c53.zip