summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/abstract-deque/abstract-deque-0.3.ebuild2
-rw-r--r--dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild2
-rw-r--r--dev-haskell/adjunctions/adjunctions-4.4.ebuild2
-rw-r--r--dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild2
-rw-r--r--dev-haskell/aeson/aeson-2.0.3.0.ebuild2
-rw-r--r--dev-haskell/alex/alex-3.2.7.1.ebuild2
-rw-r--r--dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild2
-rw-r--r--dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild2
-rw-r--r--dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild2
-rw-r--r--dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild2
-rw-r--r--dev-haskell/appar/appar-0.1.8.ebuild2
-rw-r--r--dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild2
-rw-r--r--dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild2
-rw-r--r--dev-haskell/asn1-types/asn1-types-0.3.3.ebuild2
-rw-r--r--dev-haskell/assoc/assoc-1.0.2.ebuild2
-rw-r--r--dev-haskell/async/async-2.2.4.ebuild2
-rw-r--r--dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild2
-rw-r--r--dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild2
-rw-r--r--dev-haskell/attoparsec/attoparsec-0.14.4.ebuild2
-rw-r--r--dev-haskell/auto-update/auto-update-0.1.6.ebuild2
-rw-r--r--dev-haskell/aws/aws-0.22-r5.ebuild2
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild2
-rw-r--r--dev-haskell/base-compat/base-compat-0.12.1.ebuild2
-rw-r--r--dev-haskell/base-orphans/base-orphans-0.8.6.ebuild2
-rw-r--r--dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild2
-rw-r--r--dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild2
-rw-r--r--dev-haskell/basement/basement-0.0.12.ebuild2
-rw-r--r--dev-haskell/bencode/bencode-0.6.1.1.ebuild2
-rw-r--r--dev-haskell/bifunctors/bifunctors-5.5.11.ebuild2
-rw-r--r--dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild2
-rw-r--r--dev-haskell/binary/binary-0.8.8.0.ebuild4
-rw-r--r--dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild2
-rw-r--r--dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild2
-rw-r--r--dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild2
-rw-r--r--dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild2
-rw-r--r--dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild2
-rw-r--r--dev-haskell/byteable/byteable-0.1.1.ebuild2
-rw-r--r--dev-haskell/byteorder/byteorder-1.0.4.ebuild2
-rw-r--r--dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild2
-rw-r--r--dev-haskell/c2hs/c2hs-0.28.8.ebuild2
-rw-r--r--dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild2
-rw-r--r--dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild2
-rw-r--r--dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild2
-rw-r--r--dev-haskell/cabal/cabal-3.4.1.0.ebuild4
-rw-r--r--dev-haskell/call-stack/call-stack-0.3.0.ebuild2
-rw-r--r--dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild2
-rw-r--r--dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild2
-rw-r--r--dev-haskell/cereal/cereal-0.5.8.1.ebuild2
-rw-r--r--dev-haskell/charset/charset-0.3.7.1-r1.ebuild2
-rw-r--r--dev-haskell/chell/chell-0.4.0.2.ebuild2
-rw-r--r--dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild2
-rw-r--r--dev-haskell/citeproc/citeproc-0.7.ebuild2
-rw-r--r--dev-haskell/clientsession/clientsession-0.9.1.2.ebuild2
-rw-r--r--dev-haskell/clock/clock-0.7.2.ebuild2
-rw-r--r--dev-haskell/cmdargs/cmdargs-0.10.20.ebuild2
-rw-r--r--dev-haskell/code-page/code-page-0.1.3.ebuild2
-rw-r--r--dev-haskell/colour/colour-2.3.5.ebuild2
-rw-r--r--dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild2
-rw-r--r--dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild2
-rw-r--r--dev-haskell/commonmark/commonmark-0.2.2.ebuild2
-rw-r--r--dev-haskell/comonad/comonad-5.0.8.ebuild2
-rw-r--r--dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild2
-rw-r--r--dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild2
-rw-r--r--dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild2
-rw-r--r--dev-haskell/conduit/conduit-1.3.4.2.ebuild2
-rw-r--r--dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild2
-rw-r--r--dev-haskell/connection/connection-0.3.1.ebuild2
-rw-r--r--dev-haskell/constraints/constraints-0.13.3.ebuild2
-rw-r--r--dev-haskell/contravariant/contravariant-1.5.3.ebuild2
-rw-r--r--dev-haskell/convertible/convertible-1.1.1.0.ebuild2
-rw-r--r--dev-haskell/cookie/cookie-0.4.4.ebuild2
-rw-r--r--dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild2
-rw-r--r--dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild2
-rw-r--r--dev-haskell/criterion/criterion-1.5.11.0.ebuild2
-rw-r--r--dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild2
-rw-r--r--dev-haskell/crypto-api/crypto-api-0.13.3.ebuild2
-rw-r--r--dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild2
-rw-r--r--dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild2
-rw-r--r--dev-haskell/crypto-random/crypto-random-0.0.9.ebuild2
-rw-r--r--dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild2
-rw-r--r--dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild2
-rw-r--r--dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild2
-rw-r--r--dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild2
-rw-r--r--dev-haskell/cryptonite/cryptonite-0.28.ebuild2
-rw-r--r--dev-haskell/css-text/css-text-0.1.3.0.ebuild2
-rw-r--r--dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild2
-rw-r--r--dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild2
-rw-r--r--dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild2
-rw-r--r--dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild2
-rw-r--r--dev-haskell/data-default/data-default-0.7.1.1.ebuild2
-rw-r--r--dev-haskell/data-fix/data-fix-0.3.2.ebuild2
-rw-r--r--dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild2
-rw-r--r--dev-haskell/dav/dav-1.3.4.ebuild2
-rw-r--r--dev-haskell/dbus/Manifest1
-rw-r--r--dev-haskell/dbus/dbus-1.2.22.ebuild2
-rw-r--r--dev-haskell/dbus/dbus-1.2.27.ebuild51
-rw-r--r--dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch14
-rw-r--r--dev-haskell/dbus/metadata.xml18
-rw-r--r--dev-haskell/dec/dec-0.0.3.ebuild2
-rw-r--r--dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild2
-rw-r--r--dev-haskell/deriving-compat/deriving-compat-0.6.ebuild2
-rw-r--r--dev-haskell/diff/diff-0.4.0.ebuild2
-rw-r--r--dev-haskell/digest/digest-0.0.1.2.ebuild2
-rw-r--r--dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild2
-rw-r--r--dev-haskell/distributive/distributive-0.6.2.1.ebuild2
-rw-r--r--dev-haskell/dlist/dlist-1.0.ebuild2
-rw-r--r--dev-haskell/dns/dns-4.0.1.ebuild2
-rw-r--r--dev-haskell/doclayout/doclayout-0.4.ebuild2
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild2
-rw-r--r--dev-haskell/doctest/doctest-0.20.0.ebuild2
-rw-r--r--dev-haskell/easy-file/easy-file-0.2.2.ebuild2
-rw-r--r--dev-haskell/echo/echo-0.1.3.ebuild2
-rw-r--r--dev-haskell/ed25519/ed25519-0.0.5.0.ebuild2
-rw-r--r--dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild2
-rw-r--r--dev-haskell/email-validate/email-validate-2.3.2.15.ebuild2
-rw-r--r--dev-haskell/emojis/emojis-0.1.2.ebuild2
-rw-r--r--dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild2
-rw-r--r--dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild2
-rw-r--r--dev-haskell/erf/erf-2.0.0.0-r1.ebuild2
-rw-r--r--dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild2
-rw-r--r--dev-haskell/errors/errors-2.3.0.ebuild2
-rw-r--r--dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild4
-rw-r--r--dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild2
-rw-r--r--dev-haskell/extra/extra-1.7.10.ebuild2
-rw-r--r--dev-haskell/fail/fail-4.9.0.0.ebuild2
-rw-r--r--dev-haskell/fast-logger/fast-logger-3.0.1.ebuild2
-rw-r--r--dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild2
-rw-r--r--dev-haskell/feed/feed-1.3.2.1.ebuild2
-rw-r--r--dev-haskell/fgl/fgl-5.7.0.3.ebuild2
-rw-r--r--dev-haskell/file-embed/file-embed-0.0.11.2.ebuild2
-rw-r--r--dev-haskell/filemanip/filemanip-0.3.6.3.ebuild2
-rw-r--r--dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild2
-rw-r--r--dev-haskell/findbin/findbin-0.0.5-r1.ebuild2
-rw-r--r--dev-haskell/fingertree/fingertree-0.1.4.2.ebuild2
-rw-r--r--dev-haskell/foldl/foldl-1.4.12-r1.ebuild2
-rw-r--r--dev-haskell/foundation/foundation-0.0.26.1.ebuild2
-rw-r--r--dev-haskell/free/free-5.1.9.ebuild2
-rw-r--r--dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild2
-rw-r--r--dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild2
-rw-r--r--dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild2
-rw-r--r--dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild2
-rw-r--r--dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild2
-rw-r--r--dev-haskell/git-lfs/git-lfs-1.2.0.ebuild2
-rw-r--r--dev-haskell/glob/glob-0.10.2.ebuild2
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild2
-rw-r--r--dev-haskell/haddock-library/haddock-library-1.10.0.ebuild2
-rw-r--r--dev-haskell/happy/happy-1.19.12.ebuild2
-rw-r--r--dev-haskell/hashable/hashable-1.4.0.2.ebuild2
-rw-r--r--dev-haskell/haskeline/haskeline-0.8.2.ebuild4
-rw-r--r--dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild2
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild2
-rw-r--r--dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild2
-rw-r--r--dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild2
-rw-r--r--dev-haskell/hdbc/hdbc-2.4.0.3.ebuild2
-rw-r--r--dev-haskell/hedgehog/hedgehog-1.0.5.ebuild2
-rw-r--r--dev-haskell/hinotify/hinotify-0.3.10.ebuild2
-rw-r--r--dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild2
-rw-r--r--dev-haskell/hostname/hostname-1.0-r1.ebuild2
-rw-r--r--dev-haskell/hourglass/hourglass-0.2.12.ebuild2
-rw-r--r--dev-haskell/hscolour/hscolour-1.24.4.ebuild2
-rw-r--r--dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild2
-rw-r--r--dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua-core/hslua-core-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild2
-rw-r--r--dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild2
-rw-r--r--dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild2
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild2
-rw-r--r--dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild2
-rw-r--r--dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild2
-rw-r--r--dev-haskell/hslua/hslua-2.2.0.ebuild2
-rw-r--r--dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild2
-rw-r--r--dev-haskell/hspec-core/hspec-core-2.9.4.ebuild2
-rw-r--r--dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild2
-rw-r--r--dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild2
-rw-r--r--dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild2
-rw-r--r--dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild2
-rw-r--r--dev-haskell/hspec/hspec-2.9.4.ebuild2
-rw-r--r--dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild2
-rw-r--r--dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild2
-rw-r--r--dev-haskell/html/html-1.0.1.2-r1.ebuild2
-rw-r--r--dev-haskell/http-api-data/http-api-data-0.4.3.ebuild2
-rw-r--r--dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild2
-rw-r--r--dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild2
-rw-r--r--dev-haskell/http-client/http-client-0.7.11.ebuild2
-rw-r--r--dev-haskell/http-conduit/http-conduit-2.3.8.ebuild2
-rw-r--r--dev-haskell/http-date/http-date-0.0.8.ebuild2
-rw-r--r--dev-haskell/http-media/http-media-0.8.0.0.ebuild2
-rw-r--r--dev-haskell/http-types/http-types-0.12.3.ebuild2
-rw-r--r--dev-haskell/http/http-4000.4.1.ebuild2
-rw-r--r--dev-haskell/http2/http2-3.0.1.ebuild2
-rw-r--r--dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild2
-rw-r--r--dev-haskell/hunit/hunit-1.6.2.0.ebuild2
-rw-r--r--dev-haskell/ieee754/ieee754-0.7.8.ebuild2
-rw-r--r--dev-haskell/ifelse/ifelse-0.85-r1.ebuild2
-rw-r--r--dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild2
-rw-r--r--dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild2
-rw-r--r--dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r1.ebuild2
-rw-r--r--dev-haskell/invariant/invariant-0.5.5.ebuild2
-rw-r--r--dev-haskell/iproute/iproute-1.7.8.ebuild2
-rw-r--r--dev-haskell/ipynb/ipynb-0.2.ebuild2
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild2
-rw-r--r--dev-haskell/js-chart/js-chart-2.9.4.1.ebuild2
-rw-r--r--dev-haskell/juicypixels/juicypixels-3.3.5.ebuild2
-rw-r--r--dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild2
-rw-r--r--dev-haskell/language-c/language-c-0.8.3-r1.ebuild2
-rw-r--r--dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild2
-rw-r--r--dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild2
-rw-r--r--dev-haskell/leancheck/leancheck-0.9.3.ebuild2
-rw-r--r--dev-haskell/lens/lens-5.1.1.ebuild2
-rw-r--r--dev-haskell/libmpd/libmpd-0.9.2.0.ebuild2
-rw-r--r--dev-haskell/libyaml/libyaml-0.1.2.ebuild2
-rw-r--r--dev-haskell/lift-type/lift-type-0.1.0.1.ebuild2
-rw-r--r--dev-haskell/lifted-async/lifted-async-0.10.2.ebuild2
-rw-r--r--dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild2
-rw-r--r--dev-haskell/logging-facade/logging-facade-0.3.0.ebuild2
-rw-r--r--dev-haskell/logict/logict-0.7.0.3.ebuild2
-rw-r--r--dev-haskell/lpeg/lpeg-1.0.3.ebuild2
-rw-r--r--dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild2
-rw-r--r--dev-haskell/lua/lua-2.2.0.ebuild2
-rw-r--r--dev-haskell/lukko/lukko-0.1.1.3.ebuild2
-rw-r--r--dev-haskell/magic/magic-1.1.ebuild2
-rw-r--r--dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild2
-rw-r--r--dev-haskell/math-functions/math-functions-0.3.3.0.ebuild2
-rw-r--r--dev-haskell/memory/memory-0.15.0-r1.ebuild2
-rw-r--r--dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild2
-rw-r--r--dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild2
-rw-r--r--dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild2
-rw-r--r--dev-haskell/microlens/microlens-0.4.11.2.ebuild2
-rw-r--r--dev-haskell/microstache/microstache-1.0.2.ebuild2
-rw-r--r--dev-haskell/mime-types/mime-types-0.1.0.9.ebuild2
-rw-r--r--dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild2
-rw-r--r--dev-haskell/mmap/mmap-0.5.9.ebuild2
-rw-r--r--dev-haskell/mmorph/mmorph-1.1.3.ebuild2
-rw-r--r--dev-haskell/mockery/mockery-0.3.5.ebuild2
-rw-r--r--dev-haskell/monad-control/monad-control-1.0.2.3.ebuild2
-rw-r--r--dev-haskell/monad-logger/monad-logger-0.3.32.ebuild2
-rw-r--r--dev-haskell/monad-loops/monad-loops-0.4.3.ebuild2
-rw-r--r--dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild2
-rw-r--r--dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild2
-rw-r--r--dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild2
-rw-r--r--dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild2
-rw-r--r--dev-haskell/mountpoints/mountpoints-1.0.2.ebuild2
-rw-r--r--dev-haskell/mtl/mtl-2.2.2.ebuild4
-rw-r--r--dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild2
-rw-r--r--dev-haskell/nanospec/nanospec-0.2.2.ebuild2
-rw-r--r--dev-haskell/nats/nats-1.1.2-r1.ebuild2
-rw-r--r--dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild2
-rw-r--r--dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild2
-rw-r--r--dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild2
-rw-r--r--dev-haskell/network-info/network-info-0.2.0.10.ebuild2
-rw-r--r--dev-haskell/network-multicast/network-multicast-0.3.2.ebuild2
-rw-r--r--dev-haskell/network-uri/network-uri-2.6.4.1.ebuild2
-rw-r--r--dev-haskell/network/network-3.1.2.5.ebuild2
-rw-r--r--dev-haskell/old-locale/old-locale-1.0.0.7.ebuild2
-rw-r--r--dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild2
-rw-r--r--dev-haskell/onetuple/onetuple-0.3.1.ebuild2
-rw-r--r--dev-haskell/only/only-0.1.ebuild2
-rw-r--r--dev-haskell/options/options-1.2.1.1.ebuild2
-rw-r--r--dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild2
-rw-r--r--dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild2
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild2
-rw-r--r--dev-haskell/parallel-io/parallel-io-0.3.5.ebuild2
-rw-r--r--dev-haskell/parallel/parallel-3.2.2.0.ebuild2
-rw-r--r--dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild2
-rw-r--r--dev-haskell/parsec/parsec-3.1.14.0-r1.ebuild4
-rw-r--r--dev-haskell/parsec1/parsec1-1.0.0.7.ebuild2
-rw-r--r--dev-haskell/parsers/parsers-0.12.10-r1.ebuild2
-rw-r--r--dev-haskell/path-pieces/path-pieces-0.2.1.ebuild2
-rw-r--r--dev-haskell/patience/patience-0.1.1-r1.ebuild2
-rw-r--r--dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild2
-rw-r--r--dev-haskell/pem/pem-0.2.4.ebuild2
-rw-r--r--dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild2
-rw-r--r--dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild2
-rw-r--r--dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild2
-rw-r--r--dev-haskell/persistent/persistent-2.14.0.3.ebuild2
-rw-r--r--dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild2
-rw-r--r--dev-haskell/pretty-hex/pretty-hex-1.0.ebuild2
-rw-r--r--dev-haskell/pretty-show/pretty-show-1.10.ebuild2
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild2
-rw-r--r--dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild2
-rw-r--r--dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild2
-rw-r--r--dev-haskell/primitive/primitive-0.7.3.0.ebuild2
-rw-r--r--dev-haskell/profunctors/profunctors-5.6.2.ebuild2
-rw-r--r--dev-haskell/psqueues/psqueues-0.2.7.3.ebuild2
-rw-r--r--dev-haskell/puremd5/puremd5-2.1.3.ebuild2
-rw-r--r--dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild2
-rw-r--r--dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild2
-rw-r--r--dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild2
-rw-r--r--dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild2
-rw-r--r--dev-haskell/quickcheck/quickcheck-2.14.2.ebuild2
-rw-r--r--dev-haskell/random/random-1.2.1.ebuild2
-rw-r--r--dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild2
-rw-r--r--dev-haskell/reducers/reducers-3.12.3-r1.ebuild2
-rw-r--r--dev-haskell/reflection/reflection-2.1.6.ebuild2
-rw-r--r--dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild2
-rw-r--r--dev-haskell/regex-base/regex-base-0.94.0.1.ebuild2
-rw-r--r--dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild2
-rw-r--r--dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild2
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild2
-rw-r--r--dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild2
-rw-r--r--dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild2
-rw-r--r--dev-haskell/resourcet/resourcet-1.2.4.2.ebuild2
-rw-r--r--dev-haskell/retry/retry-0.9.0.0.ebuild2
-rw-r--r--dev-haskell/rio/rio-0.1.21.0.ebuild2
-rw-r--r--dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild2
-rw-r--r--dev-haskell/safe/safe-0.3.19.ebuild2
-rw-r--r--dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild2
-rw-r--r--dev-haskell/sandi/sandi-0.5.ebuild2
-rw-r--r--dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild2
-rw-r--r--dev-haskell/securemem/securemem-0.1.10.ebuild2
-rw-r--r--dev-haskell/semialign/semialign-1.2.0.1.ebuild2
-rw-r--r--dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild2
-rw-r--r--dev-haskell/semigroups/semigroups-0.20.ebuild2
-rw-r--r--dev-haskell/semirings/semirings-0.6.ebuild2
-rw-r--r--dev-haskell/servant-server/servant-server-0.19.1.ebuild2
-rw-r--r--dev-haskell/servant/servant-0.19.ebuild2
-rw-r--r--dev-haskell/setenv/setenv-0.1.1.3.ebuild2
-rw-r--r--dev-haskell/setlocale/setlocale-1.0.0.9.ebuild2
-rw-r--r--dev-haskell/sha/sha-1.6.4.4.ebuild2
-rw-r--r--dev-haskell/shakespeare/shakespeare-2.0.30.ebuild2
-rw-r--r--dev-haskell/shelly/shelly-1.9.0.ebuild2
-rw-r--r--dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild2
-rw-r--r--dev-haskell/silently/silently-1.2.5.1.ebuild2
-rw-r--r--dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild2
-rw-r--r--dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild2
-rw-r--r--dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild2
-rw-r--r--dev-haskell/skein/skein-1.0.9.4.ebuild2
-rw-r--r--dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch39
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild3
-rw-r--r--dev-haskell/skylighting/skylighting-0.12.3.1.ebuild2
-rw-r--r--dev-haskell/smallcheck/smallcheck-1.2.0.ebuild2
-rw-r--r--dev-haskell/socks/socks-0.6.1.ebuild2
-rw-r--r--dev-haskell/sop-core/sop-core-0.5.0.2.ebuild2
-rw-r--r--dev-haskell/split/split-0.2.3.4.ebuild2
-rw-r--r--dev-haskell/splitmix/splitmix-0.1.0.3.ebuild2
-rw-r--r--dev-haskell/statevar/statevar-1.2.1.ebuild2
-rw-r--r--dev-haskell/statistics/statistics-0.15.2.0.ebuild2
-rw-r--r--dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild2
-rw-r--r--dev-haskell/stm/stm-2.5.0.1.ebuild4
-rw-r--r--dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild2
-rw-r--r--dev-haskell/strict/strict-0.4.0.1.ebuild2
-rw-r--r--dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild2
-rw-r--r--dev-haskell/string-qq/string-qq-0.0.4.ebuild2
-rw-r--r--dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild2
-rw-r--r--dev-haskell/syb/syb-0.7.2.1.ebuild2
-rw-r--r--dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild2
-rw-r--r--dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild2
-rw-r--r--dev-haskell/tagged/tagged-0.8.6.1.ebuild2
-rw-r--r--dev-haskell/tagsoup/tagsoup-0.14.8.ebuild2
-rw-r--r--dev-haskell/tar/tar-0.5.1.1-r2.ebuild2
-rw-r--r--dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild2
-rw-r--r--dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild2
-rw-r--r--dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild2
-rw-r--r--dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild2
-rw-r--r--dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild2
-rw-r--r--dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild2
-rw-r--r--dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild2
-rw-r--r--dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild2
-rw-r--r--dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild2
-rw-r--r--dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild2
-rw-r--r--dev-haskell/tasty-th/tasty-th-0.1.7.ebuild2
-rw-r--r--dev-haskell/tasty/tasty-1.4.2.3.ebuild2
-rw-r--r--dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild2
-rw-r--r--dev-haskell/temporary/temporary-1.3.ebuild2
-rw-r--r--dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild2
-rw-r--r--dev-haskell/terminfo/terminfo-0.4.1.4.ebuild2
-rw-r--r--dev-haskell/terminfo/terminfo-0.4.1.5.ebuild4
-rw-r--r--dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild2
-rw-r--r--dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild2
-rw-r--r--dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild2
-rw-r--r--dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild2
-rw-r--r--dev-haskell/test-framework/test-framework-0.8.2.0-r3.ebuild2
-rw-r--r--dev-haskell/texmath/texmath-0.12.5.1.ebuild2
-rw-r--r--dev-haskell/text-conversions/text-conversions-0.3.1.ebuild2
-rw-r--r--dev-haskell/text-icu/text-icu-0.7.1.0.ebuild2
-rw-r--r--dev-haskell/text-short/text-short-0.1.5.ebuild2
-rw-r--r--dev-haskell/text-show/text-show-3.9.7.ebuild2
-rw-r--r--dev-haskell/text/text-1.2.4.1.ebuild2
-rw-r--r--dev-haskell/text/text-1.2.5.0.ebuild4
-rw-r--r--dev-haskell/tf-random/tf-random-0.5.ebuild2
-rw-r--r--dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild2
-rw-r--r--dev-haskell/th-compat/th-compat-0.1.3.ebuild2
-rw-r--r--dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild2
-rw-r--r--dev-haskell/th-lift/th-lift-0.8.2.ebuild2
-rw-r--r--dev-haskell/these/these-1.1.1.1.ebuild2
-rw-r--r--dev-haskell/time-compat/files/fix-resolution-test.patch49
-rw-r--r--dev-haskell/time-compat/time-compat-1.9.6.1.ebuild4
-rw-r--r--dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild2
-rw-r--r--dev-haskell/time-manager/time-manager-0.0.0.ebuild2
-rw-r--r--dev-haskell/timeit/timeit-2.0.ebuild2
-rw-r--r--dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild2
-rw-r--r--dev-haskell/timezone-series/timezone-series-0.1.9.ebuild2
-rw-r--r--dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild2
-rw-r--r--dev-haskell/tls/tls-1.5.8.ebuild2
-rw-r--r--dev-haskell/torrent/torrent-10000.1.1.ebuild2
-rw-r--r--dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild2
-rw-r--r--dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild2
-rw-r--r--dev-haskell/transformers/transformers-0.5.6.2.ebuild4
-rw-r--r--dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild2
-rw-r--r--dev-haskell/trifecta/trifecta-2.1.2.ebuild2
-rw-r--r--dev-haskell/type-equality/type-equality-1.ebuild2
-rw-r--r--dev-haskell/typed-process/typed-process-0.2.6.0.ebuild2
-rw-r--r--dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild2
-rw-r--r--dev-haskell/unicode-collation/Manifest2
-rw-r--r--dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild (renamed from dev-haskell/unicode-collation/unicode-collation-0.1.3.1.ebuild)15
-rw-r--r--dev-haskell/unicode-data/unicode-data-0.3.0.ebuild2
-rw-r--r--dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild2
-rw-r--r--dev-haskell/uniplate/uniplate-1.6.13.ebuild2
-rw-r--r--dev-haskell/unix-compat/unix-compat-0.5.2.ebuild2
-rw-r--r--dev-haskell/unix-time/unix-time-0.4.7.ebuild2
-rw-r--r--dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild2
-rw-r--r--dev-haskell/unliftio/unliftio-0.2.18.ebuild2
-rw-r--r--dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild2
-rw-r--r--dev-haskell/utf8-light/utf8-light-0.4.2.ebuild2
-rw-r--r--dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild2
-rw-r--r--dev-haskell/uuid-types/uuid-types-1.0.5.ebuild2
-rw-r--r--dev-haskell/uuid/uuid-1.3.15.ebuild2
-rw-r--r--dev-haskell/vault/vault-0.3.1.5.ebuild2
-rw-r--r--dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild2
-rw-r--r--dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild2
-rw-r--r--dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild2
-rw-r--r--dev-haskell/vector/vector-0.12.3.1.ebuild2
-rw-r--r--dev-haskell/void/void-0.7.3.ebuild2
-rw-r--r--dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild2
-rw-r--r--dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild2
-rw-r--r--dev-haskell/wai-logger/wai-logger-2.3.6.ebuild2
-rw-r--r--dev-haskell/wai/wai-3.2.3.ebuild2
-rw-r--r--dev-haskell/warp-tls/warp-tls-3.2.12.ebuild2
-rw-r--r--dev-haskell/warp/warp-3.3.21.ebuild2
-rw-r--r--dev-haskell/wcwidth/wcwidth-0.0.2.ebuild2
-rw-r--r--dev-haskell/witherable/witherable-0.4.2.ebuild2
-rw-r--r--dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild2
-rw-r--r--dev-haskell/word8/word8-0.1.3.ebuild2
-rw-r--r--dev-haskell/x11-xft/x11-xft-0.3.4.ebuild2
-rw-r--r--dev-haskell/x11/x11-1.10.2.ebuild2
-rw-r--r--dev-haskell/x509-store/x509-store-1.6.7.ebuild2
-rw-r--r--dev-haskell/x509-system/x509-system-1.6.6.ebuild2
-rw-r--r--dev-haskell/x509-validation/x509-validation-1.6.11.ebuild2
-rw-r--r--dev-haskell/x509/x509-1.7.5.ebuild2
-rw-r--r--dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild2
-rw-r--r--dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild2
-rw-r--r--dev-haskell/xml-types/xml-types-0.3.8.ebuild2
-rw-r--r--dev-haskell/xml/xml-1.3.14.ebuild2
-rw-r--r--dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild2
-rw-r--r--dev-haskell/yaml/yaml-0.11.8.0.ebuild2
-rw-r--r--dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild2
-rw-r--r--dev-haskell/yesod-form/yesod-form-1.7.0.ebuild2
-rw-r--r--dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild2
-rw-r--r--dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild2
-rw-r--r--dev-haskell/yesod-test/yesod-test-1.6.12.ebuild2
-rw-r--r--dev-haskell/yesod/yesod-1.6.2.ebuild2
-rw-r--r--dev-haskell/zip-archive/zip-archive-0.4.1.ebuild2
-rw-r--r--dev-haskell/zlib/zlib-0.6.2.3.ebuild2
456 files changed, 630 insertions, 478 deletions
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 4960841f5fc..eb3f1313f33 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="usecas"
RDEPEND="dev-haskell/random:=[profile?]
diff --git a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
index 2c8785b6f89..923a169a394 100644
--- a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
+++ b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
index 0ef63035687..ebdd802ece9 100644
--- a/dev-haskell/adjunctions/adjunctions-4.4.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
index 811e0a7d941..61f33af6430 100644
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="lib-only"
RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?]
diff --git a/dev-haskell/aeson/aeson-2.0.3.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
index f0dce2ddff6..435cab972cb 100644
--- a/dev-haskell/aeson/aeson-2.0.3.0.ebuild
+++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/haskell/aeson"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="cffi +ordered-keymap"
RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
diff --git a/dev-haskell/alex/alex-3.2.7.1.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
index 2497b2c9ef9..686c4aec1f0 100644
--- a/dev-haskell/alex/alex-3.2.7.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="doc"
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
index e8b5f11277e..0ae695dc77a 100644
--- a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
+++ b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
index cd9e6220451..ef6b2f437e4 100644
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
+++ b/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
index ff4af33dff7..495548ee0b5 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="example"
RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
index a0c8389c6bf..0080f7dda41 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-> ${CABAL_DISTFILE}"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild
index e06787c1c1e..ead22e56758 100644
--- a/dev-haskell/appar/appar-0.1.8.ebuild
+++ b/dev-haskell/appar/appar-0.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
index cb8910aa1f1..ea151213f5d 100644
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
index 65d74545a35..93ffb11f816 100644
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
index e8272ab94d3..ed0675737c3 100644
--- a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
+++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hourglass:=[profile?]
diff --git a/dev-haskell/assoc/assoc-1.0.2.ebuild b/dev-haskell/assoc/assoc-1.0.2.ebuild
index c362c52c488..6c5d944c4dd 100644
--- a/dev-haskell/assoc/assoc-1.0.2.ebuild
+++ b/dev-haskell/assoc/assoc-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bifunctors-5.5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
diff --git a/dev-haskell/async/async-2.2.4.ebuild b/dev-haskell/async/async-2.2.4.ebuild
index a4b548af70c..46313d715ed 100644
--- a/dev-haskell/async/async-2.2.4.ebuild
+++ b/dev-haskell/async/async-2.2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
index ec861b59285..50bcc381889 100644
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="debug"
RDEPEND="dev-haskell/primitive:=[profile?]
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
index 033d763dc25..4faa89862eb 100644
--- a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
index 34696273487..952408dfb72 100644
--- a/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/auto-update/auto-update-0.1.6.ebuild b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
index cf130c99f08..d675ae8446e 100644
--- a/dev-haskell/auto-update/auto-update-0.1.6.ebuild
+++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/aws/aws-0.22-r5.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild
index 8531cfae56b..1985fdc5c02 100644
--- a/dev-haskell/aws/aws-0.22-r5.ebuild
+++ b/dev-haskell/aws/aws-0.22-r5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/aristidb/aws"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RESTRICT=test # requires aws account
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
index d793e3339cc..8b7711fb491 100644
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="~dev-haskell/base-compat-0.12.1:=[profile?]
>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
diff --git a/dev-haskell/base-compat/base-compat-0.12.1.ebuild b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
index cb6d0ef1312..8f8f7c48abb 100644
--- a/dev-haskell/base-compat/base-compat-0.12.1.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
index 01f192cad04..7bcc258b94d 100644
--- a/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
+++ b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
index 51b0977404e..def9e6beaee 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
index 3306ed1c601..3ad6148a0ac 100644
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/basement/basement-0.0.12.ebuild b/dev-haskell/basement/basement-0.0.12.ebuild
index 1374c887da7..2ef32a273fb 100644
--- a/dev-haskell/basement/basement-0.0.12.ebuild
+++ b/dev-haskell/basement/basement-0.0.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
index a95bda0b676..fb7740d84a3 100644
--- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/parsec:=[profile?]
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
index e3a0f5ed91b..d038a663f63 100644
--- a/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+semigroups +tagged"
RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
index 7b1b1039c68..4f5a2d2cd7c 100644
--- a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/binary/binary-0.8.8.0.ebuild b/dev-haskell/binary/binary-0.8.8.0.ebuild
index 546880c852d..6adc72487a6 100644
--- a/dev-haskell/binary/binary-0.8.8.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
@@ -28,4 +28,4 @@ RDEPEND=">=dev-lang/ghc-7.8.2:=
DEPEND="${RDEPEND}
"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
index 7af64608c8d..f41d86a36e5 100644
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild
index 6e5ecb839ba..820e92222d0 100644
--- a/dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild
index d4925282ebc..d4c92c58cab 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 7f348a54949..1d715dc0e35 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
index 27260bbc356..166b013c349 100644
--- a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index 936ad84a80f..4bf51a2594f 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
index b51823f9d0e..9e0314195dd 100644
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
index 6c80dfa7870..533fbcc7eac 100644
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/c2hs/c2hs-0.28.8.ebuild b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
index 8a2d6b0c0a5..86ea4046ef9 100644
--- a/dev-haskell/c2hs/c2hs-0.28.8.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="regression"
RESTRICT=test # needs unprefixed 'cpp'
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
index 1bb532afc29..f1cdc2abf33 100644
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.8:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
index 4ea84e532ce..9dfc83f1b0d 100644
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="debug +lukko +native-dns"
RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index 65173d2541c..0877c3f6e60 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -51,4 +51,4 @@ src_configure() {
--flag=-bundled-binary-generic
}
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6"
+CABAL_CORE_LIB_GHC_PV="8.10.6"
diff --git a/dev-haskell/cabal/cabal-3.4.1.0.ebuild b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
index fd290d5d606..d809c1c9505 100644
--- a/dev-haskell/cabal/cabal-3.4.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${CABAL_PN}/${CABAL_PN}-${PV}.tar.g
LICENSE="BSD"
SLOT="0/${PV}"
#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
@@ -48,4 +48,4 @@ src_configure() {
--flag=-bundled-binary-generic
}
-CABAL_CORE_LIB_GHC_PV="PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="9.0.2"
diff --git a/dev-haskell/call-stack/call-stack-0.3.0.ebuild b/dev-haskell/call-stack/call-stack-0.3.0.ebuild
index 6c8a3895b1e..6ac2d310879 100644
--- a/dev-haskell/call-stack/call-stack-0.3.0.ebuild
+++ b/dev-haskell/call-stack/call-stack-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
index d45cb8d2856..c8117ca5b8e 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hashable-1.0:=[profile?]
diff --git a/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
index fc3a73e5c90..5e56a031f76 100644
--- a/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
<dev-haskell/hashable-1.5:=[profile?]
diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
index fc25587da1a..b47df540ed0 100644
--- a/dev-haskell/cereal/cereal-0.5.8.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
diff --git a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
index ec8e79db796..c7c3395685b 100644
--- a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
+++ b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
index 40fa042918f..206f8641d1c 100644
--- a/dev-haskell/chell/chell-0.4.0.2.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+color-output"
RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
index c20520e3811..bfb1cdbb19e 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3"
RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/citeproc/citeproc-0.7.ebuild b/dev-haskell/citeproc/citeproc-0.7.ebuild
index cf96915d68a..bf9e6366f83 100644
--- a/dev-haskell/citeproc/citeproc-0.7.ebuild
+++ b/dev-haskell/citeproc/citeproc-0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable icu"
# Many tests for this package are known to fail and this is acceptable for
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
index 3b2dd6d8876..38127b0a7fc 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index d63e78880cc..151eb843a86 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # circular depend: tasty->clock[test]->tasty
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
index 33cfd17a779..1f22527f7aa 100644
--- a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+quotation testprog"
RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
diff --git a/dev-haskell/code-page/code-page-0.1.3.ebuild b/dev-haskell/code-page/code-page-0.1.3.ebuild
index 15b9ef285ae..8f2fa569687 100644
--- a/dev-haskell/code-page/code-page-0.1.3.ebuild
+++ b/dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild
index a36d61bf13d..e1d0d2f5f91 100644
--- a/dev-haskell/colour/colour-2.3.5.ebuild
+++ b/dev-haskell/colour/colour-2.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# circular dependencies: colour -> ansi-terminal -> test-framework -> colour
RESTRICT=test
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
index cc7424afc9d..c9dd40b98f0 100644
--- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
index 16d54861208..0e9eff90939 100644
--- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/commonmark/commonmark-0.2.2.ebuild b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
index 110b6839f6d..0884c2aa5cc 100644
--- a/dev-haskell/commonmark/commonmark-0.2.2.ebuild
+++ b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/unicode-data-0.3:=[profile?]
dev-haskell/unicode-transforms:=[profile?]
diff --git a/dev-haskell/comonad/comonad-5.0.8.ebuild b/dev-haskell/comonad/comonad-5.0.8.ebuild
index 0b826921b3e..00239eebbbb 100644
--- a/dev-haskell/comonad/comonad-5.0.8.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+indexed-traversable"
RDEPEND=">=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
index 47eaf4dbbfe..9675c6b3ffa 100644
--- a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?]
diff --git a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
index ac55d7c38c9..6dda7ddb21f 100644
--- a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
+++ b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
index ebbaa2dc56d..44e99e5eea5 100644
--- a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # requires network
diff --git a/dev-haskell/conduit/conduit-1.3.4.2.ebuild b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
index d3e219fb217..e038cbdbef1 100644
--- a/dev-haskell/conduit/conduit-1.3.4.2.ebuild
+++ b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/exceptions:=[profile?]
>=dev-haskell/mono-traversable-1.0.7:=[profile?]
diff --git a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
index 7591dd38ca1..20b170e556f 100644
--- a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
+++ b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/attoparsec-0.10.0.2:=[profile?]
diff --git a/dev-haskell/connection/connection-0.3.1.ebuild b/dev-haskell/connection/connection-0.3.1.ebuild
index 204e78f9736..60427de6ab0 100644
--- a/dev-haskell/connection/connection-0.3.1.ebuild
+++ b/dev-haskell/connection/connection-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/constraints/constraints-0.13.3.ebuild b/dev-haskell/constraints/constraints-0.13.3.ebuild
index ca6f74cc537..59ab3cfe34f 100644
--- a/dev-haskell/constraints/constraints-0.13.3.ebuild
+++ b/dev-haskell/constraints/constraints-0.13.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/contravariant/contravariant-1.5.3.ebuild b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
index 224e0767b51..86cb27e755a 100644
--- a/dev-haskell/contravariant/contravariant-1.5.3.ebuild
+++ b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+semigroups +statevar +tagged"
RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
index 25cd1f4833b..b903f09e3c6 100644
--- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild
+++ b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/cookie/cookie-0.4.4.ebuild b/dev-haskell/cookie/cookie-0.4.4.ebuild
index 392f8d712e2..e5cf8a8f677 100644
--- a/dev-haskell/cookie/cookie-0.4.4.ebuild
+++ b/dev-haskell/cookie/cookie-0.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
index db5a1640254..bdddc346fb9 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
index ac370fea7eb..4e7ee532603 100644
--- a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
diff --git a/dev-haskell/criterion/criterion-1.5.11.0.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
index b81ab6dfbb6..514e5972ac2 100644
--- a/dev-haskell/criterion/criterion-1.5.11.0.ebuild
+++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="embed-data-files"
RDEPEND=">=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
diff --git a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
index d16ab511d3f..b1109891d8b 100644
--- a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
+++ b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/cereal:=[profile?]
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
index f91c2ccb471..46382f43b3c 100644
--- a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
+++ b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="all-cpolys"
RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
index 7333f8cfa1a..fbd45d7232e 100644
--- a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
+++ b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
index 00ff829792f..3f37fce9d97 100644
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index bc6ae4d42da..94614c20147 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/securemem:=[profile?]
diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
index 3ee6c92ef88..18c798c699a 100644
--- a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
index a98b36cde29..5706d0c360e 100644
--- a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
index 11adbf91646..853c4393bb3 100644
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
index d4b691ce48c..bfe6a3a93a3 100644
--- a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
+++ b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # test suite fails to build
diff --git a/dev-haskell/cryptonite/cryptonite-0.28.ebuild b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
index 7190477eee9..19600b13973 100644
--- a/dev-haskell/cryptonite/cryptonite-0.28.ebuild
+++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp +target-attributes"
RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
diff --git a/dev-haskell/css-text/css-text-0.1.3.0.ebuild b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
index 64f53d6fd70..35ee8d518fe 100644
--- a/dev-haskell/css-text/css-text-0.1.3.0.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # fails test, not sure if it's severe
diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
index c3e6d6e9b20..07f2c311827 100644
--- a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
+++ b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
index 634f5220e76..bc9f7402c1a 100644
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
index 4780a27c7bd..d4fc2a85e69 100644
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
index 6ad48f1dbf4..ac4dca97bef 100644
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default/data-default-0.7.1.1.ebuild b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
index c723e4f30ff..115b96df6c2 100644
--- a/dev-haskell/data-default/data-default-0.7.1.1.ebuild
+++ b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
diff --git a/dev-haskell/data-fix/data-fix-0.3.2.ebuild b/dev-haskell/data-fix/data-fix-0.3.2.ebuild
index 1bb9aae7f85..153c1b61514 100644
--- a/dev-haskell/data-fix/data-fix-0.3.2.ebuild
+++ b/dev-haskell/data-fix/data-fix-0.3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index c3817d666d9..e2b74b44cf6 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 20395cf5943..fac79a5e82f 100644
--- a/dev-haskell/dav/dav-1.3.4.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 94a488b3bbb..5e6f09b7298 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1 +1,2 @@
DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9
+DIST dbus-1.2.27.tar.gz 78017 BLAKE2B 396739e7e6af0fe1921c9d3857c0650db9532d00a3fd2eda18042d42ce8336631d93d0c0ce75681b695f9e90c7205e38aea7c4f984544460ecab19c7d5090478 SHA512 2c6b87b4a793b555ef617e3f3f89695116180f0e1df2f84ee3da62c819c05c10a78d328644b84c8c9796354ee6dd1c6ad6b0430a1b9a2d7fe112b251d4606e8d
diff --git a/dev-haskell/dbus/dbus-1.2.22.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild
index 635eeebba4e..e3c321fbdbf 100644
--- a/dev-haskell/dbus/dbus-1.2.22.ebuild
+++ b/dev-haskell/dbus/dbus-1.2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
PATCHES=(
"${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch"
diff --git a/dev-haskell/dbus/dbus-1.2.27.ebuild b/dev-haskell/dbus/dbus-1.2.27.ebuild
new file mode 100644
index 00000000000..37104d3dc90
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.2.27.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A client library for the D-Bus IPC system"
+HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch"
+ "${FILESDIR}/${PN}-1.2.27-template-haskell.patch"
+)
+
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( <dev-haskell/extra-1.8
+ <dev-haskell/quickcheck-2.15
+ <dev-haskell/resourcet-1.3
+ <dev-haskell/tasty-1.5
+ <dev-haskell/tasty-hunit-0.11
+ <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+ default
+ cabal_chdeps \
+ "base >=4.16 && <5" "base >=4 && <5" \
+ "template-haskell >= 2.18 && < 2.20" "template-haskell"
+}
diff --git a/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch
new file mode 100644
index 00000000000..dab7aaff6ae
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch
@@ -0,0 +1,14 @@
+--- dbus-1.2.27-orig/lib/DBus/Generation.hs 2022-07-13 00:32:15.000000000 +1000
++++ dbus-1.2.27/lib/DBus/Generation.hs 2022-11-15 11:11:32.291154128 +1100
+@@ -148,7 +148,11 @@
+ makeFromVariantApp name = AppE (VarE 'T.fromVariant) $ VarE name
+
+ makeJustPattern :: Name -> Pat
++#if MIN_VERSION_template_haskell(2,18,0)
+ makeJustPattern name = ConP 'Just [] [VarP name]
++#else
++makeJustPattern name = ConP 'Just [VarP name]
++#endif
+
+ mapOrHead ::
+ (Num a, Eq a) => a -> (t -> b) -> [t] -> ([b] -> b) -> b
diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml
index 5063563f544..4640c75ee04 100644
--- a/dev-haskell/dbus/metadata.xml
+++ b/dev-haskell/dbus/metadata.xml
@@ -8,23 +8,23 @@
D-Bus is a simple, message-based protocol for inter-process
communication, which allows applications to interact with other parts of
the machine and the user's session using remote procedure calls.
-
+
D-Bus is a essential part of the modern Linux desktop, where it replaces
earlier protocols such as CORBA and DCOP.
-
+
This library is an implementation of the D-Bus protocol in Haskell. It
can be used to add D-Bus support to Haskell applications, without the
awkward interfaces common to foreign bindings.
-
+
Example: connect to the session bus, and get a list of active names.
-
+
@
&amp;#x7b;-\# LANGUAGE OverloadedStrings \#-&amp;#x7d;
-
+
import Data.List (sort)
import DBus
import DBus.Client
-
+
main = do
&amp;#x20; client &lt;- connectSession
&amp;#x20; //
@@ -41,7 +41,7 @@
&amp;#x20; \-- temporary names.
&amp;#x20; mapM_ putStrLn (sort names)
@
-
+
&gt;$ ghc --make list-names.hs
&gt;$ ./list-names
&gt;:1.0
@@ -56,4 +56,8 @@
&gt;org.freedesktop.secrets
&gt;org.gnome.ScreenSaver
</longdescription>
+ <upstream>
+ <remote-id type="hackage">dbus</remote-id>
+ <remote-id type="github">rblaze/haskell-dbus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/dec/dec-0.0.3.ebuild b/dev-haskell/dec/dec-0.0.3.ebuild
index 7e13994066b..d4409edc6db 100644
--- a/dev-haskell/dec/dec-0.0.3.ebuild
+++ b/dev-haskell/dec/dec-0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
index 908e086c53e..7ee7b28701c 100644
--- a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
+++ b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/math-functions-0.1.7:=[profile?]
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
index 26cea1e8499..543d7ed8d2a 100644
--- a/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
+++ b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
>=dev-haskell/transformers-compat-0.5:=[profile?]
diff --git a/dev-haskell/diff/diff-0.4.0.ebuild b/dev-haskell/diff/diff-0.4.0.ebuild
index b2239327221..5f1fe3f0a57 100644
--- a/dev-haskell/diff/diff-0.4.0.ebuild
+++ b/dev-haskell/diff/diff-0.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index a64eb88becc..c315e5d04cc 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
index 60b362f5e3e..296bf28d0ee 100644
--- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
+++ b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/distributive/distributive-0.6.2.1.ebuild b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
index 3e33184b7e8..f2a17578b59 100644
--- a/dev-haskell/distributive/distributive-0.6.2.1.ebuild
+++ b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/dlist/dlist-1.0.ebuild b/dev-haskell/dlist/dlist-1.0.ebuild
index 5837480342b..03b9113abdd 100644
--- a/dev-haskell/dlist/dlist-1.0.ebuild
+++ b/dev-haskell/dlist/dlist-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="werror"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dns/dns-4.0.1.ebuild b/dev-haskell/dns/dns-4.0.1.ebuild
index 792a4903052..b6ce27e9274 100644
--- a/dev-haskell/dns/dns-4.0.1.ebuild
+++ b/dev-haskell/dns/dns-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # uses internet to test resolver
diff --git a/dev-haskell/doclayout/doclayout-0.4.ebuild b/dev-haskell/doclayout/doclayout-0.4.ebuild
index bbb4a128cde..321fb7a785b 100644
--- a/dev-haskell/doclayout/doclayout-0.4.ebuild
+++ b/dev-haskell/doclayout/doclayout-0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?]
dev-haskell/safe:=[profile?]
diff --git a/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
index eec0793edf8..880b57228ca 100644
--- a/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
+++ b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/aeson:=[profile?]
>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
diff --git a/dev-haskell/doctest/doctest-0.20.0.ebuild b/dev-haskell/doctest/doctest-0.20.0.ebuild
index 82be7d68d74..01245921067 100644
--- a/dev-haskell/doctest/doctest-0.20.0.ebuild
+++ b/dev-haskell/doctest/doctest-0.20.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/code-page-0.1:=[profile?]
diff --git a/dev-haskell/easy-file/easy-file-0.2.2.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
index 660ee5e765f..7ea42aa72e8 100644
--- a/dev-haskell/easy-file/easy-file-0.2.2.ebuild
+++ b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
index 1bcf92d2ad2..2931bd3f29a 100644
--- a/dev-haskell/echo/echo-0.1.3.ebuild
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
index 5c56aaee47c..686e9c92ba6 100644
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index df658acb771..da72c42986d 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-haskell/random-1.0:=[profile?]
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
index fc94ede6fb2..4e0340dffc7 100644
--- a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
PATCHES=( "${FILESDIR}/${PN}-2.3.2.15-fix-doctest.patch" )
diff --git a/dev-haskell/emojis/emojis-0.1.2.ebuild b/dev-haskell/emojis/emojis-0.1.2.ebuild
index 169e9439e1a..4743fefce30 100644
--- a/dev-haskell/emojis/emojis-0.1.2.ebuild
+++ b/dev-haskell/emojis/emojis-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/text:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
index 1797580de97..f4bc49f7ea4 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
index 2d3ede9eb5d..c2c0e03efe3 100644
--- a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
+++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="halvm"
RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
index b0b2a091473..ed5bc1010ae 100644
--- a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
+++ b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
index 5265657921e..aa469da2431 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-orphans:=[profile?]
diff --git a/dev-haskell/errors/errors-2.3.0.ebuild b/dev-haskell/errors/errors-2.3.0.ebuild
index 1e90abc2141..25ea4d88471 100644
--- a/dev-haskell/errors/errors-2.3.0.ebuild
+++ b/dev-haskell/errors/errors-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
diff --git a/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild b/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild
index e41704431af..f123ecd719d 100644
--- a/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ekmett/exceptions/"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
src_prepare() {
default
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index 532db60e0f4..ac1f40583bc 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~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"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/extra/extra-1.7.10.ebuild b/dev-haskell/extra/extra-1.7.10.ebuild
index 06008462500..6f8e4443fa9 100644
--- a/dev-haskell/extra/extra-1.7.10.ebuild
+++ b/dev-haskell/extra/extra-1.7.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index e49848d4873..3ccc00ae67c 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
index 69eae850cfc..eb131f18795 100644
--- a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
+++ b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index b45834d57d9..993d6a959f9 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
diff --git a/dev-haskell/feed/feed-1.3.2.1.ebuild b/dev-haskell/feed/feed-1.3.2.1.ebuild
index b3e62b7777b..09c06e00e65 100644
--- a/dev-haskell/feed/feed-1.3.2.1.ebuild
+++ b/dev-haskell/feed/feed-1.3.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
diff --git a/dev-haskell/fgl/fgl-5.7.0.3.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
index 7caedbd751e..ee4cc0d826a 100644
--- a/dev-haskell/fgl/fgl-5.7.0.3.ebuild
+++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-7.8.2:=
"
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
index be234bc56ab..aed291a6dc5 100644
--- a/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
+++ b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.2:=
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index e07f7da0e64..3f536835abe 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
index d7edbff346b..7a241114858 100644
--- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index 66fe577a98a..1abdf760d45 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
index 24063666c9d..d0cc54d633b 100644
--- a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
+++ b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/foldl/foldl-1.4.12-r1.ebuild b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
index 21f98c77fee..e8f8fbb1f41 100644
--- a/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
+++ b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://hackage.haskell.org/package/foldl"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
PATCHES=( "${FILESDIR}/${PN}-1.4.12-cabal-doctest.patch" )
diff --git a/dev-haskell/foundation/foundation-0.0.26.1.ebuild b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
index 99ff08bad65..aeeca4edf5e 100644
--- a/dev-haskell/foundation/foundation-0.0.26.1.ebuild
+++ b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="experimental"
RESTRICT=test # hangs indefinitely
diff --git a/dev-haskell/free/free-5.1.9.ebuild b/dev-haskell/free/free-5.1.9.ebuild
index 37b438299c1..76ed67407f9 100644
--- a/dev-haskell/free/free-5.1.9.ebuild
+++ b/dev-haskell/free/free-5.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
index 33294ff7b33..9070cc5796e 100644
--- a/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
+++ b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
index e56c7e3bd08..518299ae629 100644
--- a/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
index 74e71343dc2..c0eb7c8e8af 100644
--- a/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
+++ b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
diff --git a/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
index 5948f5209da..719f31ce50c 100644
--- a/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
+++ b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
index 0bdacaeb5e4..2750ffc0629 100644
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
index 8d8c863aacd..78f078065e1 100644
--- a/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
+++ b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
LICENSE="AGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/glob/glob-0.10.2.ebuild b/dev-haskell/glob/glob-0.10.2.ebuild
index a024620f06c..e19cd0328c0 100644
--- a/dev-haskell/glob/glob-0.10.2.ebuild
+++ b/dev-haskell/glob/glob-0.10.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://hackage.haskell.org/package/${CABAL_P}/${CABAL_P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/dlist-0.4:=[profile?]
>=dev-haskell/transformers-compat-0.3:=[profile?]
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
index c0a641996ee..2fc4107994f 100644
--- a/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
+++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+lukko"
RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild
index a769f4844c7..d61c9be83da 100644
--- a/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/happy/happy-1.19.12.ebuild b/dev-haskell/happy/happy-1.19.12.ebuild
index fdc9808860f..cd025a2937e 100644
--- a/dev-haskell/happy/happy-1.19.12.ebuild
+++ b/dev-haskell/happy/happy-1.19.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="doc"
# Re: LLVM blocker - ghc-9.0.2 generates IR that crashes LLVM opt
diff --git a/dev-haskell/hashable/hashable-1.4.0.2.ebuild b/dev-haskell/hashable/hashable-1.4.0.2.ebuild
index 6ce91d0e13b..a0740a70433 100644
--- a/dev-haskell/hashable/hashable-1.4.0.2.ebuild
+++ b/dev-haskell/hashable/hashable-1.4.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/haskeline/haskeline-0.8.2.ebuild b/dev-haskell/haskeline/haskeline-0.8.2.ebuild
index 093b1cdad01..6fd62b5ea6a 100644
--- a/dev-haskell/haskeline/haskeline-0.8.2.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
# keep in sync with ghc-8.10.6
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="+terminfo"
RESTRICT=test # test requires example executable which does not work correctly
@@ -37,4 +37,4 @@ src_configure() {
}
# ghc-9.0.1 actually comes bundled with haskeline-0.8.1.0
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
index 9a84d472c28..2502cbcb4f8 100644
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
index 079fd657b40..69732101071 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index 7d75dfea2d5..45320035e79 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-db/postgresql-7:*
diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index a7a7dd75f27..69e57d8eba3 100644
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+splitbase"
RDEPEND=">=dev-db/sqlite-3.0
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 4032e5a2a5b..34fab413d95 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT="test" # Requires unmaintaned dev-haskell/testpack
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
index 9b2548782b4..ff6293ba3b6 100644
--- a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
+++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
index b05aa2c5469..eb4a87ff97f 100644
--- a/dev-haskell/hinotify/hinotify-0.3.10.ebuild
+++ b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index ee7921394a8..9f29206330a 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # Requires network access?
diff --git a/dev-haskell/hostname/hostname-1.0-r1.ebuild b/dev-haskell/hostname/hostname-1.0-r1.ebuild
index 6422259d899..486f599b0cc 100644
--- a/dev-haskell/hostname/hostname-1.0-r1.ebuild
+++ b/dev-haskell/hostname/hostname-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
index d536bbfa62b..55e5eb9e581 100644
--- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
index b73e5945673..daada744ad2 100644
--- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
index 81664845b34..fecba81f2f9 100644
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
>=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
index ec98943e633..c0c2941e1a7 100644
--- a/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
+++ b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
index 14e471f418f..3f78ce63166 100644
--- a/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
+++ b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
index cab7b554f7a..75d433b95ac 100644
--- a/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
+++ b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/lua-2.2:=[profile?] <dev-haskell/lua-2.3:=[profile?]
>=dev-lang/ghc-8.10.1:=
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
index 8a2e007125d..b8c10d62522 100644
--- a/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
+++ b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
index 56fc5a74772..aab74fa0ce2 100644
--- a/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
+++ b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
index 298afabab54..dec168ce80b 100644
--- a/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
+++ b/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
index ea33298675b..dded0e5bfd1 100644
--- a/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
+++ b/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
index cf5f5573518..fe166a18c9c 100644
--- a/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
+++ b/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild b/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
index e47b197926f..b4346e95b6b 100644
--- a/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
+++ b/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
index 74b2dda2e39..f0fe893bd43 100644
--- a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
+++ b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
index 0abd6c1ed91..04db5086a22 100644
--- a/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
+++ b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hslua/hslua-2.2.0.ebuild b/dev-haskell/hslua/hslua-2.2.0.ebuild
index 944fef62e21..ccdbc2bd09c 100644
--- a/dev-haskell/hslua/hslua-2.2.0.ebuild
+++ b/dev-haskell/hslua/hslua-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
index 078023f6b6c..c2aa67b0a4f 100644
--- a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
+++ b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # test-suite fails to build
diff --git a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
index b9360fddc44..b1e1cf43f41 100644
--- a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
+++ b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
index 22159f102e6..a1fbf99cb31 100644
--- a/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
+++ b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
index 7e7bad22fe5..11475eb6d1a 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
index bdfb5c4658c..ad72711b86b 100644
--- a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/ansi-terminal:=[profile?]
dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
index 1a40288b345..df9ddadbb4a 100644
--- a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
+++ b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/hspec/hspec-2.9.4.ebuild b/dev-haskell/hspec/hspec-2.9.4.ebuild
index b716817a8e2..f02cfb2e0e0 100644
--- a/dev-haskell/hspec/hspec-2.9.4.ebuild
+++ b/dev-haskell/hspec/hspec-2.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="~dev-haskell/hspec-core-2.9.4:=[profile?]
~dev-haskell/hspec-discover-2.9.4:=[profile?]
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
index c97e996955d..ea317b4a47c 100644
--- a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
index 3f51a0464e1..76e0ba965dc 100644
--- a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
+++ b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index f9ad2a1f9b7..167d4b5e27d 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
index fcf76497489..a23135f1151 100644
--- a/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
+++ b/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="text-show"
RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
index 0c102683979..b354ab359f9 100644
--- a/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
dev-haskell/data-default:=[profile?]
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
index 872666a4713..e4a1eb92380 100644
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test # requires network access
diff --git a/dev-haskell/http-client/http-client-0.7.11.ebuild b/dev-haskell/http-client/http-client-0.7.11.ebuild
index 474fb0cf98a..de0d480b75e 100644
--- a/dev-haskell/http-client/http-client-0.7.11.ebuild
+++ b/dev-haskell/http-client/http-client-0.7.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/async:=[profile?]
>=dev-haskell/base64-bytestring-1.0:=[profile?]
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
index 9150ebffb9a..926ec774644 100644
--- a/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
+++ b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # needs network
diff --git a/dev-haskell/http-date/http-date-0.0.8.ebuild b/dev-haskell/http-date/http-date-0.0.8.ebuild
index a24c9a68da4..0f791df74f8 100644
--- a/dev-haskell/http-date/http-date-0.0.8.ebuild
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
diff --git a/dev-haskell/http-media/http-media-0.8.0.0.ebuild b/dev-haskell/http-media/http-media-0.8.0.0.ebuild
index d73bfbb072b..dfea55661a4 100644
--- a/dev-haskell/http-media/http-media-0.8.0.0.ebuild
+++ b/dev-haskell/http-media/http-media-0.8.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/case-insensitive-1.0:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
diff --git a/dev-haskell/http-types/http-types-0.12.3.ebuild b/dev-haskell/http-types/http-types-0.12.3.ebuild
index 53ac094f05a..8df1e56a388 100644
--- a/dev-haskell/http-types/http-types-0.12.3.ebuild
+++ b/dev-haskell/http-types/http-types-0.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
diff --git a/dev-haskell/http/http-4000.4.1.ebuild b/dev-haskell/http/http-4000.4.1.ebuild
index 14bc42d0a10..fccf44337e1 100644
--- a/dev-haskell/http/http-4000.4.1.ebuild
+++ b/dev-haskell/http/http-4000.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/http2/http2-3.0.1.ebuild b/dev-haskell/http2/http2-3.0.1.ebuild
index 52e139c496b..35dca6f66f6 100644
--- a/dev-haskell/http2/http2-3.0.1.ebuild
+++ b/dev-haskell/http2/http2-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test # test suite requires too new dependencies
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
index 2ebddc7d928..048599c6a25 100644
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="buildexamples"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hunit/hunit-1.6.2.0.ebuild b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
index 202c7484150..d193460f1eb 100644
--- a/dev-haskell/hunit/hunit-1.6.2.0.ebuild
+++ b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/call-stack-0.3.0:=[profile?]
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index 9d9b23e7be9..f0eb1c63da2 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index 55692bfc4ce..ea3e4469dd4 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
index b3aee54e19d..e16c527e485 100644
--- a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
index 7655bddc842..d6c8720f80f 100644
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r1.ebuild
index 6eb3c519e9a..9634d976ad9 100644
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r1.ebuild
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
diff --git a/dev-haskell/invariant/invariant-0.5.5.ebuild b/dev-haskell/invariant/invariant-0.5.5.ebuild
index e2d0a662c9f..1bcf6479734 100644
--- a/dev-haskell/invariant/invariant-0.5.5.ebuild
+++ b/dev-haskell/invariant/invariant-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
diff --git a/dev-haskell/iproute/iproute-1.7.8.ebuild b/dev-haskell/iproute/iproute-1.7.8.ebuild
index 899941877a2..b9f1ddeba8b 100644
--- a/dev-haskell/iproute/iproute-1.7.8.ebuild
+++ b/dev-haskell/iproute/iproute-1.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # Ambiguous modules: byte-order-0.1.2.0 byteorder-1.0.4
diff --git a/dev-haskell/ipynb/ipynb-0.2.ebuild b/dev-haskell/ipynb/ipynb-0.2.ebuild
index 2ff4bf554ff..0480766975b 100644
--- a/dev-haskell/ipynb/ipynb-0.2.ebuild
+++ b/dev-haskell/ipynb/ipynb-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/aeson-1.5.2.0:=[profile?]
dev-haskell/base64-bytestring:=[profile?]
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
index abe9d9ae4df..483164b3799 100644
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
index cf1ad34f19e..9ae36ab0dde 100644
--- a/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
+++ b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
index f99fc0a9643..0df3fb07d82 100644
--- a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="mmap"
RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
index 5b344e1af00..3b6791b366a 100644
--- a/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
+++ b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
diff --git a/dev-haskell/language-c/language-c-0.8.3-r1.ebuild b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
index 0ddd95afb98..8e0d879d7f3 100644
--- a/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
+++ b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
index c7c8009e5ea..189cac22b2c 100644
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/regex-posix:=[profile?]
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
index 27555ce718f..3ed98a00bfd 100644
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
diff --git a/dev-haskell/leancheck/leancheck-0.9.3.ebuild b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
index a398399f440..7b867b15094 100644
--- a/dev-haskell/leancheck/leancheck-0.9.3.ebuild
+++ b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/lens/lens-5.1.1.ebuild b/dev-haskell/lens/lens-5.1.1.ebuild
index a420bf64f2a..92d99242552 100644
--- a/dev-haskell/lens/lens-5.1.1.ebuild
+++ b/dev-haskell/lens/lens-5.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
index 63eb7768943..97f3dfe3d94 100644
--- a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
diff --git a/dev-haskell/libyaml/libyaml-0.1.2.ebuild b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
index e46b35817d9..ecbf7a42351 100644
--- a/dev-haskell/libyaml/libyaml-0.1.2.ebuild
+++ b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="no-unicode system-libyaml"
RDEPEND=">=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
diff --git a/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
index 3d091da2085..938bce140fb 100644
--- a/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
+++ b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
index abe41347079..bb1c13f290e 100644
--- a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
index bc8b9ff63c4..a8ff747859e 100644
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?]
diff --git a/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
index 2acd4e49bce..735db704475 100644
--- a/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
+++ b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/logict/logict-0.7.0.3.ebuild b/dev-haskell/logict/logict-0.7.0.3.ebuild
index 13950a53706..38980435b78 100644
--- a/dev-haskell/logict/logict-0.7.0.3.ebuild
+++ b/dev-haskell/logict/logict-0.7.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/fail:=[profile?]
diff --git a/dev-haskell/lpeg/lpeg-1.0.3.ebuild b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
index 5434ea23546..c99513d0dbd 100644
--- a/dev-haskell/lpeg/lpeg-1.0.3.ebuild
+++ b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="rely-on-shared-lpeg-library"
RDEPEND=">=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?]
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
index 1f1a53ace94..7a4c08b2e99 100644
--- a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/lua/lua-2.2.0.ebuild b/dev-haskell/lua/lua-2.2.0.ebuild
index 04579cdb960..7e8afe830cc 100644
--- a/dev-haskell/lua/lua-2.2.0.ebuild
+++ b/dev-haskell/lua/lua-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="system-lua"
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/lukko/lukko-0.1.1.3.ebuild b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
index 15c2591b221..ba28ea89bd4 100644
--- a/dev-haskell/lukko/lukko-0.1.1.3.ebuild
+++ b/dev-haskell/lukko/lukko-0.1.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="GPL-2 BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
index 33eb7fd0a48..7deb5e8ca8c 100644
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ b/dev-haskell/magic/magic-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
index c2ab92962e2..91cae765255 100644
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
index ab302622f5c..d5057bc437c 100644
--- a/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
+++ b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
diff --git a/dev-haskell/memory/memory-0.15.0-r1.ebuild b/dev-haskell/memory/memory-0.15.0-r1.ebuild
index e623aa814b9..5af492adae3 100644
--- a/dev-haskell/memory/memory-0.15.0-r1.ebuild
+++ b/dev-haskell/memory/memory-0.15.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
index 88de6610d46..8d7abf37792 100644
--- a/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
+++ b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/aeson-2.0:=[profile?]
>=dev-haskell/attoparsec-0.10:=[profile?]
diff --git a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
index bca2d0cb886..be86ec150fe 100644
--- a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
index 0bb198bab34..f97a011ab1a 100644
--- a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/microlens/microlens-0.4.11.2.ebuild b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
index d70da370a1f..5f0f4b04d1c 100644
--- a/dev-haskell/microlens/microlens-0.4.11.2.ebuild
+++ b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/microstache/microstache-1.0.2.ebuild b/dev-haskell/microstache/microstache-1.0.2.ebuild
index e7396b72c26..4ec8a134d07 100644
--- a/dev-haskell/microstache/microstache-1.0.2.ebuild
+++ b/dev-haskell/microstache/microstache-1.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
index 788ea687d91..ad51cece2b3 100644
--- a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
+++ b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
index 67613d6c295..fcee6195307 100644
--- a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
RESTRICT=test # tests are present for removed modules
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index 11fb3fea279..84152caba55 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
# IUSE="test"
IUSE=""
diff --git a/dev-haskell/mmorph/mmorph-1.1.3.ebuild b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
index 230bce1c1f6..0c8d325b3bd 100644
--- a/dev-haskell/mmorph/mmorph-1.1.3.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/mockery/mockery-0.3.5.ebuild b/dev-haskell/mockery/mockery-0.3.5.ebuild
index 55e6b70f4db..5457c281eaf 100644
--- a/dev-haskell/mockery/mockery-0.3.5.ebuild
+++ b/dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
index 9c8606c78d8..48fc2bb5fe1 100644
--- a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
index 6a057a8cf99..ef2b8d43245 100644
--- a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
+++ b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+template-haskell"
RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
diff --git a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
index 46d7541e1cb..a1dcb58422f 100644
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
index a25f6cb320b..d2a3c042d45 100644
--- a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
+++ b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?]
diff --git a/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
index e8e6cd8feeb..737182f7a91 100644
--- a/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
+++ b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/simonmar/monad-par"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="chaselev"
RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
index 72e40052745..ad9d5a8fcfc 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
index bef7bcab3cd..adac9410b2c 100644
--- a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
+++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hashable:=[profile?]
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
index b144fc0aa83..00b8b23338f 100644
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
index 7cc8a531924..2f73634d529 100644
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.2.ebuild
@@ -17,11 +17,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
"
DEPEND="${RDEPEND}"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
index b49a405646c..007de231902 100644
--- a/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
+++ b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/math-functions-0.2.1.0:=[profile?]
diff --git a/dev-haskell/nanospec/nanospec-0.2.2.ebuild b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
index d3d10530b89..b857b003e6f 100644
--- a/dev-haskell/nanospec/nanospec-0.2.2.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # cyclic depend: silently[test]->nanospec
diff --git a/dev-haskell/nats/nats-1.1.2-r1.ebuild b/dev-haskell/nats/nats-1.1.2-r1.ebuild
index 86b1d3cd8dd..b7f57d7acae 100644
--- a/dev-haskell/nats/nats-1.1.2-r1.ebuild
+++ b/dev-haskell/nats/nats-1.1.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+binary +hashable +template-haskell"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
index a51fa796727..899dbe7dea8 100644
--- a/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
+++ b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
>=dev-haskell/monad-loops-0.3:=[profile?]
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
index 61a1e6838fd..15c30c07888 100644
--- a/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
+++ b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
index e47e73ca8bc..c19fe1692bd 100644
--- a/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
+++ b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/network-info/network-info-0.2.0.10.ebuild b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
index a415b2d0f11..f8fd2bba0f3 100644
--- a/dev-haskell/network-info/network-info-0.2.0.10.ebuild
+++ b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
index dffa7ce6f57..3bef0617f26 100644
--- a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
+++ b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
index a462f00849c..00acaf61493 100644
--- a/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
diff --git a/dev-haskell/network/network-3.1.2.5.ebuild b/dev-haskell/network/network-3.1.2.5.ebuild
index eaa8c711022..72ad0f33f26 100644
--- a/dev-haskell/network/network-3.1.2.5.ebuild
+++ b/dev-haskell/network/network-3.1.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="devel"
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index a9d031e921d..1a370e7c1d9 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index ff3a4753f50..dc55a3f0573 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
diff --git a/dev-haskell/onetuple/onetuple-0.3.1.ebuild b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
index 6c70f918974..7a150032aa3 100644
--- a/dev-haskell/onetuple/onetuple-0.3.1.ebuild
+++ b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
diff --git a/dev-haskell/only/only-0.1.ebuild b/dev-haskell/only/only-0.1.ebuild
index a91b9b02c2e..749e4aaa44d 100644
--- a/dev-haskell/only/only-0.1.ebuild
+++ b/dev-haskell/only/only-0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index e577ec55f88..cdfb7105b0d 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # circular depends: options[test]->chell->options
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
index 9e05e6b8312..662b9baa6a9 100644
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
index c107a40ddf9..b135150d2cd 100644
--- a/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
+++ b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
index a4e530e46e1..5ce56341da8 100644
--- a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
index ff8c964549a..ef11ecf557b 100644
--- a/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
+++ b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
diff --git a/dev-haskell/parallel/parallel-3.2.2.0.ebuild b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
index b873747b5d6..3aea17eca9b 100644
--- a/dev-haskell/parallel/parallel-3.2.2.0.ebuild
+++ b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="3/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild b/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
index c2a454d958a..c0565723e0b 100644
--- a/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
+++ b/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="parsec1"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/parsec/parsec-3.1.14.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.14.0-r1.ebuild
index 508110f2b46..4551401e234 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
@@ -28,7 +28,7 @@ RDEPEND=">=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
"
DEPEND="${RDEPEND}"
-CABAL_CORE_LIB_GHC_PV="PM:8.8.4-r1 PM:8.10.4-r1 PM:8.10.5-r1 PM:8.10.6 PM:8.10.7 PM:9.0.1-r1 PM:9.0.2 PM:9.0.2-r1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="8.8.4 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 PM:9999"
src_prepare() {
default
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
index 95e79234fb8..c93aed38aa3 100644
--- a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
+++ b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/parsers/parsers-0.12.10-r1.ebuild b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
index 7140d27431f..d378722a6e5 100644
--- a/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
+++ b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+attoparsec +binary +parsec"
RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
index 2d204148d1a..b8040512ebe 100644
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/text-0.5:=[profile?]
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
index 8b1f0de9b07..c84d5c7d4d5 100644
--- a/dev-haskell/patience/patience-0.1.1-r1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
index 7a363ec357e..3d6d16d1529 100644
--- a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
+++ b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
#IUSE="use-pkg-config"
IUSE=""
diff --git a/dev-haskell/pem/pem-0.2.4.ebuild b/dev-haskell/pem/pem-0.2.4.ebuild
index 7b7bdc6774f..cd14dc0ac6b 100644
--- a/dev-haskell/pem/pem-0.2.4.ebuild
+++ b/dev-haskell/pem/pem-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
index 754e7829f7c..9b4244d2079 100644
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.yesodweb.com/book/persistent"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="build-sanity-exe"
RDEPEND=">=dev-db/sqlite-3.0
diff --git a/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
index a1badb43d86..aa1bbbf954d 100644
--- a/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
+++ b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
index 7c04bcc3251..6d0b22d5f52 100644
--- a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
+++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/book/persistent"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
>=dev-haskell/blaze-html-0.9:=[profile?]
diff --git a/dev-haskell/persistent/persistent-2.14.0.3.ebuild b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
index 98a776a996c..d296879b025 100644
--- a/dev-haskell/persistent/persistent-2.14.0.3.ebuild
+++ b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.yesodweb.com/book/persistent"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
index 338fac66d58..b7c16cf09cb 100644
--- a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
+++ b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # ambiguous packages: AC-Vector-Fancy vector
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
index ad11f0ae267..7306d5c9e1a 100644
--- a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
+++ b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pretty-show/pretty-show-1.10.ebuild b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
index f1499acdb0a..d4067385578 100644
--- a/dev-haskell/pretty-show/pretty-show-1.10.ebuild
+++ b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/haskell-lexer-1.1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
dev-haskell/text:=[profile?]
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
index 6b1b22356fa..9ae3ba19cdf 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
index 4fda85be0f4..6b550bd7613 100644
--- a/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
+++ b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
index 5f109e1e001..f98dde7821a 100644
--- a/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
+++ b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
diff --git a/dev-haskell/primitive/primitive-0.7.3.0.ebuild b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
index ab4ba150e5e..e86b12bd8c8 100644
--- a/dev-haskell/primitive/primitive-0.7.3.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/haskell/primitive"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
diff --git a/dev-haskell/profunctors/profunctors-5.6.2.ebuild b/dev-haskell/profunctors/profunctors-5.6.2.ebuild
index 95e86cdb576..4d48bd69513 100644
--- a/dev-haskell/profunctors/profunctors-5.6.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-5.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
index 3809ae90e2e..2731a4e3e51 100644
--- a/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
+++ b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
index b701f2f093e..01543a41ac7 100644
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
index 2ccf2bc8d5b..4ea4895363b 100644
--- a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
+++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+binary-laws +unary-laws"
RDEPEND="dev-haskell/contravariant:=[profile?]
diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
index e0deefbe60d..32c1d4913d9 100644
--- a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
index 87d922949e3..891b3dc3649 100644
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
index 7ff4c484865..28d8cedadde 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
index 3d10229be48..fd43240ea88 100644
--- a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="+template-haskell"
RDEPEND=">=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
diff --git a/dev-haskell/random/random-1.2.1.ebuild b/dev-haskell/random/random-1.2.1.ebuild
index 3ca7fecbf7a..7371dd3c382 100644
--- a/dev-haskell/random/random-1.2.1.ebuild
+++ b/dev-haskell/random/random-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~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"
# circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
RESTRICT=test
diff --git a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
index 3a915e2ffe0..a821bbb8b25 100644
--- a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
+++ b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
index a5d8fe6d145..623558dbef5 100644
--- a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
+++ b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
diff --git a/dev-haskell/reflection/reflection-2.1.6.ebuild b/dev-haskell/reflection/reflection-2.1.6.ebuild
index 17f0de86aa9..b55dbe67f3e 100644
--- a/dev-haskell/reflection/reflection-2.1.6.ebuild
+++ b/dev-haskell/reflection/reflection-2.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
index 77f54622587..f7a59453531 100644
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
index 40c28011cca..7630c6e6d7e 100644
--- a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
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?]
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
index 232a88a9f2d..c89eaebf8d3 100644
--- a/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
index 6eb874b1fd6..47906969fcf 100644
--- a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
index 6239f9a3d60..9f7b3f925de 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
PATCHES=(
"${FILESDIR}/${PN}-1.3.2-disable-doctests.patch"
diff --git a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
index d3c304edecc..584969959ff 100644
--- a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
+++ b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # fails to build test suite
diff --git a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
index 879eaa1bbc9..24e3f6b9eac 100644
--- a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
+++ b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hashable:=[profile?]
diff --git a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
index aa73cc37d10..7292713e473 100644
--- a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/retry/retry-0.9.0.0.ebuild b/dev-haskell/retry/retry-0.9.0.0.ebuild
index f5c7487d21a..e61f61f8cea 100644
--- a/dev-haskell/retry/retry-0.9.0.0.ebuild
+++ b/dev-haskell/retry/retry-0.9.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
>=dev-haskell/random-1:=[profile?]
diff --git a/dev-haskell/rio/rio-0.1.21.0.ebuild b/dev-haskell/rio/rio-0.1.21.0.ebuild
index 9c8d6b78453..a2f0ec4a52c 100644
--- a/dev-haskell/rio/rio-0.1.21.0.ebuild
+++ b/dev-haskell/rio/rio-0.1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/hashable:=[profile?]
dev-haskell/microlens:=[profile?]
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
index 2f5748a9337..2e353109207 100644
--- a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
+++ b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?]
diff --git a/dev-haskell/safe/safe-0.3.19.ebuild b/dev-haskell/safe/safe-0.3.19.ebuild
index 512bd4bf45b..896d57a380b 100644
--- a/dev-haskell/safe/safe-0.3.19.ebuild
+++ b/dev-haskell/safe/safe-0.3.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index ed6446870a4..31bbf71b4f8 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/sandi/sandi-0.5.ebuild b/dev-haskell/sandi/sandi-0.5.ebuild
index 6236546a893..afda2898d25 100644
--- a/dev-haskell/sandi/sandi-0.5.ebuild
+++ b/dev-haskell/sandi/sandi-0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+conduit"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
index aebba746ad0..1295a667174 100644
--- a/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.7.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
index f1432417ac5..2b554a35fdc 100644
--- a/dev-haskell/securemem/securemem-0.1.10.ebuild
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/semialign/semialign-1.2.0.1.ebuild b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
index 825e7e022e0..a5ee78d0057 100644
--- a/dev-haskell/semialign/semialign-1.2.0.1.ebuild
+++ b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
index b8179b15e39..19bdf5d58a2 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ekmett/semigroupoids"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/semigroups/semigroups-0.20.ebuild b/dev-haskell/semigroups/semigroups-0.20.ebuild
index f72b5b43675..fe2a8a5a368 100644
--- a/dev-haskell/semigroups/semigroups-0.20.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/semirings/semirings-0.6.ebuild b/dev-haskell/semirings/semirings-0.6.ebuild
index dd5a71e5ad8..7d278a4ea84 100644
--- a/dev-haskell/semirings/semirings-0.6.ebuild
+++ b/dev-haskell/semirings/semirings-0.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
diff --git a/dev-haskell/servant-server/servant-server-0.19.1.ebuild b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
index 90748f168e4..e7a08fd3fc8 100644
--- a/dev-haskell/servant-server/servant-server-0.19.1.ebuild
+++ b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
PATCHES=( "${FILESDIR}/${PN}-0.18.3-add-examples-flag.patch" )
diff --git a/dev-haskell/servant/servant-0.19.ebuild b/dev-haskell/servant/servant-0.19.ebuild
index 0982492abba..7a84bce3d6a 100644
--- a/dev-haskell/servant/servant-0.19.ebuild
+++ b/dev-haskell/servant/servant-0.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/setenv/setenv-0.1.1.3.ebuild b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
index cf844cc4552..0d47036c0f3 100644
--- a/dev-haskell/setenv/setenv-0.1.1.3.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
index 25c5a26801f..07cfb3f6a17 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.6.1:=
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
index b5d44734620..04bc03d22e3 100644
--- a/dev-haskell/sha/sha-1.6.4.4.ebuild
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE="exe"
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
index c5546a462bb..de9532a3ea1 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="<dev-haskell/aeson-3:=[profile?]
dev-haskell/blaze-html:=[profile?]
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
index 45d9485971f..e0782fd6c88 100644
--- a/dev-haskell/shelly/shelly-1.9.0.ebuild
+++ b/dev-haskell/shelly/shelly-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples lifted"
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild b/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
index 6b991aa603d..246e6798341 100644
--- a/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
+++ b/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hunit-1.2:=[profile?]
diff --git a/dev-haskell/silently/silently-1.2.5.1.ebuild b/dev-haskell/silently/silently-1.2.5.1.ebuild
index d20c9417c76..50c45e90e5f 100644
--- a/dev-haskell/silently/silently-1.2.5.1.ebuild
+++ b/dev-haskell/silently/silently-1.2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
index 5e1b4e0639d..93851a62b5c 100644
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
+++ b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
index b1a26eba05f..5e193e5e033 100644
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+allow-bsd"
RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
index ad3da753bec..57e53541caf 100644
--- a/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
+++ b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
index cfece063217..9cf3a951931 100644
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ b/dev-haskell/skein/skein-1.0.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="big-endian force-endianness reference"
RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
diff --git a/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch b/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch
new file mode 100644
index 00000000000..8dce65f4c85
--- /dev/null
+++ b/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch
@@ -0,0 +1,39 @@
+https://github.com/jgm/skylighting/pull/154
+
+From 00af1d629c2f185fd3c8d3eee55857b1325f345b Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Fri, 16 Sep 2022 10:30:35 -0400
+Subject: [PATCH] Notch up core test timeout even further
+
+On very slow/embedded cpus, 25 seconds is not sufficient (even 50
+seconds is not); I had to notch the test timeout up to 75 seconds for
+everything to pass.
+
+This disables the test timeouts completely.
+---
+ test/test-skylighting.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-skylighting.hs b/test/test-skylighting.hs
+index a3977e72..0f05e573 100644
+--- a/test/test-skylighting.hs
++++ b/test/test-skylighting.hs
+@@ -224,8 +224,7 @@ p_no_drop cfg syntax t =
+
+ noDropTest :: TokenizerConfig -> [Text] -> Syntax -> TestTree
+ noDropTest cfg inps syntax =
+- localOption (mkTimeout 25000000)
+- $ testCase (Text.unpack (sName syntax))
++ testCase (Text.unpack (sName syntax))
+ $ mapM_ go inps
+ where go inp =
+ case tokenize cfg syntax inp of
+@@ -238,7 +237,7 @@ noDropTest cfg inps syntax =
+ assertFailure ("Unexpected error: " ++ e ++ "\ninput = " ++ show inp)
+
+ tokenizerTest :: TokenizerConfig -> SyntaxMap -> Bool -> FilePath -> TestTree
+-tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 25000000) $
++tokenizerTest cfg sMap regen inpFile =
+ goldenTest testname getExpected getActual
+ (compareValues referenceFile) updateGolden
+ where testname = lang ++ " tokenizing of " ++ inpFile
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
index e9f59184a96..9e849c9733d 100644
--- a/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
+++ b/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
@@ -15,8 +15,9 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable"
+PATCHES=( "${FILESDIR}/skylighting-increase-timeouts.patch" )
RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
>=dev-haskell/ansi-terminal-0.7:=[profile?]
diff --git a/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
index 557df569fad..0b2d789fb55 100644
--- a/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
+++ b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable"
RDEPEND="~dev-haskell/skylighting-core-0.12.3.1:=[profile?]
diff --git a/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
index ad622a559f8..1cf5a812682 100644
--- a/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
+++ b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/logict:=[profile?]
diff --git a/dev-haskell/socks/socks-0.6.1.ebuild b/dev-haskell/socks/socks-0.6.1.ebuild
index fcb8a099617..81247c2a63b 100644
--- a/dev-haskell/socks/socks-0.6.1.ebuild
+++ b/dev-haskell/socks/socks-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
index c43ea8f9eb2..6bd5f1dd840 100644
--- a/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
+++ b/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/split/split-0.2.3.4.ebuild b/dev-haskell/split/split-0.2.3.4.ebuild
index 00e56ffec1b..eb5b78a4dea 100644
--- a/dev-haskell/split/split-0.2.3.4.ebuild
+++ b/dev-haskell/split/split-0.2.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
index c7626da4f9b..a5f3b49d85f 100644
--- a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
+++ b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="optimised-mixer"
RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
diff --git a/dev-haskell/statevar/statevar-1.2.1.ebuild b/dev-haskell/statevar/statevar-1.2.1.ebuild
index 66419b480e4..d19f118258e 100644
--- a/dev-haskell/statevar/statevar-1.2.1.ebuild
+++ b/dev-haskell/statevar/statevar-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
diff --git a/dev-haskell/statistics/statistics-0.15.2.0.ebuild b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
index 12acef1805d..cc7f00a4a84 100644
--- a/dev-haskell/statistics/statistics-0.15.2.0.ebuild
+++ b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
diff --git a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
index 80c8a25946f..fdf2291196e 100644
--- a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
+++ b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/stm-2.4:=[profile?]
diff --git a/dev-haskell/stm/stm-2.5.0.1.ebuild b/dev-haskell/stm/stm-2.5.0.1.ebuild
index f1a3a1915b4..eee72e5f0f3 100644
--- a/dev-haskell/stm/stm-2.5.0.1.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
# keep in sync with ghc-8.10.5
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
@@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
# ghc-9.0.1 and ghc-9.0.2 actually bundles stm-2.5.0.0, but downgrades can be messy.
# Mark as bundled as a workaround.
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
index 17a426489eb..0659cfb847a 100644
--- a/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test # requires network
diff --git a/dev-haskell/strict/strict-0.4.0.1.ebuild b/dev-haskell/strict/strict-0.4.0.1.ebuild
index 2b4f3b3e7bd..812bdd31acf 100644
--- a/dev-haskell/strict/strict-0.4.0.1.ebuild
+++ b/dev-haskell/strict/strict-0.4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild b/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
index 5e167cc8c0e..dbc3a8e8557 100644
--- a/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
+++ b/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/text-0.11:=[profile?]
diff --git a/dev-haskell/string-qq/string-qq-0.0.4.ebuild b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
index 4521b113839..81517697ea5 100644
--- a/dev-haskell/string-qq/string-qq-0.0.4.ebuild
+++ b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
index 6f85ef1d74d..c00da881622 100644
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/syb/syb-0.7.2.1.ebuild b/dev-haskell/syb/syb-0.7.2.1.ebuild
index e22f5dbe0c4..e8f6a5951fd 100644
--- a/dev-haskell/syb/syb-0.7.2.1.ebuild
+++ b/dev-haskell/syb/syb-0.7.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
index c8600807ad0..c3d698f4c3e 100644
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
index 605c5ee1b84..d71388bd985 100644
--- a/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test
diff --git a/dev-haskell/tagged/tagged-0.8.6.1.ebuild b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
index 2b755db7d27..91f3e19e14f 100644
--- a/dev-haskell/tagged/tagged-0.8.6.1.ebuild
+++ b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
diff --git a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
index 419c3789934..9f03eccdbba 100644
--- a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
+++ b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild b/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
index c1d4a564435..86da89b1be1 100644
--- a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
+++ b/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
index d28ab2f5516..9d40bd56558 100644
--- a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
+++ b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
index 76e76c84b8e..f879d3b1e1d 100644
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
+++ b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
index ed11d7f37f0..e7d3f663814 100644
--- a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?]
>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
diff --git a/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
index 000f24033ec..88f2a9a7d71 100644
--- a/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
+++ b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
>=dev-haskell/tasty-0.11:=[profile?]
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
index fe8b51091f8..66fb80a6260 100644
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
+++ b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
index a20e50bcdfa..7009a12e601 100644
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/tasty:=[profile?]
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
index 5050030d0f5..1c3fac58be5 100644
--- a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
+++ b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
index 84852fde21d..34f16c5ccf3 100644
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/optparse-applicative:=[profile?]
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
index 78efd255837..8c2b38808dc 100644
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
index 250ba5f88c2..db4bbeaee32 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
index c0fcaafab52..52fde07fd72 100644
--- a/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
+++ b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/haskell-src-exts-1.18.0:=[profile?]
diff --git a/dev-haskell/tasty/tasty-1.4.2.3.ebuild b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
index 2354c54d636..f16240ba8e7 100644
--- a/dev-haskell/tasty/tasty-1.4.2.3.ebuild
+++ b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/ansi-terminal-0.9:=[profile?]
>=dev-haskell/clock-0.4.4.0:=[profile?]
diff --git a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
index 3a8dd7ed0f3..ea693946d94 100644
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/temporary/temporary-1.3.ebuild b/dev-haskell/temporary/temporary-1.3.ebuild
index 4dc5fdb3267..b14de0402bd 100644
--- a/dev-haskell/temporary/temporary-1.3.ebuild
+++ b/dev-haskell/temporary/temporary-1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
index 6ea1dd3f7d3..7e67076bfe4 100644
--- a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
+++ b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
index e6981d210b1..007ff1d9203 100644
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
@@ -24,4 +24,4 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6"
+CABAL_CORE_LIB_GHC_PV="8.10.6"
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.5.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.5.ebuild
index 52c8618befc..9d7a29f6975 100644
--- a/dev-haskell/terminfo/terminfo-0.4.1.5.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
@@ -23,4 +23,4 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.2.0.1
"
-CABAL_CORE_LIB_GHC_PV="PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="9.0.2"
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
index 7231611615e..03de581d482 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
diff --git a/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild b/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild
index b14b11071fa..a97d343d801 100644
--- a/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild
+++ b/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/leancheck:=[profile?]
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
index ffc29e79c4a..f75b9cee40c 100644
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
index ed544371d51..ea66eeea7b8 100644
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r3.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r3.ebuild
index cbfb75c0db9..05f74226c45 100644
--- a/dev-haskell/test-framework/test-framework-0.8.2.0-r3.ebuild
+++ b/dev-haskell/test-framework/test-framework-0.8.2.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT="test" # tests are missing
diff --git a/dev-haskell/texmath/texmath-0.12.5.1.ebuild b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
index 88f695e4ab9..f3a9b269a91 100644
--- a/dev-haskell/texmath/texmath-0.12.5.1.ebuild
+++ b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable server"
RDEPEND=">=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
index b2e217b3a93..8340d31af45 100644
--- a/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
+++ b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="<dev-haskell/base16-bytestring-2:=[profile?]
diff --git a/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild b/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
index 6a2ff028450..c992d111c32 100644
--- a/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
+++ b/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test # QuickCheck occasionally finds counterexamples
# and fails to build: Duplicate instance declarations: instance NFData Ordering
diff --git a/dev-haskell/text-short/text-short-0.1.5.ebuild b/dev-haskell/text-short/text-short-0.1.5.ebuild
index e23c1ef1c6e..7d512228c7e 100644
--- a/dev-haskell/text-short/text-short-0.1.5.ebuild
+++ b/dev-haskell/text-short/text-short-0.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="asserts"
RDEPEND=">=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
diff --git a/dev-haskell/text-show/text-show-3.9.7.ebuild b/dev-haskell/text-show/text-show-3.9.7.ebuild
index 186d801380a..cd3050d1627 100644
--- a/dev-haskell/text-show/text-show-3.9.7.ebuild
+++ b/dev-haskell/text-show/text-show-3.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/text/text-1.2.4.1.ebuild b/dev-haskell/text/text-1.2.4.1.ebuild
index f5ba15df6e3..d5c69728cb9 100644
--- a/dev-haskell/text/text-1.2.4.1.ebuild
+++ b/dev-haskell/text/text-1.2.4.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-lang/ghc-8.8:="
DEPEND="${RDEPEND}
"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6"
+CABAL_CORE_LIB_GHC_PV="8.10.6"
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/text/text-1.2.5.0.ebuild b/dev-haskell/text/text-1.2.5.0.ebuild
index ee4dd9c9565..0dbcaaed855 100644
--- a/dev-haskell/text/text-1.2.5.0.ebuild
+++ b/dev-haskell/text/text-1.2.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
# break cyclic dependencies:
RESTRICT=test
@@ -33,4 +33,4 @@ src_configure() {
--flag=-developer
}
-CABAL_CORE_LIB_GHC_PV="PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="9.0.2"
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
index de787319d06..d84e96d6c8a 100644
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ b/dev-haskell/tf-random/tf-random-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/primitive-0.3:=[profile?]
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
index 868c459e816..1514455da7d 100644
--- a/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
+++ b/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/glguy/th-abstraction"
LICENSE="ISC"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/th-compat/th-compat-0.1.3.ebuild b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
index ed783f7f1cb..3865f69303e 100644
--- a/dev-haskell/th-compat/th-compat-0.1.3.ebuild
+++ b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
index 9f5bf1d3d84..ce787c5e8b4 100644
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/text:=[profile?]
>=dev-haskell/th-lift-0.8:=[profile?]
diff --git a/dev-haskell/th-lift/th-lift-0.8.2.ebuild b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
index 6c55428bf98..88fc63fbee8 100644
--- a/dev-haskell/th-lift/th-lift-0.8.2.ebuild
+++ b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
diff --git a/dev-haskell/these/these-1.1.1.1.ebuild b/dev-haskell/these/these-1.1.1.1.ebuild
index 585ddfc5f3e..3e694048a72 100644
--- a/dev-haskell/these/these-1.1.1.1.ebuild
+++ b/dev-haskell/these/these-1.1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/time-compat/files/fix-resolution-test.patch b/dev-haskell/time-compat/files/fix-resolution-test.patch
new file mode 100644
index 00000000000..918bd488dbc
--- /dev/null
+++ b/dev-haskell/time-compat/files/fix-resolution-test.patch
@@ -0,0 +1,49 @@
+https://github.com/haskellari/time-compat/pull/33
+
+From 9f7aa0a5937b800402359c3e82f4bee296ae8e06 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Fri, 16 Sep 2022 11:19:20 -0400
+Subject: [PATCH] Backport 6516a35 "fix resolution test" from time
+
+The upstream version of time was incorrect in newer versions until
+https://github.com/haskell/time/commit/6516a35b3d8cad14a21a559a5d2fc22ddda32fcc.
+Because the compat implementation was correct and the upstream version
+of time is now logically identical, simply replace both versions with
+the current upstream time implementation.
+
+See https://github.com/haskellari/time-compat/issues/31 for details on
+which platforms the distinction matters. Does NOT close that issue
+though, because the original issue is for platforms on which the actual
+resolution is less precise than the expected, and this will only fix
+platforms on which the actual resolution is more precise.
+---
+ test/main/Test/Clock/Resolution.hs | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/test/main/Test/Clock/Resolution.hs b/test/main/Test/Clock/Resolution.hs
+index aab756b..4c0b1dd 100644
+--- a/test/main/Test/Clock/Resolution.hs
++++ b/test/main/Test/Clock/Resolution.hs
+@@ -25,7 +25,7 @@ gcdAll :: Real a => [a] -> a
+ gcdAll = foldr gcd' 0
+
+ testResolution :: (Show dt, Real dt) => String -> (at -> at -> dt) -> (dt, IO at) -> TestTree
+-testResolution name timeDiff (res, getTime) =
++testResolution name timeDiff (reportedRes, getTime) =
+ testCase name $ do
+ t0 <- getTime
+ times0 <-
+@@ -53,11 +53,8 @@ testResolution name timeDiff (res, getTime) =
+ threadDelay 1000 -- 1ms
+ getTime
+ let times = fmap (\t -> timeDiff t t0) $ times0 ++ times1 ++ times2 ++ times3 ++ times4
+-#if MIN_VERSION_time(1,8,0)
+- assertEqual "resolution" res $ gcdAll times
+-#else
+- assertBool ("resolution " ++ show (res, gcdAll times)) (res >= gcdAll times)
+-#endif
++ foundGrid = gcdAll times
++ assertBool ("resolution " ++ show (reportedRes, foundGrid)) (foundGrid <= reportedRes)
+
+ testResolutions :: TestTree
+ testResolutions =
diff --git a/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild b/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild
index 9c9036fee7e..be1cc3bdd89 100644
--- a/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild
+++ b/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
"
BDEPEND="app-text/dos2unix"
+PATCHES=( "${FILESDIR}/fix-resolution-test.patch" )
+
src_prepare() {
# pull revised cabal from upstream
cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
index a72b2902aea..85551cb8381 100644
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/time-manager/time-manager-0.0.0.ebuild b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
index 6b6ec889eee..58c053df7a2 100644
--- a/dev-haskell/time-manager/time-manager-0.0.0.ebuild
+++ b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/timeit/timeit-2.0.ebuild b/dev-haskell/timeit/timeit-2.0.ebuild
index 8819a279adc..e6b6c130f20 100644
--- a/dev-haskell/timeit/timeit-2.0.ebuild
+++ b/dev-haskell/timeit/timeit-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
index 018addce573..be3705eb91c 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
index 3d0add076bb..4ff687c8636 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
index 75a566f7644..e3bed06a85b 100644
--- a/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
+++ b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/tls/tls-1.5.8.ebuild b/dev-haskell/tls/tls-1.5.8.ebuild
index 250cad22de0..1cff5038af6 100644
--- a/dev-haskell/tls/tls-1.5.8.ebuild
+++ b/dev-haskell/tls/tls-1.5.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+compat +network"
RDEPEND="dev-haskell/asn1-encoding:=[profile?]
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
index 347133cf981..36df97e6386 100644
--- a/dev-haskell/torrent/torrent-10000.1.1.ebuild
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
index ea04c362c56..40c421fa271 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE="+orphaninstances"
RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
index 50d7b36d201..335656bdc91 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
index f4b2725a906..0a78f3c0ceb 100644
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
@@ -17,11 +17,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
"
-CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:9.0.2"
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
index 66d5f28f9b2..e64090f0e9b 100644
--- a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
+++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/trifecta/trifecta-2.1.2.ebuild b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
index b805a324818..0379662e0b5 100644
--- a/dev-haskell/trifecta/trifecta-2.1.2.ebuild
+++ b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/type-equality/type-equality-1.ebuild b/dev-haskell/type-equality/type-equality-1.ebuild
index 3822b28bf9c..d8769c36167 100644
--- a/dev-haskell/type-equality/type-equality-1.ebuild
+++ b/dev-haskell/type-equality/type-equality-1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
index c98a9f59da5..6035dbf2e79 100644
--- a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
+++ b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
index 1e93627077a..c472e20e6a5 100644
--- a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unicode-collation/Manifest b/dev-haskell/unicode-collation/Manifest
index 5b9b60120d2..0614efd7a2b 100644
--- a/dev-haskell/unicode-collation/Manifest
+++ b/dev-haskell/unicode-collation/Manifest
@@ -1 +1 @@
-DIST unicode-collation-0.1.3.1.tar.gz 2057181 BLAKE2B dde95fbf322a2a9100e8c3a462744006e5e1c2934f0e99c410e311256bf22a0898a7a04960284ba5f801ebfbb3d7465eeedb8ba3a6545cd991b9ee4dd00270a5 SHA512 7c8de0e1c3053bdea7f4007fd7711d5d18fd2f19ddd78ffc3d51cab3ee34623faa51d45ea8408b3e079741bfed9bc453ecc89cc2e20f479280d3646f0f1ecc44
+DIST unicode-collation-0.1.3.3.tar.gz 2056081 BLAKE2B 1b5d58b852ff457b4c794d6e8c87c0539a5987240c2cdb8329fbb00b792be1105c194b55a10b5abd9c59eac7262194065d460a18e994edd2d7f71f535acb4f41 SHA512 bbb8fb3d52fa4906ddb92fb605f49b4c726cfcffd1f950c8a78bc495594a2e7d85fa78e2009da850f0218fce09a57f829ce0f3d6a6000b9b6484754f8c8260e8
diff --git a/dev-haskell/unicode-collation/unicode-collation-0.1.3.1.ebuild b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
index 33e42136d52..e36006f5e70 100644
--- a/dev-haskell/unicode-collation/unicode-collation-0.1.3.1.ebuild
+++ b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
@@ -3,23 +3,20 @@
EAPI=8
-# ebuild generated by hackport 0.7.1.1.9999
+# ebuild generated by hackport 0.7.3.0
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Haskell implementation of the Unicode Collation Algorithm"
HOMEPAGE="https://github.com/jgm/unicode-collation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="doctests executable"
-RDEPEND="dev-haskell/parsec:=[profile?]
- >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
- dev-haskell/th-lift-instances:=[profile?]
+RDEPEND="dev-haskell/th-lift-instances:=[profile?]
>=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
@@ -31,12 +28,6 @@ DEPEND="${RDEPEND}
doctests? ( >=dev-haskell/doctest-0.8 ) )
"
-src_prepare() {
- default
- cabal_chdeps \
- 'text >= 1.2 && < 1.3' 'text >= 1.2 && < 2.1'
-}
-
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag doctests doctests) \
diff --git a/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
index 64729d63fe4..7250c2ae41d 100644
--- a/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
+++ b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
index df181e88555..70861694886 100644
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/uniplate/uniplate-1.6.13.ebuild b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
index 3bafe5a2baa..5faa7413932 100644
--- a/dev-haskell/uniplate/uniplate-1.6.13.ebuild
+++ b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?]
diff --git a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
index 30a3b262417..791e2c88724 100644
--- a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="old-time"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-time/unix-time-0.4.7.ebuild b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
index 2d0bedf0987..ee61b21cf72 100644
--- a/dev-haskell/unix-time/unix-time-0.4.7.ebuild
+++ b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # QuickCheck finds counterxamples:
diff --git a/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
index 6165cce6230..5b8bbd99472 100644
--- a/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
+++ b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/unliftio/unliftio-0.2.18.ebuild b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
index ea005fbd52b..14c9d0c484d 100644
--- a/dev-haskell/unliftio/unliftio-0.2.18.ebuild
+++ b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
>=dev-haskell/stm-2.4.3:=[profile?]
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
index 511e53671d3..6ed67bbcaf0 100644
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/hashable-1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
index 9bbb803fadf..b2c2e32a195 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 5dc7b57df2a..12e9620a1a7 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.5.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.5.ebuild
index f7b5f091f86..48de24ea6a7 100644
--- a/dev-haskell/uuid-types/uuid-types-1.0.5.ebuild
+++ b/dev-haskell/uuid-types/uuid-types-1.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/uuid/uuid-1.3.15.ebuild b/dev-haskell/uuid/uuid-1.3.15.ebuild
index c60364a5663..bac900b1f1d 100644
--- a/dev-haskell/uuid/uuid-1.3.15.ebuild
+++ b/dev-haskell/uuid/uuid-1.3.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test
diff --git a/dev-haskell/vault/vault-0.3.1.5.ebuild b/dev-haskell/vault/vault-0.3.1.5.ebuild
index 5a381fa5db6..35415b14709 100644
--- a/dev-haskell/vault/vault-0.3.1.5.ebuild
+++ b/dev-haskell/vault/vault-0.3.1.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
index 5da8dfcfea4..96ccf830696 100644
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
index 6e9a73c1cc3..8e26e983625 100644
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
index 245ed5345db..6bf94baf3fc 100644
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
index 2c1244b3802..41cbe0c6a86 100644
--- a/dev-haskell/vector/vector-0.12.3.1.ebuild
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+boundschecks internalchecks unsafechecks"
PATCHES=( "${FILESDIR}/${PN}-0.12.3.1-cabal-doctest.patch" )
diff --git a/dev-haskell/void/void-0.7.3.ebuild b/dev-haskell/void/void-0.7.3.ebuild
index 8bf9cdaede5..c11571d0e27 100644
--- a/dev-haskell/void/void-0.7.3.ebuild
+++ b/dev-haskell/void/void-0.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="safe"
RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
index 4a66f33060d..bd6f9dbbd4e 100644
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="print"
RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
diff --git a/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
index b5a27443859..85a90ac67a8 100644
--- a/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
index 5ad45751adf..d5b70563b89 100644
--- a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # does not specify full dependencies
diff --git a/dev-haskell/wai/wai-3.2.3.ebuild b/dev-haskell/wai/wai-3.2.3.ebuild
index 8db77d90004..69db4ded433 100644
--- a/dev-haskell/wai/wai-3.2.3.ebuild
+++ b/dev-haskell/wai/wai-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
>=dev-haskell/network-2.2.1.5:=[profile?]
diff --git a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
index 95f1f145b9b..af46065930e 100644
--- a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
+++ b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
diff --git a/dev-haskell/warp/warp-3.3.21.ebuild b/dev-haskell/warp/warp-3.3.21.ebuild
index 685001ed9d6..00d6c687a33 100644
--- a/dev-haskell/warp/warp-3.3.21.ebuild
+++ b/dev-haskell/warp/warp-3.3.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+allow-sendfilefd debug +x509"
RDEPEND=">=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
diff --git a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
index eed3876aa06..3d5345e1ee3 100644
--- a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+++ b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="cli"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/witherable/witherable-0.4.2.ebuild b/dev-haskell/witherable/witherable-0.4.2.ebuild
index 2df75995d87..f9751f084fe 100644
--- a/dev-haskell/witherable/witherable-0.4.2.ebuild
+++ b/dev-haskell/witherable/witherable-0.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
index d9c7250d15d..e77757c5ac0 100644
--- a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
+++ b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
diff --git a/dev-haskell/word8/word8-0.1.3.ebuild b/dev-haskell/word8/word8-0.1.3.ebuild
index d259963c5e9..3f84ef379bf 100644
--- a/dev-haskell/word8/word8-0.1.3.ebuild
+++ b/dev-haskell/word8/word8-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
index f829930741d..48b0754a3a1 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://hackage.haskell.org/package/X11-xft"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
>=dev-haskell/x11-1.2.1:=[xinerama,profile?]
diff --git a/dev-haskell/x11/x11-1.10.2.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild
index d693e34f82c..fb4f0dae9fb 100644
--- a/dev-haskell/x11/x11-1.10.2.ebuild
+++ b/dev-haskell/x11/x11-1.10.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/xmonad/X11"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="+xinerama"
# add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below
diff --git a/dev-haskell/x509-store/x509-store-1.6.7.ebuild b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
index e77dc119e99..456958825df 100644
--- a/dev-haskell/x509-store/x509-store-1.6.7.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509-system/x509-system-1.6.6.ebuild b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
index c22a903c456..71c0b42bcae 100644
--- a/dev-haskell/x509-system/x509-system-1.6.6.ebuild
+++ b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
index ed98c12e9cc..2e37c9a20ab 100644
--- a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
+++ b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509/x509-1.7.5.ebuild b/dev-haskell/x509/x509-1.7.5.ebuild
index 5f1c000d1d1..6ab2c25ae24 100644
--- a/dev-haskell/x509/x509-1.7.5.ebuild
+++ b/dev-haskell/x509/x509-1.7.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
index 1c45577d438..ff30dfa328d 100644
--- a/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?]
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
index 95c59313677..d95b950ea7b 100644
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
diff --git a/dev-haskell/xml-types/xml-types-0.3.8.ebuild b/dev-haskell/xml-types/xml-types-0.3.8.ebuild
index 06940b4c02d..6616e424a0a 100644
--- a/dev-haskell/xml-types/xml-types-0.3.8.ebuild
+++ b/dev-haskell/xml-types/xml-types-0.3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xml/xml-1.3.14.ebuild b/dev-haskell/xml/xml-1.3.14.ebuild
index bc1f8c3f5b6..4697b3f8324 100644
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ b/dev-haskell/xml/xml-1.3.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
index 7a1ae3ddd4d..e912787b644 100644
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
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?]
diff --git a/dev-haskell/yaml/yaml-0.11.8.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
index 35da845638c..c01b0d3470c 100644
--- a/dev-haskell/yaml/yaml-0.11.8.0.ebuild
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples executable"
RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
index ba8737f768a..b5a84cffb3f 100644
--- a/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
+++ b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RESTRICT=test # requires network access
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
index 09321cb102c..8bbd0f3131b 100644
--- a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
+++ b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+network-uri"
RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
index ef84a181805..2c6c2a63a94 100644
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/blaze-builder:=[profile?]
dev-haskell/conduit:=[profile?]
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
index 43d5ef0a10c..25ff501bb80 100644
--- a/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
+++ b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
index 95b62c7c66b..8a0ba3fd0f6 100644
--- a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/yesod/yesod-1.6.2.ebuild b/dev-haskell/yesod/yesod-1.6.2.ebuild
index 4bd3d17840f..f6b13208a6c 100644
--- a/dev-haskell/yesod/yesod-1.6.2.ebuild
+++ b/dev-haskell/yesod/yesod-1.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.yesodweb.com/"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND="dev-haskell/aeson:=[profile?]
>=dev-haskell/conduit-1.3:=[profile?]
diff --git a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
index b54ca3ac19f..b28822b6322 100644
--- a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable"
RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
diff --git a/dev-haskell/zlib/zlib-0.6.2.3.ebuild b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
index af84c1e03d0..74e85e39dd2 100644
--- a/dev-haskell/zlib/zlib-0.6.2.3.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
IUSE="bundled-c-zlib non-blocking-ffi"
RDEPEND=">=dev-lang/ghc-8.4.3:=