summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/abstract-deque-tests/Manifest1
-rw-r--r--dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild29
-rw-r--r--dev-haskell/abstract-deque/abstract-deque-0.3.ebuild6
-rw-r--r--dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild6
-rw-r--r--dev-haskell/abstract-par/metadata.xml3
-rw-r--r--dev-haskell/ac-ppm/Manifest1
-rw-r--r--dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild29
-rw-r--r--dev-haskell/ac-ppm/metadata.xml20
-rw-r--r--dev-haskell/adjunctions/Manifest1
-rw-r--r--dev-haskell/adjunctions/adjunctions-4.4.2.ebuild37
-rw-r--r--dev-haskell/adjunctions/adjunctions-4.4.ebuild13
-rw-r--r--dev-haskell/adjunctions/metadata.xml1
-rw-r--r--dev-haskell/aeson-compat/Manifest1
-rw-r--r--dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild58
-rw-r--r--dev-haskell/aeson-compat/metadata.xml11
-rw-r--r--dev-haskell/aeson-diff/Manifest1
-rw-r--r--dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild48
-rw-r--r--dev-haskell/aeson-diff/metadata.xml15
-rw-r--r--dev-haskell/aeson-pretty/Manifest4
-rw-r--r--dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild44
-rw-r--r--dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild38
-rw-r--r--dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild48
-rw-r--r--dev-haskell/aeson-pretty/metadata.xml18
-rw-r--r--dev-haskell/aeson-qq/Manifest1
-rw-r--r--dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild33
-rw-r--r--dev-haskell/aeson-qq/metadata.xml23
-rw-r--r--dev-haskell/aeson/Manifest5
-rw-r--r--dev-haskell/aeson/aeson-1.4.7.1.ebuild65
-rw-r--r--dev-haskell/aeson/aeson-2.0.3.0.ebuild68
-rw-r--r--dev-haskell/aeson/aeson-2.1.2.1.ebuild81
-rw-r--r--dev-haskell/aeson/metadata.xml68
-rw-r--r--dev-haskell/alex-tools/Manifest1
-rw-r--r--dev-haskell/alex-tools/alex-tools-0.4.ebuild33
-rw-r--r--dev-haskell/alex/Manifest4
-rw-r--r--dev-haskell/alex/alex-3.2.5.ebuild74
-rw-r--r--dev-haskell/alex/alex-3.2.7.1.ebuild76
-rw-r--r--dev-haskell/alex/alex-3.2.7.2.ebuild76
-rw-r--r--dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch46
-rw-r--r--dev-haskell/alex/metadata.xml4
-rw-r--r--dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild6
-rw-r--r--dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild6
-rw-r--r--dev-haskell/alut/Manifest1
-rw-r--r--dev-haskell/alut/alut-2.4.0.3.ebuild41
-rw-r--r--dev-haskell/alut/files/alut-2.4.0.3-ghc-8.patch10
-rw-r--r--dev-haskell/alut/metadata.xml10
-rw-r--r--dev-haskell/annotated-wl-pprint/Manifest1
-rw-r--r--dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild24
-rw-r--r--dev-haskell/annotated-wl-pprint/metadata.xml14
-rw-r--r--dev-haskell/ansi-terminal-types/Manifest2
-rw-r--r--dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild25
-rw-r--r--dev-haskell/ansi-terminal-types/metadata.xml12
-rw-r--r--dev-haskell/ansi-terminal/Manifest1
-rw-r--r--dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild8
-rw-r--r--dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild33
-rw-r--r--dev-haskell/ansi-terminal/metadata.xml9
-rw-r--r--dev-haskell/ansi-wl-pprint/Manifest4
-rw-r--r--dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild38
-rw-r--r--dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild48
-rw-r--r--dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild37
-rw-r--r--dev-haskell/ansi-wl-pprint/metadata.xml9
-rw-r--r--dev-haskell/appar/appar-0.1.8.ebuild6
-rw-r--r--dev-haskell/argparser/Manifest1
-rw-r--r--dev-haskell/argparser/argparser-0.3.4.ebuild26
-rw-r--r--dev-haskell/argparser/metadata.xml8
-rw-r--r--dev-haskell/arithmoi/Manifest1
-rw-r--r--dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild47
-rw-r--r--dev-haskell/arithmoi/metadata.xml22
-rw-r--r--dev-haskell/arrows/Manifest1
-rw-r--r--dev-haskell/arrows/arrows-0.4.4.2.ebuild25
-rw-r--r--dev-haskell/arrows/metadata.xml7
-rw-r--r--dev-haskell/ascii-progress/Manifest1
-rw-r--r--dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild40
-rw-r--r--dev-haskell/ascii-progress/metadata.xml18
-rw-r--r--dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild6
-rw-r--r--dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild6
-rw-r--r--dev-haskell/asn1-types/Manifest1
-rw-r--r--dev-haskell/asn1-types/asn1-types-0.3.3.ebuild6
-rw-r--r--dev-haskell/asn1-types/asn1-types-0.3.4.ebuild26
-rw-r--r--dev-haskell/assoc/Manifest2
-rw-r--r--dev-haskell/assoc/assoc-1.0.2.ebuild30
-rw-r--r--dev-haskell/assoc/assoc-1.1.ebuild32
-rw-r--r--dev-haskell/assoc/metadata.xml17
-rw-r--r--dev-haskell/async/Manifest3
-rw-r--r--dev-haskell/async/async-2.2.2.ebuild42
-rw-r--r--dev-haskell/async/async-2.2.4-r1.ebuild37
-rw-r--r--dev-haskell/async/metadata.xml45
-rw-r--r--dev-haskell/atomic-primops/Manifest2
-rw-r--r--dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild30
-rw-r--r--dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild30
-rw-r--r--dev-haskell/atomic-primops/metadata.xml13
-rw-r--r--dev-haskell/attoparsec-aeson/Manifest1
-rw-r--r--dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild23
-rw-r--r--dev-haskell/attoparsec-aeson/metadata.xml12
-rw-r--r--dev-haskell/attoparsec-conduit/Manifest1
-rw-r--r--dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild25
-rw-r--r--dev-haskell/attoparsec-conduit/metadata.xml8
-rw-r--r--dev-haskell/attoparsec-enumerator/Manifest1
-rw-r--r--dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild27
-rw-r--r--dev-haskell/attoparsec-enumerator/metadata.xml8
-rw-r--r--dev-haskell/attoparsec-iso8601/Manifest4
-rw-r--r--dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild41
-rw-r--r--dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild33
-rw-r--r--dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild33
-rw-r--r--dev-haskell/attoparsec-iso8601/metadata.xml8
-rw-r--r--dev-haskell/attoparsec/Manifest3
-rw-r--r--dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild36
-rw-r--r--dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild47
-rw-r--r--dev-haskell/attoparsec/attoparsec-0.14.4.ebuild35
-rw-r--r--dev-haskell/attoparsec/metadata.xml8
-rw-r--r--dev-haskell/authenticate-oauth/Manifest1
-rw-r--r--dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild34
-rw-r--r--dev-haskell/authenticate-oauth/metadata.xml8
-rw-r--r--dev-haskell/authenticate/Manifest1
-rw-r--r--dev-haskell/authenticate/authenticate-1.3.5.ebuild43
-rw-r--r--dev-haskell/authenticate/metadata.xml14
-rw-r--r--dev-haskell/auto-update/auto-update-0.1.6.ebuild6
-rw-r--r--dev-haskell/aws/Manifest2
-rw-r--r--dev-haskell/aws/aws-0.22-r1.ebuild79
-rw-r--r--dev-haskell/aws/aws-0.22-r5.ebuild66
-rw-r--r--dev-haskell/aws/aws-0.24.ebuild71
-rw-r--r--dev-haskell/aws/files/aws-0.22-aeson-2.patch185
-rw-r--r--dev-haskell/aws/metadata.xml7
-rw-r--r--dev-haskell/barbies/Manifest1
-rw-r--r--dev-haskell/barbies/barbies-2.0.4.0.ebuild30
-rw-r--r--dev-haskell/barbies/metadata.xml12
-rw-r--r--dev-haskell/base-compat-batteries/Manifest4
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild35
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild46
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild30
-rw-r--r--dev-haskell/base-compat-batteries/metadata.xml25
-rw-r--r--dev-haskell/base-compat/Manifest3
-rw-r--r--dev-haskell/base-compat/base-compat-0.11.1.ebuild24
-rw-r--r--dev-haskell/base-compat/base-compat-0.12.1.ebuild23
-rw-r--r--dev-haskell/base-compat/base-compat-0.13.0.ebuild23
-rw-r--r--dev-haskell/base-compat/metadata.xml8
-rw-r--r--dev-haskell/base-noprelude/Manifest1
-rw-r--r--dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild31
-rw-r--r--dev-haskell/base-noprelude/metadata.xml27
-rw-r--r--dev-haskell/base-orphans/Manifest3
-rw-r--r--dev-haskell/base-orphans/base-orphans-0.8.4.ebuild28
-rw-r--r--dev-haskell/base-orphans/base-orphans-0.8.6.ebuild26
-rw-r--r--dev-haskell/base-orphans/base-orphans-0.9.0.ebuild35
-rw-r--r--dev-haskell/base-orphans/metadata.xml8
-rw-r--r--dev-haskell/base-prelude/Manifest1
-rw-r--r--dev-haskell/base-prelude/base-prelude-1.3.ebuild24
-rw-r--r--dev-haskell/base-prelude/metadata.xml23
-rw-r--r--dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild8
-rw-r--r--dev-haskell/base-unicode-symbols/metadata.xml19
-rw-r--r--dev-haskell/base16-bytestring/Manifest1
-rw-r--r--dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild6
-rw-r--r--dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild28
-rw-r--r--dev-haskell/base16-bytestring/metadata.xml3
-rw-r--r--dev-haskell/base64-bytestring/Manifest1
-rw-r--r--dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild6
-rw-r--r--dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild28
-rw-r--r--dev-haskell/base64-bytestring/metadata.xml3
-rw-r--r--dev-haskell/base64/Manifest2
-rw-r--r--dev-haskell/base64/base64-0.4.2.4.ebuild35
-rw-r--r--dev-haskell/base64/metadata.xml12
-rw-r--r--dev-haskell/basement/Manifest3
-rw-r--r--dev-haskell/basement/basement-0.0.11.ebuild24
-rw-r--r--dev-haskell/basement/basement-0.0.12.ebuild23
-rw-r--r--dev-haskell/basement/basement-0.0.16.ebuild22
-rw-r--r--dev-haskell/basement/metadata.xml4
-rw-r--r--dev-haskell/basic-prelude/Manifest1
-rw-r--r--dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild28
-rw-r--r--dev-haskell/basic-prelude/metadata.xml26
-rw-r--r--dev-haskell/bencode/bencode-0.6.1.1.ebuild6
-rw-r--r--dev-haskell/bifunctors/Manifest3
-rw-r--r--dev-haskell/bifunctors/bifunctors-5.5.11.ebuild37
-rw-r--r--dev-haskell/bifunctors/bifunctors-5.5.15.ebuild36
-rw-r--r--dev-haskell/bifunctors/bifunctors-5.5.6.ebuild38
-rw-r--r--dev-haskell/bifunctors/metadata.xml1
-rw-r--r--dev-haskell/binary-instances/Manifest1
-rw-r--r--dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild50
-rw-r--r--dev-haskell/binary-instances/metadata.xml8
-rw-r--r--dev-haskell/binary-orphans/Manifest5
-rw-r--r--dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild42
-rw-r--r--dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild44
-rw-r--r--dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild34
-rw-r--r--dev-haskell/binary-orphans/metadata.xml4
-rw-r--r--dev-haskell/binary-tagged/Manifest1
-rw-r--r--dev-haskell/binary-tagged/binary-tagged-0.2.ebuild49
-rw-r--r--dev-haskell/binary-tagged/metadata.xml8
-rw-r--r--dev-haskell/binary/Manifest4
-rw-r--r--dev-haskell/binary/binary-0.8.7.0.ebuild31
-rw-r--r--dev-haskell/binary/binary-0.8.8.0-r1.ebuild40
-rw-r--r--dev-haskell/binary/binary-0.8.9.0-r1.ebuild38
-rw-r--r--dev-haskell/binary/metadata.xml8
-rw-r--r--dev-haskell/biocore/Manifest1
-rw-r--r--dev-haskell/biocore/biocore-0.3.1.ebuild29
-rw-r--r--dev-haskell/biocore/files/biocore-0.3.1-ghc84.patch28
-rw-r--r--dev-haskell/biocore/metadata.xml14
-rw-r--r--dev-haskell/biofasta/Manifest1
-rw-r--r--dev-haskell/biofasta/biofasta-0.0.3.ebuild25
-rw-r--r--dev-haskell/biofasta/metadata.xml8
-rw-r--r--dev-haskell/biosff/Manifest1
-rw-r--r--dev-haskell/biosff/biosff-0.3.7.1.ebuild36
-rw-r--r--dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch7
-rw-r--r--dev-haskell/biosff/metadata.xml18
-rw-r--r--dev-haskell/bitarray/Manifest1
-rw-r--r--dev-haskell/bitarray/bitarray-0.0.1.1.ebuild24
-rw-r--r--dev-haskell/bitarray/metadata.xml8
-rw-r--r--dev-haskell/bits-atomic/Manifest2
-rw-r--r--dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild35
-rw-r--r--dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch9
-rw-r--r--dev-haskell/bits-atomic/metadata.xml41
-rw-r--r--dev-haskell/bitvec/Manifest1
-rw-r--r--dev-haskell/bitvec/bitvec-1.1.3.0.ebuild40
-rw-r--r--dev-haskell/bitvec/metadata.xml17
-rw-r--r--dev-haskell/bitwise/Manifest1
-rw-r--r--dev-haskell/bitwise/bitwise-1.0.0.1.ebuild33
-rw-r--r--dev-haskell/bitwise/metadata.xml52
-rw-r--r--dev-haskell/blaze-builder-conduit/Manifest1
-rw-r--r--dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild25
-rw-r--r--dev-haskell/blaze-builder-conduit/metadata.xml11
-rw-r--r--dev-haskell/blaze-builder/Manifest4
-rw-r--r--dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild33
-rw-r--r--dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild30
-rw-r--r--dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild30
-rw-r--r--dev-haskell/blaze-builder/metadata.xml14
-rw-r--r--dev-haskell/blaze-html/Manifest1
-rw-r--r--dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild31
-rw-r--r--dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild32
-rw-r--r--dev-haskell/blaze-html/metadata.xml6
-rw-r--r--dev-haskell/blaze-markup/Manifest3
-rw-r--r--dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild38
-rw-r--r--dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild34
-rw-r--r--dev-haskell/blaze-markup/metadata.xml10
-rw-r--r--dev-haskell/blaze-textual/Manifest1
-rw-r--r--dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild43
-rw-r--r--dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch22
-rw-r--r--dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch11
-rw-r--r--dev-haskell/blaze-textual/metadata.xml17
-rw-r--r--dev-haskell/bloomfilter/Manifest1
-rw-r--r--dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild39
-rw-r--r--dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild8
-rw-r--r--dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch289
-rw-r--r--dev-haskell/bloomfilter/metadata.xml1
-rw-r--r--dev-haskell/boolean/Manifest1
-rw-r--r--dev-haskell/boolean/boolean-0.2.4.ebuild29
-rw-r--r--dev-haskell/boolean/metadata.xml8
-rw-r--r--dev-haskell/boring/Manifest1
-rw-r--r--dev-haskell/boring/boring-0.2.1.ebuild32
-rw-r--r--dev-haskell/boring/metadata.xml17
-rw-r--r--dev-haskell/boundedchan/Manifest1
-rw-r--r--dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild29
-rw-r--r--dev-haskell/boundedchan/metadata.xml8
-rw-r--r--dev-haskell/boxes/Manifest1
-rw-r--r--dev-haskell/boxes/boxes-0.1.5.ebuild26
-rw-r--r--dev-haskell/boxes/metadata.xml8
-rw-r--r--dev-haskell/bsb-http-chunked/Manifest1
-rw-r--r--dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild38
-rw-r--r--dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild21
-rw-r--r--dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch27
-rw-r--r--dev-haskell/bsb-http-chunked/metadata.xml13
-rw-r--r--dev-haskell/byteable/byteable-0.1.1.ebuild6
-rw-r--r--dev-haskell/byteable/metadata.xml3
-rw-r--r--dev-haskell/bytedump/Manifest1
-rw-r--r--dev-haskell/bytedump/bytedump-1.0.ebuild29
-rw-r--r--dev-haskell/bytedump/metadata.xml11
-rw-r--r--dev-haskell/byteorder/byteorder-1.0.4.ebuild6
-rw-r--r--dev-haskell/bytes/Manifest1
-rw-r--r--dev-haskell/bytes/bytes-0.17.ebuild46
-rw-r--r--dev-haskell/bytes/metadata.xml14
-rw-r--r--dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild6
-rw-r--r--dev-haskell/bytestring-handle/Manifest1
-rw-r--r--dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild37
-rw-r--r--dev-haskell/bytestring-handle/metadata.xml8
-rw-r--r--dev-haskell/bytestring-mmap/Manifest1
-rw-r--r--dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild24
-rw-r--r--dev-haskell/bytestring-mmap/metadata.xml8
-rw-r--r--dev-haskell/bytestring-show/Manifest1
-rw-r--r--dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild35
-rw-r--r--dev-haskell/bytestring-show/metadata.xml8
-rw-r--r--dev-haskell/bzlib/Manifest1
-rw-r--r--dev-haskell/bzlib/bzlib-0.5.1.0.ebuild26
-rw-r--r--dev-haskell/bzlib/metadata.xml18
-rw-r--r--dev-haskell/c2hs/Manifest2
-rw-r--r--dev-haskell/c2hs/c2hs-0.28.7.ebuild43
-rw-r--r--dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild42
-rw-r--r--dev-haskell/c2hs/c2hs-0.28.8.ebuild4
-rw-r--r--dev-haskell/c2hs/metadata.xml11
-rw-r--r--dev-haskell/cabal-doctest/Manifest3
-rw-r--r--dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild33
-rw-r--r--dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild26
-rw-r--r--dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild24
-rw-r--r--dev-haskell/cabal-doctest/metadata.xml10
-rw-r--r--dev-haskell/cabal-install/Manifest5
-rw-r--r--dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild74
-rw-r--r--dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild76
-rw-r--r--dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild62
-rw-r--r--dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch20
-rw-r--r--dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch11
-rw-r--r--dev-haskell/cabal-install/metadata.xml12
-rw-r--r--dev-haskell/cabal/Manifest4
-rw-r--r--dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild54
-rw-r--r--dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild69
-rw-r--r--dev-haskell/cabal/cabal-3.6.3.0.ebuild34
-rw-r--r--dev-haskell/cabal/metadata.xml4
-rw-r--r--dev-haskell/cairo/Manifest2
-rw-r--r--dev-haskell/cairo/cairo-0.13.10.0.ebuild39
-rw-r--r--dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild45
-rw-r--r--dev-haskell/cairo/cairo-0.13.8.1.ebuild38
-rw-r--r--dev-haskell/cairo/metadata.xml12
-rw-r--r--dev-haskell/call-stack/Manifest2
-rw-r--r--dev-haskell/call-stack/call-stack-0.2.0.ebuild25
-rw-r--r--dev-haskell/call-stack/call-stack-0.3.0.ebuild6
-rw-r--r--dev-haskell/call-stack/call-stack-0.4.0.ebuild23
-rw-r--r--dev-haskell/call-stack/metadata.xml4
-rw-r--r--dev-haskell/casa-client/Manifest1
-rw-r--r--dev-haskell/casa-client/casa-client-0.0.1.ebuild41
-rw-r--r--dev-haskell/casa-client/metadata.xml8
-rw-r--r--dev-haskell/casa-types/Manifest1
-rw-r--r--dev-haskell/casa-types/casa-types-0.0.1.ebuild31
-rw-r--r--dev-haskell/casa-types/metadata.xml8
-rw-r--r--dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild6
-rw-r--r--dev-haskell/cassava/Manifest3
-rw-r--r--dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild54
-rw-r--r--dev-haskell/cassava/cassava-0.5.2.0.ebuild48
-rw-r--r--dev-haskell/cassava/cassava-0.5.3.0.ebuild55
-rw-r--r--dev-haskell/cassava/metadata.xml3
-rw-r--r--dev-haskell/cereal-vector/Manifest1
-rw-r--r--dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild27
-rw-r--r--dev-haskell/cereal-vector/metadata.xml8
-rw-r--r--dev-haskell/cereal/Manifest1
-rw-r--r--dev-haskell/cereal/cereal-0.5.8.1.ebuild8
-rw-r--r--dev-haskell/cereal/cereal-0.5.8.3.ebuild25
-rw-r--r--dev-haskell/cereal/metadata.xml11
-rw-r--r--dev-haskell/cgi/Manifest1
-rw-r--r--dev-haskell/cgi/cgi-3001.5.0.0.ebuild37
-rw-r--r--dev-haskell/cgi/metadata.xml11
-rw-r--r--dev-haskell/charset/Manifest1
-rw-r--r--dev-haskell/charset/charset-0.3.10.ebuild23
-rw-r--r--dev-haskell/charset/charset-0.3.7.1-r1.ebuild15
-rw-r--r--dev-haskell/charset/metadata.xml4
-rw-r--r--dev-haskell/chaselev-deque/Manifest1
-rw-r--r--dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild36
-rw-r--r--dev-haskell/chaselev-deque/metadata.xml18
-rw-r--r--dev-haskell/chasingbottoms/Manifest2
-rw-r--r--dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild34
-rw-r--r--dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild39
-rw-r--r--dev-haskell/chasingbottoms/metadata.xml97
-rw-r--r--dev-haskell/chell/Manifest1
-rw-r--r--dev-haskell/chell/chell-0.4.0.2.ebuild12
-rw-r--r--dev-haskell/chell/chell-0.5.0.2.ebuild44
-rw-r--r--dev-haskell/chell/metadata.xml41
-rw-r--r--dev-haskell/chimera/Manifest1
-rw-r--r--dev-haskell/chimera/chimera-0.3.1.0.ebuild38
-rw-r--r--dev-haskell/chimera/metadata.xml37
-rw-r--r--dev-haskell/chunked-data/Manifest1
-rw-r--r--dev-haskell/chunked-data/chunked-data-0.3.0.ebuild27
-rw-r--r--dev-haskell/chunked-data/metadata.xml11
-rw-r--r--dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild6
-rw-r--r--dev-haskell/cipher-aes128/Manifest1
-rw-r--r--dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild41
-rw-r--r--dev-haskell/cipher-aes128/metadata.xml15
-rw-r--r--dev-haskell/cipher-camellia/Manifest1
-rw-r--r--dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild32
-rw-r--r--dev-haskell/cipher-camellia/metadata.xml11
-rw-r--r--dev-haskell/cipher-des/Manifest1
-rw-r--r--dev-haskell/cipher-des/cipher-des-0.0.6.ebuild31
-rw-r--r--dev-haskell/cipher-des/metadata.xml11
-rw-r--r--dev-haskell/cipher-rc4/Manifest1
-rw-r--r--dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild30
-rw-r--r--dev-haskell/cipher-rc4/metadata.xml11
-rw-r--r--dev-haskell/citeproc/Manifest3
-rw-r--r--dev-haskell/citeproc/citeproc-0.3.0.9.ebuild49
-rw-r--r--dev-haskell/citeproc/citeproc-0.7.ebuild54
-rw-r--r--dev-haskell/citeproc/citeproc-0.8.1.ebuild53
-rw-r--r--dev-haskell/citeproc/metadata.xml10
-rw-r--r--dev-haskell/classy-prelude/Manifest1
-rw-r--r--dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild46
-rw-r--r--dev-haskell/classy-prelude/metadata.xml14
-rw-r--r--dev-haskell/clientsession/clientsession-0.9.1.2.ebuild4
-rw-r--r--dev-haskell/clock/Manifest1
-rw-r--r--dev-haskell/clock/clock-0.7.2.ebuild4
-rw-r--r--dev-haskell/clock/clock-0.8.3.ebuild41
-rw-r--r--dev-haskell/clock/metadata.xml24
-rw-r--r--dev-haskell/cmark-gfm/Manifest1
-rw-r--r--dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild32
-rw-r--r--dev-haskell/cmark-gfm/metadata.xml16
-rw-r--r--dev-haskell/cmark/Manifest1
-rw-r--r--dev-haskell/cmark/cmark-0.6.ebuild34
-rw-r--r--dev-haskell/cmark/metadata.xml90
-rw-r--r--dev-haskell/cmdargs/Manifest1
-rw-r--r--dev-haskell/cmdargs/cmdargs-0.10.20.ebuild4
-rw-r--r--dev-haskell/cmdargs/cmdargs-0.10.22.ebuild36
-rw-r--r--dev-haskell/cmdargs/metadata.xml24
-rw-r--r--dev-haskell/code-page/Manifest1
-rw-r--r--dev-haskell/code-page/code-page-0.1.3.ebuild4
-rw-r--r--dev-haskell/code-page/code-page-0.2.1.ebuild23
-rw-r--r--dev-haskell/code-page/metadata.xml12
-rw-r--r--dev-haskell/colour/Manifest1
-rw-r--r--dev-haskell/colour/colour-2.3.5.ebuild6
-rw-r--r--dev-haskell/colour/colour-2.3.6.ebuild41
-rw-r--r--dev-haskell/colour/metadata.xml9
-rw-r--r--dev-haskell/commonmark-extensions/Manifest3
-rw-r--r--dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild32
-rw-r--r--dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild28
-rw-r--r--dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild29
-rw-r--r--dev-haskell/commonmark-extensions/metadata.xml4
-rw-r--r--dev-haskell/commonmark-pandoc/Manifest3
-rw-r--r--dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild28
-rw-r--r--dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild27
-rw-r--r--dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild26
-rw-r--r--dev-haskell/commonmark-pandoc/metadata.xml4
-rw-r--r--dev-haskell/commonmark/Manifest3
-rw-r--r--dev-haskell/commonmark/commonmark-0.1.1.4.ebuild29
-rw-r--r--dev-haskell/commonmark/commonmark-0.2.2.ebuild28
-rw-r--r--dev-haskell/commonmark/commonmark-0.2.3.ebuild29
-rw-r--r--dev-haskell/commonmark/metadata.xml4
-rw-r--r--dev-haskell/comonad-transformers/Manifest1
-rw-r--r--dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild25
-rw-r--r--dev-haskell/comonad-transformers/metadata.xml11
-rw-r--r--dev-haskell/comonad/Manifest3
-rw-r--r--dev-haskell/comonad/comonad-5.0.7.ebuild42
-rw-r--r--dev-haskell/comonad/comonad-5.0.8-r1.ebuild37
-rw-r--r--dev-haskell/comonad/metadata.xml4
-rw-r--r--dev-haskell/comonads-fd/Manifest1
-rw-r--r--dev-haskell/comonads-fd/comonads-fd-4.0.ebuild25
-rw-r--r--dev-haskell/comonads-fd/metadata.xml11
-rw-r--r--dev-haskell/concurrent-extra/Manifest1
-rw-r--r--dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild33
-rw-r--r--dev-haskell/concurrent-extra/metadata.xml38
-rw-r--r--dev-haskell/concurrent-output/Manifest1
-rw-r--r--dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild6
-rw-r--r--dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild26
-rw-r--r--dev-haskell/concurrent-output/metadata.xml15
-rw-r--r--dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild4
-rw-r--r--dev-haskell/conduit-combinators/metadata.xml3
-rw-r--r--dev-haskell/conduit-extra/Manifest1
-rw-r--r--dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild6
-rw-r--r--dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild39
-rw-r--r--dev-haskell/conduit-extra/metadata.xml4
-rw-r--r--dev-haskell/conduit/Manifest3
-rw-r--r--dev-haskell/conduit/conduit-1.3.4.2.ebuild38
-rw-r--r--dev-haskell/conduit/conduit-1.3.4.3.ebuild33
-rw-r--r--dev-haskell/conduit/conduit-1.3.4.ebuild39
-rw-r--r--dev-haskell/conduit/metadata.xml4
-rw-r--r--dev-haskell/configfile/Manifest1
-rw-r--r--dev-haskell/configfile/configfile-1.1.4.ebuild38
-rw-r--r--dev-haskell/configfile/metadata.xml8
-rw-r--r--dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild4
-rw-r--r--dev-haskell/connection/Manifest1
-rw-r--r--dev-haskell/connection/connection-0.3.1-r1.ebuild33
-rw-r--r--dev-haskell/connection/connection-0.3.1.ebuild33
-rw-r--r--dev-haskell/connection/metadata.xml9
-rw-r--r--dev-haskell/constraints/Manifest3
-rw-r--r--dev-haskell/constraints/constraints-0.11.2.ebuild30
-rw-r--r--dev-haskell/constraints/constraints-0.13.3.ebuild27
-rw-r--r--dev-haskell/constraints/constraints-0.13.4.ebuild26
-rw-r--r--dev-haskell/constraints/metadata.xml1
-rw-r--r--dev-haskell/contravariant-extras/Manifest1
-rw-r--r--dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild26
-rw-r--r--dev-haskell/contravariant-extras/metadata.xml8
-rw-r--r--dev-haskell/contravariant/Manifest3
-rw-r--r--dev-haskell/contravariant/contravariant-1.5.2.ebuild35
-rw-r--r--dev-haskell/contravariant/contravariant-1.5.3.ebuild35
-rw-r--r--dev-haskell/contravariant/contravariant-1.5.5.ebuild31
-rw-r--r--dev-haskell/contravariant/metadata.xml1
-rw-r--r--dev-haskell/control-monad-loop/Manifest1
-rw-r--r--dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild25
-rw-r--r--dev-haskell/control-monad-loop/metadata.xml11
-rw-r--r--dev-haskell/convertible/Manifest1
-rw-r--r--dev-haskell/convertible/convertible-1.1.1.0.ebuild6
-rw-r--r--dev-haskell/convertible/convertible-1.1.1.1.ebuild31
-rw-r--r--dev-haskell/convertible/metadata.xml4
-rw-r--r--dev-haskell/cookie/Manifest1
-rw-r--r--dev-haskell/cookie/cookie-0.4.4.ebuild6
-rw-r--r--dev-haskell/cookie/cookie-0.4.5.ebuild31
-rw-r--r--dev-haskell/cookie/metadata.xml1
-rw-r--r--dev-haskell/cpphs/Manifest1
-rw-r--r--dev-haskell/cpphs/cpphs-1.20.9.1.ebuild26
-rw-r--r--dev-haskell/cpphs/metadata.xml7
-rw-r--r--dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild6
-rw-r--r--dev-haskell/cprng-aes/metadata.xml3
-rw-r--r--dev-haskell/cpu/Manifest1
-rw-r--r--dev-haskell/cpu/cpu-0.1.2.ebuild29
-rw-r--r--dev-haskell/cpu/metadata.xml11
-rw-r--r--dev-haskell/criterion-measurement/Manifest1
-rw-r--r--dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild6
-rw-r--r--dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild31
-rw-r--r--dev-haskell/criterion-measurement/metadata.xml7
-rw-r--r--dev-haskell/criterion/Manifest3
-rw-r--r--dev-haskell/criterion/criterion-1.5.11.0.ebuild58
-rw-r--r--dev-haskell/criterion/criterion-1.5.6.2.ebuild61
-rw-r--r--dev-haskell/criterion/criterion-1.6.3.0.ebuild59
-rw-r--r--dev-haskell/criterion/metadata.xml19
-rw-r--r--dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild8
-rw-r--r--dev-haskell/crypto-api/crypto-api-0.13.3.ebuild6
-rw-r--r--dev-haskell/crypto-api/metadata.xml3
-rw-r--r--dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild8
-rw-r--r--dev-haskell/crypto-cipher-tests/metadata.xml3
-rw-r--r--dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild6
-rw-r--r--dev-haskell/crypto-cipher-types/metadata.xml3
-rw-r--r--dev-haskell/crypto-numbers/Manifest1
-rw-r--r--dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild36
-rw-r--r--dev-haskell/crypto-numbers/metadata.xml8
-rw-r--r--dev-haskell/crypto-pubkey-types/Manifest1
-rw-r--r--dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild26
-rw-r--r--dev-haskell/crypto-pubkey-types/metadata.xml8
-rw-r--r--dev-haskell/crypto-pubkey/Manifest1
-rw-r--r--dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild35
-rw-r--r--dev-haskell/crypto-pubkey/metadata.xml8
-rw-r--r--dev-haskell/crypto-random-api/Manifest1
-rw-r--r--dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild25
-rw-r--r--dev-haskell/crypto-random-api/metadata.xml8
-rw-r--r--dev-haskell/crypto-random/crypto-random-0.0.9.ebuild6
-rw-r--r--dev-haskell/crypto-random/metadata.xml3
-rw-r--r--dev-haskell/crypto/Manifest1
-rw-r--r--dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild48
-rw-r--r--dev-haskell/crypto/metadata.xml8
-rw-r--r--dev-haskell/cryptohash-conduit/Manifest1
-rw-r--r--dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild28
-rw-r--r--dev-haskell/cryptohash-conduit/metadata.xml8
-rw-r--r--dev-haskell/cryptohash-cryptoapi/Manifest1
-rw-r--r--dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild29
-rw-r--r--dev-haskell/cryptohash-cryptoapi/metadata.xml8
-rw-r--r--dev-haskell/cryptohash-md5/Manifest3
-rw-r--r--dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild25
-rw-r--r--dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild32
-rw-r--r--dev-haskell/cryptohash-md5/metadata.xml20
-rw-r--r--dev-haskell/cryptohash-sha1/Manifest3
-rw-r--r--dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild25
-rw-r--r--dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild29
-rw-r--r--dev-haskell/cryptohash-sha1/metadata.xml20
-rw-r--r--dev-haskell/cryptohash-sha256/Manifest2
-rw-r--r--dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild19
-rw-r--r--dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild58
-rw-r--r--dev-haskell/cryptohash-sha256/metadata.xml19
-rw-r--r--dev-haskell/cryptohash/Manifest1
-rw-r--r--dev-haskell/cryptohash/cryptohash-0.11.9.ebuild32
-rw-r--r--dev-haskell/cryptohash/metadata.xml8
-rw-r--r--dev-haskell/crypton-connection/Manifest1
-rw-r--r--dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild31
-rw-r--r--dev-haskell/crypton-connection/metadata.xml12
-rw-r--r--dev-haskell/crypton-x509-store/Manifest1
-rw-r--r--dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild29
-rw-r--r--dev-haskell/crypton-x509-store/metadata.xml12
-rw-r--r--dev-haskell/crypton-x509-system/Manifest1
-rw-r--r--dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild25
-rw-r--r--dev-haskell/crypton-x509-system/metadata.xml12
-rw-r--r--dev-haskell/crypton-x509-validation/Manifest1
-rw-r--r--dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild33
-rw-r--r--dev-haskell/crypton-x509-validation/metadata.xml12
-rw-r--r--dev-haskell/crypton-x509/Manifest2
-rw-r--r--dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild37
-rw-r--r--dev-haskell/crypton-x509/metadata.xml12
-rw-r--r--dev-haskell/crypton/Manifest1
-rw-r--r--dev-haskell/crypton/crypton-0.32.ebuild43
-rw-r--r--dev-haskell/crypton/metadata.xml23
-rw-r--r--dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild4
-rw-r--r--dev-haskell/cryptonite-conduit/metadata.xml3
-rw-r--r--dev-haskell/cryptonite/Manifest4
-rw-r--r--dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild45
-rw-r--r--dev-haskell/cryptonite/cryptonite-0.28.ebuild58
-rw-r--r--dev-haskell/cryptonite/cryptonite-0.30.ebuild53
-rw-r--r--dev-haskell/cryptonite/metadata.xml25
-rw-r--r--dev-haskell/css-text/css-text-0.1.3.0.ebuild4
-rw-r--r--dev-haskell/css-text/metadata.xml3
-rw-r--r--dev-haskell/curl/Manifest1
-rw-r--r--dev-haskell/curl/curl-1.3.8.ebuild25
-rw-r--r--dev-haskell/curl/metadata.xml8
-rw-r--r--dev-haskell/data-accessor/Manifest1
-rw-r--r--dev-haskell/data-accessor/data-accessor-0.2.3.ebuild24
-rw-r--r--dev-haskell/data-accessor/metadata.xml70
-rw-r--r--dev-haskell/data-array-byte/Manifest2
-rw-r--r--dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild35
-rw-r--r--dev-haskell/data-array-byte/metadata.xml12
-rw-r--r--dev-haskell/data-binary-ieee754/Manifest1
-rw-r--r--dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild24
-rw-r--r--dev-haskell/data-binary-ieee754/metadata.xml8
-rw-r--r--dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild4
-rw-r--r--dev-haskell/data-default-instances-base/Manifest1
-rw-r--r--dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild25
-rw-r--r--dev-haskell/data-default-instances-base/metadata.xml8
-rw-r--r--dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild6
-rw-r--r--dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild6
-rw-r--r--dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild6
-rw-r--r--dev-haskell/data-default/data-default-0.7.1.1.ebuild6
-rw-r--r--dev-haskell/data-endian/Manifest1
-rw-r--r--dev-haskell/data-endian/data-endian-0.1.1.ebuild24
-rw-r--r--dev-haskell/data-endian/metadata.xml11
-rw-r--r--dev-haskell/data-fix/Manifest2
-rw-r--r--dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild26
-rw-r--r--dev-haskell/data-fix/metadata.xml12
-rw-r--r--dev-haskell/data-hash/Manifest1
-rw-r--r--dev-haskell/data-hash/data-hash-0.2.0.1.ebuild27
-rw-r--r--dev-haskell/data-hash/metadata.xml12
-rw-r--r--dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild6
-rw-r--r--dev-haskell/dataenc/Manifest1
-rw-r--r--dev-haskell/dataenc/dataenc-0.14.0.7.ebuild45
-rw-r--r--dev-haskell/dataenc/metadata.xml13
-rw-r--r--dev-haskell/date-cache/Manifest1
-rw-r--r--dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild24
-rw-r--r--dev-haskell/date-cache/metadata.xml8
-rw-r--r--dev-haskell/dav/dav-1.3.4.ebuild6
-rw-r--r--dev-haskell/dbus/Manifest3
-rw-r--r--dev-haskell/dbus/dbus-1.2.16.ebuild45
-rw-r--r--dev-haskell/dbus/dbus-1.2.27.ebuild49
-rw-r--r--dev-haskell/dbus/dbus-1.3.0.ebuild43
-rw-r--r--dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch28
-rw-r--r--dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch14
-rw-r--r--dev-haskell/dbus/metadata.xml57
-rw-r--r--dev-haskell/dec/Manifest2
-rw-r--r--dev-haskell/dec/dec-0.0.3.ebuild14
-rw-r--r--dev-haskell/dec/dec-0.0.5.ebuild25
-rw-r--r--dev-haskell/dec/metadata.xml4
-rw-r--r--dev-haskell/deepseq-generics/Manifest1
-rw-r--r--dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild35
-rw-r--r--dev-haskell/deepseq-generics/metadata.xml26
-rw-r--r--dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild6
-rw-r--r--dev-haskell/deriving-compat/Manifest3
-rw-r--r--dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild31
-rw-r--r--dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild30
-rw-r--r--dev-haskell/deriving-compat/deriving-compat-0.6.ebuild31
-rw-r--r--dev-haskell/deriving-compat/metadata.xml44
-rw-r--r--dev-haskell/dictionary-sharing/Manifest1
-rw-r--r--dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild31
-rw-r--r--dev-haskell/dictionary-sharing/metadata.xml8
-rw-r--r--dev-haskell/diff/Manifest1
-rw-r--r--dev-haskell/diff/diff-0.4.0.ebuild6
-rw-r--r--dev-haskell/diff/diff-0.4.1.ebuild30
-rw-r--r--dev-haskell/diff/metadata.xml4
-rw-r--r--dev-haskell/digest/Manifest1
-rw-r--r--dev-haskell/digest/digest-0.0.1.2.ebuild6
-rw-r--r--dev-haskell/digest/digest-0.0.1.3.ebuild24
-rw-r--r--dev-haskell/digits/Manifest1
-rw-r--r--dev-haskell/digits/digits-0.3.1.ebuild31
-rw-r--r--dev-haskell/digits/metadata.xml (renamed from dev-haskell/abstract-deque-tests/metadata.xml)0
-rw-r--r--dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild6
-rw-r--r--dev-haskell/distributive/Manifest2
-rw-r--r--dev-haskell/distributive/distributive-0.6.1.ebuild40
-rw-r--r--dev-haskell/distributive/distributive-0.6.2.1.ebuild34
-rw-r--r--dev-haskell/djinn-ghc/Manifest1
-rw-r--r--dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild27
-rw-r--r--dev-haskell/djinn-ghc/metadata.xml8
-rw-r--r--dev-haskell/djinn-lib/Manifest1
-rw-r--r--dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild25
-rw-r--r--dev-haskell/djinn-lib/metadata.xml13
-rw-r--r--dev-haskell/dlist-instances/Manifest1
-rw-r--r--dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild26
-rw-r--r--dev-haskell/dlist-instances/metadata.xml16
-rw-r--r--dev-haskell/dlist/Manifest2
-rw-r--r--dev-haskell/dlist/dlist-0.8.0.7.ebuild25
-rw-r--r--dev-haskell/dlist/dlist-1.0.ebuild30
-rw-r--r--dev-haskell/dlist/metadata.xml9
-rw-r--r--dev-haskell/dns/dns-4.0.1.ebuild6
-rw-r--r--dev-haskell/doclayout/Manifest3
-rw-r--r--dev-haskell/doclayout/doclayout-0.3.0.2.ebuild29
-rw-r--r--dev-haskell/doclayout/doclayout-0.4.0.1.ebuild29
-rw-r--r--dev-haskell/doclayout/doclayout-0.4.ebuild29
-rw-r--r--dev-haskell/doclayout/metadata.xml10
-rw-r--r--dev-haskell/doctemplates/Manifest4
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild35
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.11.ebuild35
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.8.2.ebuild40
-rw-r--r--dev-haskell/doctemplates/doctemplates-0.9.ebuild40
-rw-r--r--dev-haskell/doctemplates/metadata.xml1
-rw-r--r--dev-haskell/doctest-driver-gen/Manifest1
-rw-r--r--dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild56
-rw-r--r--dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch31
-rw-r--r--dev-haskell/doctest-driver-gen/metadata.xml15
-rw-r--r--dev-haskell/doctest/Manifest4
-rw-r--r--dev-haskell/doctest/doctest-0.16.3.ebuild38
-rw-r--r--dev-haskell/doctest/doctest-0.20.0.ebuild52
-rw-r--r--dev-haskell/doctest/doctest-0.22.0.ebuild35
-rw-r--r--dev-haskell/doctest/metadata.xml11
-rw-r--r--dev-haskell/double-conversion/Manifest1
-rw-r--r--dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild38
-rw-r--r--dev-haskell/double-conversion/metadata.xml26
-rw-r--r--dev-haskell/drbg/Manifest1
-rw-r--r--dev-haskell/drbg/drbg-0.5.5.ebuild50
-rw-r--r--dev-haskell/drbg/metadata.xml8
-rw-r--r--dev-haskell/easy-file/easy-file-0.2.2.ebuild6
-rw-r--r--dev-haskell/easy-file/metadata.xml3
-rw-r--r--dev-haskell/echo/Manifest1
-rw-r--r--dev-haskell/echo/echo-0.1.3.ebuild13
-rw-r--r--dev-haskell/echo/echo-0.1.4-r1.ebuild35
-rw-r--r--dev-haskell/echo/metadata.xml18
-rw-r--r--dev-haskell/ed25519/Manifest1
-rw-r--r--dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild39
-rw-r--r--dev-haskell/ed25519/ed25519-0.0.5.0.ebuild45
-rw-r--r--dev-haskell/ed25519/metadata.xml10
-rw-r--r--dev-haskell/edisonapi/Manifest1
-rw-r--r--dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild32
-rw-r--r--dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch298
-rw-r--r--dev-haskell/edisonapi/metadata.xml19
-rw-r--r--dev-haskell/edisoncore/Manifest2
-rw-r--r--dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild38
-rw-r--r--dev-haskell/edisoncore/metadata.xml15
-rw-r--r--dev-haskell/edit-distance-vector/Manifest1
-rw-r--r--dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild27
-rw-r--r--dev-haskell/edit-distance-vector/metadata.xml22
-rw-r--r--dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild15
-rw-r--r--dev-haskell/edit-distance/metadata.xml3
-rw-r--r--dev-haskell/editline/Manifest1
-rw-r--r--dev-haskell/editline/editline-0.2.1.1-r1.ebuild39
-rw-r--r--dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch13
-rw-r--r--dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch13
-rw-r--r--dev-haskell/editline/metadata.xml7
-rw-r--r--dev-haskell/either/Manifest1
-rw-r--r--dev-haskell/either/either-5.0.1.1.ebuild32
-rw-r--r--dev-haskell/either/metadata.xml11
-rw-r--r--dev-haskell/ekg-core/Manifest1
-rw-r--r--dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild34
-rw-r--r--dev-haskell/ekg-core/metadata.xml11
-rw-r--r--dev-haskell/ekg-json/Manifest1
-rw-r--r--dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild36
-rw-r--r--dev-haskell/ekg-json/metadata.xml16
-rw-r--r--dev-haskell/ekg/Manifest1
-rw-r--r--dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild42
-rw-r--r--dev-haskell/ekg/metadata.xml16
-rw-r--r--dev-haskell/email-validate/Manifest3
-rw-r--r--dev-haskell/email-validate/email-validate-2.3.2.13.ebuild28
-rw-r--r--dev-haskell/email-validate/email-validate-2.3.2.15.ebuild35
-rw-r--r--dev-haskell/email-validate/email-validate-2.3.2.19.ebuild28
-rw-r--r--dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch26
-rw-r--r--dev-haskell/email-validate/metadata.xml4
-rw-r--r--dev-haskell/emojis/Manifest3
-rw-r--r--dev-haskell/emojis/emojis-0.1.2.ebuild25
-rw-r--r--dev-haskell/emojis/emojis-0.1.3.ebuild24
-rw-r--r--dev-haskell/emojis/emojis-0.1.ebuild24
-rw-r--r--dev-haskell/emojis/metadata.xml18
-rw-r--r--dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild4
-rw-r--r--dev-haskell/entropy/Manifest2
-rw-r--r--dev-haskell/entropy/entropy-0.4.1.10.ebuild30
-rw-r--r--dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild33
-rw-r--r--dev-haskell/entropy/entropy-0.4.1.6.ebuild29
-rw-r--r--dev-haskell/entropy/metadata.xml12
-rw-r--r--dev-haskell/enumerator/Manifest1
-rw-r--r--dev-haskell/enumerator/enumerator-0.4.20.ebuild30
-rw-r--r--dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch21
-rw-r--r--dev-haskell/enumerator/metadata.xml47
-rw-r--r--dev-haskell/equivalence/Manifest1
-rw-r--r--dev-haskell/equivalence/equivalence-0.3.5.ebuild29
-rw-r--r--dev-haskell/equivalence/metadata.xml19
-rw-r--r--dev-haskell/erf/erf-2.0.0.0-r1.ebuild13
-rw-r--r--dev-haskell/erf/metadata.xml3
-rw-r--r--dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild6
-rw-r--r--dev-haskell/errors/Manifest1
-rw-r--r--dev-haskell/errors/errors-2.3.0-r1.ebuild26
-rw-r--r--dev-haskell/errors/errors-2.3.0.ebuild6
-rw-r--r--dev-haskell/errors/metadata.xml11
-rw-r--r--dev-haskell/esqueleto/Manifest1
-rw-r--r--dev-haskell/esqueleto/esqueleto-3.3.4.0.ebuild56
-rw-r--r--dev-haskell/esqueleto/metadata.xml44
-rw-r--r--dev-haskell/exact-pi/Manifest1
-rw-r--r--dev-haskell/exact-pi/exact-pi-0.5.0.1.ebuild40
-rw-r--r--dev-haskell/exact-pi/metadata.xml12
-rw-r--r--dev-haskell/exceptions/Manifest1
-rw-r--r--dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild37
-rw-r--r--dev-haskell/exceptions/exceptions-0.10.4.ebuild41
-rw-r--r--dev-haskell/exceptions/metadata.xml1
-rw-r--r--dev-haskell/executable-path/Manifest1
-rw-r--r--dev-haskell/executable-path/executable-path-0.0.3.1.ebuild24
-rw-r--r--dev-haskell/executable-path/metadata.xml15
-rw-r--r--dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild6
-rw-r--r--dev-haskell/extra/Manifest3
-rw-r--r--dev-haskell/extra/extra-1.7.10.ebuild34
-rw-r--r--dev-haskell/extra/extra-1.7.14.ebuild25
-rw-r--r--dev-haskell/extra/extra-1.7.8.ebuild27
-rw-r--r--dev-haskell/extra/metadata.xml1
-rw-r--r--dev-haskell/fail/fail-4.9.0.0.ebuild6
-rw-r--r--dev-haskell/failure/Manifest1
-rw-r--r--dev-haskell/failure/failure-0.2.0.3.ebuild24
-rw-r--r--dev-haskell/failure/metadata.xml8
-rw-r--r--dev-haskell/fast-logger/Manifest1
-rw-r--r--dev-haskell/fast-logger/fast-logger-3.0.1.ebuild6
-rw-r--r--dev-haskell/fast-logger/fast-logger-3.2.2.ebuild29
-rw-r--r--dev-haskell/fast-logger/metadata.xml1
-rw-r--r--dev-haskell/fclabels/Manifest1
-rw-r--r--dev-haskell/fclabels/fclabels-2.0.5.ebuild27
-rw-r--r--dev-haskell/fclabels/metadata.xml32
-rw-r--r--dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild8
-rw-r--r--dev-haskell/feed/Manifest3
-rw-r--r--dev-haskell/feed/feed-1.3.0.1.ebuild42
-rw-r--r--dev-haskell/feed/feed-1.3.2.1-r2.ebuild53
-rw-r--r--dev-haskell/feed/feed-1.3.2.1.ebuild39
-rw-r--r--dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch18
-rw-r--r--dev-haskell/feed/metadata.xml3
-rw-r--r--dev-haskell/fgl-arbitrary/Manifest1
-rw-r--r--dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild35
-rw-r--r--dev-haskell/fgl-arbitrary/metadata.xml16
-rw-r--r--dev-haskell/fgl/Manifest3
-rw-r--r--dev-haskell/fgl/fgl-5.7.0.2.ebuild26
-rw-r--r--dev-haskell/fgl/fgl-5.7.0.3.ebuild29
-rw-r--r--dev-haskell/fgl/fgl-5.8.1.1.ebuild24
-rw-r--r--dev-haskell/fgl/metadata.xml4
-rw-r--r--dev-haskell/file-embed/Manifest1
-rw-r--r--dev-haskell/file-embed/file-embed-0.0.11.2.ebuild6
-rw-r--r--dev-haskell/file-embed/file-embed-0.0.15.0.ebuild23
-rw-r--r--dev-haskell/file-embed/metadata.xml1
-rw-r--r--dev-haskell/file-location/Manifest1
-rw-r--r--dev-haskell/file-location/file-location-0.4.9.1.ebuild29
-rw-r--r--dev-haskell/file-location/metadata.xml42
-rw-r--r--dev-haskell/filelock/Manifest1
-rw-r--r--dev-haskell/filelock/filelock-0.1.1.5.ebuild25
-rw-r--r--dev-haskell/filelock/metadata.xml8
-rw-r--r--dev-haskell/filemanip/filemanip-0.3.6.3.ebuild6
-rw-r--r--dev-haskell/filemanip/metadata.xml3
-rw-r--r--dev-haskell/filepath-bytestring/Manifest2
-rw-r--r--dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild25
-rw-r--r--dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild27
-rw-r--r--dev-haskell/filepath-bytestring/metadata.xml16
-rw-r--r--dev-haskell/filepattern/Manifest1
-rw-r--r--dev-haskell/filepattern/filepattern-0.1.2.ebuild27
-rw-r--r--dev-haskell/filepattern/metadata.xml26
-rw-r--r--dev-haskell/filestore/Manifest1
-rw-r--r--dev-haskell/filestore/filestore-0.6.5.ebuild39
-rw-r--r--dev-haskell/filestore/metadata.xml19
-rw-r--r--dev-haskell/findbin/findbin-0.0.5-r1.ebuild6
-rw-r--r--dev-haskell/findbin/metadata.xml3
-rw-r--r--dev-haskell/fingertree/Manifest1
-rw-r--r--dev-haskell/fingertree/fingertree-0.1.4.2.ebuild6
-rw-r--r--dev-haskell/fingertree/fingertree-0.1.5.0.ebuild27
-rw-r--r--dev-haskell/fingertree/metadata.xml18
-rw-r--r--dev-haskell/fixed/Manifest1
-rw-r--r--dev-haskell/fixed/fixed-0.3.ebuild24
-rw-r--r--dev-haskell/fixed/metadata.xml8
-rw-r--r--dev-haskell/fmlist/Manifest1
-rw-r--r--dev-haskell/fmlist/fmlist-0.9.3.ebuild25
-rw-r--r--dev-haskell/fmlist/metadata.xml18
-rw-r--r--dev-haskell/foldable1-classes-compat/Manifest2
-rw-r--r--dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild47
-rw-r--r--dev-haskell/foldable1-classes-compat/metadata.xml17
-rw-r--r--dev-haskell/foldl/Manifest4
-rw-r--r--dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch83
-rw-r--r--dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch120
-rw-r--r--dev-haskell/foldl/foldl-1.4.12-r1.ebuild44
-rw-r--r--dev-haskell/foldl/foldl-1.4.15.ebuild46
-rw-r--r--dev-haskell/foldl/foldl-1.4.7.ebuild39
-rw-r--r--dev-haskell/foldl/metadata.xml10
-rw-r--r--dev-haskell/foundation/Manifest3
-rw-r--r--dev-haskell/foundation/foundation-0.0.25.ebuild40
-rw-r--r--dev-haskell/foundation/foundation-0.0.26.1.ebuild40
-rw-r--r--dev-haskell/foundation/foundation-0.0.30.ebuild35
-rw-r--r--dev-haskell/foundation/metadata.xml25
-rw-r--r--dev-haskell/free/Manifest4
-rw-r--r--dev-haskell/free/free-5.1.3.ebuild35
-rw-r--r--dev-haskell/free/free-5.1.9.ebuild30
-rw-r--r--dev-haskell/free/free-5.2.ebuild31
-rw-r--r--dev-haskell/free/metadata.xml1
-rw-r--r--dev-haskell/fsnotify/Manifest1
-rw-r--r--dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild33
-rw-r--r--dev-haskell/fsnotify/metadata.xml17
-rw-r--r--dev-haskell/generic-deriving/Manifest3
-rw-r--r--dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild26
-rw-r--r--dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild25
-rw-r--r--dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild24
-rw-r--r--dev-haskell/generic-deriving/metadata.xml13
-rw-r--r--dev-haskell/generically/Manifest2
-rw-r--r--dev-haskell/generically/generically-0.1.1-r1.ebuild26
-rw-r--r--dev-haskell/generically/metadata.xml12
-rw-r--r--dev-haskell/generics-sop/Manifest3
-rw-r--r--dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild26
-rw-r--r--dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild25
-rw-r--r--dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild24
-rw-r--r--dev-haskell/generics-sop/metadata.xml33
-rw-r--r--dev-haskell/geniplate-mirror/Manifest1
-rw-r--r--dev-haskell/geniplate-mirror/geniplate-mirror-0.7.7.ebuild32
-rw-r--r--dev-haskell/geniplate-mirror/metadata.xml18
-rw-r--r--dev-haskell/genvalidity-hspec/Manifest1
-rw-r--r--dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild30
-rw-r--r--dev-haskell/genvalidity-hspec/metadata.xml8
-rw-r--r--dev-haskell/genvalidity-property/Manifest1
-rw-r--r--dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild30
-rw-r--r--dev-haskell/genvalidity-property/metadata.xml8
-rw-r--r--dev-haskell/genvalidity/Manifest1
-rw-r--r--dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild29
-rw-r--r--dev-haskell/genvalidity/metadata.xml15
-rw-r--r--dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild6
-rw-r--r--dev-haskell/getopt-generics/metadata.xml3
-rw-r--r--dev-haskell/ghc-byteorder/Manifest1
-rw-r--r--dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild28
-rw-r--r--dev-haskell/ghc-byteorder/metadata.xml23
-rw-r--r--dev-haskell/ghc-lib-parser-ex/Manifest1
-rw-r--r--dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild36
-rw-r--r--dev-haskell/ghc-lib-parser-ex/metadata.xml8
-rw-r--r--dev-haskell/ghc-lib-parser/Manifest1
-rw-r--r--dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild26
-rw-r--r--dev-haskell/ghc-lib-parser/metadata.xml8
-rw-r--r--dev-haskell/ghc-paths/Manifest1
-rw-r--r--dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild18
-rw-r--r--dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild51
-rw-r--r--dev-haskell/ghc-paths/metadata.xml11
-rw-r--r--dev-haskell/gio/Manifest1
-rw-r--r--dev-haskell/gio/gio-0.13.8.1.ebuild29
-rw-r--r--dev-haskell/gio/metadata.xml15
-rw-r--r--dev-haskell/git-lfs/Manifest2
-rw-r--r--dev-haskell/git-lfs/git-lfs-1.1.0.ebuild30
-rw-r--r--dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild33
-rw-r--r--dev-haskell/git-lfs/metadata.xml3
-rw-r--r--dev-haskell/git/Manifest1
-rw-r--r--dev-haskell/git/files/git-0.3.0-monadfail.patch103
-rw-r--r--dev-haskell/git/git-0.3.0.ebuild41
-rw-r--r--dev-haskell/git/metadata.xml19
-rw-r--r--dev-haskell/githash/Manifest1
-rw-r--r--dev-haskell/githash/githash-0.1.3.3.ebuild28
-rw-r--r--dev-haskell/githash/metadata.xml8
-rw-r--r--dev-haskell/gitrev/Manifest1
-rw-r--r--dev-haskell/gitrev/gitrev-1.3.1.ebuild25
-rw-r--r--dev-haskell/gitrev/metadata.xml14
-rw-r--r--dev-haskell/glib/Manifest2
-rw-r--r--dev-haskell/glib/glib-0.13.10.0.ebuild38
-rw-r--r--dev-haskell/glib/glib-0.13.8.1.ebuild34
-rw-r--r--dev-haskell/glib/metadata.xml13
-rw-r--r--dev-haskell/glob/Manifest3
-rw-r--r--dev-haskell/glob/glob-0.10.1.ebuild37
-rw-r--r--dev-haskell/glob/glob-0.10.2.ebuild52
-rw-r--r--dev-haskell/gluraw/Manifest1
-rw-r--r--dev-haskell/gluraw/gluraw-2.0.0.4.ebuild37
-rw-r--r--dev-haskell/gluraw/metadata.xml20
-rw-r--r--dev-haskell/glut/Manifest1
-rw-r--r--dev-haskell/glut/glut-2.7.0.15.ebuild40
-rw-r--r--dev-haskell/glut/metadata.xml14
-rw-r--r--dev-haskell/gnuidn/Manifest1
-rw-r--r--dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild30
-rw-r--r--dev-haskell/gnuidn/metadata.xml8
-rw-r--r--dev-haskell/gnutls/Manifest1
-rw-r--r--dev-haskell/gnutls/gnutls-0.2.ebuild27
-rw-r--r--dev-haskell/gnutls/metadata.xml8
-rw-r--r--dev-haskell/graphviz/Manifest1
-rw-r--r--dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild52
-rw-r--r--dev-haskell/graphviz/metadata.xml35
-rw-r--r--dev-haskell/gridtables/Manifest1
-rw-r--r--dev-haskell/gridtables/gridtables-0.1.0.0.ebuild27
-rw-r--r--dev-haskell/gridtables/metadata.xml12
-rw-r--r--dev-haskell/groupoids/Manifest1
-rw-r--r--dev-haskell/groupoids/groupoids-4.0.ebuild25
-rw-r--r--dev-haskell/groupoids/metadata.xml8
-rw-r--r--dev-haskell/gsasl/Manifest1
-rw-r--r--dev-haskell/gsasl/gsasl-0.3.7.ebuild27
-rw-r--r--dev-haskell/gsasl/metadata.xml8
-rw-r--r--dev-haskell/gtk/Manifest1
-rw-r--r--dev-haskell/gtk/gtk-0.15.5-r1.ebuild43
-rw-r--r--dev-haskell/gtk/metadata.xml18
-rw-r--r--dev-haskell/gtk2hs-buildtools/Manifest2
-rw-r--r--dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch32
-rw-r--r--dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild33
-rw-r--r--dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild37
-rw-r--r--dev-haskell/gtk2hs-buildtools/metadata.xml17
-rw-r--r--dev-haskell/gtk3/Manifest1
-rw-r--r--dev-haskell/gtk3/gtk3-0.15.5.ebuild41
-rw-r--r--dev-haskell/gtk3/metadata.xml17
-rw-r--r--dev-haskell/hackage-security/Manifest6
-rw-r--r--dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch12
-rw-r--r--dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch13
-rw-r--r--dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch33
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild68
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild63
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild55
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild75
-rw-r--r--dev-haskell/hackage-security/metadata.xml24
-rw-r--r--dev-haskell/haddock-api/Manifest2
-rw-r--r--dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch147
-rw-r--r--dev-haskell/haddock-api/haddock-api-2.23.1.ebuild31
-rw-r--r--dev-haskell/haddock-api/haddock-api-2.24.0.ebuild39
-rw-r--r--dev-haskell/haddock-api/metadata.xml8
-rw-r--r--dev-haskell/haddock-library/Manifest4
-rw-r--r--dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild49
-rw-r--r--dev-haskell/haddock-library/haddock-library-1.8.0.ebuild40
-rw-r--r--dev-haskell/haddock-library/haddock-library-1.9.0.ebuild43
-rw-r--r--dev-haskell/haddock-library/metadata.xml12
-rw-r--r--dev-haskell/haddock/Manifest2
-rw-r--r--dev-haskell/haddock/haddock-2.23.1.ebuild34
-rw-r--r--dev-haskell/haddock/haddock-2.24.0.ebuild35
-rw-r--r--dev-haskell/haddock/metadata.xml7
-rw-r--r--dev-haskell/hakyll/Manifest1
-rw-r--r--dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild86
-rw-r--r--dev-haskell/hakyll/metadata.xml15
-rw-r--r--dev-haskell/half/Manifest1
-rw-r--r--dev-haskell/half/half-0.3-r1.ebuild26
-rw-r--r--dev-haskell/half/metadata.xml8
-rw-r--r--dev-haskell/hamlet/Manifest1
-rw-r--r--dev-haskell/hamlet/hamlet-1.2.0.ebuild25
-rw-r--r--dev-haskell/hamlet/metadata.xml8
-rw-r--r--dev-haskell/happstack-server/Manifest1
-rw-r--r--dev-haskell/happstack-server/happstack-server-7.6.1.ebuild55
-rw-r--r--dev-haskell/happstack-server/metadata.xml14
-rw-r--r--dev-haskell/happy/Manifest1
-rw-r--r--dev-haskell/happy/happy-1.19.12.ebuild6
-rw-r--r--dev-haskell/happy/happy-1.20.1.1.ebuild69
-rw-r--r--dev-haskell/harp/Manifest1
-rw-r--r--dev-haskell/harp/harp-0.4.3.2.ebuild31
-rw-r--r--dev-haskell/harp/metadata.xml19
-rw-r--r--dev-haskell/hashable-time/Manifest1
-rw-r--r--dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild34
-rw-r--r--dev-haskell/hashable-time/metadata.xml8
-rw-r--r--dev-haskell/hashable/Manifest4
-rw-r--r--dev-haskell/hashable/hashable-1.2.7.0.ebuild44
-rw-r--r--dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild39
-rw-r--r--dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild45
-rw-r--r--dev-haskell/hashable/metadata.xml17
-rw-r--r--dev-haskell/hashtables/Manifest2
-rw-r--r--dev-haskell/hashtables/hashtables-1.2.4.1.ebuild44
-rw-r--r--dev-haskell/hashtables/hashtables-1.3.1.ebuild47
-rw-r--r--dev-haskell/hashtables/metadata.xml97
-rw-r--r--dev-haskell/haskeline/Manifest3
-rw-r--r--dev-haskell/haskeline/haskeline-0.7.5.0.ebuild41
-rw-r--r--dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild38
-rw-r--r--dev-haskell/haskeline/metadata.xml9
-rw-r--r--dev-haskell/haskell-lexer/Manifest2
-rw-r--r--dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild24
-rw-r--r--dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild24
-rw-r--r--dev-haskell/haskell-lexer/metadata.xml3
-rw-r--r--dev-haskell/haskell-src-exts-util/Manifest1
-rw-r--r--dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild28
-rw-r--r--dev-haskell/haskell-src-exts-util/metadata.xml8
-rw-r--r--dev-haskell/haskell-src-exts/Manifest3
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild48
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild39
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild34
-rw-r--r--dev-haskell/haskell-src-exts/metadata.xml25
-rw-r--r--dev-haskell/haskell-src-meta/Manifest1
-rw-r--r--dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild36
-rw-r--r--dev-haskell/haskell-src-meta/metadata.xml12
-rw-r--r--dev-haskell/haskell-src/Manifest1
-rw-r--r--dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch39
-rw-r--r--dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild30
-rw-r--r--dev-haskell/haskell-src/metadata.xml7
-rw-r--r--dev-haskell/haxml/Manifest1
-rw-r--r--dev-haskell/haxml/haxml-1.25.5-r1.ebuild40
-rw-r--r--dev-haskell/haxml/metadata.xml8
-rw-r--r--dev-haskell/hcg-minus/Manifest1
-rw-r--r--dev-haskell/hcg-minus/hcg-minus-0.15.ebuild25
-rw-r--r--dev-haskell/hcg-minus/metadata.xml8
-rw-r--r--dev-haskell/hcodecs/Manifest1
-rw-r--r--dev-haskell/hcodecs/hcodecs-0.5.2.ebuild33
-rw-r--r--dev-haskell/hcodecs/metadata.xml17
-rw-r--r--dev-haskell/hdbc-mysql/Manifest1
-rw-r--r--dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch11
-rw-r--r--dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild41
-rw-r--r--dev-haskell/hdbc-mysql/metadata.xml15
-rw-r--r--dev-haskell/hdbc-odbc/Manifest1
-rw-r--r--dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild42
-rw-r--r--dev-haskell/hdbc-odbc/metadata.xml8
-rw-r--r--dev-haskell/hdbc-postgresql/Manifest1
-rw-r--r--dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild25
-rw-r--r--dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild43
-rw-r--r--dev-haskell/hdbc-postgresql/metadata.xml14
-rw-r--r--dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild8
-rw-r--r--dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild40
-rw-r--r--dev-haskell/hdbc/Manifest1
-rw-r--r--dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch127
-rw-r--r--dev-haskell/hdbc/hdbc-2.4.0.3.ebuild22
-rw-r--r--dev-haskell/hdbc/hdbc-2.4.0.4.ebuild43
-rw-r--r--dev-haskell/hdbc/metadata.xml7
-rw-r--r--dev-haskell/heaps/Manifest1
-rw-r--r--dev-haskell/heaps/heaps-0.3.6.1.ebuild24
-rw-r--r--dev-haskell/heaps/metadata.xml11
-rw-r--r--dev-haskell/hedgehog/Manifest4
-rw-r--r--dev-haskell/hedgehog/hedgehog-1.0.4.ebuild41
-rw-r--r--dev-haskell/hedgehog/hedgehog-1.0.5.ebuild42
-rw-r--r--dev-haskell/hedgehog/hedgehog-1.4.ebuild39
-rw-r--r--dev-haskell/hedgehog/metadata.xml12
-rw-r--r--dev-haskell/hex/Manifest1
-rw-r--r--dev-haskell/hex/files/hex-0.1.2-monadfail.patch20
-rw-r--r--dev-haskell/hex/hex-0.1.2.ebuild26
-rw-r--r--dev-haskell/hex/metadata.xml8
-rw-r--r--dev-haskell/hexpat/Manifest1
-rw-r--r--dev-haskell/hexpat/hexpat-0.20.13.ebuild33
-rw-r--r--dev-haskell/hexpat/metadata.xml8
-rw-r--r--dev-haskell/hi-file-parser/Manifest1
-rw-r--r--dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild27
-rw-r--r--dev-haskell/hi-file-parser/metadata.xml11
-rw-r--r--dev-haskell/highlighting-kate/Manifest1
-rw-r--r--dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild37
-rw-r--r--dev-haskell/highlighting-kate/metadata.xml25
-rw-r--r--dev-haskell/hinotify/Manifest1
-rw-r--r--dev-haskell/hinotify/hinotify-0.3.10.ebuild6
-rw-r--r--dev-haskell/hinotify/hinotify-0.4.1.ebuild25
-rw-r--r--dev-haskell/hinotify/metadata.xml13
-rw-r--r--dev-haskell/hit/Manifest1
-rw-r--r--dev-haskell/hit/hit-0.7.0.ebuild33
-rw-r--r--dev-haskell/hit/metadata.xml17
-rw-r--r--dev-haskell/hjsmin/Manifest1
-rw-r--r--dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch29
-rw-r--r--dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild10
-rw-r--r--dev-haskell/hjsmin/hjsmin-0.2.1.ebuild45
-rw-r--r--dev-haskell/hjsmin/metadata.xml7
-rw-r--r--dev-haskell/hlint/Manifest1
-rw-r--r--dev-haskell/hlint/hlint-3.2.7.ebuild59
-rw-r--r--dev-haskell/hlint/metadata.xml13
-rw-r--r--dev-haskell/hoauth2/Manifest1
-rw-r--r--dev-haskell/hoauth2/hoauth2-1.16.0.ebuild40
-rw-r--r--dev-haskell/hoauth2/metadata.xml22
-rw-r--r--dev-haskell/hostname/hostname-1.0-r1.ebuild6
-rw-r--r--dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch30
-rw-r--r--dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild32
-rw-r--r--dev-haskell/hourglass/hourglass-0.2.12.ebuild8
-rw-r--r--dev-haskell/hourglass/metadata.xml9
-rw-r--r--dev-haskell/hpack/Manifest1
-rw-r--r--dev-haskell/hpack/hpack-0.33.0.ebuild44
-rw-r--r--dev-haskell/hpack/metadata.xml8
-rw-r--r--dev-haskell/hps/Manifest1
-rw-r--r--dev-haskell/hps/files/hps-0.15-ghc84.patch28
-rw-r--r--dev-haskell/hps/hps-0.15.ebuild35
-rw-r--r--dev-haskell/hps/metadata.xml11
-rw-r--r--dev-haskell/hs-bibutils/Manifest1
-rw-r--r--dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild25
-rw-r--r--dev-haskell/hs-bibutils/metadata.xml14
-rw-r--r--dev-haskell/hs3/Manifest1
-rw-r--r--dev-haskell/hs3/hs3-0.5.9.ebuild48
-rw-r--r--dev-haskell/hs3/metadata.xml17
-rw-r--r--dev-haskell/hsb2hs/Manifest1
-rw-r--r--dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild25
-rw-r--r--dev-haskell/hsb2hs/metadata.xml8
-rw-r--r--dev-haskell/hscolour/Manifest1
-rw-r--r--dev-haskell/hscolour/hscolour-1.24.4.ebuild6
-rw-r--r--dev-haskell/hscolour/hscolour-1.25.ebuild37
-rw-r--r--dev-haskell/hscolour/metadata.xml14
-rw-r--r--dev-haskell/hslogger/Manifest1
-rw-r--r--dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild45
-rw-r--r--dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild42
-rw-r--r--dev-haskell/hslogger/metadata.xml15
-rw-r--r--dev-haskell/hslua-aeson/Manifest2
-rw-r--r--dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild34
-rw-r--r--dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild35
-rw-r--r--dev-haskell/hslua-aeson/metadata.xml12
-rw-r--r--dev-haskell/hslua-classes/Manifest2
-rw-r--r--dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild32
-rw-r--r--dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild32
-rw-r--r--dev-haskell/hslua-classes/metadata.xml12
-rw-r--r--dev-haskell/hslua-cli/Manifest1
-rw-r--r--dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild33
-rw-r--r--dev-haskell/hslua-cli/metadata.xml15
-rw-r--r--dev-haskell/hslua-core/Manifest2
-rw-r--r--dev-haskell/hslua-core/hslua-core-2.2.0.ebuild30
-rw-r--r--dev-haskell/hslua-core/hslua-core-2.3.1.ebuild30
-rw-r--r--dev-haskell/hslua-core/metadata.xml12
-rw-r--r--dev-haskell/hslua-list/Manifest1
-rw-r--r--dev-haskell/hslua-list/hslua-list-1.1.1.ebuild25
-rw-r--r--dev-haskell/hslua-list/metadata.xml12
-rw-r--r--dev-haskell/hslua-marshalling/Manifest2
-rw-r--r--dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild31
-rw-r--r--dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild31
-rw-r--r--dev-haskell/hslua-marshalling/metadata.xml12
-rw-r--r--dev-haskell/hslua-module-doclayout/Manifest2
-rw-r--r--dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild28
-rw-r--r--dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild28
-rw-r--r--dev-haskell/hslua-module-doclayout/metadata.xml12
-rw-r--r--dev-haskell/hslua-module-path/Manifest3
-rw-r--r--dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild28
-rw-r--r--dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild30
-rw-r--r--dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild29
-rw-r--r--dev-haskell/hslua-module-path/metadata.xml4
-rw-r--r--dev-haskell/hslua-module-system/Manifest3
-rw-r--r--dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild31
-rw-r--r--dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild32
-rw-r--r--dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild30
-rw-r--r--dev-haskell/hslua-module-system/metadata.xml13
-rw-r--r--dev-haskell/hslua-module-text/Manifest4
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild28
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild28
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild30
-rw-r--r--dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild29
-rw-r--r--dev-haskell/hslua-module-text/metadata.xml4
-rw-r--r--dev-haskell/hslua-module-version/Manifest2
-rw-r--r--dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild30
-rw-r--r--dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild29
-rw-r--r--dev-haskell/hslua-module-version/metadata.xml12
-rw-r--r--dev-haskell/hslua-module-zip/Manifest1
-rw-r--r--dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild33
-rw-r--r--dev-haskell/hslua-module-zip/metadata.xml12
-rw-r--r--dev-haskell/hslua-objectorientation/Manifest2
-rw-r--r--dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild32
-rw-r--r--dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild33
-rw-r--r--dev-haskell/hslua-objectorientation/metadata.xml12
-rw-r--r--dev-haskell/hslua-packaging/Manifest2
-rw-r--r--dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild29
-rw-r--r--dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild30
-rw-r--r--dev-haskell/hslua-packaging/metadata.xml12
-rw-r--r--dev-haskell/hslua-repl/Manifest1
-rw-r--r--dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild32
-rw-r--r--dev-haskell/hslua-repl/metadata.xml15
-rw-r--r--dev-haskell/hslua-typing/Manifest1
-rw-r--r--dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild31
-rw-r--r--dev-haskell/hslua-typing/metadata.xml12
-rw-r--r--dev-haskell/hslua/Manifest5
-rw-r--r--dev-haskell/hslua/hslua-1.0.3.1.ebuild46
-rw-r--r--dev-haskell/hslua/hslua-1.1.2.ebuild49
-rw-r--r--dev-haskell/hslua/hslua-1.3.0.1.ebuild47
-rw-r--r--dev-haskell/hslua/hslua-2.2.0.ebuild49
-rw-r--r--dev-haskell/hslua/hslua-2.3.0.ebuild50
-rw-r--r--dev-haskell/hslua/metadata.xml7
-rw-r--r--dev-haskell/hsopenssl/Manifest1
-rw-r--r--dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild40
-rw-r--r--dev-haskell/hsopenssl/metadata.xml30
-rw-r--r--dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild6
-rw-r--r--dev-haskell/hspec-core/Manifest3
-rw-r--r--dev-haskell/hspec-core/hspec-core-2.10.6.ebuild47
-rw-r--r--dev-haskell/hspec-core/hspec-core-2.7.1.ebuild38
-rw-r--r--dev-haskell/hspec-core/hspec-core-2.9.4.ebuild40
-rw-r--r--dev-haskell/hspec-core/metadata.xml4
-rw-r--r--dev-haskell/hspec-discover/Manifest3
-rw-r--r--dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild35
-rw-r--r--dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild26
-rw-r--r--dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild27
-rw-r--r--dev-haskell/hspec-discover/metadata.xml4
-rw-r--r--dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild4
-rw-r--r--dev-haskell/hspec-expectations/metadata.xml2
-rw-r--r--dev-haskell/hspec-megaparsec/Manifest1
-rw-r--r--dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild33
-rw-r--r--dev-haskell/hspec-megaparsec/metadata.xml12
-rw-r--r--dev-haskell/hspec-meta/Manifest3
-rw-r--r--dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild30
-rw-r--r--dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild34
-rw-r--r--dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild31
-rw-r--r--dev-haskell/hspec-meta/metadata.xml4
-rw-r--r--dev-haskell/hspec-smallcheck/Manifest1
-rw-r--r--dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild31
-rw-r--r--dev-haskell/hspec-smallcheck/metadata.xml8
-rw-r--r--dev-haskell/hspec-wai/Manifest2
-rw-r--r--dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild34
-rw-r--r--dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild35
-rw-r--r--dev-haskell/hspec-wai/metadata.xml12
-rw-r--r--dev-haskell/hspec/Manifest3
-rw-r--r--dev-haskell/hspec/hspec-2.10.6.ebuild26
-rw-r--r--dev-haskell/hspec/hspec-2.7.1.ebuild28
-rw-r--r--dev-haskell/hspec/hspec-2.9.4.ebuild27
-rw-r--r--dev-haskell/hspec/metadata.xml9
-rw-r--r--dev-haskell/hsql-mysql/Manifest2
-rw-r--r--dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild26
-rw-r--r--dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild26
-rw-r--r--dev-haskell/hsql-mysql/metadata.xml8
-rw-r--r--dev-haskell/hsql-odbc/Manifest1
-rw-r--r--dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch13
-rw-r--r--dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild28
-rw-r--r--dev-haskell/hsql-odbc/metadata.xml8
-rw-r--r--dev-haskell/hsql-sqlite3/Manifest1
-rw-r--r--dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch14
-rw-r--r--dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild28
-rw-r--r--dev-haskell/hsql-sqlite3/metadata.xml8
-rw-r--r--dev-haskell/hsql/Manifest1
-rw-r--r--dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch29
-rw-r--r--dev-haskell/hsql/hsql-1.8.2-r1.ebuild40
-rw-r--r--dev-haskell/hsql/metadata.xml8
-rw-r--r--dev-haskell/hstringtemplate/Manifest1
-rw-r--r--dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild44
-rw-r--r--dev-haskell/hstringtemplate/metadata.xml8
-rw-r--r--dev-haskell/hsyaml-aeson/Manifest1
-rw-r--r--dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild45
-rw-r--r--dev-haskell/hsyaml-aeson/metadata.xml21
-rw-r--r--dev-haskell/hsyaml/Manifest4
-rw-r--r--dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild33
-rw-r--r--dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild37
-rw-r--r--dev-haskell/hsyaml/metadata.xml20
-rw-r--r--dev-haskell/htf/Manifest1
-rw-r--r--dev-haskell/htf/htf-0.14.0.3.ebuild48
-rw-r--r--dev-haskell/htf/metadata.xml23
-rw-r--r--dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild6
-rw-r--r--dev-haskell/html/html-1.0.1.2-r1.ebuild6
-rw-r--r--dev-haskell/http-api-data/Manifest4
-rw-r--r--dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild54
-rw-r--r--dev-haskell/http-api-data/http-api-data-0.4.3.ebuild58
-rw-r--r--dev-haskell/http-api-data/http-api-data-0.5.1.ebuild45
-rw-r--r--dev-haskell/http-api-data/metadata.xml4
-rw-r--r--dev-haskell/http-attoparsec/Manifest1
-rw-r--r--dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch9
-rw-r--r--dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild36
-rw-r--r--dev-haskell/http-attoparsec/metadata.xml8
-rw-r--r--dev-haskell/http-client-conduit/Manifest1
-rw-r--r--dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild25
-rw-r--r--dev-haskell/http-client-conduit/metadata.xml8
-rw-r--r--dev-haskell/http-client-multipart/Manifest1
-rw-r--r--dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild25
-rw-r--r--dev-haskell/http-client-multipart/metadata.xml8
-rw-r--r--dev-haskell/http-client-restricted/Manifest3
-rw-r--r--dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild31
-rw-r--r--dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild30
-rw-r--r--dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild29
-rw-r--r--dev-haskell/http-client-restricted/metadata.xml3
-rw-r--r--dev-haskell/http-client-tls/Manifest3
-rw-r--r--dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild39
-rw-r--r--dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild36
-rw-r--r--dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild36
-rw-r--r--dev-haskell/http-client-tls/metadata.xml1
-rw-r--r--dev-haskell/http-client/Manifest3
-rw-r--r--dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch16
-rw-r--r--dev-haskell/http-client/http-client-0.6.4.1.ebuild51
-rw-r--r--dev-haskell/http-client/http-client-0.7.11.ebuild48
-rw-r--r--dev-haskell/http-client/http-client-0.7.14.ebuild49
-rw-r--r--dev-haskell/http-client/metadata.xml4
-rw-r--r--dev-haskell/http-common/Manifest1
-rw-r--r--dev-haskell/http-common/http-common-0.8.2.1.ebuild31
-rw-r--r--dev-haskell/http-common/metadata.xml8
-rw-r--r--dev-haskell/http-conduit/Manifest2
-rw-r--r--dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild54
-rw-r--r--dev-haskell/http-conduit/http-conduit-2.3.8.ebuild43
-rw-r--r--dev-haskell/http-date/Manifest1
-rw-r--r--dev-haskell/http-date/http-date-0.0.11.ebuild29
-rw-r--r--dev-haskell/http-date/http-date-0.0.8.ebuild8
-rw-r--r--dev-haskell/http-download/Manifest1
-rw-r--r--dev-haskell/http-download/http-download-0.2.0.0.ebuild43
-rw-r--r--dev-haskell/http-download/metadata.xml8
-rw-r--r--dev-haskell/http-media/Manifest1
-rw-r--r--dev-haskell/http-media/http-media-0.8.0.0.ebuild38
-rw-r--r--dev-haskell/http-media/metadata.xml38
-rw-r--r--dev-haskell/http-reverse-proxy/Manifest1
-rw-r--r--dev-haskell/http-reverse-proxy/http-reverse-proxy-0.6.0.ebuild51
-rw-r--r--dev-haskell/http-reverse-proxy/metadata.xml14
-rw-r--r--dev-haskell/http-streams/Manifest1
-rw-r--r--dev-haskell/http-streams/http-streams-0.8.7.2.ebuild47
-rw-r--r--dev-haskell/http-streams/metadata.xml22
-rw-r--r--dev-haskell/http-types/http-types-0.12.3.ebuild6
-rw-r--r--dev-haskell/http/Manifest3
-rw-r--r--dev-haskell/http/http-4000.3.14.ebuild61
-rw-r--r--dev-haskell/http/http-4000.4.1-r1.ebuild49
-rw-r--r--dev-haskell/http/metadata.xml38
-rw-r--r--dev-haskell/http2/Manifest3
-rw-r--r--dev-haskell/http2/http2-2.0.3.ebuild46
-rw-r--r--dev-haskell/http2/http2-3.0.1.ebuild53
-rw-r--r--dev-haskell/http2/http2-4.1.2.ebuild52
-rw-r--r--dev-haskell/http2/metadata.xml4
-rw-r--r--dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild34
-rw-r--r--dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild40
-rw-r--r--dev-haskell/httpd-shed/metadata.xml2
-rw-r--r--dev-haskell/hunit/Manifest3
-rw-r--r--dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch20
-rw-r--r--dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild27
-rw-r--r--dev-haskell/hunit/hunit-1.6.0.0.ebuild30
-rw-r--r--dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild29
-rw-r--r--dev-haskell/hunit/hunit-1.6.2.0.ebuild6
-rw-r--r--dev-haskell/hunit/metadata.xml6
-rw-r--r--dev-haskell/hxt-charproperties/Manifest1
-rw-r--r--dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild30
-rw-r--r--dev-haskell/hxt-charproperties/metadata.xml8
-rw-r--r--dev-haskell/hxt-regex-xmlschema/Manifest1
-rw-r--r--dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild33
-rw-r--r--dev-haskell/hxt-regex-xmlschema/metadata.xml20
-rw-r--r--dev-haskell/hxt-unicode/Manifest1
-rw-r--r--dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild25
-rw-r--r--dev-haskell/hxt-unicode/metadata.xml8
-rw-r--r--dev-haskell/hxt/Manifest1
-rw-r--r--dev-haskell/hxt/hxt-9.3.1.18.ebuild35
-rw-r--r--dev-haskell/hxt/metadata.xml26
-rw-r--r--dev-haskell/icalendar/Manifest1
-rw-r--r--dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild52
-rw-r--r--dev-haskell/icalendar/metadata.xml8
-rw-r--r--dev-haskell/iconv/Manifest1
-rw-r--r--dev-haskell/iconv/iconv-0.4.1.3.ebuild24
-rw-r--r--dev-haskell/iconv/metadata.xml8
-rw-r--r--dev-haskell/idiii/Manifest1
-rw-r--r--dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch7
-rw-r--r--dev-haskell/idiii/idiii-0.1.3.3.ebuild33
-rw-r--r--dev-haskell/idiii/metadata.xml8
-rw-r--r--dev-haskell/idna/Manifest1
-rw-r--r--dev-haskell/idna/idna-0.3.0.ebuild27
-rw-r--r--dev-haskell/idna/metadata.xml8
-rw-r--r--dev-haskell/ieee754/Manifest1
-rw-r--r--dev-haskell/ieee754/ieee754-0.7.8.ebuild6
-rw-r--r--dev-haskell/ieee754/ieee754-0.8.0.ebuild24
-rw-r--r--dev-haskell/ieee754/metadata.xml4
-rw-r--r--dev-haskell/ifelse/ifelse-0.85-r1.ebuild6
-rw-r--r--dev-haskell/indexed-traversable-instances/Manifest3
-rw-r--r--dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild36
-rw-r--r--dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild35
-rw-r--r--dev-haskell/indexed-traversable-instances/metadata.xml12
-rw-r--r--dev-haskell/indexed-traversable/Manifest4
-rw-r--r--dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild28
-rw-r--r--dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild23
-rw-r--r--dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild23
-rw-r--r--dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild28
-rw-r--r--dev-haskell/indexed-traversable/metadata.xml4
-rw-r--r--dev-haskell/infer-license/Manifest1
-rw-r--r--dev-haskell/infer-license/infer-license-0.2.0.ebuild27
-rw-r--r--dev-haskell/infer-license/metadata.xml8
-rw-r--r--dev-haskell/inspection-testing/Manifest1
-rw-r--r--dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild33
-rw-r--r--dev-haskell/inspection-testing/metadata.xml33
-rw-r--r--dev-haskell/integer-logarithms/Manifest1
-rw-r--r--dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild48
-rw-r--r--dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild39
-rw-r--r--dev-haskell/integer-logarithms/metadata.xml4
-rw-r--r--dev-haskell/integer-roots/Manifest1
-rw-r--r--dev-haskell/integer-roots/integer-roots-1.0.ebuild31
-rw-r--r--dev-haskell/integer-roots/metadata.xml11
-rw-r--r--dev-haskell/interpolate/Manifest1
-rw-r--r--dev-haskell/interpolate/interpolate-0.2.0.ebuild30
-rw-r--r--dev-haskell/interpolate/metadata.xml8
-rw-r--r--dev-haskell/invariant/Manifest3
-rw-r--r--dev-haskell/invariant/invariant-0.5.3.ebuild45
-rw-r--r--dev-haskell/invariant/invariant-0.5.5.ebuild35
-rw-r--r--dev-haskell/invariant/invariant-0.6.2.ebuild33
-rw-r--r--dev-haskell/invariant/metadata.xml4
-rw-r--r--dev-haskell/io-streams-haproxy/Manifest1
-rw-r--r--dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild40
-rw-r--r--dev-haskell/io-streams-haproxy/metadata.xml15
-rw-r--r--dev-haskell/io-streams/Manifest1
-rw-r--r--dev-haskell/io-streams/io-streams-1.5.2.0.ebuild48
-rw-r--r--dev-haskell/io-streams/metadata.xml81
-rw-r--r--dev-haskell/iproute/Manifest1
-rw-r--r--dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch20
-rw-r--r--dev-haskell/iproute/iproute-1.7.12.ebuild32
-rw-r--r--dev-haskell/iproute/iproute-1.7.8.ebuild6
-rw-r--r--dev-haskell/iproute/metadata.xml7
-rw-r--r--dev-haskell/ipynb/Manifest2
-rw-r--r--dev-haskell/ipynb/ipynb-0.1.ebuild35
-rw-r--r--dev-haskell/ipynb/ipynb-0.2.ebuild31
-rw-r--r--dev-haskell/isocline/Manifest1
-rw-r--r--dev-haskell/isocline/isocline-1.0.9.ebuild23
-rw-r--r--dev-haskell/isocline/metadata.xml12
-rw-r--r--dev-haskell/iwlib/Manifest1
-rw-r--r--dev-haskell/iwlib/iwlib-0.1.0.ebuild25
-rw-r--r--dev-haskell/iwlib/metadata.xml8
-rw-r--r--dev-haskell/jira-wiki-markup/Manifest4
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild29
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild28
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild28
-rw-r--r--dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild26
-rw-r--r--dev-haskell/jira-wiki-markup/metadata.xml4
-rw-r--r--dev-haskell/js-chart/Manifest1
-rw-r--r--dev-haskell/js-chart/js-chart-2.9.4.1.ebuild23
-rw-r--r--dev-haskell/js-chart/metadata.xml11
-rw-r--r--dev-haskell/js-flot/Manifest1
-rw-r--r--dev-haskell/js-flot/js-flot-0.8.3.ebuild25
-rw-r--r--dev-haskell/js-flot/metadata.xml8
-rw-r--r--dev-haskell/js-jquery/Manifest1
-rw-r--r--dev-haskell/js-jquery/js-jquery-3.3.1.ebuild27
-rw-r--r--dev-haskell/js-jquery/metadata.xml17
-rw-r--r--dev-haskell/json/Manifest1
-rw-r--r--dev-haskell/json/json-0.10.ebuild35
-rw-r--r--dev-haskell/json/metadata.xml23
-rw-r--r--dev-haskell/juicypixels/Manifest1
-rw-r--r--dev-haskell/juicypixels/juicypixels-3.3.5.ebuild10
-rw-r--r--dev-haskell/juicypixels/juicypixels-3.3.7.ebuild37
-rw-r--r--dev-haskell/juicypixels/metadata.xml10
-rw-r--r--dev-haskell/kan-extensions/Manifest2
-rw-r--r--dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild33
-rw-r--r--dev-haskell/kan-extensions/kan-extensions-5.2.ebuild36
-rw-r--r--dev-haskell/keys/Manifest1
-rw-r--r--dev-haskell/keys/keys-3.12.3.ebuild34
-rw-r--r--dev-haskell/keys/metadata.xml11
-rw-r--r--dev-haskell/language-bash/Manifest1
-rw-r--r--dev-haskell/language-bash/language-bash-0.9.0.ebuild34
-rw-r--r--dev-haskell/language-bash/metadata.xml11
-rw-r--r--dev-haskell/language-c/Manifest3
-rw-r--r--dev-haskell/language-c/language-c-0.4.7.ebuild35
-rw-r--r--dev-haskell/language-c/language-c-0.7.1.ebuild34
-rw-r--r--dev-haskell/language-c/language-c-0.8.3-r1.ebuild6
-rw-r--r--dev-haskell/language-c/language-c-0.9.2.ebuild36
-rw-r--r--dev-haskell/language-c/metadata.xml11
-rw-r--r--dev-haskell/language-css/Manifest1
-rw-r--r--dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch7
-rw-r--r--dev-haskell/language-css/language-css-0.0.3.ebuild28
-rw-r--r--dev-haskell/language-css/metadata.xml8
-rw-r--r--dev-haskell/language-dot/Manifest1
-rw-r--r--dev-haskell/language-dot/language-dot-0.1.1.ebuild31
-rw-r--r--dev-haskell/language-dot/metadata.xml11
-rw-r--r--dev-haskell/language-ecmascript/Manifest1
-rw-r--r--dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild45
-rw-r--r--dev-haskell/language-ecmascript/metadata.xml17
-rw-r--r--dev-haskell/language-glsl/Manifest1
-rw-r--r--dev-haskell/language-glsl/language-glsl-0.3.0.ebuild29
-rw-r--r--dev-haskell/language-glsl/metadata.xml13
-rw-r--r--dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild8
-rw-r--r--dev-haskell/language-javascript/Manifest1
-rw-r--r--dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild6
-rw-r--r--dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild34
-rw-r--r--dev-haskell/language-javascript/metadata.xml2
-rw-r--r--dev-haskell/language-lua/Manifest1
-rw-r--r--dev-haskell/language-lua/language-lua-0.11.0.1.ebuild39
-rw-r--r--dev-haskell/language-lua/metadata.xml11
-rw-r--r--dev-haskell/language-python/Manifest1
-rw-r--r--dev-haskell/language-python/language-python-0.5.8.ebuild28
-rw-r--r--dev-haskell/language-python/metadata.xml15
-rw-r--r--dev-haskell/lazysmallcheck/Manifest1
-rw-r--r--dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild24
-rw-r--r--dev-haskell/lazysmallcheck/metadata.xml17
-rw-r--r--dev-haskell/lcs/Manifest1
-rw-r--r--dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch8
-rw-r--r--dev-haskell/lcs/lcs-0.2-r1.ebuild26
-rw-r--r--dev-haskell/lcs/metadata.xml8
-rw-r--r--dev-haskell/leancheck/Manifest1
-rw-r--r--dev-haskell/leancheck/leancheck-0.9.10.ebuild23
-rw-r--r--dev-haskell/leancheck/leancheck-0.9.3.ebuild6
-rw-r--r--dev-haskell/leancheck/metadata.xml3
-rw-r--r--dev-haskell/lens-aeson/Manifest1
-rw-r--r--dev-haskell/lens-aeson/lens-aeson-1.1.ebuild45
-rw-r--r--dev-haskell/lens-aeson/metadata.xml8
-rw-r--r--dev-haskell/lens-family-core/Manifest1
-rw-r--r--dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild24
-rw-r--r--dev-haskell/lens-family-core/metadata.xml25
-rw-r--r--dev-haskell/lens-family-th/Manifest1
-rw-r--r--dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild25
-rw-r--r--dev-haskell/lens-family-th/metadata.xml20
-rw-r--r--dev-haskell/lens-family/Manifest1
-rw-r--r--dev-haskell/lens-family/lens-family-1.2.3.ebuild26
-rw-r--r--dev-haskell/lens-family/metadata.xml22
-rw-r--r--dev-haskell/lens-simple/Manifest1
-rw-r--r--dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild29
-rw-r--r--dev-haskell/lens-simple/metadata.xml76
-rw-r--r--dev-haskell/lens/Manifest4
-rw-r--r--dev-haskell/lens/lens-4.19.2-r2.ebuild88
-rw-r--r--dev-haskell/lens/lens-5.1.1.ebuild66
-rw-r--r--dev-haskell/lens/lens-5.2.2.ebuild66
-rw-r--r--dev-haskell/lens/metadata.xml19
-rw-r--r--dev-haskell/lhs2tex/Manifest1
-rw-r--r--dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch11
-rw-r--r--dev-haskell/lhs2tex/lhs2tex-1.24.ebuild35
-rw-r--r--dev-haskell/lhs2tex/metadata.xml12
-rw-r--r--dev-haskell/libmpd/Manifest1
-rw-r--r--dev-haskell/libmpd/libmpd-0.10.0.0.ebuild33
-rw-r--r--dev-haskell/libmpd/libmpd-0.9.2.0.ebuild8
-rw-r--r--dev-haskell/libmpd/metadata.xml4
-rw-r--r--dev-haskell/libxml-sax/Manifest1
-rw-r--r--dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild28
-rw-r--r--dev-haskell/libxml-sax/metadata.xml8
-rw-r--r--dev-haskell/libxml/Manifest1
-rw-r--r--dev-haskell/libxml/libxml-0.1.1.ebuild34
-rw-r--r--dev-haskell/libxml/metadata.xml8
-rw-r--r--dev-haskell/libyaml/libyaml-0.1.2.ebuild13
-rw-r--r--dev-haskell/libyaml/metadata.xml5
-rw-r--r--dev-haskell/lift-type/Manifest1
-rw-r--r--dev-haskell/lift-type/lift-type-0.1.0.1.ebuild23
-rw-r--r--dev-haskell/lift-type/metadata.xml11
-rw-r--r--dev-haskell/lifted-async/Manifest4
-rw-r--r--dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild37
-rw-r--r--dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild32
-rw-r--r--dev-haskell/lifted-async/lifted-async-0.10.2.ebuild38
-rw-r--r--dev-haskell/lifted-async/metadata.xml5
-rw-r--r--dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild4
-rw-r--r--dev-haskell/linear/Manifest2
-rw-r--r--dev-haskell/linear/linear-1.21.3.ebuild53
-rw-r--r--dev-haskell/linear/linear-1.21.5.ebuild51
-rw-r--r--dev-haskell/linear/metadata.xml19
-rw-r--r--dev-haskell/list/Manifest1
-rw-r--r--dev-haskell/list/list-0.6.2.ebuild29
-rw-r--r--dev-haskell/list/metadata.xml11
-rw-r--r--dev-haskell/listlike/Manifest1
-rw-r--r--dev-haskell/listlike/listlike-4.6.3.ebuild38
-rw-r--r--dev-haskell/listlike/metadata.xml20
-rw-r--r--dev-haskell/logging-facade/logging-facade-0.3.0.ebuild6
-rw-r--r--dev-haskell/logging-facade/metadata.xml3
-rw-r--r--dev-haskell/logict-state/Manifest1
-rw-r--r--dev-haskell/logict-state/files/logict-state-0.1.0.5-monadfail-compat.patch64
-rw-r--r--dev-haskell/logict-state/logict-state-0.1.0.5.ebuild28
-rw-r--r--dev-haskell/logict-state/metadata.xml14
-rw-r--r--dev-haskell/logict/Manifest1
-rw-r--r--dev-haskell/logict/logict-0.7.0.3.ebuild6
-rw-r--r--dev-haskell/logict/logict-0.8.1.0.ebuild25
-rw-r--r--dev-haskell/logict/metadata.xml8
-rw-r--r--dev-haskell/lpeg/Manifest2
-rw-r--r--dev-haskell/lpeg/lpeg-1.0.3.ebuild32
-rw-r--r--dev-haskell/lpeg/lpeg-1.0.4.ebuild31
-rw-r--r--dev-haskell/lpeg/metadata.xml18
-rw-r--r--dev-haskell/lrucache/Manifest1
-rw-r--r--dev-haskell/lrucache/lrucache-1.2.0.1.ebuild25
-rw-r--r--dev-haskell/lrucache/metadata.xml48
-rw-r--r--dev-haskell/lua-arbitrary/Manifest2
-rw-r--r--dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild24
-rw-r--r--dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild25
-rw-r--r--dev-haskell/lua-arbitrary/metadata.xml12
-rw-r--r--dev-haskell/lua/Manifest2
-rw-r--r--dev-haskell/lua/lua-2.2.0.ebuild38
-rw-r--r--dev-haskell/lua/lua-2.3.1.ebuild39
-rw-r--r--dev-haskell/lua/metadata.xml12
-rw-r--r--dev-haskell/lukko/Manifest3
-rw-r--r--dev-haskell/lukko/lukko-0.1.1.2.ebuild36
-rw-r--r--dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild41
-rw-r--r--dev-haskell/lukko/metadata.xml43
-rw-r--r--dev-haskell/maccatcher/Manifest1
-rw-r--r--dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild33
-rw-r--r--dev-haskell/maccatcher/metadata.xml8
-rw-r--r--dev-haskell/magic/magic-1.1.ebuild6
-rw-r--r--dev-haskell/markdown-unlit/Manifest1
-rw-r--r--dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch23
-rw-r--r--dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild6
-rw-r--r--dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild40
-rw-r--r--dev-haskell/markdown-unlit/metadata.xml7
-rw-r--r--dev-haskell/math-functions/Manifest1
-rw-r--r--dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch118
-rw-r--r--dev-haskell/math-functions/math-functions-0.3.3.0.ebuild8
-rw-r--r--dev-haskell/math-functions/math-functions-0.3.4.2.ebuild43
-rw-r--r--dev-haskell/math-functions/metadata.xml6
-rw-r--r--dev-haskell/megaparsec-tests/Manifest1
-rw-r--r--dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild36
-rw-r--r--dev-haskell/megaparsec-tests/metadata.xml12
-rw-r--r--dev-haskell/megaparsec/Manifest3
-rw-r--r--dev-haskell/megaparsec/megaparsec-9.0.1.ebuild44
-rw-r--r--dev-haskell/megaparsec/megaparsec-9.2.2.ebuild31
-rw-r--r--dev-haskell/megaparsec/metadata.xml4
-rw-r--r--dev-haskell/memory/Manifest2
-rw-r--r--dev-haskell/memory/memory-0.15.0-r1.ebuild38
-rw-r--r--dev-haskell/memory/memory-0.15.0.ebuild35
-rw-r--r--dev-haskell/memory/memory-0.18.0.ebuild36
-rw-r--r--dev-haskell/memory/metadata.xml12
-rw-r--r--dev-haskell/memotrie/Manifest1
-rw-r--r--dev-haskell/memotrie/memotrie-0.6.10.ebuild36
-rw-r--r--dev-haskell/memotrie/metadata.xml19
-rw-r--r--dev-haskell/mersenne-random-pure64/Manifest1
-rw-r--r--dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild25
-rw-r--r--dev-haskell/mersenne-random-pure64/metadata.xml25
-rw-r--r--dev-haskell/microaeson/Manifest2
-rw-r--r--dev-haskell/microaeson/metadata.xml12
-rw-r--r--dev-haskell/microaeson/microaeson-0.1.0.1.ebuild36
-rw-r--r--dev-haskell/microlens-aeson/Manifest2
-rw-r--r--dev-haskell/microlens-aeson/metadata.xml3
-rw-r--r--dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild31
-rw-r--r--dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild30
-rw-r--r--dev-haskell/microlens-mtl/Manifest1
-rw-r--r--dev-haskell/microlens-mtl/metadata.xml9
-rw-r--r--dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild6
-rw-r--r--dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild24
-rw-r--r--dev-haskell/microlens-th/Manifest3
-rw-r--r--dev-haskell/microlens-th/metadata.xml9
-rw-r--r--dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild26
-rw-r--r--dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild25
-rw-r--r--dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild33
-rw-r--r--dev-haskell/microlens/Manifest1
-rw-r--r--dev-haskell/microlens/metadata.xml4
-rw-r--r--dev-haskell/microlens/microlens-0.4.11.2.ebuild8
-rw-r--r--dev-haskell/microlens/microlens-0.4.13.0.ebuild22
-rw-r--r--dev-haskell/microstache/Manifest5
-rw-r--r--dev-haskell/microstache/metadata.xml10
-rw-r--r--dev-haskell/microstache/microstache-1.0.1.1.ebuild39
-rw-r--r--dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild34
-rw-r--r--dev-haskell/microstache/microstache-1.0.2.ebuild46
-rw-r--r--dev-haskell/mime-mail/Manifest1
-rw-r--r--dev-haskell/mime-mail/metadata.xml14
-rw-r--r--dev-haskell/mime-mail/mime-mail-0.5.0.ebuild29
-rw-r--r--dev-haskell/mime-types/Manifest1
-rw-r--r--dev-haskell/mime-types/metadata.xml1
-rw-r--r--dev-haskell/mime-types/mime-types-0.1.0.9.ebuild6
-rw-r--r--dev-haskell/mime-types/mime-types-0.1.1.0.ebuild23
-rw-r--r--dev-haskell/mime/Manifest1
-rw-r--r--dev-haskell/mime/metadata.xml8
-rw-r--r--dev-haskell/mime/mime-0.4.0.2.ebuild25
-rw-r--r--dev-haskell/minisat/Manifest1
-rw-r--r--dev-haskell/minisat/metadata.xml8
-rw-r--r--dev-haskell/minisat/minisat-0.1.2.ebuild25
-rw-r--r--dev-haskell/mintty/Manifest1
-rw-r--r--dev-haskell/mintty/metadata.xml27
-rw-r--r--dev-haskell/mintty/mintty-0.1.2.ebuild24
-rw-r--r--dev-haskell/missingh/Manifest4
-rw-r--r--dev-haskell/missingh/metadata.xml17
-rw-r--r--dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild44
-rw-r--r--dev-haskell/missingh/missingh-1.4.3.0.ebuild49
-rw-r--r--dev-haskell/missingh/missingh-1.6.0.0.ebuild38
-rw-r--r--dev-haskell/mmap/mmap-0.5.9.ebuild6
-rw-r--r--dev-haskell/mmorph/Manifest2
-rw-r--r--dev-haskell/mmorph/metadata.xml8
-rw-r--r--dev-haskell/mmorph/mmorph-1.1.3.ebuild6
-rw-r--r--dev-haskell/mmorph/mmorph-1.2.0.ebuild25
-rw-r--r--dev-haskell/mockery/mockery-0.3.5.ebuild4
-rw-r--r--dev-haskell/mod/Manifest1
-rw-r--r--dev-haskell/mod/metadata.xml16
-rw-r--r--dev-haskell/mod/mod-0.1.1.0.ebuild34
-rw-r--r--dev-haskell/monad-control/Manifest1
-rw-r--r--dev-haskell/monad-control/metadata.xml22
-rw-r--r--dev-haskell/monad-control/monad-control-1.0.2.3.ebuild4
-rw-r--r--dev-haskell/monad-control/monad-control-1.0.3.1.ebuild26
-rw-r--r--dev-haskell/monad-journal/Manifest1
-rw-r--r--dev-haskell/monad-journal/metadata.xml19
-rw-r--r--dev-haskell/monad-journal/monad-journal-0.8.1.ebuild27
-rw-r--r--dev-haskell/monad-logger/Manifest1
-rw-r--r--dev-haskell/monad-logger/metadata.xml5
-rw-r--r--dev-haskell/monad-logger/monad-logger-0.3.32.ebuild6
-rw-r--r--dev-haskell/monad-logger/monad-logger-0.3.40.ebuild40
-rw-r--r--dev-haskell/monad-loops/metadata.xml3
-rw-r--r--dev-haskell/monad-loops/monad-loops-0.4.3.ebuild6
-rw-r--r--dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild6
-rw-r--r--dev-haskell/monad-par/Manifest1
-rw-r--r--dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild43
-rw-r--r--dev-haskell/monad-par/monad-par-0.3.5.ebuild44
-rw-r--r--dev-haskell/monad-parallel/Manifest1
-rw-r--r--dev-haskell/monad-parallel/metadata.xml11
-rw-r--r--dev-haskell/monad-parallel/monad-parallel-0.8.ebuild24
-rw-r--r--dev-haskell/monad-unlift/Manifest1
-rw-r--r--dev-haskell/monad-unlift/metadata.xml11
-rw-r--r--dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild28
-rw-r--r--dev-haskell/monadcatchio-mtl/Manifest1
-rw-r--r--dev-haskell/monadcatchio-mtl/metadata.xml13
-rw-r--r--dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r2.ebuild40
-rw-r--r--dev-haskell/monadcatchio-transformers/Manifest1
-rw-r--r--dev-haskell/monadcatchio-transformers/metadata.xml8
-rw-r--r--dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild38
-rw-r--r--dev-haskell/monadlib/Manifest1
-rw-r--r--dev-haskell/monadlib/metadata.xml8
-rw-r--r--dev-haskell/monadlib/monadlib-3.10.ebuild29
-rw-r--r--dev-haskell/monadplus/Manifest1
-rw-r--r--dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch33
-rw-r--r--dev-haskell/monadplus/metadata.xml13
-rw-r--r--dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild26
-rw-r--r--dev-haskell/monadrandom/Manifest1
-rw-r--r--dev-haskell/monadrandom/metadata.xml8
-rw-r--r--dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild34
-rw-r--r--dev-haskell/monads-tf/Manifest1
-rw-r--r--dev-haskell/monads-tf/metadata.xml13
-rw-r--r--dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild4
-rw-r--r--dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild27
-rw-r--r--dev-haskell/mono-traversable-instances/Manifest1
-rw-r--r--dev-haskell/mono-traversable-instances/metadata.xml11
-rw-r--r--dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.1.0.ebuild31
-rw-r--r--dev-haskell/mono-traversable/Manifest1
-rw-r--r--dev-haskell/mono-traversable/metadata.xml3
-rw-r--r--dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild8
-rw-r--r--dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild33
-rw-r--r--dev-haskell/mountpoints/mountpoints-1.0.2.ebuild6
-rw-r--r--dev-haskell/mtl-compat/metadata.xml20
-rw-r--r--dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild8
-rw-r--r--dev-haskell/mtl/metadata.xml10
-rw-r--r--dev-haskell/mtl/mtl-2.2.2-r1.ebuild27
-rw-r--r--dev-haskell/mtl/mtl-2.2.2.ebuild27
-rw-r--r--dev-haskell/multipart/Manifest1
-rw-r--r--dev-haskell/multipart/metadata.xml11
-rw-r--r--dev-haskell/multipart/multipart-0.2.0.ebuild26
-rw-r--r--dev-haskell/murmur-hash/Manifest1
-rw-r--r--dev-haskell/murmur-hash/metadata.xml19
-rw-r--r--dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild24
-rw-r--r--dev-haskell/mustache/Manifest1
-rw-r--r--dev-haskell/mustache/metadata.xml16
-rw-r--r--dev-haskell/mustache/mustache-2.3.1.ebuild44
-rw-r--r--dev-haskell/mutable-containers/Manifest1
-rw-r--r--dev-haskell/mutable-containers/metadata.xml11
-rw-r--r--dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild29
-rw-r--r--dev-haskell/mwc-random/Manifest2
-rw-r--r--dev-haskell/mwc-random/metadata.xml15
-rw-r--r--dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild6
-rw-r--r--dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild41
-rw-r--r--dev-haskell/mysql-simple/Manifest1
-rw-r--r--dev-haskell/mysql-simple/metadata.xml20
-rw-r--r--dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild42
-rw-r--r--dev-haskell/mysql/Manifest1
-rw-r--r--dev-haskell/mysql/metadata.xml20
-rw-r--r--dev-haskell/mysql/mysql-0.1.7.ebuild37
-rw-r--r--dev-haskell/nanospec/metadata.xml4
-rw-r--r--dev-haskell/nanospec/nanospec-0.2.2.ebuild29
-rw-r--r--dev-haskell/nats/Manifest1
-rw-r--r--dev-haskell/nats/metadata.xml3
-rw-r--r--dev-haskell/nats/nats-1.1.2-r1.ebuild41
-rw-r--r--dev-haskell/nats/nats-1.1.2.ebuild36
-rw-r--r--dev-haskell/neat-interpolation/Manifest1
-rw-r--r--dev-haskell/neat-interpolation/metadata.xml14
-rw-r--r--dev-haskell/neat-interpolation/neat-interpolation-0.5.1.2.ebuild32
-rw-r--r--dev-haskell/netlink/metadata.xml6
-rw-r--r--dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild31
-rw-r--r--dev-haskell/netlink/netlink-1.1.1.0.ebuild11
-rw-r--r--dev-haskell/network-bsd/metadata.xml3
-rw-r--r--dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild29
-rw-r--r--dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild32
-rw-r--r--dev-haskell/network-byte-order/Manifest2
-rw-r--r--dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild25
-rw-r--r--dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild25
-rw-r--r--dev-haskell/network-conduit/Manifest1
-rw-r--r--dev-haskell/network-conduit/metadata.xml8
-rw-r--r--dev-haskell/network-conduit/network-conduit-1.1.0.ebuild31
-rw-r--r--dev-haskell/network-data/Manifest1
-rw-r--r--dev-haskell/network-data/metadata.xml16
-rw-r--r--dev-haskell/network-data/network-data-0.5.3.ebuild43
-rw-r--r--dev-haskell/network-info/Manifest1
-rw-r--r--dev-haskell/network-info/metadata.xml15
-rw-r--r--dev-haskell/network-info/network-info-0.2.0.10.ebuild4
-rw-r--r--dev-haskell/network-info/network-info-0.2.1.ebuild22
-rw-r--r--dev-haskell/network-multicast/network-multicast-0.3.2.ebuild6
-rw-r--r--dev-haskell/network-run/Manifest1
-rw-r--r--dev-haskell/network-run/metadata.xml12
-rw-r--r--dev-haskell/network-run/network-run-0.2.4.ebuild23
-rw-r--r--dev-haskell/network-uri/Manifest4
-rw-r--r--dev-haskell/network-uri/metadata.xml24
-rw-r--r--dev-haskell/network-uri/network-uri-2.5.0.0.ebuild24
-rw-r--r--dev-haskell/network-uri/network-uri-2.6.3.0.ebuild27
-rw-r--r--dev-haskell/network-uri/network-uri-2.6.4.1.ebuild32
-rw-r--r--dev-haskell/network-uri/network-uri-2.6.4.2.ebuild39
-rw-r--r--dev-haskell/network/Manifest8
-rw-r--r--dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch11
-rw-r--r--dev-haskell/network/metadata.xml18
-rw-r--r--dev-haskell/network/network-2.4.1.2.ebuild28
-rw-r--r--dev-haskell/network/network-2.4.2.2.ebuild29
-rw-r--r--dev-haskell/network/network-2.5.0.0.ebuild29
-rw-r--r--dev-haskell/network/network-2.6.2.1.ebuild27
-rw-r--r--dev-haskell/network/network-2.6.3.1-r1.ebuild32
-rw-r--r--dev-haskell/network/network-3.0.1.1.ebuild28
-rw-r--r--dev-haskell/network/network-3.1.2.5.ebuild33
-rw-r--r--dev-haskell/network/network-3.1.3.0.ebuild32
-rw-r--r--dev-haskell/newtype-generics/Manifest1
-rw-r--r--dev-haskell/newtype-generics/metadata.xml14
-rw-r--r--dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild32
-rw-r--r--dev-haskell/newtype/Manifest1
-rw-r--r--dev-haskell/newtype/metadata.xml11
-rw-r--r--dev-haskell/newtype/newtype-0.2.2.0.ebuild31
-rw-r--r--dev-haskell/nonce/Manifest1
-rw-r--r--dev-haskell/nonce/metadata.xml21
-rw-r--r--dev-haskell/nonce/nonce-1.0.7-r1.ebuild37
-rw-r--r--dev-haskell/nonce/nonce-1.0.7.ebuild36
-rw-r--r--dev-haskell/nothunks/Manifest1
-rw-r--r--dev-haskell/nothunks/metadata.xml17
-rw-r--r--dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild51
-rw-r--r--dev-haskell/numinstances/Manifest1
-rw-r--r--dev-haskell/numinstances/metadata.xml8
-rw-r--r--dev-haskell/numinstances/numinstances-1.4.ebuild29
-rw-r--r--dev-haskell/numtype-dk/Manifest1
-rw-r--r--dev-haskell/numtype-dk/metadata.xml17
-rw-r--r--dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild24
-rw-r--r--dev-haskell/objectname/Manifest1
-rw-r--r--dev-haskell/objectname/metadata.xml8
-rw-r--r--dev-haskell/objectname/objectname-1.1.0.1.ebuild29
-rw-r--r--dev-haskell/old-locale/old-locale-1.0.0.7.ebuild14
-rw-r--r--dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild14
-rw-r--r--dev-haskell/onetuple/Manifest3
-rw-r--r--dev-haskell/onetuple/metadata.xml12
-rw-r--r--dev-haskell/onetuple/onetuple-0.3.1.ebuild27
-rw-r--r--dev-haskell/onetuple/onetuple-0.4.1.1.ebuild28
-rw-r--r--dev-haskell/only/only-0.1.ebuild6
-rw-r--r--dev-haskell/open-browser/Manifest1
-rw-r--r--dev-haskell/open-browser/metadata.xml8
-rw-r--r--dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild31
-rw-r--r--dev-haskell/openal/Manifest1
-rw-r--r--dev-haskell/openal/metadata.xml10
-rw-r--r--dev-haskell/openal/openal-1.7.0.5.ebuild40
-rw-r--r--dev-haskell/opengl/Manifest1
-rw-r--r--dev-haskell/opengl/metadata.xml19
-rw-r--r--dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild42
-rw-r--r--dev-haskell/openglraw/Manifest1
-rw-r--r--dev-haskell/openglraw/metadata.xml26
-rw-r--r--dev-haskell/openglraw/openglraw-3.3.4.0.ebuild42
-rw-r--r--dev-haskell/openssl-streams/Manifest1
-rw-r--r--dev-haskell/openssl-streams/metadata.xml16
-rw-r--r--dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild32
-rw-r--r--dev-haskell/options/Manifest1
-rw-r--r--dev-haskell/options/metadata.xml59
-rw-r--r--dev-haskell/options/options-1.2.1.1.ebuild6
-rw-r--r--dev-haskell/options/options-1.2.1.2.ebuild32
-rw-r--r--dev-haskell/optparse-applicative/Manifest4
-rw-r--r--dev-haskell/optparse-applicative/metadata.xml62
-rw-r--r--dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild29
-rw-r--r--dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild42
-rw-r--r--dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild36
-rw-r--r--dev-haskell/optparse-simple/Manifest1
-rw-r--r--dev-haskell/optparse-simple/metadata.xml11
-rw-r--r--dev-haskell/optparse-simple/optparse-simple-0.1.1.3.ebuild31
-rw-r--r--dev-haskell/ordered-containers/Manifest1
-rw-r--r--dev-haskell/ordered-containers/metadata.xml12
-rw-r--r--dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild22
-rw-r--r--dev-haskell/pandoc-citeproc/Manifest1
-rw-r--r--dev-haskell/pandoc-citeproc/metadata.xml30
-rw-r--r--dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild69
-rw-r--r--dev-haskell/pandoc-lua-engine/Manifest2
-rw-r--r--dev-haskell/pandoc-lua-engine/metadata.xml12
-rw-r--r--dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild50
-rw-r--r--dev-haskell/pandoc-lua-marshal/Manifest2
-rw-r--r--dev-haskell/pandoc-lua-marshal/metadata.xml12
-rw-r--r--dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild33
-rw-r--r--dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild35
-rw-r--r--dev-haskell/pandoc-server/Manifest1
-rw-r--r--dev-haskell/pandoc-server/metadata.xml12
-rw-r--r--dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild34
-rw-r--r--dev-haskell/pandoc-types/Manifest4
-rw-r--r--dev-haskell/pandoc-types/metadata.xml4
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.20.ebuild34
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild31
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.22.ebuild34
-rw-r--r--dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild30
-rw-r--r--dev-haskell/pandoc/Manifest1
-rw-r--r--dev-haskell/pandoc/metadata.xml15
-rw-r--r--dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild105
-rw-r--r--dev-haskell/pango/Manifest2
-rw-r--r--dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch33
-rw-r--r--dev-haskell/pango/metadata.xml4
-rw-r--r--dev-haskell/pango/pango-0.13.10.0.ebuild32
-rw-r--r--dev-haskell/pango/pango-0.13.8.1.ebuild40
-rw-r--r--dev-haskell/pantry/Manifest1
-rw-r--r--dev-haskell/pantry/metadata.xml8
-rw-r--r--dev-haskell/pantry/pantry-0.4.0.2.ebuild72
-rw-r--r--dev-haskell/parallel-io/Manifest2
-rw-r--r--dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild37
-rw-r--r--dev-haskell/parallel-io/parallel-io-0.3.5.ebuild33
-rw-r--r--dev-haskell/parallel/parallel-3.2.2.0.ebuild15
-rw-r--r--dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild4
-rw-r--r--dev-haskell/parsec/Manifest2
-rw-r--r--dev-haskell/parsec/metadata.xml12
-rw-r--r--dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild41
-rw-r--r--dev-haskell/parsec/parsec-3.1.14.0.ebuild34
-rw-r--r--dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild34
-rw-r--r--dev-haskell/parsec1/Manifest1
-rw-r--r--dev-haskell/parsec1/metadata.xml26
-rw-r--r--dev-haskell/parsec1/parsec1-1.0.0.7.ebuild6
-rw-r--r--dev-haskell/parsec1/parsec1-1.0.0.8.ebuild23
-rw-r--r--dev-haskell/parser-combinators/Manifest3
-rw-r--r--dev-haskell/parser-combinators/metadata.xml4
-rw-r--r--dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild31
-rw-r--r--dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild74
-rw-r--r--dev-haskell/parsers/Manifest2
-rw-r--r--dev-haskell/parsers/metadata.xml16
-rw-r--r--dev-haskell/parsers/parsers-0.12.10-r1.ebuild57
-rw-r--r--dev-haskell/parsers/parsers-0.12.10.ebuild41
-rw-r--r--dev-haskell/parsers/parsers-0.12.11.ebuild37
-rw-r--r--dev-haskell/path-io/Manifest1
-rw-r--r--dev-haskell/path-io/metadata.xml8
-rw-r--r--dev-haskell/path-io/path-io-1.6.0-r1.ebuild43
-rw-r--r--dev-haskell/path-pieces/path-pieces-0.2.1.ebuild6
-rw-r--r--dev-haskell/path/Manifest1
-rw-r--r--dev-haskell/path/metadata.xml8
-rw-r--r--dev-haskell/path/path-0.7.0.ebuild42
-rw-r--r--dev-haskell/patience/Manifest1
-rw-r--r--dev-haskell/patience/metadata.xml17
-rw-r--r--dev-haskell/patience/patience-0.1.1-r1.ebuild4
-rw-r--r--dev-haskell/patience/patience-0.3.ebuild22
-rw-r--r--dev-haskell/pcap/Manifest1
-rw-r--r--dev-haskell/pcap/metadata.xml12
-rw-r--r--dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild24
-rw-r--r--dev-haskell/pcg-random/Manifest1
-rw-r--r--dev-haskell/pcg-random/metadata.xml12
-rw-r--r--dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild31
-rw-r--r--dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild6
-rw-r--r--dev-haskell/pem/pem-0.2.4.ebuild6
-rw-r--r--dev-haskell/persistent-mysql/Manifest1
-rw-r--r--dev-haskell/persistent-mysql/metadata.xml21
-rw-r--r--dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild45
-rw-r--r--dev-haskell/persistent-postgresql/Manifest1
-rw-r--r--dev-haskell/persistent-postgresql/metadata.xml8
-rw-r--r--dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild48
-rw-r--r--dev-haskell/persistent-qq/Manifest1
-rw-r--r--dev-haskell/persistent-qq/metadata.xml8
-rw-r--r--dev-haskell/persistent-qq/persistent-qq-2.9.2.ebuild39
-rw-r--r--dev-haskell/persistent-sqlite/Manifest3
-rw-r--r--dev-haskell/persistent-sqlite/metadata.xml9
-rw-r--r--dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild60
-rw-r--r--dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild58
-rw-r--r--dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild59
-rw-r--r--dev-haskell/persistent-template/Manifest2
-rw-r--r--dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild23
-rw-r--r--dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild35
-rw-r--r--dev-haskell/persistent-test/Manifest2
-rw-r--r--dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch252
-rw-r--r--dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild47
-rw-r--r--dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild41
-rw-r--r--dev-haskell/persistent/Manifest4
-rw-r--r--dev-haskell/persistent/metadata.xml4
-rw-r--r--dev-haskell/persistent/persistent-2.10.5.2.ebuild50
-rw-r--r--dev-haskell/persistent/persistent-2.14.0.3.ebuild52
-rw-r--r--dev-haskell/persistent/persistent-2.14.5.1.ebuild55
-rw-r--r--dev-haskell/pgp-wordlist/metadata.xml3
-rw-r--r--dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild6
-rw-r--r--dev-haskell/pid1/Manifest1
-rw-r--r--dev-haskell/pid1/metadata.xml8
-rw-r--r--dev-haskell/pid1/pid1-0.1.2.0.ebuild24
-rw-r--r--dev-haskell/pipes/Manifest1
-rw-r--r--dev-haskell/pipes/metadata.xml35
-rw-r--r--dev-haskell/pipes/pipes-4.3.14.ebuild33
-rw-r--r--dev-haskell/pointed/Manifest1
-rw-r--r--dev-haskell/pointed/metadata.xml22
-rw-r--r--dev-haskell/pointed/pointed-5.0.2.ebuild47
-rw-r--r--dev-haskell/polyparse/Manifest1
-rw-r--r--dev-haskell/polyparse/metadata.xml16
-rw-r--r--dev-haskell/polyparse/polyparse-1.13.ebuild33
-rw-r--r--dev-haskell/postgresql-libpq/Manifest1
-rw-r--r--dev-haskell/postgresql-libpq/metadata.xml16
-rw-r--r--dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild39
-rw-r--r--dev-haskell/postgresql-simple/Manifest1
-rw-r--r--dev-haskell/postgresql-simple/metadata.xml8
-rw-r--r--dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild57
-rw-r--r--dev-haskell/pqueue/Manifest1
-rw-r--r--dev-haskell/pqueue/metadata.xml8
-rw-r--r--dev-haskell/pqueue/pqueue-1.4.1.3.ebuild25
-rw-r--r--dev-haskell/prelude-extras/Manifest1
-rw-r--r--dev-haskell/prelude-extras/metadata.xml8
-rw-r--r--dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild24
-rw-r--r--dev-haskell/preprocessor-tools/Manifest1
-rw-r--r--dev-haskell/preprocessor-tools/metadata.xml19
-rw-r--r--dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild28
-rw-r--r--dev-haskell/pretty-hex/Manifest1
-rw-r--r--dev-haskell/pretty-hex/metadata.xml4
-rw-r--r--dev-haskell/pretty-hex/pretty-hex-1.0.ebuild4
-rw-r--r--dev-haskell/pretty-hex/pretty-hex-1.1.ebuild24
-rw-r--r--dev-haskell/pretty-show/Manifest2
-rw-r--r--dev-haskell/pretty-show/metadata.xml3
-rw-r--r--dev-haskell/pretty-show/pretty-show-1.10.ebuild26
-rw-r--r--dev-haskell/pretty-show/pretty-show-1.9.5.ebuild27
-rw-r--r--dev-haskell/prettyclass/Manifest1
-rw-r--r--dev-haskell/prettyclass/metadata.xml8
-rw-r--r--dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild24
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/Manifest3
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/metadata.xml4
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild29
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild28
-rw-r--r--dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild33
-rw-r--r--dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest1
-rw-r--r--dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml12
-rw-r--r--dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild26
-rw-r--r--dev-haskell/prettyprinter/Manifest3
-rw-r--r--dev-haskell/prettyprinter/metadata.xml20
-rw-r--r--dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild33
-rw-r--r--dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild33
-rw-r--r--dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild44
-rw-r--r--dev-haskell/primitive-addr/metadata.xml3
-rw-r--r--dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild6
-rw-r--r--dev-haskell/primitive/Manifest5
-rw-r--r--dev-haskell/primitive/metadata.xml26
-rw-r--r--dev-haskell/primitive/primitive-0.7.1.0.ebuild27
-rw-r--r--dev-haskell/primitive/primitive-0.7.3.0.ebuild26
-rw-r--r--dev-haskell/primitive/primitive-0.7.4.0.ebuild46
-rw-r--r--dev-haskell/process-extras/Manifest1
-rw-r--r--dev-haskell/process-extras/metadata.xml11
-rw-r--r--dev-haskell/process-extras/process-extras-0.7.4.ebuild30
-rw-r--r--dev-haskell/profunctor-extras/Manifest1
-rw-r--r--dev-haskell/profunctor-extras/metadata.xml8
-rw-r--r--dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild25
-rw-r--r--dev-haskell/profunctors/Manifest3
-rw-r--r--dev-haskell/profunctors/metadata.xml1
-rw-r--r--dev-haskell/profunctors/profunctors-5.5.1.ebuild31
-rw-r--r--dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild31
-rw-r--r--dev-haskell/project-template/Manifest1
-rw-r--r--dev-haskell/project-template/metadata.xml11
-rw-r--r--dev-haskell/project-template/project-template-0.2.1.0.ebuild32
-rw-r--r--dev-haskell/psqueue/Manifest1
-rw-r--r--dev-haskell/psqueue/metadata.xml17
-rw-r--r--dev-haskell/psqueue/psqueue-1.1.0.1.ebuild36
-rw-r--r--dev-haskell/psqueues/Manifest2
-rw-r--r--dev-haskell/psqueues/psqueues-0.2.7.2.ebuild31
-rw-r--r--dev-haskell/psqueues/psqueues-0.2.7.3.ebuild30
-rw-r--r--dev-haskell/publicsuffixlist/Manifest1
-rw-r--r--dev-haskell/publicsuffixlist/metadata.xml15
-rw-r--r--dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild38
-rw-r--r--dev-haskell/punycode/Manifest1
-rw-r--r--dev-haskell/punycode/metadata.xml14
-rw-r--r--dev-haskell/punycode/punycode-2.0.ebuild31
-rw-r--r--dev-haskell/puremd5/puremd5-2.1.3.ebuild4
-rw-r--r--dev-haskell/pwstore-fast/Manifest1
-rw-r--r--dev-haskell/pwstore-fast/metadata.xml8
-rw-r--r--dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild28
-rw-r--r--dev-haskell/quickcheck-classes-base/metadata.xml3
-rw-r--r--dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild12
-rw-r--r--dev-haskell/quickcheck-classes/Manifest1
-rw-r--r--dev-haskell/quickcheck-classes/metadata.xml46
-rw-r--r--dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild12
-rw-r--r--dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild47
-rw-r--r--dev-haskell/quickcheck-instances/Manifest5
-rw-r--r--dev-haskell/quickcheck-instances/metadata.xml18
-rw-r--r--dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild49
-rw-r--r--dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild55
-rw-r--r--dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild45
-rw-r--r--dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild6
-rw-r--r--dev-haskell/quickcheck-unicode/metadata.xml1
-rw-r--r--dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild14
-rw-r--r--dev-haskell/quickcheck/Manifest3
-rw-r--r--dev-haskell/quickcheck/metadata.xml17
-rw-r--r--dev-haskell/quickcheck/quickcheck-2.13.2.ebuild39
-rw-r--r--dev-haskell/quickcheck/quickcheck-2.14.2.ebuild40
-rw-r--r--dev-haskell/quickcheck/quickcheck-2.14.3.ebuild36
-rw-r--r--dev-haskell/random-bytestring/Manifest1
-rw-r--r--dev-haskell/random-bytestring/metadata.xml14
-rw-r--r--dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild31
-rw-r--r--dev-haskell/random/Manifest3
-rw-r--r--dev-haskell/random/random-1.1.ebuild24
-rw-r--r--dev-haskell/random/random-1.2.1.1.ebuild38
-rw-r--r--dev-haskell/random/random-1.2.1.ebuild27
-rw-r--r--dev-haskell/ranges/Manifest1
-rw-r--r--dev-haskell/ranges/metadata.xml12
-rw-r--r--dev-haskell/ranges/ranges-0.2.4-r1.ebuild24
-rw-r--r--dev-haskell/raw-strings-qq/metadata.xml3
-rw-r--r--dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild6
-rw-r--r--dev-haskell/readable/Manifest1
-rw-r--r--dev-haskell/readable/metadata.xml15
-rw-r--r--dev-haskell/readable/readable-0.3.1.ebuild25
-rw-r--r--dev-haskell/readargs/Manifest1
-rw-r--r--dev-haskell/readargs/metadata.xml74
-rw-r--r--dev-haskell/readargs/readargs-1.2.3.ebuild32
-rw-r--r--dev-haskell/readline/Manifest1
-rw-r--r--dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch9
-rw-r--r--dev-haskell/readline/metadata.xml7
-rw-r--r--dev-haskell/readline/readline-1.0.3.0-r1.ebuild33
-rw-r--r--dev-haskell/rebase/Manifest1
-rw-r--r--dev-haskell/rebase/metadata.xml27
-rw-r--r--dev-haskell/rebase/rebase-1.4.1.ebuild45
-rw-r--r--dev-haskell/recaptcha/Manifest1
-rw-r--r--dev-haskell/recaptcha/metadata.xml20
-rw-r--r--dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild34
-rw-r--r--dev-haskell/recv/Manifest1
-rw-r--r--dev-haskell/recv/metadata.xml12
-rw-r--r--dev-haskell/recv/recv-0.1.0.ebuild24
-rw-r--r--dev-haskell/reducers/Manifest2
-rw-r--r--dev-haskell/reducers/metadata.xml1
-rw-r--r--dev-haskell/reducers/reducers-3.12.3-r1.ebuild17
-rw-r--r--dev-haskell/reducers/reducers-3.12.4.ebuild30
-rw-r--r--dev-haskell/refact/Manifest1
-rw-r--r--dev-haskell/refact/metadata.xml8
-rw-r--r--dev-haskell/refact/refact-0.3.0.2.ebuild24
-rw-r--r--dev-haskell/reflection/reflection-2.1.6.ebuild4
-rw-r--r--dev-haskell/regex-applicative-text/Manifest1
-rw-r--r--dev-haskell/regex-applicative-text/metadata.xml8
-rw-r--r--dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild33
-rw-r--r--dev-haskell/regex-applicative/metadata.xml3
-rw-r--r--dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild6
-rw-r--r--dev-haskell/regex-base/Manifest5
-rw-r--r--dev-haskell/regex-base/metadata.xml14
-rw-r--r--dev-haskell/regex-base/regex-base-0.94.0.0.ebuild34
-rw-r--r--dev-haskell/regex-base/regex-base-0.94.0.1.ebuild26
-rw-r--r--dev-haskell/regex-base/regex-base-0.94.0.2.ebuild24
-rw-r--r--dev-haskell/regex-compat-tdfa/Manifest1
-rw-r--r--dev-haskell/regex-compat-tdfa/metadata.xml8
-rw-r--r--dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild33
-rw-r--r--dev-haskell/regex-compat/Manifest3
-rw-r--r--dev-haskell/regex-compat/metadata.xml15
-rw-r--r--dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild40
-rw-r--r--dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild33
-rw-r--r--dev-haskell/regex-pcre-builtin/Manifest1
-rw-r--r--dev-haskell/regex-pcre-builtin/metadata.xml11
-rw-r--r--dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild34
-rw-r--r--dev-haskell/regex-pcre/Manifest1
-rw-r--r--dev-haskell/regex-pcre/metadata.xml8
-rw-r--r--dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild43
-rw-r--r--dev-haskell/regex-posix/Manifest3
-rw-r--r--dev-haskell/regex-posix/metadata.xml4
-rw-r--r--dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild21
-rw-r--r--dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild33
-rw-r--r--dev-haskell/regex-tdfa/Manifest3
-rw-r--r--dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch18
-rw-r--r--dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch24
-rw-r--r--dev-haskell/regex-tdfa/metadata.xml3
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild36
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild39
-rw-r--r--dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild38
-rw-r--r--dev-haskell/rerebase/Manifest1
-rw-r--r--dev-haskell/rerebase/metadata.xml13
-rw-r--r--dev-haskell/rerebase/rerebase-1.4.1.ebuild25
-rw-r--r--dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild33
-rw-r--r--dev-haskell/resolv/resolv-0.1.2.0.ebuild27
-rw-r--r--dev-haskell/resource-pool/Manifest1
-rw-r--r--dev-haskell/resource-pool/metadata.xml4
-rw-r--r--dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild6
-rw-r--r--dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild30
-rw-r--r--dev-haskell/resourcet/Manifest1
-rw-r--r--dev-haskell/resourcet/metadata.xml3
-rw-r--r--dev-haskell/resourcet/resourcet-1.2.4.2.ebuild6
-rw-r--r--dev-haskell/resourcet/resourcet-1.2.6.ebuild26
-rw-r--r--dev-haskell/retry/Manifest3
-rw-r--r--dev-haskell/retry/metadata.xml16
-rw-r--r--dev-haskell/retry/retry-0.8.1.1.ebuild39
-rw-r--r--dev-haskell/retry/retry-0.9.0.0.ebuild38
-rw-r--r--dev-haskell/retry/retry-0.9.3.1.ebuild40
-rw-r--r--dev-haskell/rfc5051/Manifest2
-rw-r--r--dev-haskell/rfc5051/metadata.xml27
-rw-r--r--dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild29
-rw-r--r--dev-haskell/rfc5051/rfc5051-0.2.ebuild25
-rw-r--r--dev-haskell/riff/Manifest1
-rw-r--r--dev-haskell/riff/metadata.xml15
-rw-r--r--dev-haskell/riff/riff-0.3.0.1.ebuild35
-rw-r--r--dev-haskell/rio-orphans/Manifest1
-rw-r--r--dev-haskell/rio-orphans/metadata.xml8
-rw-r--r--dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild32
-rw-r--r--dev-haskell/rio-prettyprint/Manifest1
-rw-r--r--dev-haskell/rio-prettyprint/metadata.xml8
-rw-r--r--dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild33
-rw-r--r--dev-haskell/rio/Manifest3
-rw-r--r--dev-haskell/rio/metadata.xml4
-rw-r--r--dev-haskell/rio/rio-0.1.18.0.ebuild38
-rw-r--r--dev-haskell/rio/rio-0.1.21.0.ebuild34
-rw-r--r--dev-haskell/rio/rio-0.1.22.0-r1.ebuild36
-rw-r--r--dev-haskell/rsa/Manifest1
-rw-r--r--dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch19
-rw-r--r--dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch21
-rw-r--r--dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch23
-rw-r--r--dev-haskell/rsa/metadata.xml16
-rw-r--r--dev-haskell/rsa/rsa-2.3.1.ebuild49
-rw-r--r--dev-haskell/safe-exceptions/Manifest1
-rw-r--r--dev-haskell/safe-exceptions/metadata.xml1
-rw-r--r--dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild15
-rw-r--r--dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild24
-rw-r--r--dev-haskell/safe/safe-0.3.19.ebuild6
-rw-r--r--dev-haskell/safesemaphore/metadata.xml3
-rw-r--r--dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild6
-rw-r--r--dev-haskell/sandi/sandi-0.5.ebuild6
-rw-r--r--dev-haskell/say/Manifest1
-rw-r--r--dev-haskell/say/metadata.xml11
-rw-r--r--dev-haskell/say/say-0.1.0.0.ebuild27
-rw-r--r--dev-haskell/scientific/Manifest3
-rw-r--r--dev-haskell/scientific/metadata.xml15
-rw-r--r--dev-haskell/scientific/scientific-0.3.6.2.ebuild36
-rw-r--r--dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild49
-rw-r--r--dev-haskell/securemem/securemem-0.1.10.ebuild4
-rw-r--r--dev-haskell/selective/Manifest1
-rw-r--r--dev-haskell/selective/metadata.xml17
-rw-r--r--dev-haskell/selective/selective-0.3.ebuild29
-rw-r--r--dev-haskell/semialign/Manifest3
-rw-r--r--dev-haskell/semialign/metadata.xml15
-rw-r--r--dev-haskell/semialign/semialign-1.2.0.1.ebuild51
-rw-r--r--dev-haskell/semialign/semialign-1.3.ebuild39
-rw-r--r--dev-haskell/semigroupoid-extras/Manifest1
-rw-r--r--dev-haskell/semigroupoid-extras/metadata.xml16
-rw-r--r--dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild31
-rw-r--r--dev-haskell/semigroupoids/Manifest2
-rw-r--r--dev-haskell/semigroupoids/metadata.xml26
-rw-r--r--dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild49
-rw-r--r--dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild43
-rw-r--r--dev-haskell/semigroups/Manifest2
-rw-r--r--dev-haskell/semigroups/metadata.xml15
-rw-r--r--dev-haskell/semigroups/semigroups-0.18.5.ebuild45
-rw-r--r--dev-haskell/semigroups/semigroups-0.20.ebuild39
-rw-r--r--dev-haskell/semirings/Manifest3
-rw-r--r--dev-haskell/semirings/metadata.xml36
-rw-r--r--dev-haskell/semirings/semirings-0.5.4.ebuild34
-rw-r--r--dev-haskell/semirings/semirings-0.6-r2.ebuild36
-rw-r--r--dev-haskell/sendfile/Manifest1
-rw-r--r--dev-haskell/sendfile/metadata.xml16
-rw-r--r--dev-haskell/sendfile/sendfile-0.7.11.1.ebuild30
-rw-r--r--dev-haskell/servant-server/Manifest4
-rw-r--r--dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch31
-rw-r--r--dev-haskell/servant-server/metadata.xml12
-rw-r--r--dev-haskell/servant-server/servant-server-0.19.1.ebuild72
-rw-r--r--dev-haskell/servant-server/servant-server-0.20.ebuild53
-rw-r--r--dev-haskell/servant/Manifest4
-rw-r--r--dev-haskell/servant/metadata.xml12
-rw-r--r--dev-haskell/servant/servant-0.19.ebuild60
-rw-r--r--dev-haskell/servant/servant-0.20.ebuild44
-rw-r--r--dev-haskell/setenv/setenv-0.1.1.3.ebuild6
-rw-r--r--dev-haskell/setlocale/Manifest2
-rw-r--r--dev-haskell/setlocale/metadata.xml3
-rw-r--r--dev-haskell/setlocale/setlocale-1.0.0.10.ebuild25
-rw-r--r--dev-haskell/setlocale/setlocale-1.0.0.9.ebuild15
-rw-r--r--dev-haskell/sha/sha-1.6.4.4.ebuild4
-rw-r--r--dev-haskell/shakespeare-css/Manifest1
-rw-r--r--dev-haskell/shakespeare-css/metadata.xml8
-rw-r--r--dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild25
-rw-r--r--dev-haskell/shakespeare-i18n/Manifest1
-rw-r--r--dev-haskell/shakespeare-i18n/metadata.xml8
-rw-r--r--dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild25
-rw-r--r--dev-haskell/shakespeare-js/Manifest1
-rw-r--r--dev-haskell/shakespeare-js/metadata.xml8
-rw-r--r--dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild25
-rw-r--r--dev-haskell/shakespeare-text/Manifest1
-rw-r--r--dev-haskell/shakespeare-text/metadata.xml8
-rw-r--r--dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild25
-rw-r--r--dev-haskell/shakespeare/Manifest2
-rw-r--r--dev-haskell/shakespeare/metadata.xml13
-rw-r--r--dev-haskell/shakespeare/shakespeare-2.0.25.ebuild43
-rw-r--r--dev-haskell/shakespeare/shakespeare-2.0.30.ebuild40
-rw-r--r--dev-haskell/shell-escape/Manifest1
-rw-r--r--dev-haskell/shell-escape/metadata.xml11
-rw-r--r--dev-haskell/shell-escape/shell-escape-0.2.0.ebuild25
-rw-r--r--dev-haskell/shelly/Manifest2
-rw-r--r--dev-haskell/shelly/metadata.xml26
-rw-r--r--dev-haskell/shelly/shelly-1.12.1.ebuild78
-rw-r--r--dev-haskell/shelly/shelly-1.9.0.ebuild51
-rw-r--r--dev-haskell/should-not-typecheck/Manifest1
-rw-r--r--dev-haskell/should-not-typecheck/metadata.xml14
-rw-r--r--dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild27
-rw-r--r--dev-haskell/silently/Manifest1
-rw-r--r--dev-haskell/silently/metadata.xml3
-rw-r--r--dev-haskell/silently/silently-1.2.5.1.ebuild6
-rw-r--r--dev-haskell/silently/silently-1.2.5.3.ebuild28
-rw-r--r--dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild4
-rw-r--r--dev-haskell/simple-sendfile/Manifest1
-rw-r--r--dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch56
-rw-r--r--dev-haskell/simple-sendfile/metadata.xml5
-rw-r--r--dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild6
-rw-r--r--dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild39
-rw-r--r--dev-haskell/singleton-bool/Manifest1
-rw-r--r--dev-haskell/singleton-bool/metadata.xml4
-rw-r--r--dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild14
-rw-r--r--dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild25
-rw-r--r--dev-haskell/size-based/Manifest1
-rw-r--r--dev-haskell/size-based/metadata.xml8
-rw-r--r--dev-haskell/size-based/size-based-0.1.2.0.ebuild33
-rw-r--r--dev-haskell/skein/metadata.xml3
-rw-r--r--dev-haskell/skein/skein-1.0.9.4.ebuild6
-rw-r--r--dev-haskell/skylighting-core/Manifest4
-rw-r--r--dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch39
-rw-r--r--dev-haskell/skylighting-core/metadata.xml20
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild51
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild49
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.14.ebuild46
-rw-r--r--dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild54
-rw-r--r--dev-haskell/skylighting-format-ansi/Manifest1
-rw-r--r--dev-haskell/skylighting-format-ansi/metadata.xml12
-rw-r--r--dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild25
-rw-r--r--dev-haskell/skylighting-format-blaze-html/Manifest1
-rw-r--r--dev-haskell/skylighting-format-blaze-html/metadata.xml12
-rw-r--r--dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild25
-rw-r--r--dev-haskell/skylighting-format-context/Manifest1
-rw-r--r--dev-haskell/skylighting-format-context/metadata.xml12
-rw-r--r--dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild23
-rw-r--r--dev-haskell/skylighting-format-latex/Manifest1
-rw-r--r--dev-haskell/skylighting-format-latex/metadata.xml12
-rw-r--r--dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild23
-rw-r--r--dev-haskell/skylighting/Manifest4
-rw-r--r--dev-haskell/skylighting/metadata.xml13
-rw-r--r--dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild37
-rw-r--r--dev-haskell/skylighting/skylighting-0.12.3.1.ebuild35
-rw-r--r--dev-haskell/skylighting/skylighting-0.14.ebuild39
-rw-r--r--dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild37
-rw-r--r--dev-haskell/smallcheck/Manifest1
-rw-r--r--dev-haskell/smallcheck/metadata.xml8
-rw-r--r--dev-haskell/smallcheck/smallcheck-1.2.0.ebuild6
-rw-r--r--dev-haskell/smallcheck/smallcheck-1.2.1.ebuild28
-rw-r--r--dev-haskell/snap-core/Manifest1
-rw-r--r--dev-haskell/snap-core/metadata.xml47
-rw-r--r--dev-haskell/snap-core/snap-core-1.0.4.2.ebuild64
-rw-r--r--dev-haskell/snap-server/Manifest1
-rw-r--r--dev-haskell/snap-server/metadata.xml32
-rw-r--r--dev-haskell/snap-server/snap-server-1.1.1.2.ebuild63
-rw-r--r--dev-haskell/socks/socks-0.6.1.ebuild6
-rw-r--r--dev-haskell/some/Manifest1
-rw-r--r--dev-haskell/some/metadata.xml15
-rw-r--r--dev-haskell/some/some-1.0.5.ebuild29
-rw-r--r--dev-haskell/sop-core/Manifest2
-rw-r--r--dev-haskell/sop-core/sop-core-0.5.0.1.ebuild24
-rw-r--r--dev-haskell/sop-core/sop-core-0.5.0.2.ebuild27
-rw-r--r--dev-haskell/split/Manifest1
-rw-r--r--dev-haskell/split/metadata.xml4
-rw-r--r--dev-haskell/split/split-0.2.3.4.ebuild15
-rw-r--r--dev-haskell/split/split-0.2.3.5.ebuild23
-rw-r--r--dev-haskell/splitmix/Manifest4
-rw-r--r--dev-haskell/splitmix/metadata.xml29
-rw-r--r--dev-haskell/splitmix/splitmix-0.0.4.ebuild33
-rw-r--r--dev-haskell/splitmix/splitmix-0.1.0.3.ebuild47
-rw-r--r--dev-haskell/splitmix/splitmix-0.1.0.4.ebuild52
-rw-r--r--dev-haskell/stack-bin/Manifest1
-rw-r--r--dev-haskell/stack-bin/metadata.xml15
-rw-r--r--dev-haskell/stack-bin/stack-bin-2.3.1.ebuild39
-rw-r--r--dev-haskell/stack/Manifest1
-rw-r--r--dev-haskell/stack/metadata.xml25
-rw-r--r--dev-haskell/stack/stack-2.3.3.ebuild114
-rw-r--r--dev-haskell/statevar/Manifest3
-rw-r--r--dev-haskell/statevar/metadata.xml5
-rw-r--r--dev-haskell/statevar/statevar-1.1.1.1.ebuild30
-rw-r--r--dev-haskell/statevar/statevar-1.2.1.ebuild30
-rw-r--r--dev-haskell/statevar/statevar-1.2.2.ebuild26
-rw-r--r--dev-haskell/statistics/Manifest1
-rw-r--r--dev-haskell/statistics/metadata.xml97
-rw-r--r--dev-haskell/statistics/statistics-0.15.2.0.ebuild6
-rw-r--r--dev-haskell/statistics/statistics-0.16.2.0.ebuild44
-rw-r--r--dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild6
-rw-r--r--dev-haskell/stm/Manifest4
-rw-r--r--dev-haskell/stm/metadata.xml11
-rw-r--r--dev-haskell/stm/stm-2.5.0.0.ebuild28
-rw-r--r--dev-haskell/stm/stm-2.5.0.1-r1.ebuild32
-rw-r--r--dev-haskell/stm/stm-2.5.0.2-r1.ebuild28
-rw-r--r--dev-haskell/stmonadtrans/Manifest1
-rw-r--r--dev-haskell/stmonadtrans/metadata.xml17
-rw-r--r--dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild35
-rw-r--r--dev-haskell/store-core/Manifest1
-rw-r--r--dev-haskell/store-core/metadata.xml11
-rw-r--r--dev-haskell/store-core/store-core-0.4.4.3.ebuild32
-rw-r--r--dev-haskell/store/Manifest1
-rw-r--r--dev-haskell/store/metadata.xml8
-rw-r--r--dev-haskell/store/store-0.7.6.ebuild66
-rw-r--r--dev-haskell/stream/Manifest1
-rw-r--r--dev-haskell/stream/metadata.xml8
-rw-r--r--dev-haskell/stream/stream-0.4.7.2.ebuild31
-rw-r--r--dev-haskell/streaming-commons/Manifest3
-rw-r--r--dev-haskell/streaming-commons/metadata.xml4
-rw-r--r--dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild34
-rw-r--r--dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild32
-rw-r--r--dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild33
-rw-r--r--dev-haskell/strict/Manifest4
-rw-r--r--dev-haskell/strict/metadata.xml9
-rw-r--r--dev-haskell/strict/strict-0.3.2-r1.ebuild24
-rw-r--r--dev-haskell/strict/strict-0.4.0.1.ebuild46
-rw-r--r--dev-haskell/strict/strict-0.5.ebuild37
-rw-r--r--dev-haskell/string-conversions/Manifest1
-rw-r--r--dev-haskell/string-conversions/metadata.xml16
-rw-r--r--dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild29
-rw-r--r--dev-haskell/string-qq/metadata.xml4
-rw-r--r--dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild31
-rw-r--r--dev-haskell/string-qq/string-qq-0.0.4.ebuild26
-rw-r--r--dev-haskell/stringable/Manifest1
-rw-r--r--dev-haskell/stringable/metadata.xml8
-rw-r--r--dev-haskell/stringable/stringable-0.1.3.ebuild26
-rw-r--r--dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild6
-rw-r--r--dev-haskell/stringprep/Manifest1
-rw-r--r--dev-haskell/stringprep/metadata.xml8
-rw-r--r--dev-haskell/stringprep/stringprep-1.0.0.ebuild30
-rw-r--r--dev-haskell/stringsearch/Manifest1
-rw-r--r--dev-haskell/stringsearch/metadata.xml18
-rw-r--r--dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild38
-rw-r--r--dev-haskell/syb-with-class/Manifest1
-rw-r--r--dev-haskell/syb-with-class/metadata.xml12
-rw-r--r--dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild25
-rw-r--r--dev-haskell/syb/Manifest3
-rw-r--r--dev-haskell/syb/metadata.xml11
-rw-r--r--dev-haskell/syb/syb-0.7.1.ebuild26
-rw-r--r--dev-haskell/syb/syb-0.7.2.1.ebuild26
-rw-r--r--dev-haskell/syb/syb-0.7.2.4.ebuild24
-rw-r--r--dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild10
-rw-r--r--dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild26
-rw-r--r--dev-haskell/system-filepath/system-filepath-0.4.14.ebuild28
-rw-r--r--dev-haskell/system-posix-redirect/Manifest1
-rw-r--r--dev-haskell/system-posix-redirect/metadata.xml8
-rw-r--r--dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild24
-rw-r--r--dev-haskell/tagged/Manifest4
-rw-r--r--dev-haskell/tagged/metadata.xml1
-rw-r--r--dev-haskell/tagged/tagged-0.8.6.1.ebuild33
-rw-r--r--dev-haskell/tagged/tagged-0.8.6.ebuild40
-rw-r--r--dev-haskell/tagged/tagged-0.8.7.ebuild30
-rw-r--r--dev-haskell/tagshare/Manifest1
-rw-r--r--dev-haskell/tagshare/metadata.xml8
-rw-r--r--dev-haskell/tagshare/tagshare-0.0.ebuild25
-rw-r--r--dev-haskell/tagsoup/tagsoup-0.14.8.ebuild6
-rw-r--r--dev-haskell/tagstream-conduit/Manifest1
-rw-r--r--dev-haskell/tagstream-conduit/metadata.xml17
-rw-r--r--dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild37
-rw-r--r--dev-haskell/tar-conduit/Manifest1
-rw-r--r--dev-haskell/tar-conduit/metadata.xml8
-rw-r--r--dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild31
-rw-r--r--dev-haskell/tar/Manifest1
-rw-r--r--dev-haskell/tar/metadata.xml14
-rw-r--r--dev-haskell/tar/tar-0.5.1.1-r3.ebuild32
-rw-r--r--dev-haskell/tar/tar-0.5.1.1.ebuild40
-rw-r--r--dev-haskell/tasty-ant-xml/Manifest1
-rw-r--r--dev-haskell/tasty-ant-xml/metadata.xml14
-rw-r--r--dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild30
-rw-r--r--dev-haskell/tasty-expected-failure/Manifest1
-rw-r--r--dev-haskell/tasty-expected-failure/metadata.xml21
-rw-r--r--dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild17
-rw-r--r--dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild40
-rw-r--r--dev-haskell/tasty-golden/Manifest1
-rw-r--r--dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch76
-rw-r--r--dev-haskell/tasty-golden/metadata.xml9
-rw-r--r--dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild6
-rw-r--r--dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild80
-rw-r--r--dev-haskell/tasty-hedgehog/Manifest3
-rw-r--r--dev-haskell/tasty-hedgehog/metadata.xml4
-rw-r--r--dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild37
-rw-r--r--dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild32
-rw-r--r--dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild29
-rw-r--r--dev-haskell/tasty-hslua/Manifest2
-rw-r--r--dev-haskell/tasty-hslua/metadata.xml12
-rw-r--r--dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild26
-rw-r--r--dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild25
-rw-r--r--dev-haskell/tasty-hunit/Manifest2
-rw-r--r--dev-haskell/tasty-hunit/metadata.xml3
-rw-r--r--dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild26
-rw-r--r--dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild26
-rw-r--r--dev-haskell/tasty-kat/metadata.xml3
-rw-r--r--dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild6
-rw-r--r--dev-haskell/tasty-lua/Manifest3
-rw-r--r--dev-haskell/tasty-lua/metadata.xml4
-rw-r--r--dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild29
-rw-r--r--dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild31
-rw-r--r--dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild30
-rw-r--r--dev-haskell/tasty-quickcheck/Manifest1
-rw-r--r--dev-haskell/tasty-quickcheck/metadata.xml4
-rw-r--r--dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild10
-rw-r--r--dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild29
-rw-r--r--dev-haskell/tasty-rerun/Manifest2
-rw-r--r--dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild38
-rw-r--r--dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild34
-rw-r--r--dev-haskell/tasty-smallcheck/Manifest1
-rw-r--r--dev-haskell/tasty-smallcheck/metadata.xml3
-rw-r--r--dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild6
-rw-r--r--dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild28
-rw-r--r--dev-haskell/tasty-th/tasty-th-0.1.7.ebuild4
-rw-r--r--dev-haskell/tasty/Manifest2
-rw-r--r--dev-haskell/tasty/metadata.xml7
-rw-r--r--dev-haskell/tasty/tasty-1.2.3.ebuild39
-rw-r--r--dev-haskell/tasty/tasty-1.4.2.3.ebuild40
-rw-r--r--dev-haskell/template-haskell-compat-v0208/Manifest1
-rw-r--r--dev-haskell/template-haskell-compat-v0208/metadata.xml8
-rw-r--r--dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild24
-rw-r--r--dev-haskell/temporary-rc/metadata.xml3
-rw-r--r--dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild8
-rw-r--r--dev-haskell/temporary/files/temporary-1.3-smp-flag.patch46
-rw-r--r--dev-haskell/temporary/metadata.xml9
-rw-r--r--dev-haskell/temporary/temporary-1.3-r1.ebuild44
-rw-r--r--dev-haskell/temporary/temporary-1.3.ebuild8
-rw-r--r--dev-haskell/tensor/Manifest1
-rw-r--r--dev-haskell/tensor/metadata.xml8
-rw-r--r--dev-haskell/tensor/tensor-1.1.0.1.ebuild29
-rw-r--r--dev-haskell/terminal-size/Manifest1
-rw-r--r--dev-haskell/terminal-size/metadata.xml4
-rw-r--r--dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild6
-rw-r--r--dev-haskell/terminal-size/terminal-size-0.3.3.ebuild22
-rw-r--r--dev-haskell/terminfo/Manifest1
-rw-r--r--dev-haskell/terminfo/metadata.xml10
-rw-r--r--dev-haskell/terminfo/terminfo-0.4.1.4.ebuild27
-rw-r--r--dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild15
-rw-r--r--dev-haskell/test-framework-leancheck/metadata.xml3
-rw-r--r--dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild6
-rw-r--r--dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild41
-rw-r--r--dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild39
-rw-r--r--dev-haskell/test-framework-th/metadata.xml3
-rw-r--r--dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild6
-rw-r--r--dev-haskell/test-framework/Manifest1
-rw-r--r--dev-haskell/test-framework/metadata.xml9
-rw-r--r--dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild48
-rw-r--r--dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild39
-rw-r--r--dev-haskell/testing-feat/Manifest1
-rw-r--r--dev-haskell/testing-feat/metadata.xml23
-rw-r--r--dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild28
-rw-r--r--dev-haskell/testing-type-modifiers/Manifest1
-rw-r--r--dev-haskell/testing-type-modifiers/metadata.xml24
-rw-r--r--dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild24
-rw-r--r--dev-haskell/texmath/Manifest3
-rw-r--r--dev-haskell/texmath/metadata.xml16
-rw-r--r--dev-haskell/texmath/texmath-0.12.2.ebuild41
-rw-r--r--dev-haskell/texmath/texmath-0.12.5.1.ebuild50
-rw-r--r--dev-haskell/texmath/texmath-0.12.8.3.ebuild52
-rw-r--r--dev-haskell/text-binary/Manifest1
-rw-r--r--dev-haskell/text-binary/metadata.xml13
-rw-r--r--dev-haskell/text-binary/text-binary-0.2.1.1.ebuild25
-rw-r--r--dev-haskell/text-conversions/Manifest3
-rw-r--r--dev-haskell/text-conversions/metadata.xml4
-rw-r--r--dev-haskell/text-conversions/text-conversions-0.3.0.ebuild30
-rw-r--r--dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild25
-rw-r--r--dev-haskell/text-conversions/text-conversions-0.3.1.ebuild29
-rw-r--r--dev-haskell/text-icu/Manifest3
-rw-r--r--dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch12
-rw-r--r--dev-haskell/text-icu/metadata.xml31
-rw-r--r--dev-haskell/text-icu/text-icu-0.7.0.1.ebuild31
-rw-r--r--dev-haskell/text-icu/text-icu-0.7.1.0.ebuild35
-rw-r--r--dev-haskell/text-icu/text-icu-0.8.0.2.ebuild36
-rw-r--r--dev-haskell/text-metrics/Manifest1
-rw-r--r--dev-haskell/text-metrics/metadata.xml8
-rw-r--r--dev-haskell/text-metrics/text-metrics-0.3.0.ebuild43
-rw-r--r--dev-haskell/text-short/Manifest3
-rw-r--r--dev-haskell/text-short/metadata.xml11
-rw-r--r--dev-haskell/text-short/text-short-0.1.3.ebuild44
-rw-r--r--dev-haskell/text-short/text-short-0.1.5-r1.ebuild43
-rw-r--r--dev-haskell/text-show/Manifest3
-rw-r--r--dev-haskell/text-show/metadata.xml37
-rw-r--r--dev-haskell/text-show/text-show-3.10.4.ebuild42
-rw-r--r--dev-haskell/text-show/text-show-3.8.5.ebuild56
-rw-r--r--dev-haskell/text-show/text-show-3.9.7.ebuild42
-rw-r--r--dev-haskell/text-stream-decode/Manifest1
-rw-r--r--dev-haskell/text-stream-decode/metadata.xml8
-rw-r--r--dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild32
-rw-r--r--dev-haskell/text/Manifest4
-rw-r--r--dev-haskell/text/metadata.xml32
-rw-r--r--dev-haskell/text/text-1.2.4.0-r1.ebuild38
-rw-r--r--dev-haskell/text/text-1.2.4.1.ebuild37
-rw-r--r--dev-haskell/text/text-1.2.4.1_rc1.ebuild42
-rw-r--r--dev-haskell/text/text-1.2.5.0-r1.ebuild48
-rw-r--r--dev-haskell/tf-random/tf-random-0.5.ebuild6
-rw-r--r--dev-haskell/th-abstraction/Manifest4
-rw-r--r--dev-haskell/th-abstraction/metadata.xml11
-rw-r--r--dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild24
-rw-r--r--dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild22
-rw-r--r--dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild24
-rw-r--r--dev-haskell/th-compat/Manifest3
-rw-r--r--dev-haskell/th-compat/metadata.xml12
-rw-r--r--dev-haskell/th-compat/th-compat-0.1.3.ebuild26
-rw-r--r--dev-haskell/th-compat/th-compat-0.1.4.ebuild29
-rw-r--r--dev-haskell/th-expand-syns/Manifest1
-rw-r--r--dev-haskell/th-expand-syns/metadata.xml11
-rw-r--r--dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild25
-rw-r--r--dev-haskell/th-lift-instances/Manifest3
-rw-r--r--dev-haskell/th-lift-instances/metadata.xml8
-rw-r--r--dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild30
-rw-r--r--dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild27
-rw-r--r--dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild25
-rw-r--r--dev-haskell/th-lift/Manifest4
-rw-r--r--dev-haskell/th-lift/metadata.xml3
-rw-r--r--dev-haskell/th-lift/th-lift-0.8.1.ebuild25
-rw-r--r--dev-haskell/th-lift/th-lift-0.8.2.ebuild25
-rw-r--r--dev-haskell/th-lift/th-lift-0.8.4.ebuild23
-rw-r--r--dev-haskell/th-orphans/Manifest1
-rw-r--r--dev-haskell/th-orphans/metadata.xml14
-rw-r--r--dev-haskell/th-orphans/th-orphans-0.13.10.ebuild31
-rw-r--r--dev-haskell/th-reify-many/Manifest1
-rw-r--r--dev-haskell/th-reify-many/metadata.xml17
-rw-r--r--dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild27
-rw-r--r--dev-haskell/th-utilities/Manifest1
-rw-r--r--dev-haskell/th-utilities/metadata.xml8
-rw-r--r--dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild30
-rw-r--r--dev-haskell/these/Manifest3
-rw-r--r--dev-haskell/these/metadata.xml12
-rw-r--r--dev-haskell/these/these-1.1.1.1.ebuild45
-rw-r--r--dev-haskell/these/these-1.2.ebuild32
-rw-r--r--dev-haskell/threads/Manifest1
-rw-r--r--dev-haskell/threads/metadata.xml34
-rw-r--r--dev-haskell/threads/threads-0.5.1.6.ebuild29
-rw-r--r--dev-haskell/thyme/Manifest1
-rw-r--r--dev-haskell/thyme/metadata.xml22
-rw-r--r--dev-haskell/thyme/thyme-0.3.5.5.ebuild47
-rw-r--r--dev-haskell/time-compat/Manifest3
-rw-r--r--dev-haskell/time-compat/files/fix-resolution-test.patch49
-rw-r--r--dev-haskell/time-compat/metadata.xml4
-rw-r--r--dev-haskell/time-compat/time-compat-1.9.3.ebuild38
-rw-r--r--dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild41
-rw-r--r--dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild4
-rw-r--r--dev-haskell/time-manager/metadata.xml3
-rw-r--r--dev-haskell/time-manager/time-manager-0.0.0.ebuild6
-rw-r--r--dev-haskell/timeit/metadata.xml3
-rw-r--r--dev-haskell/timeit/timeit-2.0.ebuild6
-rw-r--r--dev-haskell/timezone-olson/Manifest1
-rw-r--r--dev-haskell/timezone-olson/metadata.xml4
-rw-r--r--dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild10
-rw-r--r--dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild24
-rw-r--r--dev-haskell/timezone-series/Manifest2
-rw-r--r--dev-haskell/timezone-series/metadata.xml11
-rw-r--r--dev-haskell/timezone-series/timezone-series-0.1.13.ebuild24
-rw-r--r--dev-haskell/timezone-series/timezone-series-0.1.9.ebuild8
-rw-r--r--dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild6
-rw-r--r--dev-haskell/tls/Manifest3
-rw-r--r--dev-haskell/tls/metadata.xml21
-rw-r--r--dev-haskell/tls/tls-1.5.4.ebuild47
-rw-r--r--dev-haskell/tls/tls-1.5.8.ebuild47
-rw-r--r--dev-haskell/tls/tls-1.8.0.ebuild47
-rw-r--r--dev-haskell/toml-parser/Manifest1
-rw-r--r--dev-haskell/toml-parser/metadata.xml12
-rw-r--r--dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild31
-rw-r--r--dev-haskell/top/Manifest1
-rw-r--r--dev-haskell/top/files/top-1.7-ghc-7.10.patch66
-rw-r--r--dev-haskell/top/files/top-1.7-ghc84.patch12
-rw-r--r--dev-haskell/top/metadata.xml15
-rw-r--r--dev-haskell/top/top-1.7.ebuild36
-rw-r--r--dev-haskell/torrent/torrent-10000.1.1.ebuild4
-rw-r--r--dev-haskell/transformers-base/Manifest1
-rw-r--r--dev-haskell/transformers-base/metadata.xml1
-rw-r--r--dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild4
-rw-r--r--dev-haskell/transformers-base/transformers-base-0.4.6.ebuild31
-rw-r--r--dev-haskell/transformers-compat/Manifest1
-rw-r--r--dev-haskell/transformers-compat/metadata.xml13
-rw-r--r--dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild6
-rw-r--r--dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild31
-rw-r--r--dev-haskell/transformers/metadata.xml12
-rw-r--r--dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild27
-rw-r--r--dev-haskell/transformers/transformers-0.5.6.2.ebuild27
-rw-r--r--dev-haskell/tree-diff/Manifest4
-rw-r--r--dev-haskell/tree-diff/metadata.xml32
-rw-r--r--dev-haskell/tree-diff/tree-diff-0.1.ebuild58
-rw-r--r--dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild47
-rw-r--r--dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild54
-rw-r--r--dev-haskell/trifecta/Manifest3
-rw-r--r--dev-haskell/trifecta/metadata.xml4
-rw-r--r--dev-haskell/trifecta/trifecta-2.1.2.ebuild41
-rw-r--r--dev-haskell/trifecta/trifecta-2.1.3.ebuild40
-rw-r--r--dev-haskell/trifecta/trifecta-2.1.ebuild48
-rw-r--r--dev-haskell/type-equality/metadata.xml3
-rw-r--r--dev-haskell/type-equality/type-equality-1.ebuild15
-rw-r--r--dev-haskell/typed-process/Manifest1
-rw-r--r--dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch62
-rw-r--r--dev-haskell/typed-process/metadata.xml4
-rw-r--r--dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild44
-rw-r--r--dev-haskell/typed-process/typed-process-0.2.6.0.ebuild8
-rw-r--r--dev-haskell/typst-symbols/Manifest1
-rw-r--r--dev-haskell/typst-symbols/metadata.xml12
-rw-r--r--dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild23
-rw-r--r--dev-haskell/typst/Manifest1
-rw-r--r--dev-haskell/typst/metadata.xml15
-rw-r--r--dev-haskell/typst/typst-0.3.2.0.ebuild47
-rw-r--r--dev-haskell/unbounded-delays/Manifest1
-rw-r--r--dev-haskell/unbounded-delays/metadata.xml6
-rw-r--r--dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild4
-rw-r--r--dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild24
-rw-r--r--dev-haskell/unexceptionalio/Manifest1
-rw-r--r--dev-haskell/unexceptionalio/metadata.xml20
-rw-r--r--dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild27
-rw-r--r--dev-haskell/unicode-collation/Manifest2
-rw-r--r--dev-haskell/unicode-collation/metadata.xml17
-rw-r--r--dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild35
-rw-r--r--dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild37
-rw-r--r--dev-haskell/unicode-data/Manifest4
-rw-r--r--dev-haskell/unicode-data/metadata.xml12
-rw-r--r--dev-haskell/unicode-data/unicode-data-0.3.0.ebuild38
-rw-r--r--dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild25
-rw-r--r--dev-haskell/unicode-transforms/Manifest2
-rw-r--r--dev-haskell/unicode-transforms/metadata.xml3
-rw-r--r--dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild41
-rw-r--r--dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild37
-rw-r--r--dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild38
-rw-r--r--dev-haskell/uniplate/Manifest2
-rw-r--r--dev-haskell/uniplate/metadata.xml3
-rw-r--r--dev-haskell/uniplate/uniplate-1.6.12.ebuild34
-rw-r--r--dev-haskell/uniplate/uniplate-1.6.13.ebuild34
-rw-r--r--dev-haskell/uniqueid/Manifest1
-rw-r--r--dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch46
-rw-r--r--dev-haskell/uniqueid/metadata.xml18
-rw-r--r--dev-haskell/uniqueid/uniqueid-0.1.1.ebuild24
-rw-r--r--dev-haskell/unix-compat/Manifest1
-rw-r--r--dev-haskell/unix-compat/metadata.xml9
-rw-r--r--dev-haskell/unix-compat/unix-compat-0.5.2.ebuild6
-rw-r--r--dev-haskell/unix-compat/unix-compat-0.7.ebuild33
-rw-r--r--dev-haskell/unix-time/Manifest1
-rw-r--r--dev-haskell/unix-time/metadata.xml4
-rw-r--r--dev-haskell/unix-time/unix-time-0.4.10.ebuild26
-rw-r--r--dev-haskell/unix-time/unix-time-0.4.7.ebuild6
-rw-r--r--dev-haskell/unixutils/Manifest1
-rw-r--r--dev-haskell/unixutils/metadata.xml8
-rw-r--r--dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild34
-rw-r--r--dev-haskell/unliftio-core/Manifest2
-rw-r--r--dev-haskell/unliftio-core/metadata.xml4
-rw-r--r--dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild13
-rw-r--r--dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild24
-rw-r--r--dev-haskell/unliftio/Manifest3
-rw-r--r--dev-haskell/unliftio/metadata.xml4
-rw-r--r--dev-haskell/unliftio/unliftio-0.2.12.1.ebuild29
-rw-r--r--dev-haskell/unliftio/unliftio-0.2.18.ebuild28
-rw-r--r--dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild31
-rw-r--r--dev-haskell/unordered-containers/Manifest4
-rw-r--r--dev-haskell/unordered-containers/metadata.xml11
-rw-r--r--dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild43
-rw-r--r--dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild37
-rw-r--r--dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild42
-rw-r--r--dev-haskell/uri-bytestring-aeson/Manifest1
-rw-r--r--dev-haskell/uri-bytestring-aeson/metadata.xml8
-rw-r--r--dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild27
-rw-r--r--dev-haskell/uri-bytestring/Manifest1
-rw-r--r--dev-haskell/uri-bytestring/metadata.xml14
-rw-r--r--dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild51
-rw-r--r--dev-haskell/uri-encode/Manifest1
-rw-r--r--dev-haskell/uri-encode/metadata.xml12
-rw-r--r--dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild34
-rw-r--r--dev-haskell/uri/Manifest1
-rw-r--r--dev-haskell/uri/metadata.xml8
-rw-r--r--dev-haskell/uri/uri-0.1.6.4.ebuild27
-rw-r--r--dev-haskell/url/Manifest1
-rw-r--r--dev-haskell/url/metadata.xml8
-rw-r--r--dev-haskell/url/url-2.1.3-r1.ebuild24
-rw-r--r--dev-haskell/utf8-light/Manifest1
-rw-r--r--dev-haskell/utf8-light/metadata.xml4
-rw-r--r--dev-haskell/utf8-light/utf8-light-0.4.2.ebuild8
-rw-r--r--dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild25
-rw-r--r--dev-haskell/utf8-string/Manifest1
-rw-r--r--dev-haskell/utf8-string/metadata.xml13
-rw-r--r--dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild15
-rw-r--r--dev-haskell/utf8-string/utf8-string-1.0.2.ebuild24
-rw-r--r--dev-haskell/uuagc-cabal/Manifest1
-rw-r--r--dev-haskell/uuagc-cabal/metadata.xml8
-rw-r--r--dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.ebuild27
-rw-r--r--dev-haskell/uuagc/Manifest1
-rw-r--r--dev-haskell/uuagc/metadata.xml11
-rw-r--r--dev-haskell/uuagc/uuagc-0.9.53.1.ebuild36
-rw-r--r--dev-haskell/uuid-types/Manifest3
-rw-r--r--dev-haskell/uuid-types/metadata.xml8
-rw-r--r--dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild45
-rw-r--r--dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild39
-rw-r--r--dev-haskell/uuid/Manifest3
-rw-r--r--dev-haskell/uuid/metadata.xml8
-rw-r--r--dev-haskell/uuid/uuid-1.3.13-r1.ebuild49
-rw-r--r--dev-haskell/uuid/uuid-1.3.15-r1.ebuild42
-rw-r--r--dev-haskell/uulib/Manifest1
-rw-r--r--dev-haskell/uulib/metadata.xml10
-rw-r--r--dev-haskell/uulib/uulib-0.9.24.ebuild24
-rw-r--r--dev-haskell/validity/Manifest1
-rw-r--r--dev-haskell/validity/metadata.xml15
-rw-r--r--dev-haskell/validity/validity-0.9.0.3.ebuild25
-rw-r--r--dev-haskell/vault/Manifest3
-rw-r--r--dev-haskell/vault/metadata.xml9
-rw-r--r--dev-haskell/vault/vault-0.3.1.4.ebuild33
-rw-r--r--dev-haskell/vault/vault-0.3.1.5-r2.ebuild32
-rw-r--r--dev-haskell/vector-algorithms/Manifest4
-rw-r--r--dev-haskell/vector-algorithms/metadata.xml10
-rw-r--r--dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild39
-rw-r--r--dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild39
-rw-r--r--dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild49
-rw-r--r--dev-haskell/vector-binary-instances/Manifest2
-rw-r--r--dev-haskell/vector-binary-instances/metadata.xml23
-rw-r--r--dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild13
-rw-r--r--dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild27
-rw-r--r--dev-haskell/vector-builder/Manifest1
-rw-r--r--dev-haskell/vector-builder/metadata.xml36
-rw-r--r--dev-haskell/vector-builder/vector-builder-0.3.8.ebuild34
-rw-r--r--dev-haskell/vector-instances/Manifest1
-rw-r--r--dev-haskell/vector-instances/metadata.xml14
-rw-r--r--dev-haskell/vector-instances/vector-instances-3.4.ebuild36
-rw-r--r--dev-haskell/vector-space/Manifest1
-rw-r--r--dev-haskell/vector-space/metadata.xml22
-rw-r--r--dev-haskell/vector-space/vector-space-0.16.ebuild29
-rw-r--r--dev-haskell/vector-th-unbox/Manifest2
-rw-r--r--dev-haskell/vector-th-unbox/metadata.xml10
-rw-r--r--dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild19
-rw-r--r--dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild26
-rw-r--r--dev-haskell/vector/Manifest4
-rw-r--r--dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch86
-rw-r--r--dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch27
-rw-r--r--dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch42
-rw-r--r--dev-haskell/vector/metadata.xml66
-rw-r--r--dev-haskell/vector/vector-0.12.1.2.ebuild46
-rw-r--r--dev-haskell/vector/vector-0.12.3.1-r1.ebuild50
-rw-r--r--dev-haskell/vector/vector-0.12.3.1.ebuild70
-rw-r--r--dev-haskell/void/void-0.7.3.ebuild6
-rw-r--r--dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild15
-rw-r--r--dev-haskell/wai-conduit/Manifest1
-rw-r--r--dev-haskell/wai-conduit/metadata.xml15
-rw-r--r--dev-haskell/wai-conduit/wai-conduit-3.0.0.4.ebuild27
-rw-r--r--dev-haskell/wai-cors/Manifest1
-rw-r--r--dev-haskell/wai-cors/metadata.xml12
-rw-r--r--dev-haskell/wai-cors/wai-cors-0.2.7.ebuild37
-rw-r--r--dev-haskell/wai-extra/Manifest2
-rw-r--r--dev-haskell/wai-extra/metadata.xml1
-rw-r--r--dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild75
-rw-r--r--dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild6
-rw-r--r--dev-haskell/wai-logger/Manifest1
-rw-r--r--dev-haskell/wai-logger/wai-logger-2.3.6.ebuild10
-rw-r--r--dev-haskell/wai-logger/wai-logger-2.4.0.ebuild32
-rw-r--r--dev-haskell/wai-test/Manifest1
-rw-r--r--dev-haskell/wai-test/metadata.xml8
-rw-r--r--dev-haskell/wai-test/wai-test-3.0.0.ebuild25
-rw-r--r--dev-haskell/wai-websockets/Manifest1
-rw-r--r--dev-haskell/wai-websockets/metadata.xml12
-rw-r--r--dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild38
-rw-r--r--dev-haskell/wai/Manifest2
-rw-r--r--dev-haskell/wai/wai-3.2.2.1.ebuild29
-rw-r--r--dev-haskell/wai/wai-3.2.3.ebuild28
-rw-r--r--dev-haskell/warp-tls/Manifest1
-rw-r--r--dev-haskell/warp-tls/metadata.xml1
-rw-r--r--dev-haskell/warp-tls/warp-tls-3.2.12.ebuild6
-rw-r--r--dev-haskell/warp-tls/warp-tls-3.4.1.ebuild37
-rw-r--r--dev-haskell/warp/Manifest3
-rw-r--r--dev-haskell/warp/metadata.xml8
-rw-r--r--dev-haskell/warp/warp-3.3.13.ebuild60
-rw-r--r--dev-haskell/warp/warp-3.3.21.ebuild57
-rw-r--r--dev-haskell/warp/warp-3.3.28.ebuild54
-rw-r--r--dev-haskell/wavy/Manifest1
-rw-r--r--dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch14
-rw-r--r--dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch11
-rw-r--r--dev-haskell/wavy/metadata.xml16
-rw-r--r--dev-haskell/wavy/wavy-0.1.0.0.ebuild43
-rw-r--r--dev-haskell/wcwidth/metadata.xml3
-rw-r--r--dev-haskell/wcwidth/wcwidth-0.0.2.ebuild6
-rw-r--r--dev-haskell/websockets/Manifest2
-rw-r--r--dev-haskell/websockets/metadata.xml (renamed from dev-haskell/alex-tools/metadata.xml)0
-rw-r--r--dev-haskell/websockets/websockets-0.12.7.3.ebuild47
-rw-r--r--dev-haskell/weigh/Manifest1
-rw-r--r--dev-haskell/weigh/metadata.xml11
-rw-r--r--dev-haskell/weigh/weigh-0.0.16.ebuild34
-rw-r--r--dev-haskell/with-location/Manifest1
-rw-r--r--dev-haskell/with-location/metadata.xml8
-rw-r--r--dev-haskell/with-location/with-location-0.1.0.ebuild25
-rw-r--r--dev-haskell/witherable/Manifest2
-rw-r--r--dev-haskell/witherable/metadata.xml12
-rw-r--r--dev-haskell/witherable/witherable-0.4.2-r1.ebuild37
-rw-r--r--dev-haskell/wl-pprint-annotated/Manifest1
-rw-r--r--dev-haskell/wl-pprint-annotated/metadata.xml4
-rw-r--r--dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild29
-rw-r--r--dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild28
-rw-r--r--dev-haskell/wl-pprint-text/Manifest1
-rw-r--r--dev-haskell/wl-pprint-text/metadata.xml8
-rw-r--r--dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild26
-rw-r--r--dev-haskell/wl-pprint/Manifest1
-rw-r--r--dev-haskell/wl-pprint/metadata.xml13
-rw-r--r--dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild24
-rw-r--r--dev-haskell/word8/word8-0.1.3.ebuild4
-rw-r--r--dev-haskell/wreq/Manifest1
-rw-r--r--dev-haskell/wreq/metadata.xml39
-rw-r--r--dev-haskell/wreq/wreq-0.5.3.2.ebuild76
-rw-r--r--dev-haskell/wx/Manifest1
-rw-r--r--dev-haskell/wx/metadata.xml11
-rw-r--r--dev-haskell/wx/wx-0.92.3.0-r1.ebuild29
-rw-r--r--dev-haskell/wxc/Manifest1
-rw-r--r--dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch32
-rw-r--r--dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch27
-rw-r--r--dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch12
-rw-r--r--dev-haskell/wxc/metadata.xml18
-rw-r--r--dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild68
-rw-r--r--dev-haskell/wxcore/Manifest1
-rw-r--r--dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch5
-rw-r--r--dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch11
-rw-r--r--dev-haskell/wxcore/metadata.xml14
-rw-r--r--dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild53
-rw-r--r--dev-haskell/wxdirect/Manifest1
-rw-r--r--dev-haskell/wxdirect/metadata.xml14
-rw-r--r--dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild47
-rw-r--r--dev-haskell/x11-xft/Manifest2
-rw-r--r--dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild31
-rw-r--r--dev-haskell/x11-xft/x11-xft-0.3.4.ebuild34
-rw-r--r--dev-haskell/x11/Manifest2
-rw-r--r--dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch10
-rw-r--r--dev-haskell/x11/metadata.xml9
-rw-r--r--dev-haskell/x11/x11-1.10.2.ebuild39
-rw-r--r--dev-haskell/x11/x11-1.9.2.ebuild44
-rw-r--r--dev-haskell/x509-store/Manifest1
-rw-r--r--dev-haskell/x509-store/metadata.xml1
-rw-r--r--dev-haskell/x509-store/x509-store-1.6.7.ebuild6
-rw-r--r--dev-haskell/x509-store/x509-store-1.6.9.ebuild29
-rw-r--r--dev-haskell/x509-system/Manifest1
-rw-r--r--dev-haskell/x509-system/metadata.xml1
-rw-r--r--dev-haskell/x509-system/x509-system-1.6.6.ebuild4
-rw-r--r--dev-haskell/x509-system/x509-system-1.6.7.ebuild27
-rw-r--r--dev-haskell/x509-validation/Manifest1
-rw-r--r--dev-haskell/x509-validation/metadata.xml1
-rw-r--r--dev-haskell/x509-validation/x509-validation-1.6.11.ebuild6
-rw-r--r--dev-haskell/x509-validation/x509-validation-1.6.12.ebuild33
-rw-r--r--dev-haskell/x509/Manifest1
-rw-r--r--dev-haskell/x509/metadata.xml2
-rw-r--r--dev-haskell/x509/x509-1.7.5.ebuild6
-rw-r--r--dev-haskell/x509/x509-1.7.7.ebuild32
-rw-r--r--dev-haskell/xhtml/Manifest1
-rw-r--r--dev-haskell/xhtml/metadata.xml10
-rw-r--r--dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild24
-rw-r--r--dev-haskell/xml-conduit/Manifest1
-rw-r--r--dev-haskell/xml-conduit/metadata.xml16
-rw-r--r--dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild8
-rw-r--r--dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild38
-rw-r--r--dev-haskell/xml-hamlet/Manifest1
-rw-r--r--dev-haskell/xml-hamlet/metadata.xml3
-rw-r--r--dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild8
-rw-r--r--dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild31
-rw-r--r--dev-haskell/xml-types/xml-types-0.3.8.ebuild6
-rw-r--r--dev-haskell/xml/xml-1.3.14.ebuild6
-rw-r--r--dev-haskell/xmlgen/Manifest1
-rw-r--r--dev-haskell/xmlgen/metadata.xml8
-rw-r--r--dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild29
-rw-r--r--dev-haskell/xss-sanitize/Manifest1
-rw-r--r--dev-haskell/xss-sanitize/metadata.xml4
-rw-r--r--dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild4
-rw-r--r--dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild33
-rw-r--r--dev-haskell/yaml/Manifest3
-rw-r--r--dev-haskell/yaml/metadata.xml11
-rw-r--r--dev-haskell/yaml/yaml-0.11.11.2.ebuild65
-rw-r--r--dev-haskell/yaml/yaml-0.11.5.0.ebuild47
-rw-r--r--dev-haskell/yaml/yaml-0.11.8.0.ebuild56
-rw-r--r--dev-haskell/yesod-auth-hashdb/Manifest1
-rw-r--r--dev-haskell/yesod-auth-hashdb/metadata.xml14
-rw-r--r--dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild44
-rw-r--r--dev-haskell/yesod-auth/Manifest2
-rw-r--r--dev-haskell/yesod-auth/metadata.xml11
-rw-r--r--dev-haskell/yesod-auth/yesod-auth-1.6.10.3.ebuild61
-rw-r--r--dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild61
-rw-r--r--dev-haskell/yesod-core/Manifest3
-rw-r--r--dev-haskell/yesod-core/metadata.xml9
-rw-r--r--dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild63
-rw-r--r--dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild59
-rw-r--r--dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild59
-rw-r--r--dev-haskell/yesod-default/Manifest1
-rw-r--r--dev-haskell/yesod-default/metadata.xml8
-rw-r--r--dev-haskell/yesod-default/yesod-default-1.2.0.ebuild23
-rw-r--r--dev-haskell/yesod-form/Manifest3
-rw-r--r--dev-haskell/yesod-form/metadata.xml18
-rw-r--r--dev-haskell/yesod-form/yesod-form-1.6.7.ebuild48
-rw-r--r--dev-haskell/yesod-form/yesod-form-1.7.0.ebuild47
-rw-r--r--dev-haskell/yesod-form/yesod-form-1.7.4.ebuild45
-rw-r--r--dev-haskell/yesod-json/Manifest1
-rw-r--r--dev-haskell/yesod-json/metadata.xml8
-rw-r--r--dev-haskell/yesod-json/yesod-json-1.2.0.ebuild23
-rw-r--r--dev-haskell/yesod-persistent/Manifest2
-rw-r--r--dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild35
-rw-r--r--dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild32
-rw-r--r--dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild6
-rw-r--r--dev-haskell/yesod-test/Manifest1
-rw-r--r--dev-haskell/yesod-test/yesod-test-1.6.12.ebuild6
-rw-r--r--dev-haskell/yesod-test/yesod-test-1.6.14.ebuild47
-rw-r--r--dev-haskell/yesod/Manifest3
-rw-r--r--dev-haskell/yesod/metadata.xml11
-rw-r--r--dev-haskell/yesod/yesod-1.6.1.0.ebuild42
-rw-r--r--dev-haskell/yesod/yesod-1.6.2.1.ebuild40
-rw-r--r--dev-haskell/yesod/yesod-1.6.2.ebuild39
-rw-r--r--dev-haskell/zip-archive/Manifest1
-rw-r--r--dev-haskell/zip-archive/metadata.xml5
-rw-r--r--dev-haskell/zip-archive/zip-archive-0.4.1.ebuild6
-rw-r--r--dev-haskell/zip-archive/zip-archive-0.4.3.ebuild37
-rw-r--r--dev-haskell/zlib-bindings/Manifest1
-rw-r--r--dev-haskell/zlib-bindings/metadata.xml11
-rw-r--r--dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild27
-rw-r--r--dev-haskell/zlib-conduit/Manifest1
-rw-r--r--dev-haskell/zlib-conduit/metadata.xml11
-rw-r--r--dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild25
-rw-r--r--dev-haskell/zlib-enum/Manifest1
-rw-r--r--dev-haskell/zlib-enum/metadata.xml8
-rw-r--r--dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild40
-rw-r--r--dev-haskell/zlib/Manifest5
-rw-r--r--dev-haskell/zlib/metadata.xml23
-rw-r--r--dev-haskell/zlib/zlib-0.6.2.2.ebuild38
-rw-r--r--dev-haskell/zlib/zlib-0.6.2.3.ebuild39
-rw-r--r--dev-haskell/zlib/zlib-0.6.3.0.ebuild38
2949 files changed, 24726 insertions, 32071 deletions
diff --git a/dev-haskell/abstract-deque-tests/Manifest b/dev-haskell/abstract-deque-tests/Manifest
deleted file mode 100644
index 085d45549eef..000000000000
--- a/dev-haskell/abstract-deque-tests/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST abstract-deque-tests-0.3.tar.gz 11427 BLAKE2B 2a43e52bb0a5b7634f179e5857eb01d76429134345003fc2f3b14460363221940f8296ac3adc5f024e2578e684664092c2ec5c1b2eb45af378ec32011e1dca67 SHA512 0e7ecb27d156e91c156a81866a1854aabd0fa88b57598575fbacb578bbfa769ba4de699158e8e12a7d26afe583e2a397b871ac0c08819a5b63bef749f8c1c213
diff --git a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
deleted file mode 100644
index f7d8def802ae..000000000000
--- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A test-suite for any queue or double-ended queue satisfying an interface"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?]
- dev-haskell/hunit:=[profile?]
- >=dev-haskell/random-1.0:=[profile?]
- >=dev-haskell/test-framework-0.6:=[profile?]
- >=dev-haskell/test-framework-hunit-0.2.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 74ca8d523ded..0a02da239316 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 26e5aa08e9c8..d36aa894cbed 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/abstract-par/metadata.xml b/dev-haskell/abstract-par/metadata.xml
index 937381521944..8902881b1334 100644
--- a/dev-haskell/abstract-par/metadata.xml
+++ b/dev-haskell/abstract-par/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">simonmar/monad-par</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/ac-ppm/Manifest b/dev-haskell/ac-ppm/Manifest
deleted file mode 100644
index ad3ac868235e..000000000000
--- a/dev-haskell/ac-ppm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AC-PPM-1.1.1.tar.gz 2958 BLAKE2B c2d5c96eebde31a45d8bd3c956687d01fc0c56906b841816bfcc80912831324fde0ccbb67f7aff99fc3efe4797fafcec554cd2599806168c9ea8c975d6f1eb0f SHA512 c296cb02fa9d70ca1f75bfdda8e307f66c800ac0e7b110bdd4af685c6acc506f3310456519d2445f850263baa22aa317266c68166bfcb551d297296d8c4de5ef
diff --git a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild b/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
deleted file mode 100644
index 08e3960accc9..000000000000
--- a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="AC-PPM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trivial package for writing PPM images"
-HOMEPAGE="https://hackage.haskell.org/package/AC-PPM"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ac-ppm/metadata.xml b/dev-haskell/ac-ppm/metadata.xml
deleted file mode 100644
index 51ade57a54de..000000000000
--- a/dev-haskell/ac-ppm/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package is written in 100% Haskell and enables you to
- write PPM (\"Portable Pixel Map\") images in human-readable
- text format as well as the more efficient binary format.
- It uses the ByteString library for maximum efficiency.
- For those that don't know, PPM is an image file format
- which is trivially simple, but therefore horribly inefficient.
- None the less, many programs can read PPM files, so this
- package represents an easy way to write Haskell code that
- generates images, without having to depend on any external
- C code.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/adjunctions/Manifest b/dev-haskell/adjunctions/Manifest
index afe8fa6e259d..5559da4b7fad 100644
--- a/dev-haskell/adjunctions/Manifest
+++ b/dev-haskell/adjunctions/Manifest
@@ -1 +1,2 @@
+DIST adjunctions-4.4.2.tar.gz 17201 BLAKE2B d9951182ba124a5de173dacbc9963f16fd540df5bbc3c6bdcef78d05e6e6d59f53ec102b045d02de7a3081d4ee01e5ed0daff50146341904a229271d5125ef22 SHA512 3785268bd3971f16dc0f2517556127590e8fb87f8e2cb8dfc74c356a8496ac1f2a46115097c4750d1d92eb21f25e0beec0a248d3442da2c8f6eb9da8cc4c51e3
DIST adjunctions-4.4.tar.gz 19891 BLAKE2B 6057f990bbcea406e2c12253828c1defac8b7b1eeeff4b89054b528fcea94b80df9bc8672cfd13783aaab6864acc708d0c1428dd72800c695db5f29e7954a96e SHA512 30f4fb8a30d8428e032d322a9a627e7ebc44b2c737e87670907134a5aa6019145f2c3e6b2e7f8e00d5ffbe1ce4b4a5c812c3ee976257419d7d429b19db28918c
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild
new file mode 100644
index 000000000000..4c77a491faf4
--- /dev/null
+++ b/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Adjunctions and representable functors"
+HOMEPAGE="https://github.com/ekmett/adjunctions/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+ >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+ >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+ >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ )
+"
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
index d8a25e508008..95acfc45ad33 100644
--- a/dev-haskell/adjunctions/adjunctions-4.4.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
@@ -36,9 +36,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'containers >= 0.3 && < 0.6' 'containers >= 0.3'
-}
+CABAL_CHDEPS=(
+ 'containers >= 0.3 && < 0.6' 'containers >= 0.3'
+)
diff --git a/dev-haskell/adjunctions/metadata.xml b/dev-haskell/adjunctions/metadata.xml
index 4781a3d127c2..6f4d6e325a29 100644
--- a/dev-haskell/adjunctions/metadata.xml
+++ b/dev-haskell/adjunctions/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">adjunctions</remote-id>
<remote-id type="github">ekmett/adjunctions</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
deleted file mode 100644
index 0d011a4d2aed..000000000000
--- a/dev-haskell/aeson-compat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aeson-compat-0.3.9.tar.gz 7441 BLAKE2B c370023ca56ddcd1f60cd4ee57e29299178bb04f9fad274e3109424df926c357faeab4e22416938b71f5f3109cf90ed8b3282fe14250ac17c872ea887998a8bc SHA512 84da7cbace32527d0e20d32415ba770d14417ad4dd9ca0f86e8b5f100449af8a51a7b32c7dfdd7b3557764bd7dfc9ae4aa0a95999bc34b074f49d243a4f4bc46
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
deleted file mode 100644
index afeccade5caf..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
- >=dev-haskell/base-compat-0.6.0:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/hashable-1.2:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?]
- >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.9
- >=dev-haskell/quickcheck-2.10
- >=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.6 && <4.13' 'base >=4.6' \
- 'base-compat >=0.6.0 && <0.11' 'base-compat >=0.6.0' \
- 'hashable >=1.2 && <1.3' 'hashable >=1.2' \
- 'semigroups >=0.18.5 && <0.19' 'semigroups >=0.18.5' \
- 'time >=1.4.0.1 && <1.9' 'time >=1.4.0.1' \
- 'tasty >=0.10 && <1.2' 'tasty >=0.10' \
- 'QuickCheck >=2.10 && <2.13' 'QuickCheck >=2.10'
-}
diff --git a/dev-haskell/aeson-compat/metadata.xml b/dev-haskell/aeson-compat/metadata.xml
deleted file mode 100644
index 56a763741ed7..000000000000
--- a/dev-haskell/aeson-compat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">phadej/aeson-compat</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest
deleted file mode 100644
index 54c6ad89ebfc..000000000000
--- a/dev-haskell/aeson-diff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aeson-diff-1.1.0.8.tar.gz 16521 BLAKE2B fb72ea03dc4b35791f151f22c4fab3f9cafecd604c520137c79af5e4c71772399516d0120bd01e2335fbf7747525babedf5603e5e8d3ba244a9907c81c9f1ea8 SHA512 5a5f703dec592c0cfd825eb1899006350649c52bf810ff1aaaf4134ebfbc11f5fbe9e7f158a8c3a21dbef4902b1f9e94148bc116e27418b2b786f6d31c7561fb
diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
deleted file mode 100644
index d44881aa49be..000000000000
--- a/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extract and apply patches to JSON documents"
-HOMEPAGE="https://github.com/thsutton/aeson-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Ambiguous module name ‘Data.Vector’: found in multiple packages: AC-Vector-Fancy-2.4.0 vector-0.12.0.2
-RESTRICT=test
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/edit-distance-vector:=[profile?]
- dev-haskell/hashable:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/optparse-applicative:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/doctest-0.9
- dev-haskell/glob
- dev-haskell/hlint
- dev-haskell/quickcheck
- dev-haskell/quickcheck-instances )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.9 && <4.14' 'base >=4.9'
-}
diff --git a/dev-haskell/aeson-diff/metadata.xml b/dev-haskell/aeson-diff/metadata.xml
deleted file mode 100644
index a36d49eabc5f..000000000000
--- a/dev-haskell/aeson-diff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
-
- This is a small library for working with changes to JSON documents. It
- includes a library and two command-line executables in the style of the
- diff(1) and patch(1) commands available on many systems.
-
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest
index 6463e1c0e00f..3ff96125c846 100644
--- a/dev-haskell/aeson-pretty/Manifest
+++ b/dev-haskell/aeson-pretty/Manifest
@@ -1 +1,3 @@
-DIST aeson-pretty-0.8.8.tar.gz 5600 BLAKE2B cac5605b17405868ea373806021e9ba2b3bd3bcb864e97067d4086289a53c2118922e318fb966172a0c0cf0df900e577698afdcea1291464151fc0a01f359dde SHA512 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779
+DIST aeson-pretty-0.8.10.tar.gz 5894 BLAKE2B 11f743ec9eaf301412efdde98b7237b0445a1089532804271613fb189e9b58ceab9cf2f710ff6a9e40f9755413fb110df63f2a80449469d3d655eb684338f76b SHA512 9eb39f5d70fe841d10c4e9fcacc3b380aa2a377590e8165f11c11318f7cdacb26757713efbb2b8324b57d1d5d89a1b210094ac6ab385a4dd32a9f6591847c4ac
+DIST aeson-pretty-0.8.9.cabal 2549 BLAKE2B 8039fb1ab628e04e0661331860ee2340c1dde9ed971619bdceb8b31500037fa94977034e07a9b8722b7bba818bda0b9b23cc608b71084121c276bce9a7e805da SHA512 b602bd81625dfd00906dd61613c2f4446f88c3afb82a0dec960de62802f5db17d2d77895f22108660f500831d9b0f24f5709b45b0f17f98630442842954dd5b7
+DIST aeson-pretty-0.8.9.tar.gz 5802 BLAKE2B 85d13676bb6f569a9df0f88a0882f493a6a2e55a74e702fa14f1d419b337f2a9f9d531de3dbd5283c80237e6fac11babf5aaba8f29aaf272ce6fc062412f1878 SHA512 00c99799cbe9e268109116f909ea0d9ef2708e578ec363ba5455b43d76d1f89bc9820dcbd3a63a1fb300460d97a71105f028f4ad9853b56ce16a097826b1d3d5
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild
new file mode 100644
index 000000000000..4e095248d035
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="https://github.com/informatikr/aeson-pretty"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+executable"
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.14.0:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/aeson-1.1:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ executable? ( >=dev-haskell/aeson-0.6:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ dev-haskell/attoparsec-aeson:=[profile?]
+ >=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ if use executable; then
+ local lib_flag=-lib-only
+ else
+ local lib_flag=lib-only
+ fi
+
+ haskell-cabal_src_configure \
+ --flag="${lib_flag}"
+}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
deleted file mode 100644
index 9e23eefb7e8d..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?]
- >=dev-haskell/semigroups-0.18.2:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
- >=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
new file mode 100644
index 000000000000..9ea9df617e03
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="https://github.com/informatikr/aeson-pretty"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="lib-only"
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.14.0:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ >=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ !lib-only? ( >=dev-haskell/aeson-0.6:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag lib-only lib-only)
+}
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/aeson-pretty/metadata.xml b/dev-haskell/aeson-pretty/metadata.xml
index da44aa251acf..260b34f47acb 100644
--- a/dev-haskell/aeson-pretty/metadata.xml
+++ b/dev-haskell/aeson-pretty/metadata.xml
@@ -6,25 +6,11 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
+ <flag name="executable">build/install the command-line tool as well as the library</flag>
<flag name="lib-only">don't build 'aeson-pretty' executable.</flag>
</use>
- <longdescription>
- A JSON pretty-printing library compatible with aeson as well as
- a command-line tool to improve readabilty of streams of JSON data.
-
- The /library/ provides the function "encodePretty". It is a drop-in
- replacement for aeson's "encode" function, producing JSON-ByteStrings for
- human readers.
-
- The /command-line tool/ reads JSON from stdin and writes prettified JSON
- to stdout. It also offers a complementary "compact"-mode, essentially the
- opposite of pretty-printing. If you specify @-flib-only@ like this
-
- &gt; cabal install -flib-only aeson-pretty
-
- the command-line tool will NOT be installed.
- </longdescription>
<upstream>
+ <remote-id type="hackage">aeson-pretty</remote-id>
<remote-id type="github">informatikr/aeson-pretty</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/aeson-qq/Manifest b/dev-haskell/aeson-qq/Manifest
deleted file mode 100644
index 6b0d37dea680..000000000000
--- a/dev-haskell/aeson-qq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aeson-qq-0.8.3.tar.gz 4751 BLAKE2B 538c51c52470ad628326f67d4822812b352e7141c94ec2e385fc889d869c512705ee4ee58951c31e8422ccdd2ab855cfe4262a874864bd19b60e0ad67132798a SHA512 f7ef90529b4c9661ffc54ab8ebfc73c9966e6338591b871678be2a6e63ecf30089fd33279a074bd8d1905d71c8198ea5cc24c828d6e940e7af7585ba826a0c29
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
deleted file mode 100644
index 229b7a3ccb24..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/sol/aeson-qq#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base-compat:=[profile?]
- >=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/metadata.xml b/dev-haskell/aeson-qq/metadata.xml
deleted file mode 100644
index 3b5d15550add..000000000000
--- a/dev-haskell/aeson-qq/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- @aeson-qq@ provides a JSON quasiquoter for Haskell.
-
- This package exposes the function `aesonQQ` that compile-time
- converts a string representation of a JSON value into a
- `Data.Aeson.Value`. `aesonQQ` has the signature
-
- &gt;aesonQQ :: QuasiQuoter
-
- Consult the @README@ for documentation:
- &lt;https://github.com/zalora/aeson-qq#readme&gt;
- </longdescription>
- <upstream>
- <remote-id type="github">zalora/aeson-qq</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index efb710cb2fb1..50aa1b5d1de5 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -1 +1,4 @@
-DIST aeson-1.4.7.1.tar.gz 277911 BLAKE2B bffac6e82e7220f270fce44055859b27a97740b6f012f4e51d0970acd38a7bcd40d9bc3c4f1ba1df0df4d3d38dac0b8731dfdfe1f902b07a38efeaea842587d2 SHA512 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705
+DIST aeson-2.0.3.0-rev1.cabal 5867 BLAKE2B c64638d037ee4599a15c2c2c051b569649f57663312aaebc10c2a47cf2dfd834d03e8e4c909d70874737fd407f46f75744052ebe9319cde8ef56e4676115dbe0 SHA512 54b3ed453d6ec93a73d4bb639132164e1ffa698e87076577da39137ec2bb62b0c1a2f66d9412e1adad97d7d6cc32a6738e0495b0c4d312c183d7a29d01a29784
+DIST aeson-2.0.3.0.tar.gz 297283 BLAKE2B e6784fd2081c56d6f2f2fb82b383478ab743fcce77568c430c2b62a79b4ee89901b7e278b1da948215215d50ef72bbdef128fb5dfb6679c92d30586d1406302e SHA512 546adaaf864ca40012a268d71f442479f0ad7c69e9f943391801570e227a2faa652494766f1f63b77c730e019e83ebdd7511426baa12792a28fbb470eca64552
+DIST aeson-2.1.2.1-rev3.cabal 6359 BLAKE2B d3e42c55def1ad014ad4d74b08385c462f6c9e5ddde40c0e248742e4123e58926a7e9fafeb3db3c1f98316bc3ce225430ec2571943c0ed50b206f6424fe5445a SHA512 2c7f2185c2c1e3506d6bc39ba096bcf9c6364b9437501c591b1accdbe081510a51bfe3a76e1fe63c40b093e263ac2eec8c4b58c31c93aed95918781e8a77b206
+DIST aeson-2.1.2.1.tar.gz 335908 BLAKE2B 73ca0e21006d68259c56313d99de897199526cd0d78f3d124d9f42e53bcd7498b3ac0abf5d1327ee64fcf29c7771186df88458a140eca21814ee4d77459b71ee SHA512 c7e3c5d61ac99b7e66a468cdcd0a20c9d0f42142b2398086aa1a3a992c60814c9d7505e4c15120fb00f0015ab1fb5592d6acdb31995e7af956f2867b95f12a40
diff --git a/dev-haskell/aeson/aeson-1.4.7.1.ebuild b/dev-haskell/aeson/aeson-1.4.7.1.ebuild
deleted file mode 100644
index cbb99b44a856..000000000000
--- a/dev-haskell/aeson/aeson-1.4.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -developer,-bytestring-builder
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cffi fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
- >=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
- >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
- >=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
- >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/base-compat
- >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
- dev-haskell/base16-bytestring
- >=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
- >=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.14
- >=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
- >=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
- >=dev-haskell/quickcheck-2.10.0.1 <dev-haskell/quickcheck-2.14
- >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bytestring-builder \
- $(cabal_flag cffi cffi) \
- --flag=-developer \
- $(cabal_flag fast fast)
-}
diff --git a/dev-haskell/aeson/aeson-2.0.3.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
new file mode 100644
index 000000000000..2f374da46b2a
--- /dev/null
+++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -developer,-bytestring-builder,-fast
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast JSON parsing and encoding"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cffi +ordered-keymap"
+
+RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+ >=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+ >=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+ >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
+ >=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+ >=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.3:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ >=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/base-compat
+ >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
+ dev-haskell/base16-bytestring
+ >=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+ >=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.15
+ >=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
+ >=dev-haskell/quickcheck-instances-0.3.26.1 <dev-haskell/quickcheck-instances-0.4
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bytestring-builder \
+ $(cabal_flag cffi cffi) \
+ --flag=-developer \
+ --flag=-fast \
+ $(cabal_flag ordered-keymap ordered-keymap)
+}
diff --git a/dev-haskell/aeson/aeson-2.1.2.1.ebuild b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
new file mode 100644
index 000000000000..7d33c94268c2
--- /dev/null
+++ b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: -developer,-bytestring-builder,-fast
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast JSON parsing and encoding"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cffi +ordered-keymap"
+
+RESTRICT=test # one test case fails
+
+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.14:=[profile?]
+ >=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+ >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
+ >=dev-haskell/generically-0.1:=[profile?] <dev-haskell/generically-0.2:=[profile?]
+ >=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.4:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ >=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ || (
+ ( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+ cffi? (
+ <dev-haskell/text-2.0:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? (
+ dev-haskell/base-compat
+ >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.10
+ dev-haskell/base16-bytestring
+ >=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+ >=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.15
+ >=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
+ >=dev-haskell/quickcheck-instances-0.3.29 <dev-haskell/quickcheck-instances-0.4
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bytestring-builder \
+ $(cabal_flag cffi cffi) \
+ --flag=-developer \
+ --flag=-fast \
+ $(cabal_flag ordered-keymap ordered-keymap)
+}
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
index 8d64f5709b5b..91c30329a7a5 100644
--- a/dev-haskell/aeson/metadata.xml
+++ b/dev-haskell/aeson/metadata.xml
@@ -5,70 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A JSON parsing and encoding library optimized for ease of use
- and high performance.
-
- /Note/: if you use GHCi or Template Haskell, please see the
- @README@ file for important details about building this package,
- and other packages that depend on it:
- &lt;https://github.com/mailrank/aeson#readme&gt;
-
- Parsing performance on a late 2010 MacBook Pro (2.66GHz Core i7),
- for mostly-English tweets from Twitter's JSON search API:
-
- * 0.8 KB, 32-bit GHC 6.12.3: 30538 msg\/sec (24.9 MB\/sec)
-
- * 0.8 KB, 64-bit GHC 7.0.3: 31204 msg\/sec (25.4 MB\/sec)
-
- * 6.4 KB, 32-bit GHC 6.12.3: 6731 msg\/sec (42.3 MB\/sec)
-
- * 6.4 KB, 64-bit GHC 7.0.3: 6627 msg\/sec (41.7 MB\/sec)
-
- * 11.8 KB, 32-bit GHC 6.12.3: 3751 msg\/sec (43.2 MB\/sec)
-
- * 11.8 KB, 64-bit GHC 7.0.3: 3381 msg\/sec (38.9 MB\/sec)
-
- * 31.2 KB, 32-bit GHC 6.12.3: 1306 msg\/sec (39.8 MB\/sec)
-
- * 31.2 KB, 64-bit GHC 7.0.3: 1132 msg\/sec (34.5 MB\/sec)
-
- * 61.5 KB, 32-bit GHC 6.12.3: 616 msg\/sec (37.0 MB\/sec)
-
- * 61.5 KB, 64-bit GHC 7.0.3: 534 msg\/sec (32.1 MB\/sec)
-
- Handling heavily-escaped text is a little more work. Here is
- parsing performance with Japanese tweets, where much of the text
- is entirely Unicode-escaped.
-
- * 14.6 KB, 32-bit GHC 6.12.3: 2315 msg\/sec (33.1 MB\/sec)
-
- * 14.6 KB, 64-bit GHC 7.0.3: 1986 msg\/sec (28.4 MB\/sec)
-
- * 44.1 KB, 32-bit GHC 6.12.3: 712 msg\/sec (30.7 MB\/sec)
-
- * 44.1 KB, 64-bit GHC 7.0.3: 634 msg\/sec (27.3 MB\/sec)
-
- * 82.9 KB, 32-bit GHC 6.12.3: 377 msg\/sec (30.5 MB\/sec)
-
- * 82.9 KB, 64-bit GHC 7.0.3: 332 msg\/sec (26.9 MB\/sec)
-
- Encoding performance on the same machine and data:
-
- * English, 854 bytes: 43439 msg\/sec (35.4 MB/sec)
-
- * English, 6.4 KB: 7127 msg\/sec (44.8 MB/sec)
-
- * Engish, 61.5 KB: 765 msg\/sec (46.0 MB/sec)
-
- * Japanese, 14.6 KB: 4727 msg\/sec (67.5 MB/sec)
-
- * Japanese, 44.1 KB: 1505 msg\/sec (64.8 MB/sec)
-
- (A note on naming: in Greek mythology, Aeson was the father of Jason.)
- </longdescription>
<use>
<flag name="cffi">Controls whether to include c-ffi bits or pure haskell. Default to False for security.</flag>
- <flag name="fast">compile without optimizations</flag>
+ <flag name="ordered-keymap">Use ordered @Data.Map.Strict@ for KeyMap implementation.</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">aeson</remote-id>
+ <remote-id type="github">haskell/aeson</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/alex-tools/Manifest b/dev-haskell/alex-tools/Manifest
deleted file mode 100644
index f9e6e7c5d06b..000000000000
--- a/dev-haskell/alex-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alex-tools-0.4.tar.gz 4507 BLAKE2B 3475957bfe9eda85b53bd4a541cf4441b6eece6901834723c84e4e9877579e8b45258f045aece44ed0d1f17f17f3ab77ea61d56421f07b998bf0a5b7f69e915c SHA512 d4282acdd6f734e3077802d3e87588eaf704f449fb9a46cc330f17a067bb142d948b7c0ae430def970e0b4dc5caf533b226e02112bdc9a2b1c79b552d3abc681
diff --git a/dev-haskell/alex-tools/alex-tools-0.4.ebuild b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
deleted file mode 100644
index f1f30eb55b20..000000000000
--- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A set of functions for a common use case of Alex"
-HOMEPAGE="https://hackage.haskell.org/package/alex-tools"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.7 && <4.12' 'base >=4.7' \
- 'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0'
-}
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 350fc71f3556..7171c96ded47 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1 +1,3 @@
-DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
+DIST alex-13732056ff8d287f2ee0c4ecb968efe04516c890.tar.gz 103395 BLAKE2B 1254655ec480fe648238df6864d9623f0128bcdbcfca22f5b63e85b24183ece5e21ae8dc5e1a26c5f511233c420a33dc19a6fcbc2824ae56043ba75fc38e5d49 SHA512 5c7e9e0633ea4536fb4be981c123d42bc3ac035732ad5cb88d9f9b38199d13f7ef211f4e2f1fc475490019461bb56eafb702c3b4c61417dd1cc6c555c1a436d2
+DIST alex-3.2.7.1.tar.gz 108229 BLAKE2B 1c1c3488c6e0f559003de5edc1250afdd09098eb4da3414d8c461d03ee5f08b94f80e6f6d32366f6d8d0563a068ee8b2a1c9cb7b78bbbf0a1dcf3767ea448ffd SHA512 f8ff12de874b905449fdda0d704f9e4ac30fa3e60e965f82d7bb2d6e3974cf926f85134d32878c48faf0ec4a002ea7240cf6696e1cbcad25a0eebb9d1850cc07
+DIST alex-3.2.7.2.tar.gz 85450 BLAKE2B fcb752b24b475e5502b686dec717f613c7fbda8eeb3583f4807e419960479ddaea0e578e7ab81974e480ad9ecf59d8a0bf94341da72d247221e9d2905206641f SHA512 925c652883a12c3d271b212d1a83df15e98b3c8b5a70aecc91786db601101f9544722a04969bc4d84265910c1994cfb79fc6d50aa01a04604c4bb11735513a58
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.5.ebuild
deleted file mode 100644
index 3592bc74fd47..000000000000
--- a/dev-haskell/alex/alex-3.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- doc? ( ~app-text/docbook-xml-dtd-4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
- default
-
- if use doc; then
- cd "${S}/doc/"
- eautoreconf
- fi
-}
-src_configure() {
- # make sure we don't accidentally use those
- # installed in system
- haskell-cabal_src_configure \
- --with-alex=false \
- --with-happy=false \
- --flag=small_base
-
- if use doc; then
- cd "${S}/doc/"
- econf
- fi
-}
-
-src_compile() {
- haskell-cabal_src_compile
-
- if use doc; then
- emake -C "${S}/doc/" -j1
- fi
-}
-
-src_test() {
- # 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
- # 2. use freshly built ALEX= binary and datadir path
- alex_datadir="${S}"/data \
- emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
-}
-
-src_install() {
- haskell-cabal_src_install
-
- if use doc; then
- doman "${S}/doc/alex.1"
- docinto html
- dodoc -r "${S}/doc/alex/"
- fi
-}
diff --git a/dev-haskell/alex/alex-3.2.7.1.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
new file mode 100644
index 000000000000..c8cefbf899a3
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="https://www.haskell.org/alex/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ doc? ( ~app-text/docbook-xml-dtd-4.2
+ app-text/docbook-xsl-stylesheets
+ >=dev-libs/libxslt-1.1.2 )
+"
+
+src_prepare() {
+ default
+
+ if use doc; then
+ cd "${S}/doc/"
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ # make sure we don't accidentally use those
+ # installed in system
+ haskell-cabal_src_configure \
+ --with-alex=false \
+ --with-happy=false \
+ --flag=small_base
+
+ if use doc; then
+ cd "${S}/doc/"
+ econf
+ fi
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+
+ if use doc; then
+ emake -C "${S}/doc/" -j1
+ fi
+}
+
+src_test() {
+ # 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+ # 2. use freshly built ALEX= binary and datadir path
+ alex_datadir="${S}"/data \
+ emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+ haskell-cabal_src_install
+
+ if use doc; then
+ doman "${S}/doc/alex.1"
+ docinto html
+ dodoc -r "${S}/doc/alex/"
+ fi
+}
diff --git a/dev-haskell/alex/alex-3.2.7.2.ebuild b/dev-haskell/alex/alex-3.2.7.2.ebuild
new file mode 100644
index 000000000000..0b2e45036a1b
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.7.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="https://www.haskell.org/alex/"
+
+GIT_REPO="https://github.com/haskell/${PN}"
+GIT_COMMIT="13732056ff8d287f2ee0c4ecb968efe04516c890"
+GIT_P="${PN}-${GIT_COMMIT}"
+GIT_S="${WORKDIR}/${GIT_P}"
+SRC_URI+=" doc? (
+ ${GIT_REPO}/archive/${GIT_COMMIT}.tar.gz -> ${GIT_P}.tar.gz
+)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ doc? (
+ dev-python/sphinx
+ dev-python/sphinx-rtd-theme
+ )
+"
+src_prepare() {
+ if use doc; then
+ cp -a "${GIT_S}/doc/" "${S}" || die
+ eapply "${FILESDIR}/${PN}-3.2.7.2-fix-docs.patch"
+ fi
+
+ haskell-cabal_src_prepare
+}
+
+src_configure() {
+ # make sure we don't accidentally use those
+ # installed in system
+ haskell-cabal_src_configure \
+ --with-alex=false \
+ --with-happy=false \
+ --flag=small_base
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+
+ if use doc; then
+ emake -C "${S}/doc/" -j1
+ fi
+}
+
+src_test() {
+ # 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+ # 2. use freshly built ALEX= binary and datadir path
+ alex_datadir="${S}"/data \
+ emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+ haskell-cabal_src_install
+
+ if use doc; then
+ dodoc -r "${S}/doc/_build/html"
+ fi
+}
diff --git a/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch b/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch
new file mode 100644
index 000000000000..2ed25658754d
--- /dev/null
+++ b/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch
@@ -0,0 +1,46 @@
+From e461c3b0935a05a169aa22a1b113c08f8989eea6 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sat, 8 Apr 2023 12:18:36 -0600
+Subject: [PATCH 1/1] Fix documentation
+
+contributing.rst refers to a non-existant 'bug-fixes' doc
+
+conf.py refers to non-existant '_static' directory
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ doc/conf.py | 2 +-
+ doc/contributing.rst | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index ea3862d..718b0e6 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -49,7 +49,7 @@ html_theme = 'sphinx_rtd_theme'
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = ['_static']
++#html_static_path = ['_static']
+
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'sphinx'
+diff --git a/doc/contributing.rst b/doc/contributing.rst
+index 6df2865..e889b90 100644
+--- a/doc/contributing.rst
++++ b/doc/contributing.rst
+@@ -8,8 +8,8 @@ Contributing to Alex
+ Source Code Repository
+ ----------------------
+
+-Alex is hosted on `GitHub <https://github.com/haskell/alex>`__.
+-As previously discussed in `bug-reports`_, we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
++Alex is hosted on `GitHub <https://github.com/haskell/alex>`__,
++and we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
+ We also use `GitHub pull requests <https://github.com/haskell/alex/pulls>`__ for managing changes;
+ feel free to submit them!
+
+--
+2.39.2
+
diff --git a/dev-haskell/alex/metadata.xml b/dev-haskell/alex/metadata.xml
index 937381521944..fc9c458f8018 100644
--- a/dev-haskell/alex/metadata.xml
+++ b/dev-haskell/alex/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">alex</remote-id>
+ <remote-id type="github">haskell/alex</remote-id>
+ </upstream>
</pkgmetadata>
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 c94cd28992d4..f57ca6381068 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: +pkgconfig
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 564a44494d08..4e541f9e442e 100644
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
+++ b/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/alut/Manifest b/dev-haskell/alut/Manifest
deleted file mode 100644
index 4a4194d06fc4..000000000000
--- a/dev-haskell/alut/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ALUT-2.4.0.3.tar.gz 25587 BLAKE2B acdc2878748c322acb630e05a2712f73aecee2ab1d789fe338e15b86b758cf708b962a5268ae159a5ace12f8749e772c8b654cbe97a13ae90fc65b2ad51e193d SHA512 3ca21f4846618c197e4d7fec49f20e9964ffe9ef320fd0880a307743f9b2240b1fa4004da630e000bb2255cad42ed081ca47d84bf8dd1fca72d0cfbf818ecda1
diff --git a/dev-haskell/alut/alut-2.4.0.3.ebuild b/dev-haskell/alut/alut-2.4.0.3.ebuild
deleted file mode 100644
index a85bd82de5f4..000000000000
--- a/dev-haskell/alut/alut-2.4.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?]
- >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- media-libs/freealut
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.4.0.3-ghc-8.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples buildexamples) \
- --flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/alut/files/alut-2.4.0.3-ghc-8.patch b/dev-haskell/alut/files/alut-2.4.0.3-ghc-8.patch
deleted file mode 100644
index dd8a512d3efa..000000000000
--- a/dev-haskell/alut/files/alut-2.4.0.3-ghc-8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/examples/Basic/OpenALInfo.hs
-+++ b/examples/Basic/OpenALInfo.hs
-@@ -7,6 +7,7 @@
-
- import Text.PrettyPrint
- import Sound.ALUT
-+import Prelude hiding ((<>))
-
- -- This program prints some basic information about ALC and AL.
-
diff --git a/dev-haskell/alut/metadata.xml b/dev-haskell/alut/metadata.xml
deleted file mode 100644
index cf70ab7eb803..000000000000
--- a/dev-haskell/alut/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">haskell-openal/ALUT</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/annotated-wl-pprint/Manifest b/dev-haskell/annotated-wl-pprint/Manifest
deleted file mode 100644
index c44b061f57b1..000000000000
--- a/dev-haskell/annotated-wl-pprint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST annotated-wl-pprint-0.7.0.tar.gz 10338 BLAKE2B 3210f0ecde3e9689ea17c27210cb11a260c02b8db9dc285335c715330202918f5d22792a27ea5f89dd7946d8e6deac5911bc81ed8e207095426e82a07753e090 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a
diff --git a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
deleted file mode 100644
index 353aeb10d833..000000000000
--- a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer, with annotation support"
-HOMEPAGE="https://github.com/david-christiansen/annotated-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/annotated-wl-pprint/metadata.xml b/dev-haskell/annotated-wl-pprint/metadata.xml
deleted file mode 100644
index 898262c1fe5f..000000000000
--- a/dev-haskell/annotated-wl-pprint/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is a modified version of wl-pprint, which was based on Wadler's
- paper "A Prettier Printer". See the haddocks for full info. This
- version allows the library user to annotate the text with semantic
- information, which can later be rendered in a variety of ways.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ansi-terminal-types/Manifest b/dev-haskell/ansi-terminal-types/Manifest
new file mode 100644
index 000000000000..19ceb2e07a54
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/Manifest
@@ -0,0 +1,2 @@
+DIST ansi-terminal-types-0.11.5-rev1.cabal 1482 BLAKE2B a15dd696455d69c5685db41bfe48ecd9eceeecad0b84616a891202bd5ae4c3db6dc659343a522a785ad98a781d0689be9ea5f5dfa2109d117f8e1a238dcfe553 SHA512 ac36e6d542d70cfc440fcb675c3139879b480a2197559e3bb2b2f6d927370d8cfbc21d9005bca4d87b05ecd0c7c631fd1a941760f0b2d0151dd31d1bc93f48d1
+DIST ansi-terminal-types-0.11.5.tar.gz 4660 BLAKE2B 99acf20cead2bca1c293ed4ce9b89f8516416cfb6323d75c67c1f794e3ee04b2ed5783f324485903ce4f36542424412618de5c124f518d2dd3a272a5de3560be SHA512 a37ef258985f9979c0abcc5187cbccea3629b7c74ab52d57f61d0a1c6e4ea5a5bb5d1bcb5176ea5115afa55b6c6f09b75ad918a41b9c1420684845b8928ec070
diff --git a/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild b/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild
new file mode 100644
index 000000000000..e49b0cb4383a
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Types and functions used to represent SGR aspects"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/ansi-terminal-types/metadata.xml b/dev-haskell/ansi-terminal-types/metadata.xml
new file mode 100644
index 000000000000..c3b2a8511d2b
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">ansi-terminal-types</remote-id>
+ <remote-id type="github">UnkindPartition/ansi-terminal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index 6cf12dfd24d7..4e5302074e32 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1 +1,2 @@
DIST ansi-terminal-0.10.3.tar.gz 35863 BLAKE2B 8535a0dcfbf4287abee8c52cd951d155c30b8a2de73a4799ad51e093ff4651fd2bcc771a61627c143f2f48b7cc66e9bb125166be1b13d2d51bcdf1d1666450ee SHA512 231dfaaef2e7b1fb40a0e63bcdce984f914dd0c17af90bc2415c127d503dc438d1952dadfbb524f9ae83d872b30a353d875dda74eb492536cf8953c1e4224187
+DIST ansi-terminal-1.0.tar.gz 31745 BLAKE2B 8abca65206e9999ec18823da827466065d16d9f99f37310f852cde29159e3819b2bb9e3c64878271bd9412cf5377afc925267b372960627dad57cc70f6ef4037 SHA512 008b8d96b9ef128124aa094d5043ffbc4364a7441850ba98da620ab4dc5df8540736dc9f92abbe9097ee96a5f592723e5b14f9bbaa1ddfecf3af36cd46311b82
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 98a4b995a5ea..afe703125486 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="example"
RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild
new file mode 100644
index 000000000000..f540c0412d3c
--- /dev/null
+++ b/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -win32-2-13-1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple ANSI terminal support"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="example"
+
+RDEPEND="
+ ~dev-haskell/ansi-terminal-types-0.11.5:=[profile?]
+ >=dev-haskell/colour-2.1.0:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag example example) \
+ --flag=-win32-2-13-1
+}
diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml
index 496367aa108b..ae4ef182c883 100644
--- a/dev-haskell/ansi-terminal/metadata.xml
+++ b/dev-haskell/ansi-terminal/metadata.xml
@@ -5,14 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- ANSI terminal support for Haskell: allows cursor movement, screen clearing, color output showing or hiding the cursor, and
- changing the title. Compatible with Windows and those Unixes with ANSI terminals, but only GHC is supported as a compiler.
- </longdescription>
<use>
- <flag name="example">Build the example application.</flag>
+ <flag name="example">Build the example application</flag>
</use>
<upstream>
- <remote-id type="github">feuerbach/ansi-terminal</remote-id>
+ <remote-id type="hackage">ansi-terminal</remote-id>
+ <remote-id type="github">UnkindPartition/ansi-terminal</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 49f62e483b55..176387badfc5 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1 +1,3 @@
-DIST ansi-wl-pprint-0.6.8.2.tar.gz 16491 BLAKE2B dd0619b5ee9f043b225dcafdc7dc4f8b095ccd24644f03cd46c3596765ecb3c2eba7955f5cf4032664b9da9473ee508c59c4b18e7b30725ab81c00fa96e5f2ad SHA512 00c39dcdd90071011d2db6e196c472fddc61bf3ee4baed0414de1a1ef1e13801fceb647a718018e1a644d2276845af7bc58d5bf72dcb35d193ef6391ba2f8ac3
+DIST ansi-wl-pprint-0.6.9-rev3.cabal 2425 BLAKE2B ea9e5f58811e8ffcda756b73c8ef5c7507fc25ce183b4a6fa3872d703752a74ad8de63376b900d6b61b077be0af9099b2b3da3240b7267ae2f72bcd50d412e22 SHA512 f7af7c4adcf43ffa199bb71828442e9b99eecb1450ff966771ee0f3b9b249cb20e7d2a70d1c54955b2f162a1acf0b6912f7cee09f00686da31b6522f501c05bf
+DIST ansi-wl-pprint-0.6.9.tar.gz 16723 BLAKE2B c0ddfa0651ab8bc008546d3c5520cb85c3e7d7c676c634e89978de0a4e3d2927e4bce6337306b0d0d5821af3d0202eafea48e203c298e707b6b82b8a5c6404e6 SHA512 2a66236f740f0b45b6133555e8b1315dc85ece1c16dd51e4aa7f31d2fee03d66869af5f81e6383aa840f503c2cad46f3655f53b784ebca7b3480efb53eea2a04
+DIST ansi-wl-pprint-1.0.2.tar.gz 5699 BLAKE2B cd644c9a0cfc3d99470b3755e159b60faf4433132701aac9746425c38e40fc16c0fcf5405ebb05ed972e49194d90abbb0bb90a41bcdefc217e8664646964432e SHA512 2b6db1f25b180f53f2a81d2658d36f91d7b112aa242709e0693712ea6974cb0790ea56789678e714cd572ea226f2803484af572ae6fc7c4dc84536020701e3ac
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
deleted file mode 100644
index ca01de330e4b..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
- >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag example example)
-}
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0'
-}
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
new file mode 100644
index 000000000000..685e910d628e
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples example)
+}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild
new file mode 100644
index 000000000000..98c3fd2836cc
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+ >=dev-haskell/prettyprinter-compat-ansi-wl-pprint-1.0.2:=[profile?] <dev-haskell/prettyprinter-compat-ansi-wl-pprint-1.0.3:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ examples? (
+ dev-haskell/ansi-terminal:=[profile?]
+ dev-haskell/prettyprinter:=[profile?]
+ dev-haskell/prettyprinter-ansi-terminal:=[profile?]
+ dev-haskell/text:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples example)
+}
diff --git a/dev-haskell/ansi-wl-pprint/metadata.xml b/dev-haskell/ansi-wl-pprint/metadata.xml
index 316d5c90c5c1..65ffa89968bc 100644
--- a/dev-haskell/ansi-wl-pprint/metadata.xml
+++ b/dev-haskell/ansi-wl-pprint/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This is a pretty printing library based on Wadler's paper "A Prettier Printer". It has been enhanced with support for ANSI terminal colored output using the ansi-terminal package.
- </longdescription>
- <use>
- <flag name="example">Build the example application.</flag>
- </use>
<upstream>
- <remote-id type="github">batterseapower/ansi-wl-pprint</remote-id>
+ <remote-id type="hackage">ansi-wl-pprint</remote-id>
+ <remote-id type="github">ekmett/ansi-wl-pprint</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild
index eda1f1780826..24b4ad8aa020 100644
--- a/dev-haskell/appar/appar-0.1.8.ebuild
+++ b/dev-haskell/appar/appar-0.1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/argparser/Manifest b/dev-haskell/argparser/Manifest
deleted file mode 100644
index 337cc1b01a4d..000000000000
--- a/dev-haskell/argparser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST argparser-0.3.4.tar.gz 14562 BLAKE2B d3c8fa436f9cc63f5d344423b88290363eab401cc82b53ebd0a638e1020031c4994aa0d5e10b1868579e8a0f6beed7df2a908a834e735179546d10a85358692e SHA512 c7aa03426e42df57ea02ad86d044624ce8e7c0e5b3ce124434fa64a172c8dbf70001e1353b9d3bb15ad780535adc8c0426939d1b26e52a7c51b17987fc72d7d7
diff --git a/dev-haskell/argparser/argparser-0.3.4.ebuild b/dev-haskell/argparser/argparser-0.3.4.ebuild
deleted file mode 100644
index 70926277cfdc..000000000000
--- a/dev-haskell/argparser/argparser-0.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing files
-inherit haskell-cabal
-
-DESCRIPTION="Command line parsing framework for console applications"
-HOMEPAGE="https://hackage.haskell.org/package/argparser"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/argparser/metadata.xml b/dev-haskell/argparser/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/argparser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
deleted file mode 100644
index 791a6acbe9ac..000000000000
--- a/dev-haskell/arithmoi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arithmoi-0.11.0.1.tar.gz 188071 BLAKE2B 0958f4dc0ac1f37a02c9c5e4908ba8a29df3aafe4e060c79076c9c86d9ed11242ab19aa6a4c7dd732fd620b0513b1056d70fcc984dfa3d6b6a5ef99f7e887728 SHA512 8140d9b035290faf9aa044f11f42c101e4a02f1346d5237f46338355828bb6b8bf44f3f8454abfaa6a88e381c2e5476d8512c6edf251dbaf8ba3d776ea68a641
diff --git a/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild b/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild
deleted file mode 100644
index 96a95a839f5e..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/Bodigrim/arithmoi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/chimera-0.3:=[profile?]
- dev-haskell/constraints:=[profile?]
- >=dev-haskell/exact-pi-0.5:=[profile?]
- >=dev-haskell/integer-logarithms-1.0:=[profile?]
- >=dev-haskell/integer-roots-1.0:=[profile?]
- dev-haskell/mod:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/semirings-0.5.2:=[profile?]
- >=dev-haskell/vector-0.12:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( >=dev-haskell/quickcheck-2.10
- >=dev-haskell/quickcheck-classes-0.6.3
- >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11
- >=dev-haskell/tasty-rerun-1.1.17
- >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-check-bounds
-}
diff --git a/dev-haskell/arithmoi/metadata.xml b/dev-haskell/arithmoi/metadata.xml
deleted file mode 100644
index 310f1bcfde42..000000000000
--- a/dev-haskell/arithmoi/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library of basic functionality needed for
- number-theoretic calculations. The aim of this library
- is to provide efficient implementations of the functions.
- Primes and related things (totients, factorisation),
- powers (integer roots and tests, modular exponentiation),
- integer logarithms.
- Note: Requires GHC &gt;= 6.12 with the integer-gmp package
- for efficiency. Portability is on the to-do list (with
- low priority, however).
- </longdescription>
- <upstream>
- <remote-id type="github">cartazio/arithmoi</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
deleted file mode 100644
index 412bb2b74664..000000000000
--- a/dev-haskell/arrows/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arrows-0.4.4.2.tar.gz 12701 BLAKE2B b8654f3a4a2b86dba64ccd307d6344522d9622989b5d0c0394dc534a994dcd11867aa15702d16ea330c5772931e0fd8dbcb140124ddee8a7713fd208004edcb3 SHA512 596d5433c49bd20960533f6d773af7d07ae71f90dd2badc426ba1fba473bf28e29308861f1f7b7c3fc775e968cbd02bb421342258f77028ac41185d41970f64a
diff --git a/dev-haskell/arrows/arrows-0.4.4.2.ebuild b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
deleted file mode 100644
index c06833f1abd9..000000000000
--- a/dev-haskell/arrows/arrows-0.4.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Arrow classes and transformers"
-HOMEPAGE="https://www.haskell.org/arrows/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stream:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/arrows/metadata.xml b/dev-haskell/arrows/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/arrows/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ascii-progress/Manifest b/dev-haskell/ascii-progress/Manifest
deleted file mode 100644
index f1fe76d05808..000000000000
--- a/dev-haskell/ascii-progress/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ascii-progress-0.3.3.0.tar.gz 6585 BLAKE2B 660f9721eda21a77e8fe9e39e16b51ab9176dd211b9c44ef0bf249414a4ffd6035203734e07dcce51bd2c0d74a6ab1e760cd3f48b25b454f4136f65eb379dcfa SHA512 766ff51ae441a7e7016d4016dbef6e6b1fea9e9f9b66f7bc622f8d977123a046aa03bf87fddb90b4439f8ec2939dd9a00f345c732a780027e294b42489dd61c3
diff --git a/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild b/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild
deleted file mode 100644
index dbd2155e3330..000000000000
--- a/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A simple progress bar for the console"
-HOMEPAGE="https://github.com/yamadapc/haskell-ascii-progress"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/async-2.0.1.5:=[profile?]
- >=dev-haskell/concurrent-output-1.7:=[profile?]
- >=dev-haskell/data-default-0.5.3:=[profile?]
- >=dev-lang/ghc-7.6.1:=
- examples? ( >=dev-haskell/conduit-1.2:=[profile?]
- dev-haskell/http:=[profile?]
- >=dev-haskell/http-conduit-2.1:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3
- >=dev-haskell/quickcheck-2.6 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples examples)
-}
diff --git a/dev-haskell/ascii-progress/metadata.xml b/dev-haskell/ascii-progress/metadata.xml
deleted file mode 100644
index 6afb78dde73c..000000000000
--- a/dev-haskell/ascii-progress/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A simple Haskell progress bar for the console. Heavily borrows from TJ
- Holowaychuk's Node.JS project
- &lt;https://github.com/tj/node-progress progress&gt;
-
- &lt;https://github.com/yamadapc/haskell-ascii-progress github&gt;
- </longdescription>
- <upstream>
- <remote-id type="github">yamadapc/haskell-ascii-progress</remote-id>
- </upstream>
-</pkgmetadata>
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 6157709240c4..0c343d8d18e9 100644
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 82d27ddeea93..c23dee5ce33e 100644
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
index 0c9f6a0fa01a..28fbedd10480 100644
--- a/dev-haskell/asn1-types/Manifest
+++ b/dev-haskell/asn1-types/Manifest
@@ -1 +1,2 @@
DIST asn1-types-0.3.3.tar.gz 6478 BLAKE2B 3ed6229e8eb1215e47dbbe6791598744ab99a8613c3c5401a504a88f84d9ed82170b2372a19935458d619eb28d9e633d3d5cec324c453b5b67e50a95af2b730b SHA512 d83fca6d585103f7d112a314bfa4da98bf055cbc7541b55717db6260295fcb7dd96d1ac9a25e39ea31881f1a8454d19ed004d59f3c20118b26ef155a99ec5278
+DIST asn1-types-0.3.4.tar.gz 6472 BLAKE2B 429381cd73b1ce99f0ca73f95d767eed6b0286cde2c95605427547eaa7cd81a72fa1c72cfb562dcb253f3acb15c71a445e516d6901436c3eabc643353b1a5807 SHA512 0c2b76f134a77da65ecaa797d92b2ee273a72e9bd4467d354012c2b584216cdf2084974393fa4b850207720a3e0801d4a5af5f15137574ff1d7a341c5014184d
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 e1e050ef0dde..83b3ca1d397b 100644
--- a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
+++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hourglass:=[profile?]
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild
new file mode 100644
index 000000000000..5f7ea1e863d3
--- /dev/null
+++ b/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN.1 types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/assoc/Manifest b/dev-haskell/assoc/Manifest
new file mode 100644
index 000000000000..e17310607d2b
--- /dev/null
+++ b/dev-haskell/assoc/Manifest
@@ -0,0 +1,2 @@
+DIST assoc-1.0.2.tar.gz 3047 BLAKE2B 07f409ce555ac5f041d83db94829638e00ec50175499d42263f19570bc9f58788522ba4edc058450e90912b75aa21f7bfbdcd054cd5025a4aa0cb88b74020c9d SHA512 20fd0056dcc2dff9504e090be5c2ef27692a795133620e60b9382cfdfbaf26d1019617acf48f0f762e22d699068bc4dbd35a714177ce3a36761c0065708b9168
+DIST assoc-1.1.tar.gz 3193 BLAKE2B fd5a68cc7040a48c7a5c4b8e3e525d92dff9e3f3a03b0fa8b3e7eada2aafbaf92a0fbed671935b3192b8a5b3a5a8e903be63715ceecca7fb6d00c80adfabd251 SHA512 1ce6f3ca4ce9de3457b07ef995ec1819b0013bf90ee20c97ef7152b164c6751ea7f435ae28e4b55e9976ffa720aed7e2491daf5254480dd4b980e23d3420e9bb
diff --git a/dev-haskell/assoc/assoc-1.0.2.ebuild b/dev-haskell/assoc/assoc-1.0.2.ebuild
new file mode 100644
index 000000000000..78322c8ab38b
--- /dev/null
+++ b/dev-haskell/assoc/assoc-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="swap and assoc: Symmetric and Semigroupy Bifunctors"
+HOMEPAGE="https://hackage.haskell.org/package/assoc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-5.5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+"
+
+CABAL_CHDEPS=(
+ 'base >=4.3 && <4.15' 'base >=4.3'
+)
diff --git a/dev-haskell/assoc/assoc-1.1.ebuild b/dev-haskell/assoc/assoc-1.1.ebuild
new file mode 100644
index 000000000000..da591fd067ca
--- /dev/null
+++ b/dev-haskell/assoc/assoc-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="swap and assoc: Symmetric and Semigroupy Bifunctors"
+HOMEPAGE="https://hackage.haskell.org/package/assoc"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+ tagged? (
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/assoc/metadata.xml b/dev-haskell/assoc/metadata.xml
new file mode 100644
index 000000000000..36be56b76ead
--- /dev/null
+++ b/dev-haskell/assoc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">assoc</remote-id>
+ <remote-id type="github">phadej/assoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index c12ebc6df2aa..55c58a488c27 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1 +1,2 @@
-DIST async-2.2.2.tar.gz 12927 BLAKE2B a0fa95525153e1065888072d4c7590a6184fbbedd957d0a7867235414681c9959be385a75007160d50fb3a9e015c83651175c4399f24b7a0d981cfbe0f8bf250 SHA512 6984c74b76dc1db73363ca2e360d2be6f2e7b4de5c7de452c4df7ee996b2256790a8cecb532af6d7d675541315a16f8e4ce566c5f79e4102e4a857f057e2d811
+DIST async-2.2.4-rev3.cabal 3112 BLAKE2B f6ba4c03655f37c60e45a5033b7d5a5c229e7db42544e9a960068d9c8852b1731f9907f7df2e554b3e461e1aba49cc8569eb74dda34b7b7874959165c3e86d05 SHA512 607f99484695767eb69b8650247cc6ca9a9d5e74eafa81d42dc01aa735dd2e6eec3021fbc232cafc4573e630f981ab31e090c6de04b99e2f0d450ea664dca3ea
+DIST async-2.2.4.tar.gz 14148 BLAKE2B c47e47a4bbe98d05bdd6b8ad89888013643f36ea5ede8af306b98749cec3cf9c3e87330339af4152cf7e84f5b9ced39c1eb69079921d4c0b7c993191bc052c2d SHA512 24f37f974dd7573138475d04c0fccb97fcbd8b3de56f7d06199b8f936fd9a29cd0ba0574212a753a81de8958b3292ecee79d0e8d0d2f51eb91874424e6219569
diff --git a/dev-haskell/async/async-2.2.2.ebuild b/dev-haskell/async/async-2.2.2.ebuild
deleted file mode 100644
index 56eecdbe0d44..000000000000
--- a/dev-haskell/async/async-2.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bench
-}
diff --git a/dev-haskell/async/async-2.2.4-r1.ebuild b/dev-haskell/async/async-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..2b522272e173
--- /dev/null
+++ b/dev-haskell/async/async-2.2.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -bench
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/simonmar/async"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/hunit
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bench
+}
diff --git a/dev-haskell/async/metadata.xml b/dev-haskell/async/metadata.xml
index e34a2487ed0f..fadb019c43bb 100644
--- a/dev-haskell/async/metadata.xml
+++ b/dev-haskell/async/metadata.xml
@@ -3,51 +3,10 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides a higher-level interface over
- threads, in which an @Async a@ is a concurrent
- thread that will eventually deliver a value of
- type @a@. The package provides ways to create
- @Async@ computations, wait for their results, and
- cancel them.
-
- Using @Async@ is safer than using threads in two
- ways:
-
- * When waiting for a thread to return a result,
- if the thread dies with an exception then the
- caller must either re-throw the exception
- ('wait') or handle it ('waitCatch'); the
- exception cannot be ignored.
-
- * The API makes it possible to build a tree of
- threads that are automatically killed when
- their parent dies (see 'withAsync').
-
- Changes in 2.0.1.3:
-
- * Bump @base@ dependency to allow 4.6
-
- Changes in 2.0.1.2:
-
- * Bump @stm@ dependency to 2.4
-
- Changes in 2.0.1.1:
-
- * Safe Haskell support: @Control.Concurrent.Async@ is now @Trustworthy@
-
- Changes in 2.0.1.0:
-
- * Added a @Functor@ instance for @Async@
-
- * Added @asyncBound@, @asyncOn@, @asyncWithUnmask@, @asyncOnWithUnmask@, @withAsyncBound@, @withAsyncOn@, @withAsyncWithUnmask@, @withAsyncOnWithUnmask@.
-
- * Added @mapConcurrently@
-
- * Added @Concurrently@ (with @Applicative@ and @Alternative@ instances)
- </longdescription>
<upstream>
+ <remote-id type="hackage">async</remote-id>
<remote-id type="github">simonmar/async</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index 58a9046fbf9f..f6726618f84e 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -1 +1 @@
-DIST atomic-primops-0.8.3.tar.gz 34880 BLAKE2B 44bda52c0e6f52fe6663f70b4f55b630fe89bb12e41f50134b54f51524a9f839aacf65e658cba72f8071a188db7b6b09ab81ccfaf95354d52dfe2a5b39befff6 SHA512 c92371741ea6e0a0208d539abea73c53269b155f3dc84ebea7b20afab5882852756a0c15fdc309c9a9d6ad575589d8f8a99adb9117bbe3d7465d97b17af08b09
+DIST atomic-primops-0.8.4.tar.gz 33639 BLAKE2B 5293b6f839599fe7a47c8f3f13a03df12fe8a5d7223a4b488a86b7f1f2c208ecd01f75acf7378668b4f91046221d9076875e05ca2611bb51d6ff1ad7a2e0d8f6 SHA512 a9e873e6f4eba26541d370c5ee3b81b518a1bf0f54d303d26a2065ba47eac7db1366436661b108c0648503386ffb9cb121567236c9635bf30d4e523a2d63a8b4
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
deleted file mode 100644
index 1c12a46173f3..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
new file mode 100644
index 000000000000..40072d8e285b
--- /dev/null
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
+HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag debug debug)
+}
diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml
index 6bed7c28c7bf..e7eb4b93a250 100644
--- a/dev-haskell/atomic-primops/metadata.xml
+++ b/dev-haskell/atomic-primops/metadata.xml
@@ -5,15 +5,22 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <use>
+ <flag name="debug">Enable extra internal checks.</flag>
+ </use>
<longdescription>
- After GHC 7.4 a new `casMutVar#` primop became available, but it's
+ After GHC 7.4 a new `casMutVar#` primop became available, but it&#39;s
difficult to use safely, because pointer equality is a highly
unstable property in Haskell. This library provides a safer method
- based on the concept of "Tickets".
+ based on the concept of &quot;Tickets&quot;.
- Also, this library uses the "foreign primop" capability of GHC to
+ Also, this library uses the &quot;foreign primop&quot; capability of GHC to
add access to other variants that may be of
interest, specifically, compare and swap inside an array.
+
+ Note that as of GHC 7.8, the relevant primops have been included in GHC itself.
+ This library is engineered to work pre- and post-GHC-7.8, while exposing the
+ same interface.
</longdescription>
<upstream>
<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
diff --git a/dev-haskell/attoparsec-aeson/Manifest b/dev-haskell/attoparsec-aeson/Manifest
new file mode 100644
index 000000000000..ef6b1a022ecf
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/Manifest
@@ -0,0 +1 @@
+DIST attoparsec-aeson-2.1.0.0.tar.gz 1484 BLAKE2B 11f65f27998f854c620f6fd196c2965d098427a81868fdd6aeb8654afb7e6489c5948b29a56946abfd7a24255a4a0dd15ee317e59e6a3e651f7b6d702a17f638 SHA512 9923fa28399257a79a52ae027ff839bf7c4f9c30560790064ffc42fd372a611d55a7f3630cf094825637cf32c7dff18a8ad02294a5c811e445cfee0a1197dd58
diff --git a/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild b/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild
new file mode 100644
index 000000000000..e84b4ba3d3fd
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of aeson's Value with attoparsec"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/attoparsec-aeson/metadata.xml b/dev-haskell/attoparsec-aeson/metadata.xml
new file mode 100644
index 000000000000..d1697fabc99e
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">attoparsec-aeson</remote-id>
+ <remote-id type="github">haskell/aeson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/attoparsec-conduit/Manifest b/dev-haskell/attoparsec-conduit/Manifest
deleted file mode 100644
index 5c47d543bbd3..000000000000
--- a/dev-haskell/attoparsec-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST attoparsec-conduit-1.1.0.tar.gz 1210 BLAKE2B b2a02358ff9516971d1abcca57c3c6e2eb9b83f83af3bbd9ed3b89af4977329fbf7dc9b776cef7383715d7911cfde0df41601aff07d50160c1bb3b463f3eedb6 SHA512 7a883b25cc1bfed03a35593927d51dba920fca8d29e610adb7a409807867241847583f68550cc1344a2e333639a703db860ac6c8f6e19f36595a9001e9334472
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
deleted file mode 100644
index 922d4df188ad..000000000000
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Consume attoparsec parsers via conduit. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/attoparsec-conduit/metadata.xml b/dev-haskell/attoparsec-conduit/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/attoparsec-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-enumerator/Manifest b/dev-haskell/attoparsec-enumerator/Manifest
deleted file mode 100644
index c7f5c7482e4a..000000000000
--- a/dev-haskell/attoparsec-enumerator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST attoparsec-enumerator-0.3.4.tar.gz 2485 BLAKE2B e5d290228bec79723b4693e1c6e56e318483e2c60fd226022fc968903cbfd25ca6b8f09a2a4376c1671b3bd2dbf72e35f1a9f39e1d0ac8187e3e9b71f0c37744 SHA512 caf6bc858c9c0f41f3ec332cf4149bdc9233cad112579eb79a20dff1893994cee365c2863a47a72fef8d30aaab1d30b506b98c3a8b8429c461811f717c8fd31d
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
deleted file mode 100644
index 566c5d2c8ee6..000000000000
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pass input from an enumerator to an Attoparsec parser"
-HOMEPAGE="https://john-millikin.com/software/attoparsec-enumerator/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest
index 0e4a91f5164e..b663c7854dcd 100644
--- a/dev-haskell/attoparsec-iso8601/Manifest
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -1 +1,3 @@
-DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
+DIST attoparsec-iso8601-1.0.2.1.tar.gz 4457 BLAKE2B f613d95643c53cc01061e0ee88c1bc42a05d3b9d5f60993b1a3744b09ff74a2d039bd5c75e23696ba0c6953227dd9bcd47cbdd4be719448698cfb9774b8600a6 SHA512 7be279057d0338c5825f5a9d578df23364325e274334d0cca37a4cba6a3a626202994fa284f529b08c3e1067278f6a1fbabbcaf2769a845efdaa05605ed4a6e0
+DIST attoparsec-iso8601-1.1.0.0-rev1.cabal 1402 BLAKE2B c039631ec6d84035997dd470a9e57b834ca2708cc3b05c52bf0aed2cd62c79ba4adadb5283f7228134b8e23c98f9124c9a7fb201f77ce02e748788182e2d6c92 SHA512 551b71c88fb410d84bd284818c7882850a6916eb3ddb63eb8e1cec7bd1181275241f1f502ad59bf07eb07c39662fed5a2edade0ec83e9580791d044afd2d8477
+DIST attoparsec-iso8601-1.1.0.0.tar.gz 5564 BLAKE2B 8e4a5e43e38f5c9f1f052b4c9d25988d70c2b2b23a0a9d7df2d1158c8fe6e3c64a5453ff6b053301352816593a4c2f441723f1da826a64e9c346b3d99c7dd8bf SHA512 4613c2e1b492c4ebf30d1788e8b067592e507e226bd85caacc1844d5a486c1b9c8727117e426763122836205b7341b8603ac15566facd3f0338b55e784f4dfe0
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
deleted file mode 100644
index e7b5c6dd1290..000000000000
--- a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -developer -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
- >=dev-haskell/base-compat-0.9.1:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
- cabal_chdeps \
- 'base-compat >= 0.9.1 && < 0.11' 'base-compat >= 0.9.1'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag developer developer) \
- --flag=-developer -fast \
- $(cabal_flag fast fast)
-}
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
new file mode 100644
index 000000000000..d1abf2973fd2
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer,+fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
+HOMEPAGE="https://github.com/haskell/aeson"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer \
+ --flag=fast
+}
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild
new file mode 100644
index 000000000000..9b0f0f390a57
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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.14:=[profile?]
+ >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3.0.0 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/attoparsec-iso8601/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml
index 8ca0c5599269..9623d88b74f5 100644
--- a/dev-haskell/attoparsec-iso8601/metadata.xml
+++ b/dev-haskell/attoparsec-iso8601/metadata.xml
@@ -5,8 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="developer">operate in developer mode</flag>
- <flag name="fast">compile without optimizations</flag>
- </use>
+ <upstream>
+ <remote-id type="hackage">attoparsec-iso8601</remote-id>
+ <remote-id type="github">haskell/aeson</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index d9917fc007b9..878932895f29 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -1 +1,2 @@
-DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
+DIST attoparsec-0.14.4-rev4.cabal 5679 BLAKE2B d03ea52e19bc1e07da35f298245e613040f26d45b63322bc7995566802f71ec9d8aca05d96abc0585e06006053413abe5e58590bcd4fbfe1b13583d8e80788d3 SHA512 b879016ea2ff3ebb7b92d39282d48735d2d063ca94dc7cb6552a4d34607afe778876771911c844bd88cad6065aeb2ab85b7e41bbc8d4f1fe9de205af1a77db56
+DIST attoparsec-0.14.4.tar.gz 160701 BLAKE2B eb7094b0e1b064f5b10c198950b33a085722ee22bd6f0036c8e53aa5475f1b40fe08d528ec3afd547b13cd5712a51e5bcb86a8465a59174a35d603b3f9c13a0a SHA512 48aa7743b24def2db7041e3e0189d9844194c42b5d216ff5060806a80eb550200ddcb11e9321a910ac4881ffdd7381d80a4b88a73acfb29209c650eababb925b
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
deleted file mode 100644
index 20e44cf82d48..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QC-2.10 finds contradiction
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/text-1.1.1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild
new file mode 100644
index 000000000000..0ea6ec5604e8
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -developer
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bgamari/attoparsec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+ dev-haskell/quickcheck-unicode
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-quickcheck-0.8
+ dev-haskell/vector
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer
+}
diff --git a/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
new file mode 100644
index 000000000000..d1a1be678f48
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bgamari/attoparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+# dev-haskell/quickcheck-unicode
+# >=dev-haskell/tasty-0.11
+# >=dev-haskell/tasty-quickcheck-0.8
+# dev-haskell/vector )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer
+}
diff --git a/dev-haskell/attoparsec/metadata.xml b/dev-haskell/attoparsec/metadata.xml
index c6df28c11857..90b0090fc01f 100644
--- a/dev-haskell/attoparsec/metadata.xml
+++ b/dev-haskell/attoparsec/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A fast parser combinator library, aimed particularly at dealing
- efficiently with network protocols and complicated text/binary
- file formats.
- </longdescription>
<upstream>
- <remote-id type="github">bos/attoparsec</remote-id>
+ <remote-id type="hackage">attoparsec</remote-id>
+ <remote-id type="github">bgamari/attoparsec</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/authenticate-oauth/Manifest b/dev-haskell/authenticate-oauth/Manifest
deleted file mode 100644
index bd99a05472ed..000000000000
--- a/dev-haskell/authenticate-oauth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST authenticate-oauth-1.6.0.1.tar.gz 9470 BLAKE2B 9326a4dfeeaede4d9b69e7f92be66b7d3f4d74fab30fdeb3e63e7741f33d5ec68f287b35a4c7a424084aa693881c9e23b78fd2f7ebb1c1a32073cef7e23d7078 SHA512 b2a6310097a6edc5bd3c38052a2eca73d3f398c0b9ff4b8f1d43a1f4dc83b7297df12f3fc0bfdecfce17e600f90b13c4c9e3f31c02b17d7fec0134a34c093fd6
diff --git a/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild b/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
deleted file mode 100644
index 4494268101f2..000000000000
--- a/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library to authenticate with OAuth for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/http-client-0.3:=[profile?]
- >=dev-haskell/http-types-0.6:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?]
- >=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/authenticate-oauth/metadata.xml b/dev-haskell/authenticate-oauth/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/authenticate-oauth/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/authenticate/Manifest b/dev-haskell/authenticate/Manifest
deleted file mode 100644
index a484ef9a9379..000000000000
--- a/dev-haskell/authenticate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST authenticate-1.3.5.tar.gz 8817 BLAKE2B cfd9a4e9f8a6d4f76cb3c3e1e496c8eafbc5b675cc14b38463bb4175d3bcab86d1561a3434f6638062905e9bf3543f689cae5b4510283bb4da3c513a56014510 SHA512 12962fcf71c732a7e709e7069d46691917b9ee9f2af6aab5556b76a4556b6ffc39e52082a4fcdbe501c2cbc7cc496b1164b6a9f2c3883597fcdd0a8298d4ac1a
diff --git a/dev-haskell/authenticate/authenticate-1.3.5.ebuild b/dev-haskell/authenticate/authenticate-1.3.5.ebuild
deleted file mode 100644
index 5f168e7885e2..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/case-insensitive-0.2:=[profile?]
- >=dev-haskell/conduit-0.5:=[profile?]
- >=dev-haskell/html-conduit-1.3:=[profile?]
- >=dev-haskell/http-conduit-1.5:=[profile?]
- >=dev-haskell/http-types-0.6:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/metadata.xml b/dev-haskell/authenticate/metadata.xml
deleted file mode 100644
index 7c5409a507bf..000000000000
--- a/dev-haskell/authenticate/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package</flag>
- </use>
- <upstream>
- <remote-id type="github">yesodweb/authenticate</remote-id>
- </upstream>
-</pkgmetadata>
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 576e43979d73..6fdca292797a 100644
--- a/dev-haskell/auto-update/auto-update-0.1.6.ebuild
+++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index f7b3eacc87cf..5847acb0bd11 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1 +1,3 @@
+DIST aws-0.22-rev3.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
+DIST aws-0.24.tar.gz 106782 BLAKE2B 3e9feb13f3e21577c0bf9969865f3475c40e466a2377cd659171166e6b9727b6c501f4a31b7de4720fc6a0ec4d4b266732e3c2eb34d0b4bb38527a6babfebe4a SHA512 d453ea185a47b0fb93d2e8849ea81e1b0bae081aa81d280f94618d8fb357b6e4b71a43a6c8df0e4ba2b64390346daf50672ed9f9849cc6737a5ae58b5ac52af8
diff --git a/dev-haskell/aws/aws-0.22-r1.ebuild b/dev-haskell/aws/aws-0.22-r1.ebuild
deleted file mode 100644
index d5a5b18362a0..000000000000
--- a/dev-haskell/aws/aws-0.22-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: networkbsd:network-3
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-3 examples"
-
-RESTRICT=test # requires aws account
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
- >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
- >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
- >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
- >=dev-haskell/cryptonite-0.11:=[profile?]
- >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
- >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?]
- >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- examples? ( >=dev-haskell/errors-2.0:=[profile?] )
- network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
- >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
- !network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/aeson-0.7
- >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7
- >=dev-haskell/lifted-base-0.2
- >=dev-haskell/mtl-2.1
- >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.8
- >=dev-haskell/tasty-hunit-0.8
- >=dev-haskell/tasty-quickcheck-0.8
- >=dev-haskell/text-1.1
- >=dev-haskell/transformers-base-0.4
- !examples? ( >=dev-haskell/errors-2.0 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples examples) \
- $(cabal_flag network-3 networkbsd)
-}
diff --git a/dev-haskell/aws/aws-0.22-r5.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild
new file mode 100644
index 000000000000..5467613144fc
--- /dev/null
+++ b/dev-haskell/aws/aws-0.22-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +networkbsd
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+ >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+ >=dev-haskell/cryptonite-0.11:=[profile?]
+ >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+ >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/monad-control-0.3:=[profile?]
+ >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+ >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+ >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-haskell/vector-0.10:=[profile?]
+ >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-aeson-2.patch )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples examples) \
+ --flag=networkbsd
+}
diff --git a/dev-haskell/aws/aws-0.24.ebuild b/dev-haskell/aws/aws-0.24.ebuild
new file mode 100644
index 000000000000..acd4e2c2fe01
--- /dev/null
+++ b/dev-haskell/aws/aws-0.24.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: +networkbsd
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-2.0.0.0:=[profile?]
+ >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+ >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+ >=dev-haskell/cryptonite-0.11:=[profile?]
+ >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+ >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/monad-control-0.3:=[profile?]
+ >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+ >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+ >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-haskell/vector-0.10:=[profile?]
+ >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.8
+ >=dev-haskell/lifted-base-0.2
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.8
+ >=dev-haskell/tasty-hunit-0.8
+ >=dev-haskell/tasty-quickcheck-0.8
+ >=dev-haskell/transformers-base-0.4
+ !examples? ( >=dev-haskell/errors-2.0 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples examples) \
+ --flag=networkbsd
+}
diff --git a/dev-haskell/aws/files/aws-0.22-aeson-2.patch b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
new file mode 100644
index 000000000000..25d5966ed0a7
--- /dev/null
+++ b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
@@ -0,0 +1,185 @@
+From 7af7586c5d244d07f77d49e5fdc739e6e8e54816 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joeyh@joeyh.name>
+Date: Mon, 18 Oct 2021 14:35:30 -0400
+Subject: [PATCH] build with aeson 2
+
+---
+ Aws/DynamoDb/Commands/Table.hs | 4 +--
+ Aws/DynamoDb/Commands/UpdateItem.hs | 5 ++--
+ Aws/DynamoDb/Core.hs | 39 +++++++++++++++--------------
+ aws.cabal | 2 +-
+ 4 files changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/Aws/DynamoDb/Commands/Table.hs b/Aws/DynamoDb/Commands/Table.hs
+index 5fb42e0..a5fe025 100644
+--- a/Aws/DynamoDb/Commands/Table.hs
++++ b/Aws/DynamoDb/Commands/Table.hs
+@@ -35,9 +35,9 @@ module Aws.DynamoDb.Commands.Table
+ import Control.Applicative
+ import Data.Aeson ((.!=), (.:), (.:?), (.=))
+ import qualified Data.Aeson as A
++import qualified Data.Aeson.KeyMap as KM
+ import qualified Data.Aeson.Types as A
+ import Data.Char (toUpper)
+-import qualified Data.HashMap.Strict as M
+ import Data.Scientific (Scientific)
+ import qualified Data.Text as T
+ import Data.Time
+@@ -281,7 +281,7 @@ data TableDescription
+
+ instance A.FromJSON TableDescription where
+ parseJSON = A.withObject "Table must be an object" $ \o -> do
+- t <- case (M.lookup "Table" o, M.lookup "TableDescription" o) of
++ t <- case (KM.lookup "Table" o, KM.lookup "TableDescription" o) of
+ (Just (A.Object t), _) -> return t
+ (_, Just (A.Object t)) -> return t
+ _ -> fail "Table description must have key 'Table' or 'TableDescription'"
+diff --git a/Aws/DynamoDb/Commands/UpdateItem.hs b/Aws/DynamoDb/Commands/UpdateItem.hs
+index 0d94a59..1152b5a 100644
+--- a/Aws/DynamoDb/Commands/UpdateItem.hs
++++ b/Aws/DynamoDb/Commands/UpdateItem.hs
+@@ -31,6 +31,7 @@ module Aws.DynamoDb.Commands.UpdateItem
+ -------------------------------------------------------------------------------
+ import Control.Applicative
+ import Data.Aeson
++import qualified Data.Aeson.Key as AK
+ import Data.Default
+ import qualified Data.Text as T
+ import Prelude
+@@ -91,9 +92,9 @@ instance ToJSON AttributeUpdates where
+ toJSON = object . map mk . getAttributeUpdates
+ where
+ mk AttributeUpdate { auAction = UDelete, auAttr = auAttr } =
+- (attrName auAttr) .= object
++ (AK.fromText (attrName auAttr)) .= object
+ ["Action" .= UDelete]
+- mk AttributeUpdate { .. } = (attrName auAttr) .= object
++ mk AttributeUpdate { .. } = AK.fromText (attrName auAttr) .= object
+ ["Value" .= (attrVal auAttr), "Action" .= auAction]
+
+
+diff --git a/Aws/DynamoDb/Core.hs b/Aws/DynamoDb/Core.hs
+index 1c116d3..b9a6cc4 100644
+--- a/Aws/DynamoDb/Core.hs
++++ b/Aws/DynamoDb/Core.hs
+@@ -128,6 +128,8 @@ import Control.Monad.Trans.Resource (throwM)
+ import qualified Crypto.Hash as CH
+ import Data.Aeson
+ import qualified Data.Aeson as A
++import qualified Data.Aeson.Key as AK
++import qualified Data.Aeson.KeyMap as KM
+ import Data.Aeson.Types (Pair, parseEither)
+ import qualified Data.Aeson.Types as A
+ import qualified Data.Attoparsec.ByteString as AttoB (endOfInput)
+@@ -141,7 +143,6 @@ import Data.Conduit
+ import Data.Conduit.Attoparsec (sinkParser)
+ import Data.Default
+ import Data.Function (on)
+-import qualified Data.HashMap.Strict as HM
+ import Data.Int
+ import Data.IORef
+ import Data.List
+@@ -536,7 +537,7 @@ instance ToJSON PrimaryKey where
+ toJSON (PrimaryKey h (Just r)) =
+ let Object p1 = toJSON h
+ Object p2 = toJSON r
+- in Object (p1 `HM.union` p2)
++ in Object (p1 `KM.union` p2)
+
+ instance FromJSON PrimaryKey where
+ parseJSON p = do
+@@ -544,8 +545,8 @@ instance FromJSON PrimaryKey where
+ case length l of
+ 1 -> return $ head l
+ _ -> fail "Unable to parse PrimaryKey"
+- where listPKey p'= map (\(txt,dval)-> hk txt dval)
+- . HM.toList <$> parseJSON p'
++ where listPKey p'= map (\(k,dval)-> hk (AK.toText k) dval)
++ . KM.toList <$> parseJSON p'
+
+
+ -- | A key-value pair
+@@ -661,9 +662,9 @@ instance ToJSON Attribute where
+ -------------------------------------------------------------------------------
+ -- | Parse a JSON object that contains attributes
+ parseAttributeJson :: Value -> A.Parser [Attribute]
+-parseAttributeJson (Object v) = mapM conv $ HM.toList v
++parseAttributeJson (Object v) = mapM conv $ KM.toList v
+ where
+- conv (k, o) = Attribute k <$> parseJSON o
++ conv (k, o) = Attribute (AK.toText k) <$> parseJSON o
+ parseAttributeJson _ = error "Attribute JSON must be an Object"
+
+
+@@ -674,7 +675,7 @@ attributesJson as = object $ map attributeJson as
+
+ -- | Convert into JSON pair
+ attributeJson :: Attribute -> Pair
+-attributeJson (Attribute nm v) = nm .= v
++attributeJson (Attribute nm v) = AK.fromText nm .= v
+
+
+ -------------------------------------------------------------------------------
+@@ -962,7 +963,7 @@ conditionsJson key (Conditions op es) = b ++ a
+ where
+ a = if null es
+ then []
+- else [key .= object (map conditionJson es)]
++ else [AK.fromText key .= object (map conditionJson es)]
+
+ b = if length (take 2 es) > 1
+ then ["ConditionalOperator" .= String (rendCondOp op) ]
+@@ -1046,7 +1047,7 @@ renderCondOp c = case c of
+
+
+ conditionJson :: Condition -> Pair
+-conditionJson Condition{..} = condAttr .= condOp
++conditionJson Condition{..} = AK.fromText condAttr .= condOp
+
+
+ instance ToJSON CondOp where
+@@ -1076,12 +1077,12 @@ data ConsumedCapacity = ConsumedCapacity {
+
+
+ instance FromJSON ConsumedCapacity where
+- parseJSON (Object v) = ConsumedCapacity
+- <$> v .: "CapacityUnits"
+- <*> (HM.toList <$> v .:? "GlobalSecondaryIndexes" .!= mempty)
+- <*> (HM.toList <$> v .:? "LocalSecondaryIndexes" .!= mempty)
+- <*> (v .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
+- <*> v .: "TableName"
++ parseJSON (Object o) = ConsumedCapacity
++ <$> o .: "CapacityUnits"
++ <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "GlobalSecondaryIndexes" .!= mempty)
++ <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "LocalSecondaryIndexes" .!= mempty)
++ <*> (o .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
++ <*> o .: "TableName"
+ parseJSON _ = fail "ConsumedCapacity must be an Object."
+
+
+@@ -1115,8 +1116,8 @@ data ItemCollectionMetrics = ItemCollectionMetrics {
+
+
+ instance FromJSON ItemCollectionMetrics where
+- parseJSON (Object v) = ItemCollectionMetrics
+- <$> (do m <- v .: "ItemCollectionKey"
+- return $ head $ HM.toList m)
+- <*> v .: "SizeEstimateRangeGB"
++ parseJSON (Object o) = ItemCollectionMetrics
++ <$> (do m <- o .: "ItemCollectionKey"
++ return $ (\(k, v) -> (AK.toText k, v)) $ head $ KM.toList m)
++ <*> o .: "SizeEstimateRangeGB"
+ parseJSON _ = fail "ItemCollectionMetrics must be an Object."
+
+
+--- a/aws.cabal 2022-07-25 08:47:06.270139909 +1000
++++ b/aws.cabal 2022-07-25 08:47:28.497479783 +1000
+@@ -35,7 +35,7 @@
+ Default: True
+
+ Library
+- build-depends: aeson <1.6
++ build-depends: aeson >= 2.0
+
+ Exposed-modules:
+ Aws
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
index 83ba450bb8bd..6fe81a3157ca 100644
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="network-3">Use network-3</flag>
- </use>
- <longdescription>
- Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
- </longdescription>
<upstream>
+ <remote-id type="hackage">aws</remote-id>
<remote-id type="github">aristidb/aws</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/barbies/Manifest b/dev-haskell/barbies/Manifest
new file mode 100644
index 000000000000..613ce0bf4784
--- /dev/null
+++ b/dev-haskell/barbies/Manifest
@@ -0,0 +1 @@
+DIST barbies-2.0.4.0.tar.gz 51770 BLAKE2B 23707bf90c4cf05beb1e1cc9c529d5968b2cf88ea445cc6f566f7ab8d175d5abe9e50f74383fb2ee55c1ee2c6cd3f02998fc241de0c5410d1eb899915b9e10ef SHA512 52b6a3dabbd1a9fc6c734c372927a6c746c22f7904bb36d47e8d3861425dcbef246ccad3aed38c55498bea7dbcb90dcd2454982a52c6c6f61b23bb38b8a53ae3
diff --git a/dev-haskell/barbies/barbies-2.0.4.0.ebuild b/dev-haskell/barbies/barbies-2.0.4.0.ebuild
new file mode 100644
index 000000000000..7c0b781c245f
--- /dev/null
+++ b/dev-haskell/barbies/barbies-2.0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Classes for working with types that can change clothes"
+HOMEPAGE="https://github.com/jcpetruzza/barbies#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/distributive:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
diff --git a/dev-haskell/barbies/metadata.xml b/dev-haskell/barbies/metadata.xml
new file mode 100644
index 000000000000..7ac724eff070
--- /dev/null
+++ b/dev-haskell/barbies/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">barbies</remote-id>
+ <remote-id type="github">jcpetruzza/barbies</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
index 43b7be06991d..a1e3a81f5046 100644
--- a/dev-haskell/base-compat-batteries/Manifest
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -1 +1,3 @@
-DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
+DIST base-compat-batteries-0.12.1-rev2.cabal 8891 BLAKE2B b7d6ebe0a100757dc6b95b3dcc25b5922b7a5c781c726fe69549d21631be0339dd08a0017427830e35c36dd2074b5be55b6f71d6555c6ca0050e7b825b2cb1b0 SHA512 38d81b3d72e9cb731d5c25310e71a5f73b004a37a4211315fb750c29e3bbccca40daeae175d25f8c602d1b2d13eee899cf5b2dea401d1aa5bf821b588b93572a
+DIST base-compat-batteries-0.12.1.tar.gz 17623 BLAKE2B c5bd92d32b4dbd67e28fc355a06c6e431be28f52db08f7ae9ba5fb067ac9536cbbf6c1315bf09417278856f1402bbc8376b51b34d564f0d0d15e21d0f317b4f1 SHA512 346ad1e53e4712017e610d1883e91371c1bbdefdce35b2830b8807e207f6fbd2233e2be153d85b6632059f58d3d9c74435537719823533ddddd47d96b231b0cf
+DIST base-compat-batteries-0.13.0.tar.gz 19320 BLAKE2B 20935aefca4709eef035de8fd8538b9be1f926e62571629949458c48028c68b51fb8ed7e58862225355273576f18baadc9be4f2d2262efe93592b2765b0ad804 SHA512 3f509034ea6ef1de86985082dd949abefa6570a2c14338571a263221d1a3f9da17a77918174aecb8d7fb83970da2a362f1d3ac0f3c5a5bca76edbcac368edeef
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
deleted file mode 100644
index 44b59da090b3..000000000000
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="base-compat with extra batteries"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/base-compat-0.11.1:=[profile?]
- >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
- >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
- >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.8
- dev-haskell/quickcheck )
-"
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
new file mode 100644
index 000000000000..2e6a2be81b5c
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="2"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
new file mode 100644
index 000000000000..b4df2533f1c3
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ ~dev-haskell/base-compat-0.13.0:=[profile?]
+ >=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.4:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck
+ )
+"
diff --git a/dev-haskell/base-compat-batteries/metadata.xml b/dev-haskell/base-compat-batteries/metadata.xml
index 3369edc6d299..b019d00e8863 100644
--- a/dev-haskell/base-compat-batteries/metadata.xml
+++ b/dev-haskell/base-compat-batteries/metadata.xml
@@ -5,25 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides functions available in later versions of @base@ to
- a wider range of compilers, without requiring you to use CPP
- pragmas in your code.
-
- This package provides the same API as the
- @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@
- library, but depends on compatibility packages
- (such as @semigroups@) to offer a wider support window than
- @base-compat@, which has no dependencies. Most of the modules
- in this library have the same names as in @base-compat@
- to make it easier to switch between the two. There also exist
- versions of each module with the suffix @.Repl.Batteries@,
- which are distinct from anything in @base-compat@, to allow
- for easier use in GHCi.
-
- See
- @&lt;https://github.com/haskell-compat/base-compat/blob/master/base-compat/README.markdown#dependencies here&gt;@
- for a more comprehensive list of differences between
- @base-compat@ and @base-compat-batteries@.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">base-compat-batteries</remote-id>
+ <remote-id type="github">haskell-compat/base-compat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index 82ca1dd1f016..196151c01fbd 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1 +1,2 @@
-DIST base-compat-0.11.1.tar.gz 33691 BLAKE2B a598582e1a76b2b83d4168da3fbdf2b0ab34127d60ba46c9803101d075989000bed7f01384d58292d96c1099857964c74d9d7bad092fca94502442b635a82245 SHA512 d92a81e670535b4ca6fd95d51800972bbc52008ef21ccc22119341974c45bec66ed725c795da8d94c8ef824dfaa7f9c03a173b643daf339a4759c49453cfcec8
+DIST base-compat-0.12.1.tar.gz 35504 BLAKE2B 8b450d9b89509b36c4810d9c1471c782af3f782c7069f764ec79952c61ac59db8cfac3def772b8f7b61c311c7761ad793226aec1a58ea7d521733a2563e1abc5 SHA512 2ae3e1baad0d0f25c227a9b066ea266cff4f274448c418546d37c6274d77df4349215722fce3d6eaae2093ad31c9b2c70b02f1233513eaa59a59c6255669d318
+DIST base-compat-0.13.0.tar.gz 40057 BLAKE2B 34c90979269daea2585773f006e53d8191a01806b37e9359341a64b7c2806cdf449a23040cf46c25b63fc9036820426a7be8c01b9149643a11492192d53587b8 SHA512 6b9602f72a4bf04fc52c1fd3727fad1ba1ac85d2c572e2189f4da96f59698350c403930af10ae2e2b43cf06aac3fcb2a2609374d4d3b8a1dadfb554913d96d72
diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
deleted file mode 100644
index 792d6215c9b6..000000000000
--- a/dev-haskell/base-compat/base-compat-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/base-compat/base-compat-0.12.1.ebuild b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
new file mode 100644
index 000000000000..7adea7054d7b
--- /dev/null
+++ b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="A compatibility layer for base"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/base-compat/base-compat-0.13.0.ebuild b/dev-haskell/base-compat/base-compat-0.13.0.ebuild
new file mode 100644
index 000000000000..9704f477be1f
--- /dev/null
+++ b/dev-haskell/base-compat/base-compat-0.13.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A compatibility layer for base"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/base-compat/metadata.xml b/dev-haskell/base-compat/metadata.xml
index 61bd74f402d6..477d462857a1 100644
--- a/dev-haskell/base-compat/metadata.xml
+++ b/dev-haskell/base-compat/metadata.xml
@@ -5,8 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Ban CPP from your code. See the README for what is covered:
- &lt;https://github.com/sol/base-compat#readme&gt;
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">base-compat</remote-id>
+ <remote-id type="github">haskell-compat/base-compat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/base-noprelude/Manifest b/dev-haskell/base-noprelude/Manifest
deleted file mode 100644
index e5d9b986e87e..000000000000
--- a/dev-haskell/base-noprelude/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST base-noprelude-4.13.0.0.tar.gz 2864 BLAKE2B 25d13ae8a2cbee524d46cfe351abbe77321b61dd118bc26b8d275179fdaa5d429450c3e99a12518646bfaa13258a5ffaa9eaf0cb0bd7bb84a93187ae175f6d36 SHA512 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf
diff --git a/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild b/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
deleted file mode 100644
index db91878d219a..000000000000
--- a/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="\"base\" package sans \"Prelude\" module"
-HOMEPAGE="https://github.com/hvr/base-noprelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.0
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'build-depends: base ==4.13.0.0' 'build-depends: base >=4.13.0.0'
-}
diff --git a/dev-haskell/base-noprelude/metadata.xml b/dev-haskell/base-noprelude/metadata.xml
deleted file mode 100644
index ed8d6a25b248..000000000000
--- a/dev-haskell/base-noprelude/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package simplifies defining custom "Prelude"s without having
- to use @-XNoImplicitPrelude@ by re-exporting the full module-hierarchy of
- the [base-4.13.0.0](https://hackage.haskell.org/package/base-4.13.0.0)
- package /except/ for the "Prelude" module.
-
- An usage example for such a "Prelude"-replacement is available with
- the [Prelude](http://hackage.haskell.org/package/Prelude) package.
-
- Starting with GHC 7.10 &amp; Cabal-1.22 this package makes use of the
- package-level @reexported-modules@ feature.
-
- Each version of @base-noprelude@ depends on a specific
- @base@-version and thus mirrors @base@'s
- versioning (with the exception that @base-noprelude@ needs to add an
- /additional/ 5th version component in case of bug-fix releases).
-
- See &lt;https://github.com/hvr/base-noprelude&gt; for more information.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index 11b16201f2db..d2469804410a 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1 +1,2 @@
-DIST base-orphans-0.8.4.tar.gz 22573 BLAKE2B 0fe59f562864e41419a9b77087d70488cc6d9e5c762c92815d05d326bfb0a6aaa11e3da82b4bb0664549e56e4abd5f81330a836010f7b56cb26f86c8b82c3038 SHA512 ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6
+DIST base-orphans-0.8.6.tar.gz 24255 BLAKE2B 8e8106cbdb58956ef6fc7c133e5a5c5537af8fa1ab56545a533f7c061361583b3921e77fdae2277a39cbc505a7e108fb672942528fe752fd7ef0506a4821547b SHA512 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff
+DIST base-orphans-0.9.0.tar.gz 26025 BLAKE2B f5c5f6266b3f9ab746d76deae58f304827dea6f32dc95474c21314ee7dc3a7836428bc967e0e2ca2e19c39e063e1116ea4db1932f4d35e409a598d44991844e1 SHA512 63700bbd7f59ce598bd855de9e708559245bbac438d1585e5bdec3d0671d4940da3a25684abe727d88353c886eff5913da1fbbe98eada8f2325b20f1f7ffcf55
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
deleted file mode 100644
index 3edd14593a73..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->temporary->sxceptions->test-framework->base-orphans
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12"
-# test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-# dev-haskell/quickcheck )
-# "
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
new file mode 100644
index 000000000000..d585fa60c896
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+# dev-haskell/quickcheck )
diff --git a/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild b/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild
new file mode 100644
index 000000000000..b9b1124f43f6
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ dev-haskell/quickcheck
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/base-orphans/metadata.xml b/dev-haskell/base-orphans/metadata.xml
index b75119e4482f..9b4ac4f22a89 100644
--- a/dev-haskell/base-orphans/metadata.xml
+++ b/dev-haskell/base-orphans/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- @base-orphans@ defines orphan instances that mimic instances available in later versions of @base@ to a wider (older) range of compilers. @base-orphans@ does not export anything except the orphan instances themselves and complements @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@.
-
- See the README for what instances are covered: &lt;https://github.com/haskell-compat/base-orphans#readme&gt;
- </longdescription>
<upstream>
- <remote-id type="github">haskell-compat/base-orphans#readme</remote-id>
+ <remote-id type="hackage">base-orphans</remote-id>
+ <remote-id type="github">haskell-compat/base-orphans</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
deleted file mode 100644
index ce9c6c77cbb2..000000000000
--- a/dev-haskell/base-prelude/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST base-prelude-1.3.tar.gz 4323 BLAKE2B 3d36ddfa5528f16d4323f690c42fe8871f563cbfc926d5e79831ddb0aebe5ca705842bb87d21dc960bbfaa088a298f7f810dd085228877755678b3daa6c67b4c SHA512 de0f500e0d2d962491951445e7409f337bbf5614417cf6dd54cf04e1dad9ad181bc09648c9f7e0201838fde38ca86b2f89eb40805c9d9df7afb9dbaae565eda9
diff --git a/dev-haskell/base-prelude/base-prelude-1.3.ebuild b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
deleted file mode 100644
index 68bd3c865ce3..000000000000
--- a/dev-haskell/base-prelude/base-prelude-1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
-HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/base-prelude/metadata.xml b/dev-haskell/base-prelude/metadata.xml
deleted file mode 100644
index 718cba806a9d..000000000000
--- a/dev-haskell/base-prelude/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library which aims to reexport all the non-conflicting and
- most general definitions from the \"base\" package.
- This includes APIs for applicatives, arrows, monoids, foldables, traversables,
- exceptions, generics, ST, MVars and STM.
-
- This package will never have any dependencies other than \"base\".
-
- /Versioning policy/
-
- The versioning policy of this package deviates from PVP in the sense
- that its exports in part are transitively determined by the version of \"base\".
- Therefore it's recommended for the users of \"base-prelude\" to specify
- the bounds of \"base\" as well.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
index 905982501871..e313b921e66f 100644
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Unicode alternatives for common functions and operators"
-HOMEPAGE="https://haskell.org/haskellwiki/Unicode-symbols"
+HOMEPAGE="http://haskell.org/haskellwiki/Unicode-symbols"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
index eb5dfb583b25..937381521944 100644
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ b/dev-haskell/base-unicode-symbols/metadata.xml
@@ -3,23 +3,6 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package defines new symbols for a number of functions,
- operators and types in the base package.
-
- All symbols are documented with their actual definition and
- information regarding their Unicode code point. They should be
- completely interchangeable with their definitions.
-
- For further Unicode goodness you can enable the @UnicodeSyntax@
- language extension \[1\]. This extension enables Unicode characters
- to be used to stand for certain ASCII character sequences,
- i.e. &amp;#x2192; instead of @-&gt;@, &amp;#x2200; instead of @forall@ and many
- others.
-
- Original idea by P&amp;#xE9;ter Divi&amp;#xE1;nszky.
-
- \[1\] &lt;http://www.haskell.org/ghc/docs/latest/html/users_guide/syntax-extns.html#unicode-syntax&gt;
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest
index 705ecc252a2c..b4a20f800e84 100644
--- a/dev-haskell/base16-bytestring/Manifest
+++ b/dev-haskell/base16-bytestring/Manifest
@@ -1 +1,2 @@
DIST base16-bytestring-0.1.1.7.tar.gz 5136 BLAKE2B 65fbfb5288cae1cd17d4955c9ec55a40d00cd90556dd6c3923d110988612859e2301f4d9c2317a0b24f6dc1532fbb82b3b53133499c24ba276eb1f6754707a1f SHA512 33c4c1e35489cee42ced9fffed3ee11bfe976dc167adc3ab715c224e69025fd9634cb010ee09bf86aa71170e12172c823964fdc3bed4611c599f686beea2985e
+DIST base16-bytestring-1.0.2.0.tar.gz 7219 BLAKE2B 021e49d0e72b23d13928ec08957861b0f7a6c4291c5280403413e89382166653ae5a96ecadc82dc63a7c94a1771e2de0bbd6630b40ed312e221b1c5c125d8280 SHA512 61e483c08f3cd81c0ffa891bd6f4aa5ff222d8184880deb5aeeae8184bd6efdbb373ca6bece2cd597490492107c91a2f4fd6ca9c71c712e298bce7418b9f7135
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 e05e533222a1..8f719d6cfdd2 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/base16-bytestring/base16-bytestring-1.0.2.0.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
new file mode 100644
index 000000000000..149b0d0369e2
--- /dev/null
+++ b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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="RFC 4648-compliant Base16 encodings for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base16-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml
index 1989ef029c5b..997be21f7ed6 100644
--- a/dev-haskell/base16-bytestring/metadata.xml
+++ b/dev-haskell/base16-bytestring/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">bos/base16-bytestring</remote-id>
+ <remote-id type="hackage">base16-bytestring</remote-id>
+ <remote-id type="github">haskell/base16-bytestring</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index 4aceec28c4f0..24dd714790ae 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1 +1,2 @@
DIST base64-bytestring-1.0.0.3.tar.gz 10104 BLAKE2B 00dca0236c739704f45991d974b99715c2c903d8ee228b7fbe3524d690496248d8b6acc798e8c42c70d4bc382b9c79f4f54bd2a858d3863207bb93fa44478ab6 SHA512 e4e244752491ac279a88afc4ceb0fe4c44b75fc369ff47ec29e3c99996b4be967051034c94f0c659d47a153d6b9e0b65a75ea419fdfd52fd50cdc0da2dca7db6
+DIST base64-bytestring-1.2.1.0.tar.gz 13743 BLAKE2B d9776517c76fdeec5df4fe720755d7aaa7206d1570b45f1abeda50cb9f553576ed973a3ba0bb6438c64ecc8644ff298d15ed2fa0575929c156a543d9f9124398 SHA512 730d5fd7bd1cf90792d0eea75de1fd333c6cab73f4d178db6d3c7006d77f222734a53bb10ef3a296862ca31338e2ae387acfdd44b119014cff7a0a13362e6e96
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 458d52682faa..f281d2c5bb5c 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.5.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild
new file mode 100644
index 000000000000..305384d3794b
--- /dev/null
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base64-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml
index 25fcbe922d4d..0093a6a3e552 100644
--- a/dev-haskell/base64-bytestring/metadata.xml
+++ b/dev-haskell/base64-bytestring/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">bos/base64-bytestring</remote-id>
+ <remote-id type="hackage">base64-bytestring</remote-id>
+ <remote-id type="github">haskell/base64-bytestring</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/base64/Manifest b/dev-haskell/base64/Manifest
new file mode 100644
index 000000000000..32757fc573f4
--- /dev/null
+++ b/dev-haskell/base64/Manifest
@@ -0,0 +1,2 @@
+DIST base64-0.4.2.4-rev3.cabal 2862 BLAKE2B 3038bc0d78af581c777855db20cbd108b93f063233b7020c1a7ec1734cfa620cf44af8e8d2984f82335e829a9169639f206ac8ee351fc5d8aacfdd2ccac15ccf SHA512 98ff6439f2a812f0c121f8b37cc2b2e45ae6658d3d55f28f339961d56a4967a60fe9f1cbba0de0d0f7c9c63df2e6327551edbe1af773ee7e1257339ad4969389
+DIST base64-0.4.2.4.tar.gz 22065 BLAKE2B c6e794a55e25da6e5f2dd3d793d4f6d2fe759b8923a9d84fdcb9e251018ee579e80db8658afef0448a918fe4e87eda06357b6644d21499f4b8b44936d4f307e2 SHA512 cf7e0f3b7dbd336ecee0aad8df93793c9f72dbfc882f2f5491e3910693f2c530bb2d9762baea729cb7c5cc2a4c3bf130fdff2aa2661fc23e0c8d726de58deb6f
diff --git a/dev-haskell/base64/base64-0.4.2.4.ebuild b/dev-haskell/base64/base64-0.4.2.4.ebuild
new file mode 100644
index 000000000000..064fa0a7d244
--- /dev/null
+++ b/dev-haskell/base64/base64-0.4.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern RFC 4648-compliant Base64 library"
+HOMEPAGE="https://github.com/emilypi/base64"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ || ( ( >=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 ) )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/base64-bytestring
+ dev-haskell/quickcheck
+ dev-haskell/random-bytestring
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ dev-haskell/text )
+"
diff --git a/dev-haskell/base64/metadata.xml b/dev-haskell/base64/metadata.xml
new file mode 100644
index 000000000000..fa170158148f
--- /dev/null
+++ b/dev-haskell/base64/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">base64</remote-id>
+ <remote-id type="github">emilypi/base64</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/basement/Manifest b/dev-haskell/basement/Manifest
index 3ed82f269c4c..ff64c96e6048 100644
--- a/dev-haskell/basement/Manifest
+++ b/dev-haskell/basement/Manifest
@@ -1 +1,2 @@
-DIST basement-0.0.11.tar.gz 134032 BLAKE2B 52d9d674841d048b53011589c7a87c7cd7e45655db3c7bc2c99574b8a49bace33f20abf7d4614cf3106e2b87cb67340e5d2f76416889038c2e081c1f62f46bdb SHA512 2396e692fcaa080418eb90c38148dbb2465490ffaa5e35d141573d32729794dffb444bdddd55082878520a22629cfead5fdc1ac98f1d369600cc3165b64730d5
+DIST basement-0.0.12.tar.gz 134142 BLAKE2B cf0ff62bdd69cdcb075b5e63e9d60e7033ac85007101cd8c1d38776cbd1b60b336606e502a91ab8fb7275273f9fa3eae7344f0e47aa269bada2649c7be07caad SHA512 4515fbecfb8280cfd669313d236a5e3b4ef45ba3fd3da8626073fa3a44a889370c48c582ea633eac5df4a5e716c495cf827deb9239274fbdb63a14d19f9682fb
+DIST basement-0.0.16.tar.gz 134837 BLAKE2B f3be5d658e96f5eb6512e2089421185ac67d634a6a61cab13c183d138a34bb6d5a42146f57b08ba0b5c6b4cb0af0b6c9b0af42410602a24b8756917b49ea6cb6 SHA512 dde9a98047e8bece8d938161c95cc25a5924193a271e40120d3a96f02927b5050a8d3abed6c34ae1910bb17c07feb46664dca39d7ba594afc78c055ed27023d9
diff --git a/dev-haskell/basement/basement-0.0.11.ebuild b/dev-haskell/basement/basement-0.0.11.ebuild
deleted file mode 100644
index ea25452e60fb..000000000000
--- a/dev-haskell/basement/basement-0.0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Foundation scrap box of array & string"
-HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/basement/basement-0.0.12.ebuild b/dev-haskell/basement/basement-0.0.12.ebuild
new file mode 100644
index 000000000000..6ba5c0feea65
--- /dev/null
+++ b/dev-haskell/basement/basement-0.0.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Foundation scrap box of array & string"
+HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/basement/basement-0.0.16.ebuild b/dev-haskell/basement/basement-0.0.16.ebuild
new file mode 100644
index 000000000000..889c4511c3a0
--- /dev/null
+++ b/dev-haskell/basement/basement-0.0.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Foundation scrap box of array & string"
+HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/basement/metadata.xml b/dev-haskell/basement/metadata.xml
index 937381521944..eaf9f7355248 100644
--- a/dev-haskell/basement/metadata.xml
+++ b/dev-haskell/basement/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">basement</remote-id>
+ <remote-id type="github">haskell-foundation/foundation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/basic-prelude/Manifest b/dev-haskell/basic-prelude/Manifest
deleted file mode 100644
index 946fe8d7d9be..000000000000
--- a/dev-haskell/basic-prelude/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST basic-prelude-0.7.0.tar.gz 6471 BLAKE2B 17bb72b3d508d8a4def83c2946a01ab3f48b84c2484103cc66b6ef8c956599d90e060198536e02ca593c6a6f9b5845b76463281113e4fff0b37a72716100c6bb SHA512 34b62d1cdddb8d5c5ec51f0b9cca8746174f2daf40e5fe0f0188707da1f590844bffccfc6d049e8e161323f541281130aa92700514455a947c503274422e271f
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild
deleted file mode 100644
index 66d78d13ead7..000000000000
--- a/dev-haskell/basic-prelude/basic-prelude-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
-HOMEPAGE="https://github.com/snoyberg/basic-prelude#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/basic-prelude/metadata.xml b/dev-haskell/basic-prelude/metadata.xml
deleted file mode 100644
index f70adbae158f..000000000000
--- a/dev-haskell/basic-prelude/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The premise of @basic-prelude@ is that there are a lot of very commonly desired features missing from the standard @Prelude@, such as commonly used operators (@\&lt;$\&gt;@ and @&gt;=&gt;@, for instance) and imports for common datatypes (e.g., @ByteString@ and @Vector@). At the same time, there are lots of other components which are more debatable, such as providing polymorphic versions of common functions.
-
- So @basic-prelude@ is intended to give a common foundation for a number of alternate preludes. The package provides two modules: @CorePrelude@ provides the common ground for other preludes to build on top of, while @BasicPrelude@ exports @CorePrelude@ together with commonly used list functions to provide a drop-in replacement for the standard @Prelude@.
-
- Users wishing to have an improved @Prelude@ can use @BasicPrelude@. Developers wishing to create a new prelude should use @CorePrelude@.
-
- Release history:
-
- [0.3] Moved a number of exports from @BasicPrelude@ to @CorePrelude@ and vice-versa.
-
- [0.2] Renamed @BasicPrelude@ to @CorePrelude@ and added a new @BasicPrelude@ module provided a full-featured @Prelude@ alternative. Also added a number of new exports.
-
- [0.1] Initial version, code taken from @classy-prelude@ with a few minor tweaks.
- </longdescription>
- <upstream>
- <remote-id type="github">snoyberg/basic-prelude</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
index e2d92b959353..dc4225cff129 100644
--- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/parsec:=[profile?]
diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest
index aa1e6df93082..7e4744650f17 100644
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@@ -1 +1,2 @@
-DIST bifunctors-5.5.6.tar.gz 44721 BLAKE2B 9f0d588ad514b60ac6ac5fc1f5e1c265b111330e008d57340baee4011e6aadbdaa9a7d24b480cd7d568f57e61214821129ce8785a5731763a08306a2c8151b5a SHA512 d78471bdf9c83c77d49825321984964e165c77ee4f02f8c4232ce272246057b0064b68553f8d70a11a930fc771dc55a2991ff63d6d7af89bb749f23737ba6a5b
+DIST bifunctors-5.5.11.tar.gz 46003 BLAKE2B 82572e6c162ab105fdce6c3cd7e44da16db232c2233e4d2e3551001a20a2bff0bb4e41fabebc974290749275621a9b0abe3925156090cb960b95e8cbcf43150d SHA512 09f66d1a086a72a822e804521c2258acb16fd5a4a29c3758b97987f27a271f58e3dd4103518b31b3bdf44465c87fe5573a0bba168ba109287ca3370b8ab491a1
+DIST bifunctors-5.5.15.tar.gz 47395 BLAKE2B 5c9af0cc90689c0482aa07ea0a9c7cddb159a016ae075aa20ea441a4a83348db806313e95ec4c90e890f4686eac4622cb384cfca901d265f98deff045edd66ef SHA512 59977c7eec1d1e66c99becc90c29715f90c309ab1ace8e1021d512bf58cb8781e3b3ee5e7de16735fd3cd844b4d918d5f0f6d5afbf1a4da75fa854915356192f
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
new file mode 100644
index 000000000000..ebb45b068841
--- /dev/null
+++ b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Bifunctors package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/bifunctors/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+ >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ tagged? ( >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ dev-haskell/transformers-compat )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semigroups semigroups) \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild
new file mode 100644
index 000000000000..3a05ec6b5ba2
--- /dev/null
+++ b/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Bifunctors package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/bifunctors/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+ >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ tagged? ( >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ dev-haskell/transformers-compat )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semigroups semigroups) \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
deleted file mode 100644
index 0e03032f6a2e..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 bifunctors package"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
- tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.8
- >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag semigroups semigroups) \
- $(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
index a6a7455d7563..6ba6658569a5 100644
--- a/dev-haskell/bifunctors/metadata.xml
+++ b/dev-haskell/bifunctors/metadata.xml
@@ -20,6 +20,7 @@
</flag>
</use>
<upstream>
+ <remote-id type="hackage">bifunctors</remote-id>
<remote-id type="github">ekmett/bifunctors</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/binary-instances/Manifest b/dev-haskell/binary-instances/Manifest
deleted file mode 100644
index d4c03f59e1b6..000000000000
--- a/dev-haskell/binary-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST binary-instances-1.0.0.1.tar.gz 5025 BLAKE2B 403f6bc8c55bec745b5284b8ebd1ddb429b277b1acbd9081207a40f07eefdc5533cf612fb74bbd7a741378051e06cb6d1d85413572e8e12a42e244e17a42649e SHA512 8933f2eab4a23460bd9be7547f229416adccb3e82ec452f75567fa5b5cb6babe4b7f243fbf3799099647bc4f890eaa1acc962128caa8caafc3ff724867585e3d
diff --git a/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild b/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild
deleted file mode 100644
index 14821193cb32..000000000000
--- a/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://github.com/phadej/binary-instances#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # Needs fix in ghc/text: https://github.com/haskell/text/issues/277
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
- >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.2:=[profile?]
- >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.7:=[profile?]
- >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
- >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
- >=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
- >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
- >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.6.0.1 && <4.15' 'base >=4.6.0.1' && <5 \
- 'binary >=0.5.1.1 && <0.8.9' 'binary >=0.5.1.1'
-}
diff --git a/dev-haskell/binary-instances/metadata.xml b/dev-haskell/binary-instances/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/binary-instances/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
index 6f777e43dcdc..97a389bfec17 100644
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@@ -1 +1,4 @@
-DIST binary-orphans-1.0.1.tar.gz 4425 BLAKE2B 2f94e8e2fa70578b0feaa338ea5148f2f373cabdf4fcfaa3092ff7f92484fc7708da09bba8ea51de626c70c74de3051a6eae6c0a2280d125504d168c730e0f14 SHA512 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
+DIST binary-orphans-1.0.2.cabal 2264 BLAKE2B aba78e56c07192df484757aa58fdc79ea201cf4545499b11f3a82cbfd0af57c0db0fd1134255f7697b0276f2e7807ba5a74b9b591d233b99e6fec4c908ecdda8 SHA512 8cb030d9a9dc32a4a3ada6684babc5b45d8a6a786261668eb01ae36f3d496f1ca25b0a31782c3728bfb3ede3883df52015aefd85bbf0911ac7e0222d1a33de6e
+DIST binary-orphans-1.0.2.tar.gz 4566 BLAKE2B bdb19771f2ef1201d55766bb26b461341d23899356379a0fa031cf014dc8dd9341bab1538488fe739c9ccecd51ad686e4781220c962a073866238a443ddac389 SHA512 49b6c758b0e94594e9a5feab7f5c3398fcd6b0498c06fffa5e9eb1d39c753f64c0eafbfdd2826a9581a47f2caa5e4194aef89840ce95ba1455844e74b6d6ad1e
+DIST binary-orphans-1.0.4.1-rev2.cabal 2468 BLAKE2B 3ede254321f8d537fe21d6377e0afbbbe3f1cfcbe3815fbbe76d50fcc8fbf46adcf93e4acb790fb8c4e214f94dd1eb063e50f278339aad3db99f95e9021c05d8 SHA512 3cb06701cbb27547eecd41564ded69812ebfbd516033c74eea09c40c789e6d909de27007b38078f35285651313d5a82e36903f36be4cb4e42cdf88d1b0b4634e
+DIST binary-orphans-1.0.4.1.tar.gz 5327 BLAKE2B 6f0a0c12f9c75aca8d3fe5b902eeedec337d9e7bf2dd282a6c2d80ca7e955f12749aab7794d4ed125a8f7fa77bfc39823e9226ff322f8e36008309decf02d948 SHA512 97b37ecc232ef0117f1b0ce11fcd527dad41c6680ad327b74c51fa10ef3cb672a9e1a6c1e6bd015dc1a7f4a4a657178790aa8af8e8200ca7eebd2f11db131a13
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
deleted file mode 100644
index 7003eae643b2..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?]
- >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
- >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
- >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
- >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.5 && <4.14' 'base >=4.5' \
- 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.7' 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.9' \
- 'semigroups >=0.18.5 && <0.19.1' 'semigroups >=0.18.5'
-}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
new file mode 100644
index 000000000000..e1438badd88e
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Tests fail to build
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
+# >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
+# >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild
new file mode 100644
index 000000000000..321a9daf32cf
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.28 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+ >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11
+ )
+"
diff --git a/dev-haskell/binary-orphans/metadata.xml b/dev-haskell/binary-orphans/metadata.xml
index 937381521944..9751c66cf0c8 100644
--- a/dev-haskell/binary-orphans/metadata.xml
+++ b/dev-haskell/binary-orphans/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">binary-orphans</remote-id>
+ <remote-id type="github">phadej/binary-orphans</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
deleted file mode 100644
index c9d742303d37..000000000000
--- a/dev-haskell/binary-tagged/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST binary-tagged-0.2.tar.gz 9570 BLAKE2B 06519bc4862da1ad4804c487f5b250600e20dff479d47db88dc0b83030a08078b41d1a6691a7b9dc2de62defb797d30bc8081158e722a6c564e08e1a89287971 SHA512 03bcf80b39d5f8e1256ac45b557904d6750d1786f4b4da0c1b9e5c004503d5375699480f89426145a3eea103555c5f4fc820cb87053a2b6ccf4c7e1d6faf7120
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
deleted file mode 100644
index f53ead554f72..000000000000
--- a/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Tagged binary serialisation"
-HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
- >=dev-haskell/cryptohash-sha1-0.11.100.1:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?]
- >=dev-haskell/generics-sop-0.3.2.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
- >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/bifunctors
- >=dev-haskell/binary-instances-1 <dev-haskell/binary-instances-1.1
- dev-haskell/quickcheck-instances
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.7.0.2 && <4.13' 'base >=4.7.0.2' \
- 'time >=1.4.2 && <1.9' 'time >=1.4.2'
-}
diff --git a/dev-haskell/binary-tagged/metadata.xml b/dev-haskell/binary-tagged/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/binary-tagged/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index acf2a3a47684..273a10e52ff5 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1 +1,3 @@
-DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
+DIST binary-0.8.8.0-rev1.cabal 6279 BLAKE2B 4c87f56dca43a860388120dec92f58bd8b6359f0cb952df353ea37b3e65cc791394bf18f2fc4d72a8444a7fc4bbd5ca6babc37dd4cd6768d8f2aa387ea62b7fa SHA512 67027e5dbebd4a3225493fe416b354aa1a4f5896a48f121807163ad6fb4c6e5571849be230dd4d3be36e10f8aa2dc30acfbe50076d86e8933d8d20d5c4a8b343
+DIST binary-0.8.8.0.tar.gz 57327 BLAKE2B c105f4bf92ec52df51d3c7bda1aae99b3d40727aa4d3c1397431b2b727a934e62ee1f9ab7ed45b3502b17bd7a9a61f95a2a66690e40ae25b177fc8c79c462ae5 SHA512 9e4b116a2661d7970dbcf5ec3432ce88514380cab145358c3368a2dca35a16ab9d1f0d09ce2eb853a456764215744195d593629fb08e29b627345e3ae913592f
+DIST binary-0.8.9.0.tar.gz 57311 BLAKE2B 17915bbe2001413d8c0a92873184775e288768a2c33e6f669684a9eecdd667bee7220d389b6c26df39fb6fcf88a3e0d8a0e9e5ea70413b676b7789abc721a27a SHA512 247dd9c9f919c6a83ca7334029009bb753ba235a0006913be5ff13cc15da0f681823187669b58d804dee25592a7d149a24c4c4ab60a9f633a5195c37378eae50
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
deleted file mode 100644
index a77c059d3e0b..000000000000
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depend: test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
new file mode 100644
index 000000000000..a83a9c106765
--- /dev/null
+++ b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depend: test-suite"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="https://github.com/kolmodin/binary"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
+# dev-haskell/hunit
+# >=dev-haskell/quickcheck-2.9
+# >=dev-haskell/random-1.0.1.0
+# dev-haskell/test-framework
+# >=dev-haskell/test-framework-quickcheck2-0.3
+# )
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/binary/binary-0.8.9.0-r1.ebuild b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
new file mode 100644
index 000000000000..c94c8c12207c
--- /dev/null
+++ b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="https://github.com/kolmodin/binary"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
+
+RDEPEND="
+ >=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
+# dev-haskell/hunit
+# >=dev-haskell/quickcheck-2.9
+# >=dev-haskell/random-1.0.1.0
+# dev-haskell/test-framework
+# >=dev-haskell/test-framework-quickcheck2-0.3
+# )
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/binary/metadata.xml b/dev-haskell/binary/metadata.xml
index 21fe6c14fc23..2c20e36ad6b0 100644
--- a/dev-haskell/binary/metadata.xml
+++ b/dev-haskell/binary/metadata.xml
@@ -5,14 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Efficient, pure binary serialisation using lazy ByteStrings.
- Haskell values may be encoded to and from binary formats,
- written to disk as binary, or sent over the network.
- Serialisation speeds of over 1 G\/sec have been observed,
- so this library should be suitable for high performance
- scenarios.
- </longdescription>
<upstream>
<remote-id type="github">kolmodin/binary</remote-id>
</upstream>
diff --git a/dev-haskell/biocore/Manifest b/dev-haskell/biocore/Manifest
deleted file mode 100644
index 301a0ddeebdc..000000000000
--- a/dev-haskell/biocore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biocore-0.3.1.tar.gz 2812 BLAKE2B ff94cbbb37c7f74c7d08e31a626336d4db621c468dd42df43ba20739224378b1ecd358e74111174eea6a30450e50091245490606da39781d92e905cb1e875db6 SHA512 0a9a3690aa0888c688c8429facd0a26ac94f639222568d2e68a0640714098a40fa38d196800900486d12b36ee735576519d98e4d45f0320261d3f5de9ab09311
diff --git a/dev-haskell/biocore/biocore-0.3.1.ebuild b/dev-haskell/biocore/biocore-0.3.1.ebuild
deleted file mode 100644
index 41e81668702e..000000000000
--- a/dev-haskell/biocore/biocore-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="https://hackage.haskell.org/package/biocore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stringable:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/biocore/files/biocore-0.3.1-ghc84.patch b/dev-haskell/biocore/files/biocore-0.3.1-ghc84.patch
deleted file mode 100644
index b0a404eb8b46..000000000000
--- a/dev-haskell/biocore/files/biocore-0.3.1-ghc84.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/Bio/Core/Sequence.hs
-+++ b/src/Bio/Core/Sequence.hs
-@@ -37,2 +37,3 @@ import Data.Stringable hiding (length)
- import Data.Monoid
-+import qualified Data.Semigroup as S
-
-@@ -42,2 +43,5 @@ newtype SeqData = SeqData { unSD :: LC.ByteString }
-
-+instance S.Semigroup SeqData where
-+ (<>) (SeqData s1) (SeqData s2) = SeqData (mappend s1 s2)
-+
- instance Monoid SeqData where
-@@ -51,2 +55,9 @@ newtype SeqLabel = SeqLabel { unSL :: LC.ByteString }
-
-+instance S.Semigroup SeqLabel where
-+ (<>) (SeqLabel s1) (SeqLabel s2) = let
-+ (i1:r1) = LC.words s1
-+ (i2:r2) = LC.words s2
-+ sid = mconcat [i1,(LC.pack ":"),i2]
-+ in SeqLabel (LC.unwords ([sid]++r1++[LC.pack ":"]++r2))
-+
- instance Monoid SeqLabel where
-@@ -68,2 +79,5 @@ newtype QualData = QualData { unQD :: L.ByteString }
-
-+instance S.Semigroup QualData where
-+ (<>) (QualData s1) (QualData s2) = QualData (mappend s1 s2)
-+
- instance Monoid QualData where
diff --git a/dev-haskell/biocore/metadata.xml b/dev-haskell/biocore/metadata.xml
deleted file mode 100644
index 6fe4dd9247b7..000000000000
--- a/dev-haskell/biocore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A set of core definitions and data structures
- commonly used in bioinformatics. The intention is that bioinformatics
- libraries will use this as a common ground to avoid needless incompatibilities
- and duplicated work.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biofasta/Manifest b/dev-haskell/biofasta/Manifest
deleted file mode 100644
index a465fef9be65..000000000000
--- a/dev-haskell/biofasta/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biofasta-0.0.3.tar.gz 14468 BLAKE2B 5df80e3ad74e1c7d5f5cd6538dcdae880829eb7bcef5eb009171e77a24a7705f91a8a7edc24bba1ecbdc73056bd5e9217a6d87cddac43f2bc470c041cddefaa2 SHA512 de50d2f499fc0ee532b5ca28dff868c3dd0d243eaadeb1a4e3a3ebb913812f3308f581aefbf79806d58535b1f78ae283660b5a2348da1a9535f4d48f96b8678e
diff --git a/dev-haskell/biofasta/biofasta-0.0.3.ebuild b/dev-haskell/biofasta/biofasta-0.0.3.ebuild
deleted file mode 100644
index 1ec7f03607ee..000000000000
--- a/dev-haskell/biofasta/biofasta-0.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for reading fasta sequence files"
-HOMEPAGE="https://patch-tag.com/r/dfornika/biofasta/home"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/biocore-0.3.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/biofasta/metadata.xml b/dev-haskell/biofasta/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/biofasta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/biosff/Manifest b/dev-haskell/biosff/Manifest
deleted file mode 100644
index 6609aac6d6ee..000000000000
--- a/dev-haskell/biosff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biosff-0.3.7.1.tar.gz 26705 BLAKE2B abf585342c14c01a8f202b34ec94e67138e345918b43a52dbf535c3690bca2039c977ee36ebef861d5f215174429f41702e84d440cf52316de0ec82722053f72 SHA512 ce075d734864b9a00999d5c37c824ece5ba475b583536eb842835b4a44ff56581f18ba8ddf065f2ea4416ff4f96279f6a46f5e57330a43d40164f4cabab2ab9f
diff --git a/dev-haskell/biosff/biosff-0.3.7.1.ebuild b/dev-haskell/biosff/biosff-0.3.7.1.ebuild
deleted file mode 100644
index a3d46f863ec0..000000000000
--- a/dev-haskell/biosff/biosff-0.3.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library and executables for working with SFF files"
-HOMEPAGE="http://biohaskell.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fclip +flower +frecover"
-
-RDEPEND=">=dev-haskell/biocore-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- flower? ( dev-haskell/cmdargs:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.10.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag fclip fclip) \
- $(cabal_flag flower flower) \
- $(cabal_flag frecover frecover)
-}
diff --git a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch b/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
deleted file mode 100644
index 48c29358ca7c..000000000000
--- a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/Flower/Main.hs b/src/Flower/Main.hs
-index b0cbd1c..3428db5 100644
---- a/src/Flower/Main.hs
-+++ b/src/Flower/Main.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- FlowEr - FLOWgram ExtractoR
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
deleted file mode 100644
index 1c01edd0aec8..000000000000
--- a/dev-haskell/biosff/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="fclip">Build the 'fclip' executable.</flag>
- <flag name="flower">Build the 'flower' executable.</flag>
- <flag name="frecover">Build the 'frecover' executable.</flag>
- </use>
- <longdescription>
- The library contains the functionality for reading and writing
- SFF files (sequencing data from 454 and Ion Torrent). It duplicates
- code from (and is incompatible with) the "bio" library.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bitarray/Manifest b/dev-haskell/bitarray/Manifest
deleted file mode 100644
index 89f9abf6bfe2..000000000000
--- a/dev-haskell/bitarray/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bitarray-0.0.1.1.tar.gz 3701 BLAKE2B f26a89d1999eaf851ffdb66d6e34c4047169fbf1c253acde0631101039ee6f6a7d0ab8640f25b8a1837df9974ac137c5ca1e7f64d537bdd059aaf3eae7e5c5aa SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602
diff --git a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
deleted file mode 100644
index b343dc284a87..000000000000
--- a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable and immutable bit arrays"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/bitarray/metadata.xml b/dev-haskell/bitarray/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/bitarray/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/bits-atomic/Manifest b/dev-haskell/bits-atomic/Manifest
deleted file mode 100644
index fedb3f2de91d..000000000000
--- a/dev-haskell/bits-atomic/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bits-atomic-0.1.3-gcc-5.patch 30907 BLAKE2B 135d495f914af645de82c4d3cd491460dba6fee5293a591f9e83ad07efd7b47cedf32a841557eca0a852690e9367c6fd7a0d6722d6212193c7188fe70d673d77 SHA512 0a40015f225325db3716ac0a17e33eef3f2042b72f933000a52734b103ea3e316a0242a0b75c90a31d0d4c31d33da8d32b07f7c067d79ade51df66ea75a3b19c
-DIST bits-atomic-0.1.3.tar.gz 7982 BLAKE2B 4ac1e6c808c30fb8ad59509aefb9dcb32f98023b31efb2eabf59ea94cbc681aa94219a8389179c7755dfb8ad944bcab122676aca361502d030c85d04c7a4f113 SHA512 e13c21c81ebc6cce2f85a184a572eb1647439f605985a8344ff219cc685c7d0adcf5d2433ea75fa1560a807e329cab23b548435adc0087e6294417eb7a65fbf1
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
deleted file mode 100644
index 278b011fad91..000000000000
--- a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Atomic bit operations on memory locations for low-level synchronization"
-HOMEPAGE="https://hackage.haskell.org/package/bits-atomic"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://dev.gentoo.org/~slyfox/patches/${P}-gcc-5.patch"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
-
-PATCHES=(
- "${DISTDIR}"/${P}-gcc-5.patch
- "${FILESDIR}"/${P}-ghc-8.patch
-)
diff --git a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
deleted file mode 100644
index eb12edc2d4f3..000000000000
--- a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/test/test.hs b/test/test.hs
-index 38238b5..c3a99b0 100644
---- a/test/test.hs
-+++ b/test/test.hs
-@@ -35,3 +35,3 @@ testPattern = 0xdeadbeef
-
--type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
-+type PolyTest = forall a . (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
-
diff --git a/dev-haskell/bits-atomic/metadata.xml b/dev-haskell/bits-atomic/metadata.xml
deleted file mode 100644
index d93ea74cbc2d..000000000000
--- a/dev-haskell/bits-atomic/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Atomic operations including CAS (compare-and-swap), fetch &amp; add and variants
- suitable for low-level shared-memory synchronization.
-
- The implementation is using GCC's builtin atomic operations (available in GCC &gt;=
- 4) in C wrappers called through the FFI. See these links for background:
-
- * GCC manual: &lt;https://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html&gt;
-
- * GCC wiki: &lt;https://gcc.gnu.org/wiki/Atomic&gt;
-
- /Portability/: This package is primarily developed on a Linux system, but
- should work wherever GCC &gt;= 4 is available. It has been confirmed as working
- on OSX. On Windows, it should work with Cygwin but currently fails for
- vanilla Haskell-Platform 2010.1.0.0 as it still packages GCC 3.x. An
- installer for updated versions of GCC is available at
- &lt;http://www.mingw.org/&gt; and should make this package work in connection with
- Haskell-Platform. Feedback on compatibility would be appreciated.
-
- /Testing:/ The following commands can be used to compile and run the test suite:
-
- &gt; cabal unpack bits-atomic &amp;&amp; cd bits-atomic-* # if not yet locally available
- &gt; cabal configure -ftest
- &gt; cabal build
- &gt; cabal test
-
- /Recent changes/:
-
- * 0.1.3: Documentation updates, especially on portability. No functional
- changes.
-
- * 0.1.2: Avoid using System.FilePath in Setup.hs to fix build failure on hackage
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bitvec/Manifest b/dev-haskell/bitvec/Manifest
new file mode 100644
index 000000000000..e39759f70fb9
--- /dev/null
+++ b/dev-haskell/bitvec/Manifest
@@ -0,0 +1 @@
+DIST bitvec-1.1.3.0.tar.gz 35865 BLAKE2B b63dc22574176993f55f0935e1d89f6660ef365189838821c11a04a07ff2a41241a1f0a34b148f36036eba3ea55adda516e355a574ae1e49b658c986fb515254 SHA512 4a54726e0ec0923019329fd2f110011f547761e51a7485f684526ba7f97caac170fde1a4bfe84b57a016ad85c6e440b85f20993c15854e9e79231ecd07d960ca
diff --git a/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild b/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild
new file mode 100644
index 000000000000..25d80a6e03b7
--- /dev/null
+++ b/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Space-efficient bit vectors"
+HOMEPAGE="https://github.com/Bodigrim/bitvec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+gmp"
+
+RDEPEND="
+ >=dev-haskell/primitive-0.5:=[profile?]
+ >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ gmp? (
+ dev-libs/gmp
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/quickcheck-classes-0.6.1
+ dev-haskell/quickcheck-classes-base
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag gmp libgmp)
+}
diff --git a/dev-haskell/bitvec/metadata.xml b/dev-haskell/bitvec/metadata.xml
new file mode 100644
index 000000000000..c0879f2b3fdc
--- /dev/null
+++ b/dev-haskell/bitvec/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="gmp">Link against the GMP library for the ultimate performance of
+`zipBits`, `invertBits` and `countBits`. Users are strongly encouraged
+to enable this flag whenever possible.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">bitvec</remote-id>
+ <remote-id type="github">Bodigrim/bitvec</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
deleted file mode 100644
index 206b04dec792..000000000000
--- a/dev-haskell/bitwise/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bitwise-1.0.0.1.tar.gz 16473 BLAKE2B e7caa6d1ac864d6c12ff471a7080559da93f3973eeb5949e54ee2a2f205cab4a9c452578c0a22102fe613964af4f9367b037552a30dd711b08cac2dd2c3ccdca SHA512 b8653549ef0d0f4eb608802f6124cd969c16cbeb6f26dd83839bbaab7d56cf0c1b39a7ac3dba40f3fa00f3f67f38bad091ee0f01e7f6aea7f9c0bafa34efb443
diff --git a/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild b/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
deleted file mode 100644
index 7c437a36a1a8..000000000000
--- a/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
-HOMEPAGE="https://code.mathr.co.uk/bitwise"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.4 && < 2.12' 'QuickCheck >= 2.4' \
- 'base >= 4.7 && < 4.12' 'base >= 4.7'
-}
diff --git a/dev-haskell/bitwise/metadata.xml b/dev-haskell/bitwise/metadata.xml
deleted file mode 100644
index 361f919bab11..000000000000
--- a/dev-haskell/bitwise/metadata.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Unboxed multidimensional bit packed Bool arrays with fast aggregate
- operations based on lifting Bool operations to bitwise operations.
-
- There are many other bit packed structures out there, but none met
- all of these requirements:
-
- (1) unboxed bit packed Bool array,
-
- (2) multi-dimensional indexing,
-
- (3) fast (de)serialization, or interoperable with foreign code,
-
- (4) fast aggregate operations (fold, map, zip).
-
- Quick tour of the bitwise library:
-
- [Data.Bits.Bitwise] Lift boolean operations on 'Bool' to bitwise
- operations on 'Data.Bits.Bits'.
-
- [Data.Array.BitArray] Immutable bit arrays.
-
- [Data.Array.BitArray.ST] Mutable bit arrays in 'Control.Monad.ST.ST'.
-
- [Data.Array.BitArray.IO] Mutable bit arrays in 'IO'.
-
- [Data.Array.BitArray.ByteString] (De)serialization.
-
- [Codec.Image.PBM] Portable bitmap monochrome 2D image format.
-
- Very rough performance benchmarks:
-
- * immutable random access single bit reads:
- @BitArray ix@ is about 40% slower than @UArray ix Bool@,
-
- * 'Control.Monad.ST.ST' mutable random access single bit reads:
- @STBitArray s ix@ is about the same as @STUArray s ix Bool@,
-
- * immutable map @Bool -&gt; Bool@:
- @BitArray ix@ is about 85x faster than @UArray ix Bool@,
-
- * immutable zipWith @Bool -&gt; Bool -&gt; Bool@:
- @BitArray ix@ is about 1300x faster than @UArray ix Bool@.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder-conduit/Manifest b/dev-haskell/blaze-builder-conduit/Manifest
deleted file mode 100644
index 72a107c9da58..000000000000
--- a/dev-haskell/blaze-builder-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST blaze-builder-conduit-1.1.0.tar.gz 1367 BLAKE2B f62b2a5d8dcabec2d9173eb2cdd0569821735624bc8dd9c14779f9a3e2a2c6222d9c95666daac3884aa2edb8b1f2324a8e097d513e48f8479761597d4be570ab SHA512 99a558801dd0bfec495648dc1a964ddf7a53d363c82ddde794bb98b6c3d12ca74edc7d79257cbf83d8802d0197c75c9e71e637de32e30b76600ce9475b0ad797
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
deleted file mode 100644
index 4efad85f8a29..000000000000
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Convert streams of builders to streams of bytestrings. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/blaze-builder-conduit/metadata.xml b/dev-haskell/blaze-builder-conduit/metadata.xml
deleted file mode 100644
index ed3c0820e087..000000000000
--- a/dev-haskell/blaze-builder-conduit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">snoyberg/conduit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
index fc4677add169..a99be0961582 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -1 +1,3 @@
-DIST blaze-builder-0.4.1.0.tar.gz 61365 BLAKE2B 6c6a1c2f7b97a75bb7489471e34674d0502ec1b2871643dc945ef0574d94cc09c2726d03fcc4f38d43f34baadd8629a0e81d5292998153ee8b907d546153488c SHA512 0962634113a19d39fb19a9df895a4e4e3e0fc5b2c17fd0d5c27e1cd9da128fd3af2f01d7b0ce894d3964b5b3bd874aeae205b126e069a6e5d964ad97c753da39
+DIST blaze-builder-0.4.2.1.tar.gz 60704 BLAKE2B 0799da061985559e3281d064dc2624a1ae2310befaadfc2cddca6999f3725bfc2a8a97d73810566c82b6037e1524ee19059c10ed6eb88707e95792ce2c1282ce SHA512 30f8d1d70a1aeb5b4c4e3170e40207c0f39933050e04bbdff49683a8b2e850921e80fa8e2d7f2b7a2a19fd6340bb65fad9c1d33999abf8a388d3f0ce921d0744
+DIST blaze-builder-0.4.2.2-rev1.cabal 3685 BLAKE2B 71003f887114361d365105f2120ee300826de1f523ef94f29bcd76432613b81e27f9f990fc2e6af4bd045b49fd8a041802e07388cddfd9721ca8739e0e4834da SHA512 62f24833b5dc73e2e0ad8972b265e905bdc2f40f3466c6657bceafcd8c73a5a039bfbf9e99ea2e5a4b94363cec17b59de2775e0d6d6eb1877ff29a9035afe50f
+DIST blaze-builder-0.4.2.2.tar.gz 60707 BLAKE2B b096325d84df3b60f618f53d8288dd1bdd8b9100a88ff4853bc327a0f21b5a9c4b6ea4769203cbbed2740378420b2604f74a4ca25355ba1298b9a9ea95cf36d3 SHA512 4a0aeaa909a487c652103c5d68180fb34bd2a8be9d625b96056b632081c3f58b8588811f3f47fcf8b58c680ae1c38e4ba8d7066617cb1b660f1994520427d654
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
deleted file mode 100644
index 7393389c427f..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- dev-haskell/utf8-string )
-"
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
new file mode 100644
index 000000000000..1081883d2e10
--- /dev/null
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient buffered output"
+HOMEPAGE="https://github.com/lpsmith/blaze-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:= <dev-lang/ghc-9.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2
+ dev-haskell/utf8-string )
+"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild
new file mode 100644
index 000000000000..19fdd3527d52
--- /dev/null
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient buffered output"
+HOMEPAGE="https://github.com/blaze-builder/blaze-builder"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2
+ dev-haskell/utf8-string )
+"
diff --git a/dev-haskell/blaze-builder/metadata.xml b/dev-haskell/blaze-builder/metadata.xml
index d61b16af6ba1..3bdb9d6eeead 100644
--- a/dev-haskell/blaze-builder/metadata.xml
+++ b/dev-haskell/blaze-builder/metadata.xml
@@ -5,18 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides an abstraction of buffered output of
- byte streams and several convenience functions to exploit
- it. For example, it allows to efficiently serialize
- Haskell values to lazy bytestrings with a large average
- chunk size. The large average chunk size allows to make
- good use of cache prefetching in later processing steps
- (e.g. compression) and reduces the sytem call overhead
- when writing the resulting lazy bytestring to a file or
- sending it over the network.
- </longdescription>
<upstream>
- <remote-id type="github">meiersi/blaze-builder</remote-id>
+ <remote-id type="hackage">blaze-builder</remote-id>
+ <remote-id type="github">blaze-builder/blaze-builder</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
index 429311a2e9e3..4fd175b3a555 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -1 +1,2 @@
+DIST blaze-html-0.9.1.2-rev2.cabal 3062 BLAKE2B d39b3ba6f0e43a82cc30b603748f4c5d73e736d57ef671583785923d8daa6100bed5884a34b2d41a3c72e010e24783ffacc69025a9e83eef7e423311e747f9e9 SHA512 debb09afd6a0a8e8ac63026f2de02ddc6ab396f035067824f158f7604fe43d0d5c0ec8f5df7634323855c4ad2ba5319b4880169d680537dfd94dca3fd88f9f62
DIST blaze-html-0.9.1.2.tar.gz 81617 BLAKE2B 36e86647db47ee55a32daf2cf2afa51fd58436c7de7e7dac81b298cc1ea7e1ba1fd470d2a19def3bc6aabc51bd046c8c611300fa4ecb5f0e1cee2286a0b461e6 SHA512 26e5294285033fa453ab9914a5bdb37c42f5b7c3a10400be1ff6dd125a70499d556c106cc8128154dc0c455c8b80b489a883265fcb626e2d4afcd8e4d94374bc
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild
new file mode 100644
index 000000000000..dba23781e701
--- /dev/null
+++ b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
+HOMEPAGE="https://jaspervdj.be/blaze"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
deleted file mode 100644
index 3a7fb9dbead9..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
- >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/metadata.xml b/dev-haskell/blaze-html/metadata.xml
index 2cc9cebf2e16..937381521944 100644
--- a/dev-haskell/blaze-html/metadata.xml
+++ b/dev-haskell/blaze-html/metadata.xml
@@ -5,10 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A blazingly fast HTML combinator library for the Haskell
- programming language. The Text.Blaze module is a good
- starting point, as well as this tutorial:
- &lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
index bc9ebb22132a..7f8482735520 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -1 +1,2 @@
-DIST blaze-markup-0.8.2.4.tar.gz 14518 BLAKE2B 43f07bdfeac60e60b55a7a0f8a1bf3c1386597b09511a6df2139246b05d10bc66899ffad7eefbd97cc1c981e7dcc8f7e345ec41675293599f22e1d3849ecd5d9 SHA512 e75fe4162f165975febced4d54460c64a4a4d1ec1db963fcda7d1c1e2cc2c24f8eb565ba0170524aa28da3b3cc1d8057d036a1ab963052436dd550189d5cd263
+DIST blaze-markup-0.8.2.8-rev4.cabal 2271 BLAKE2B 2e3f4619511693df71d0c13f7b11be0a93ba17ca1a4d8309e28cfce7c51be356f5192be0fb0cd7078cd99d8653032d3fd9fbd3bb9097dfe8fdbfb9190d25bb7f SHA512 a26f0036aedb8fc9261d61be03545cd181c74e70a82c29d799c45c448f7dff5d8c413e4e2ef4a1997b43a1992a60c33e45090e3ca345898f80182016992b37b4
+DIST blaze-markup-0.8.2.8.tar.gz 14519 BLAKE2B 14e411fa06da460f3ef2362179d910562d292190396430c9fe6fae76195d0d6d0a5a2110659f41217515afdbece60618eca6264906a554fc9668f25abaac7119 SHA512 d677b611c751c2dfd4bd12c1b1aa612b08356c90b9962b60d4972a9626ddd0337bcaf40b4595b64c1d3bf506d017f058771d00fa55979b94283095061be18944
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
deleted file mode 100644
index 522cbb17b49e..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
- >=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4 && < 4.14' 'base >= 4'
-}
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild
new file mode 100644
index 000000000000..03a9ca261bc6
--- /dev/null
+++ b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast markup combinator library for Haskell"
+HOMEPAGE="https://jaspervdj.be/blaze"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ )
+"
diff --git a/dev-haskell/blaze-markup/metadata.xml b/dev-haskell/blaze-markup/metadata.xml
index 74fb0c3c235f..d03ec965e673 100644
--- a/dev-haskell/blaze-markup/metadata.xml
+++ b/dev-haskell/blaze-markup/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Core modules of a blazingly fast markup combinator library for the Haskell
- programming language. The Text.Blaze module is a good
- starting point, as well as this tutorial:
- &lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">blaze-markup</remote-id>
+ <remote-id type="github">jaspervdj/blaze-markup</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/blaze-textual/Manifest b/dev-haskell/blaze-textual/Manifest
deleted file mode 100644
index 7ad60d9ff8a0..000000000000
--- a/dev-haskell/blaze-textual/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST blaze-textual-0.2.1.0.tar.gz 6914 BLAKE2B 1f56b564d91429abf12984602784dd1af4e3e4f0ba603e306912c00fae4efd5e74575e1c3387fc382265edb3343987477f24950e3814cacb9651c9e3333259c6 SHA512 260036fc712fab44e6f852dd8b40d9fbe79e0a181788d647806b128da19f57cf2e024ffe0567265deddabebb27b9dc9dbd34422cbdbf04c9e21d3e010a4f7ee5
diff --git a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
deleted file mode 100644
index 909db630574a..000000000000
--- a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -developer,-native
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast rendering of common datatypes"
-HOMEPAGE="https://github.com/bos/blaze-textual"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
- >=dev-haskell/double-conversion-0.2.0.1:=[profile?]
- dev-haskell/old-locale:=[profile?]
- >=dev-haskell/text-0.11.0.2:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/quickcheck-2.4.0.1
- >=dev-haskell/test-framework-0.3.3
- >=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.1.0-ghc-9.0.patch
- "${FILESDIR}"/${PN}-0.2.1.0-integer-simple-fallback.patch
-)
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer \
- --flag=-native
-}
diff --git a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch
deleted file mode 100644
index 86dfdb602fcb..000000000000
--- a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-ghc-9.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit c93b53a4aaad5a6ee2ddf90010957981d75d3579 (HEAD -> master, origin/master, origin/HEAD)
-Author: Andrey Prokopenko <persiantiger@yandex.ru>
-Date: Sun Apr 18 01:21:37 2021 +0300
-
- Hide `quoteRemInteger` import for base-4.15.0.0
-
-diff --git a/Blaze/Text/Int.hs b/Blaze/Text/Int.hs
-index 58cdbf4..bf395a3 100644
---- a/Blaze/Text/Int.hs
-+++ b/Blaze/Text/Int.hs
-@@ -23,7 +23,10 @@ import Data.Int (Int8, Int16, Int32, Int64)
- import Data.Monoid (mappend, mempty)
- import Data.Word (Word, Word8, Word16, Word32, Word64)
- import GHC.Base (quotInt, remInt)
-+#if MIN_VERSION_base(4,15,0)
-+#else
- import GHC.Num (quotRemInteger)
-+#endif
- import GHC.Types (Int(..))
-
- #if defined(INTEGER_GMP)
-
diff --git a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch b/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch
deleted file mode 100644
index 44ff8fdc6ff6..000000000000
--- a/dev-haskell/blaze-textual/files/blaze-textual-0.2.1.0-integer-simple-fallback.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Allow ghc[-gmp] to discover integer-simple: https://bugs.gentoo.org/790467
---- a/blaze-textual.cabal
-+++ b/blaze-textual.cabal
-@@ -39,7 +39,6 @@ flag native
- flag integer-simple
- description: use integer-simple instead of integer-gmp
- default: False
-- manual: True
-
- library
- exposed-modules:
diff --git a/dev-haskell/blaze-textual/metadata.xml b/dev-haskell/blaze-textual/metadata.xml
deleted file mode 100644
index 833c880d8e99..000000000000
--- a/dev-haskell/blaze-textual/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library for efficiently rendering Haskell datatypes to
- bytestrings.
-
- /Note/: if you use GHCi or Template Haskell, please see the
- @README@ file for important details about building this package,
- and other packages that depend on it:
- &lt;https://github.com/bos/blaze-textual#readme&gt;
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
index 71e862e056cb..4b77ae077d88 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -1 +1,2 @@
+DIST bloomfilter-2.0.1.0-rev2.cabal 1806 BLAKE2B 4652a7515577ea06bab01e561d8ccc8127b15b84c0cfeb47ca0fbc1af04e0327022135242752f4a2a6e829dc7b8aa2b1eb3a34a60aeb7430306664d9f1578fbe SHA512 59baafec819dac814a3c6336569fa9f13507976e1899d346ce6ea42a667e3e13fdb12e1b23443d46ef949c6b46ef665f691ad13d1952b41c5fd565f3598a1be6
DIST bloomfilter-2.0.1.0.tar.gz 22100 BLAKE2B c00a904a32c2e16810b19e27d7adef365ecf48b62bcd8da871aa3b33cb9b6e18cb11771da5a7df7209ce048e2fa1176b9c3f015030d0349a10a32375f462df02 SHA512 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
new file mode 100644
index 000000000000..89eb41c70f59
--- /dev/null
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure and impure Bloom Filter implementations"
+HOMEPAGE="https://github.com/bos/bloomfilter"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.1.0-ghc-9_2-fix.patch"
+)
+
+CABAL_CHDEPS=(
+ 'base >= 4.4 && < 4.16' 'base >= 4.4'
+ 'base >= 4.4 && < 4.16' 'base >= 4.4'
+)
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.5
+ dev-haskell/random
+ dev-haskell/test-framework
+ dev-haskell/test-framework-quickcheck2
+ )
+"
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 746d11fb076a..bce47d8d507f 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch b/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch
new file mode 100644
index 000000000000..d08788f687b8
--- /dev/null
+++ b/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch
@@ -0,0 +1,289 @@
+From fb79b39c44404fd791a3bed973e9d844fb084f1e Mon Sep 17 00:00:00 2001
+From: Simon Jakobi <simon.jakobi@gmail.com>
+From: <https://github.com/bos/bloomfilter/pull/20>
+Date: Fri, 12 Nov 2021 01:37:36 +0100
+Subject: [PATCH 1/2] Fix build with GHC 9.2
+
+The `FastShift.shift{L,R}` methods are replaced with `unsafeShift{L,R}`
+introduced in base-4.5.
+
+Fixes #19.
+---
+ Data/BloomFilter.hs | 16 +++++------
+ Data/BloomFilter/Hash.hs | 15 +++++-----
+ Data/BloomFilter/Mutable.hs | 20 +++++++-------
+ Data/BloomFilter/Util.hs | 55 ++++++-------------------------------
+ bloomfilter.cabal | 2 +-
+ 5 files changed, 34 insertions(+), 74 deletions(-)
+
+diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
+index 2210cef..6b47c21 100644
+--- a/Data/BloomFilter.hs
++++ b/Data/BloomFilter.hs
+@@ -78,8 +78,8 @@ import Control.DeepSeq (NFData(..))
+ import Data.Array.Base (unsafeAt)
+ import qualified Data.Array.Base as ST
+ import Data.Array.Unboxed (UArray)
+-import Data.Bits ((.&.))
+-import Data.BloomFilter.Util (FastShift(..), (:*)(..))
++import Data.Bits ((.&.), unsafeShiftL, unsafeShiftR)
++import Data.BloomFilter.Util ((:*)(..))
+ import qualified Data.BloomFilter.Mutable as MB
+ import qualified Data.BloomFilter.Mutable.Internal as MB
+ import Data.BloomFilter.Mutable.Internal (Hash, MBloom)
+@@ -98,7 +98,7 @@ data Bloom a = B {
+ }
+
+ instance Show (Bloom a) where
+- show ub = "Bloom { " ++ show ((1::Int) `shiftL` shift ub) ++ " bits } "
++ show ub = "Bloom { " ++ show ((1::Int) `unsafeShiftL` shift ub) ++ " bits } "
+
+ instance NFData (Bloom a) where
+ rnf !_ = ()
+@@ -172,7 +172,7 @@ singleton hash numBits elt = create hash numBits (\mb -> MB.insert mb elt)
+ -- | Given a filter's mask and a hash value, compute an offset into
+ -- a word array and a bit offset within that word.
+ hashIdx :: Int -> Word32 -> (Int :* Int)
+-hashIdx mask x = (y `shiftR` logBitsInHash) :* (y .&. hashMask)
++hashIdx mask x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask)
+ where hashMask = 31 -- bitsInHash - 1
+ y = fromIntegral x .&. mask
+
+@@ -191,7 +191,7 @@ hashesU ub elt = hashIdx (mask ub) `map` hashes ub elt
+ -- /still/ some possibility that @True@ will be returned.
+ elem :: a -> Bloom a -> Bool
+ elem elt ub = all test (hashesU ub elt)
+- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) /= 0
++ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) /= 0
+
+ modify :: (forall s. (MBloom s a -> ST s z)) -- ^ mutation function (result is discarded)
+ -> Bloom a
+@@ -255,11 +255,11 @@ insertList elts = modify $ \mb -> mapM_ (MB.insert mb) elts
+ -- is /still/ some possibility that @True@ will be returned.
+ notElem :: a -> Bloom a -> Bool
+ notElem elt ub = any test (hashesU ub elt)
+- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) == 0
++ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) == 0
+
+ -- | Return the size of an immutable Bloom filter, in bits.
+ length :: Bloom a -> Int
+-length = shiftL 1 . shift
++length = unsafeShiftL 1 . shift
+
+ -- | Build an immutable Bloom filter from a seed value. The seeding
+ -- function populates the filter as follows.
+@@ -318,7 +318,7 @@ fromList hashes numBits = unfold hashes numBits convert
+ logPower2 :: Int -> Int
+ logPower2 k = go 0 k
+ where go j 1 = j
+- go j n = go (j+1) (n `shiftR` 1)
++ go j n = go (j+1) (n `unsafeShiftR` 1)
+
+ -- $overview
+ --
+diff --git a/Data/BloomFilter/Hash.hs b/Data/BloomFilter/Hash.hs
+index 132a3a4..d071fd4 100644
+--- a/Data/BloomFilter/Hash.hs
++++ b/Data/BloomFilter/Hash.hs
+@@ -38,8 +38,7 @@ module Data.BloomFilter.Hash
+ ) where
+
+ import Control.Monad (foldM)
+-import Data.Bits ((.&.), (.|.), xor)
+-import Data.BloomFilter.Util (FastShift(..))
++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR, xor)
+ import Data.List (unfoldr)
+ import Data.Int (Int8, Int16, Int32, Int64)
+ import Data.Word (Word8, Word16, Word32, Word64)
+@@ -91,11 +90,11 @@ class Hashable a where
+ -> Word64 -- ^ salt
+ -> IO Word64
+ hashIO64 v salt = do
+- let s1 = fromIntegral (salt `shiftR` 32) .&. maxBound
++ let s1 = fromIntegral (salt `unsafeShiftR` 32) .&. maxBound
+ s2 = fromIntegral salt
+ h1 <- hashIO32 v s1
+ h2 <- hashIO32 v s2
+- return $ (fromIntegral h1 `shiftL` 32) .|. fromIntegral h2
++ return $ (fromIntegral h1 `unsafeShiftL` 32) .|. fromIntegral h2
+
+ -- | Compute a 32-bit hash.
+ hash32 :: Hashable a => a -> Word32
+@@ -149,8 +148,8 @@ cheapHashes :: Hashable a => Int -- ^ number of hashes to compute
+ cheapHashes k v = go 0
+ where go i | i == j = []
+ | otherwise = hash : go (i + 1)
+- where !hash = h1 + (h2 `shiftR` i)
+- h1 = fromIntegral (h `shiftR` 32)
++ where !hash = h1 + (h2 `unsafeShiftR` i)
++ h1 = fromIntegral (h `unsafeShiftR` 32)
+ h2 = fromIntegral h
+ h = hashSalt64 0x9150a946c4a8966e v
+ j = fromIntegral k
+@@ -163,7 +162,7 @@ instance Hashable Integer where
+ (salt `xor` 0x3ece731e)
+ | otherwise = hashIO32 (unfoldr go k) salt
+ where go 0 = Nothing
+- go i = Just (fromIntegral i :: Word32, i `shiftR` 32)
++ go i = Just (fromIntegral i :: Word32, i `unsafeShiftR` 32)
+
+ instance Hashable Bool where
+ hashIO32 = hashOne32
+@@ -224,7 +223,7 @@ instance Hashable Word64 where
+ -- | A fast unchecked shift. Nasty, but otherwise GHC 6.8.2 does a
+ -- test and branch on every shift.
+ div4 :: CSize -> CSize
+-div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `shiftR` 2)
++div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `unsafeShiftR` 2)
+
+ alignedHash :: Ptr a -> CSize -> Word32 -> IO Word32
+ alignedHash ptr bytes salt
+diff --git a/Data/BloomFilter/Mutable.hs b/Data/BloomFilter/Mutable.hs
+index edff1fc..0bb5cc9 100644
+--- a/Data/BloomFilter/Mutable.hs
++++ b/Data/BloomFilter/Mutable.hs
+@@ -65,9 +65,9 @@ module Data.BloomFilter.Mutable
+ import Control.Monad (liftM, forM_)
+ import Control.Monad.ST (ST)
+ import Data.Array.Base (unsafeRead, unsafeWrite)
+-import Data.Bits ((.&.), (.|.))
++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR)
+ import Data.BloomFilter.Array (newArray)
+-import Data.BloomFilter.Util (FastShift(..), (:*)(..), nextPowerOfTwo)
++import Data.BloomFilter.Util ((:*)(..), nextPowerOfTwo)
+ import Data.Word (Word32)
+ import Data.BloomFilter.Mutable.Internal
+
+@@ -86,9 +86,9 @@ new hash numBits = MB hash shft msk `liftM` newArray numElems numBytes
+ | numBits > maxHash = maxHash
+ | isPowerOfTwo numBits = numBits
+ | otherwise = nextPowerOfTwo numBits
+- numElems = max 2 (twoBits `shiftR` logBitsInHash)
+- numBytes = numElems `shiftL` logBytesInHash
+- trueBits = numElems `shiftL` logBitsInHash
++ numElems = max 2 (twoBits `unsafeShiftR` logBitsInHash)
++ numBytes = numElems `unsafeShiftL` logBytesInHash
++ trueBits = numElems `unsafeShiftL` logBitsInHash
+ shft = logPower2 trueBits
+ msk = trueBits - 1
+ isPowerOfTwo n = n .&. (n - 1) == 0
+@@ -109,7 +109,7 @@ logBytesInHash = 2 -- logPower2 (sizeOf (undefined :: Hash))
+ -- | Given a filter's mask and a hash value, compute an offset into
+ -- a word array and a bit offset within that word.
+ hashIdx :: Int -> Word32 -> (Int :* Int)
+-hashIdx msk x = (y `shiftR` logBitsInHash) :* (y .&. hashMask)
++hashIdx msk x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask)
+ where hashMask = 31 -- bitsInHash - 1
+ y = fromIntegral x .&. msk
+
+@@ -125,7 +125,7 @@ insert mb elt = do
+ let mu = bitArray mb
+ forM_ (hashesM mb elt) $ \(word :* bit) -> do
+ old <- unsafeRead mu word
+- unsafeWrite mu word (old .|. (1 `shiftL` bit))
++ unsafeWrite mu word (old .|. (1 `unsafeShiftL` bit))
+
+ -- | Query a mutable Bloom filter for membership. If the value is
+ -- present, return @True@. If the value is not present, there is
+@@ -135,7 +135,7 @@ elem elt mb = loop (hashesM mb elt)
+ where mu = bitArray mb
+ loop ((word :* bit):wbs) = do
+ i <- unsafeRead mu word
+- if i .&. (1 `shiftL` bit) == 0
++ if i .&. (1 `unsafeShiftL` bit) == 0
+ then return False
+ else loop wbs
+ loop _ = return True
+@@ -145,7 +145,7 @@ elem elt mb = loop (hashesM mb elt)
+
+ -- | Return the size of a mutable Bloom filter, in bits.
+ length :: MBloom s a -> Int
+-length = shiftL 1 . shift
++length = unsafeShiftL 1 . shift
+
+
+ -- | Slow, crummy way of computing the integer log of an integer known
+@@ -153,7 +153,7 @@ length = shiftL 1 . shift
+ logPower2 :: Int -> Int
+ logPower2 k = go 0 k
+ where go j 1 = j
+- go j n = go (j+1) (n `shiftR` 1)
++ go j n = go (j+1) (n `unsafeShiftR` 1)
+
+ -- $overview
+ --
+diff --git a/Data/BloomFilter/Util.hs b/Data/BloomFilter/Util.hs
+index 7f695dc..6ade6e5 100644
+--- a/Data/BloomFilter/Util.hs
++++ b/Data/BloomFilter/Util.hs
+@@ -2,15 +2,11 @@
+
+ module Data.BloomFilter.Util
+ (
+- FastShift(..)
+- , nextPowerOfTwo
++ nextPowerOfTwo
+ , (:*)(..)
+ ) where
+
+-import Data.Bits ((.|.))
+-import qualified Data.Bits as Bits
+-import GHC.Base
+-import GHC.Word
++import Data.Bits ((.|.), unsafeShiftR)
+
+ -- | A strict pair type.
+ data a :* b = !a :* !b
+@@ -22,46 +18,11 @@ nextPowerOfTwo :: Int -> Int
+ {-# INLINE nextPowerOfTwo #-}
+ nextPowerOfTwo n =
+ let a = n - 1
+- b = a .|. (a `shiftR` 1)
+- c = b .|. (b `shiftR` 2)
+- d = c .|. (c `shiftR` 4)
+- e = d .|. (d `shiftR` 8)
+- f = e .|. (e `shiftR` 16)
+- g = f .|. (f `shiftR` 32) -- in case we're on a 64-bit host
++ b = a .|. (a `unsafeShiftR` 1)
++ c = b .|. (b `unsafeShiftR` 2)
++ d = c .|. (c `unsafeShiftR` 4)
++ e = d .|. (d `unsafeShiftR` 8)
++ f = e .|. (e `unsafeShiftR` 16)
++ g = f .|. (f `unsafeShiftR` 32) -- in case we're on a 64-bit host
+ !h = g + 1
+ in h
+-
+--- | This is a workaround for poor optimisation in GHC 6.8.2. It
+--- fails to notice constant-width shifts, and adds a test and branch
+--- to every shift. This imposes about a 10% performance hit.
+-class FastShift a where
+- shiftL :: a -> Int -> a
+- shiftR :: a -> Int -> a
+-
+-instance FastShift Word32 where
+- {-# INLINE shiftL #-}
+- shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftL#` i#)
+-
+- {-# INLINE shiftR #-}
+- shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#)
+-
+-instance FastShift Word64 where
+- {-# INLINE shiftL #-}
+- shiftL (W64# x#) (I# i#) = W64# (x# `uncheckedShiftL64#` i#)
+-
+- {-# INLINE shiftR #-}
+- shiftR (W64# x#) (I# i#) = W64# (x# `uncheckedShiftRL64#` i#)
+-
+-instance FastShift Int where
+- {-# INLINE shiftL #-}
+- shiftL (I# x#) (I# i#) = I# (x# `iShiftL#` i#)
+-
+- {-# INLINE shiftR #-}
+- shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#)
+-
+-instance FastShift Integer where
+- {-# INLINE shiftL #-}
+- shiftL = Bits.shiftL
+-
+- {-# INLINE shiftR #-}
+- shiftR = Bits.shiftR
diff --git a/dev-haskell/bloomfilter/metadata.xml b/dev-haskell/bloomfilter/metadata.xml
index dd195e7ec1e2..d27a73cfe53f 100644
--- a/dev-haskell/bloomfilter/metadata.xml
+++ b/dev-haskell/bloomfilter/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">bloomfilter</remote-id>
<remote-id type="github">bos/bloomfilter</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
deleted file mode 100644
index 955715eec975..000000000000
--- a/dev-haskell/boolean/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Boolean-0.2.4.tar.gz 6634 BLAKE2B 6964300eb6d4ed8d74a087e7349fc816c4af770af6127fba0285e6afcd22c072b7101c09d907cb794645c3726d0db36b8855a0c1f7b3d6298e49062b68d9944e SHA512 2b92666edbc2b0cf0e0f0d09125b78324229996ea1896b58779daff7f7d10b4dc4d1b8ebbcd63690cb61b68264d797fa40312ca0e934962bbeee4fb6fba1805a
diff --git a/dev-haskell/boolean/boolean-0.2.4.ebuild b/dev-haskell/boolean/boolean-0.2.4.ebuild
deleted file mode 100644
index f61c6a820028..000000000000
--- a/dev-haskell/boolean/boolean-0.2.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Boolean"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generalized booleans and numbers"
-HOMEPAGE="https://hackage.haskell.org/package/Boolean"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boolean/metadata.xml b/dev-haskell/boolean/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/boolean/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/boring/Manifest b/dev-haskell/boring/Manifest
new file mode 100644
index 000000000000..af57818f531d
--- /dev/null
+++ b/dev-haskell/boring/Manifest
@@ -0,0 +1 @@
+DIST boring-0.2.1.tar.gz 5668 BLAKE2B 8bc10995f27531cee73b87084b4db08830cbad22a13c5419d84c46b3db53c432e9ee77dc1d0bc0892c2969f643384de83378df8d62701caed60df7881693f55f SHA512 25f3dd8b44f7b35962e9b02304215b2547525b74200d4ee2bc9990c66bd40e9a3383ba7300ab2746e1704684db86788f2cea03163f9a84b62214d9d3691edd80
diff --git a/dev-haskell/boring/boring-0.2.1.ebuild b/dev-haskell/boring/boring-0.2.1.ebuild
new file mode 100644
index 000000000000..9f2c10be3afb
--- /dev/null
+++ b/dev-haskell/boring/boring-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Boring and Absurd types"
+HOMEPAGE="https://github.com/phadej/boring"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+ tagged? (
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/boring/metadata.xml b/dev-haskell/boring/metadata.xml
new file mode 100644
index 000000000000..c0a9c4cc8fcb
--- /dev/null
+++ b/dev-haskell/boring/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">boring</remote-id>
+ <remote-id type="github">phadej/boring</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/boundedchan/Manifest b/dev-haskell/boundedchan/Manifest
deleted file mode 100644
index 697eb8c05b87..000000000000
--- a/dev-haskell/boundedchan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BoundedChan-1.0.3.0.tar.gz 3591 BLAKE2B df6f085ea129efccec006dec7133524fc88332fb6451f8ee63702b985e6481c5741aecc0974c203f43b25f63036dbf0935e44e4a9cabf3f1c3574be9580bdf26 SHA512 4d842d2b499dce265329f81a402fbda2e97e00b7e04d55176225f6a1284d5dafae4712df1ab71effd328e65f218c582440d4db3e62e253033da49339cbfb7055
diff --git a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
deleted file mode 100644
index 1a257e5e28f5..000000000000
--- a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="BoundedChan"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementation of bounded channels"
-HOMEPAGE="https://hackage.haskell.org/package/BoundedChan"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boundedchan/metadata.xml b/dev-haskell/boundedchan/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/boundedchan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
deleted file mode 100644
index c39673d18079..000000000000
--- a/dev-haskell/boxes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST boxes-0.1.5.tar.gz 7598 BLAKE2B e90b94b85d2cc47904df690de2a9bc0ff058230d0134315b02ffc436e172deded72880084542628594968e82e8e81268e95582d39f4cd7d3f499d25e56faac35 SHA512 44527be9a8351aef9e6a98bc90276c0137892e2672ca5ae15968ac21cfc1f0ce92d2c734c26b5493b2f8597ab1a65cb9cf5d050b6b02b0a61d6b6df4143ba4d7
diff --git a/dev-haskell/boxes/boxes-0.1.5.ebuild b/dev-haskell/boxes/boxes-0.1.5.ebuild
deleted file mode 100644
index 8e0f2d920a85..000000000000
--- a/dev-haskell/boxes/boxes-0.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="2D text pretty-printing library"
-HOMEPAGE="https://hackage.haskell.org/package/boxes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.9.2
- test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/boxes/metadata.xml b/dev-haskell/boxes/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/boxes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/bsb-http-chunked/Manifest b/dev-haskell/bsb-http-chunked/Manifest
index 1998bde6fdfd..973ca6d7b2b7 100644
--- a/dev-haskell/bsb-http-chunked/Manifest
+++ b/dev-haskell/bsb-http-chunked/Manifest
@@ -1 +1,2 @@
+DIST bsb-http-chunked-0.0.0.4-rev3.cabal 2678 BLAKE2B bb6500f2b185bfdad11da72202c944c815db63ef5efde76bbe8216237390fc2dfb9642944ed8fc6edd78479486bc463dd3ff247fc4687fd458de7f033161c6e0 SHA512 aaa23ff987a3f9a93eafbb7ee31343038c465f92dacc1835441be8f89e20b88f4677b16c10fb775f66f77204273b60fe97c9c11846ba1822d63c4ed2e8fcefb6
DIST bsb-http-chunked-0.0.0.4.tar.gz 6630 BLAKE2B d16b539f34518aaec4875b7644ceebbf50b94ddcdd9a2bb612dabfcd5eafbaa9753d187a5b137f39126993e0b75c9ffcebafb3772d948b45512e33ff3fae1dd9 SHA512 74c04c2fd372067c42d3631cdfc2ad7093c0c3af1145833ab307c538dbb936d2042492d4e81c520c3adde8634df29ff8558822f06f226c52d16abb4a35ab1a13
diff --git a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild
new file mode 100644
index 000000000000..6513ce234259
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Chunked HTTP transfer encoding for bytestring builders"
+HOMEPAGE="https://github.com/sjakobi/bsb-http-chunked"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.0.0.4-disable-doctests-ghc-9_2.patch"
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/attoparsec
+ >=dev-haskell/blaze-builder-0.2.1.4
+ >=dev-haskell/doctest-0.8
+ dev-haskell/hedgehog
+ dev-haskell/tasty
+ dev-haskell/tasty-hedgehog
+ dev-haskell/tasty-hunit
+ )
+"
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 f0ec776e1522..5dd3456be0d4 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,11 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
"
+
+# Tests do not work correctly on >=ghc-9.2
+RDEPEND+="
+ test? (
+ <dev-lang/ghc-9.1
+ )
+"
+
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.22.2.0
test? ( dev-haskell/attoparsec
@@ -30,9 +38,6 @@ DEPEND="${RDEPEND}
dev-haskell/tasty-hunit )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.8 && < 4.13' 'base >= 4.8'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.8 && < 4.13' 'base >= 4.8'
+)
diff --git a/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch b/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch
new file mode 100644
index 000000000000..649e9cc6368f
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch
@@ -0,0 +1,27 @@
+From 11051d3af3d490f30b06a08e5b1f0b14eb648ece Mon Sep 17 00:00:00 2001
+From: Simon Jakobi <simon.jakobi@gmail.com>
+Date: Fri, 17 Dec 2021 14:47:41 +0100
+Subject: [PATCH] Disable doctests for GHC >= 9.2
+
+Closes #38.
+
+Bug: https://github.com/sjakobi/bsb-http-chunked/pull/39
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ bsb-http-chunked.cabal | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/bsb-http-chunked.cabal b/bsb-http-chunked.cabal
+index 95cbd7e..b56651c 100644
+--- a/bsb-http-chunked.cabal
++++ b/bsb-http-chunked.cabal
+@@ -66,6 +66,9 @@ test-suite doctests
+ , doctest >= 0.8
+ ghc-options: -Wall
+ type: exitcode-stdio-1.0
++ if impl(ghc >= 9.2)
++ -- https://github.com/sjakobi/bsb-http-chunked/issues/38
++ buildable: False
+
+ benchmark bench
+ hs-source-dirs: bench
diff --git a/dev-haskell/bsb-http-chunked/metadata.xml b/dev-haskell/bsb-http-chunked/metadata.xml
index e28ca99313c5..526f641c88ff 100644
--- a/dev-haskell/bsb-http-chunked/metadata.xml
+++ b/dev-haskell/bsb-http-chunked/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library contains functions for encoding [bytestring
- builders](http://hackage.haskell.org/package/bytestring/docs/Data-ByteString-Builder.html#t:Builder)
- for [chunked HTTP\/1.1 transfer](https://en.wikipedia.org/wiki/Chunked_transfer_encoding).
-
- This functionality was extracted from
- the [blaze-builder](http://hackage.haskell.org/package/blaze-builder)
- package.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">bsb-http-chunked</remote-id>
+ <remote-id type="github">sjakobi/bsb-http-chunked</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index baf7a77b5f27..989a3f7ae3a7 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
index 937381521944..0f4a77f67e72 100644
--- a/dev-haskell/byteable/metadata.xml
+++ b/dev-haskell/byteable/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/hs-byteable</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/bytedump/Manifest b/dev-haskell/bytedump/Manifest
deleted file mode 100644
index 238b44c673a7..000000000000
--- a/dev-haskell/bytedump/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytedump-1.0.tar.gz 3812 BLAKE2B 37af60e27616c8b30e72e0f3260619ac5f7d76986fe75a2fc1b4f8749dfb636a67800ebe5be19494bb250d60a97316927bd5843a5492a8a6e463ce46c92808a4 SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe
diff --git a/dev-haskell/bytedump/bytedump-1.0.ebuild b/dev-haskell/bytedump/bytedump-1.0.ebuild
deleted file mode 100644
index 349dc3af64a9..000000000000
--- a/dev-haskell/bytedump/bytedump-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Flexible byte dump helpers for human readers"
-HOMEPAGE="https://github.com/vincenthz/hs-bytedump"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable)
-}
diff --git a/dev-haskell/bytedump/metadata.xml b/dev-haskell/bytedump/metadata.xml
deleted file mode 100644
index 6c0a461abe7b..000000000000
--- a/dev-haskell/bytedump/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="executable">build executable file</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
index fae9f941b8f1..e4900354daa5 100644
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
deleted file mode 100644
index 5f1d6f42596e..000000000000
--- a/dev-haskell/bytes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytes-0.17.tar.gz 19794 BLAKE2B 12ed44aced19c62e5a78673ca01cdbc0b42d3d265b0254ced120c95ffaa1264be53db3bcedc9a84ad7a0ebf443f40ba6693d04774b307033944d4c9709a06469 SHA512 1114bfb8db6a870b1edb1a77d9234ce0bdac38a5d12708de537d09bca2a3580d16755031b704b9fdceaa0a531009b7e7f392a6f1ee173eff9720774038f675a1
diff --git a/dev-haskell/bytes/bytes-0.17.ebuild b/dev-haskell/bytes/bytes-0.17.ebuild
deleted file mode 100644
index 5707b82636dd..000000000000
--- a/dev-haskell/bytes/bytes-0.17.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Sharing code for serialization between binary and cereal"
-HOMEPAGE="https://github.com/ekmett/bytes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-
-RESTRICT=test # fail to doctest
-
-RDEPEND=">=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
- >=dev-haskell/cereal-0.5.2:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?]
- >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-lib-werror \
- $(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/bytes/metadata.xml b/dev-haskell/bytes/metadata.xml
deleted file mode 100644
index 716113a6947f..000000000000
--- a/dev-haskell/bytes/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="test-doctests">Enable the doctest suite when using the enable-tests option for cabal.</flag>
- </use>
- <upstream>
- <remote-id type="github">ekmett/bytes</remote-id>
- </upstream>
-</pkgmetadata>
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 47fc91ec63d2..6ac2cee6e9b5 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytestring-handle/Manifest b/dev-haskell/bytestring-handle/Manifest
deleted file mode 100644
index cf75fa6b6d61..000000000000
--- a/dev-haskell/bytestring-handle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytestring-handle-0.1.0.6.tar.gz 6203 BLAKE2B e821b33a97983e124c679c2b9f2316151e695ebf615f739d50b5d4524804878dddb861d2abd7708ad635cd563a007e867232f81f229b368b5ca4afb90d4730cf SHA512 a585488207680a6f1ba6538cf10d03e059010d42994803f9edc6d9c1fff08e479117a6d1449f923a8d5de9884b93438e80b81c75978e5c3145310c21ba14498c
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
deleted file mode 100644
index 4cb46da2c8f6..000000000000
--- a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ByteString-backed Handles"
-HOMEPAGE="https://hub.darcs.net/ganesh/bytestring-handle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.1.2
- >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.2 && < 4.11' 'base >= 4.2' \
- 'QuickCheck >= 2.1.2 && < 2.11' 'QuickCheck >= 2.1.2'
-}
diff --git a/dev-haskell/bytestring-handle/metadata.xml b/dev-haskell/bytestring-handle/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/bytestring-handle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-mmap/Manifest b/dev-haskell/bytestring-mmap/Manifest
deleted file mode 100644
index bd72d9ca97c5..000000000000
--- a/dev-haskell/bytestring-mmap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytestring-mmap-0.2.2.tar.gz 7188 BLAKE2B d699e51f8f2416e30013dcf87fcfaa4d0ef129c1ca9951c320a7312a1ce73db14addedf47fc138b485197a4cfb115378a4544428ad974c70d89d7b3b467ace22 SHA512 0cde0bb36808d7086f6b3e3e94813c205a61ec1d0b2156a7fac98c1dc520dcdd1821a7873b7ecb9a77fdcd254b5ac1077da86865ade20a49bba0e0da1befcf46
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
deleted file mode 100644
index 1edb2c934332..000000000000
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="mmap support for strict ByteStrings"
-HOMEPAGE="http://code.haskell.org/~dons/code/bytestring-mmap/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/bytestring-mmap/metadata.xml b/dev-haskell/bytestring-mmap/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/bytestring-mmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-show/Manifest b/dev-haskell/bytestring-show/Manifest
deleted file mode 100644
index 7766b0ae8884..000000000000
--- a/dev-haskell/bytestring-show/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytestring-show-0.3.5.6.tar.gz 8145 BLAKE2B 421a6593e77f200db1f905a5e74071116327dd018fc8117c5c81fe0193891070f3b190b4d7ffd2e056ba4b1adb9e8eae87e2f905036a0f85ab94ab7d03602d05 SHA512 f59a041e30ec3b3eb9f971968606685ba5968dafc44d92ed50c9f7f124b891f48fc6612fdfc1a57f702e76e41f70c647e81c1919ab7fee194db9d97ddd73dd10
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
deleted file mode 100644
index c9d31c589831..000000000000
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into readable byte strings"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
- default
-
- # Use default for compatibility with Cabal-3
- rm Setup.lhs || die
- cabal_chdeps \
- 'binary < 0.8' 'binary' \
- 'containers < 0.6' 'containers'
-}
diff --git a/dev-haskell/bytestring-show/metadata.xml b/dev-haskell/bytestring-show/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/bytestring-show/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/bzlib/Manifest b/dev-haskell/bzlib/Manifest
deleted file mode 100644
index 722171286c82..000000000000
--- a/dev-haskell/bzlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bzlib-0.5.1.0.tar.gz 46082 BLAKE2B d17e3832d71ca745da6884f1762aaae8ad22babed44fda9a87d2dae731334b8c1af398c78d2f79e02183ef22a53717e0a9f127fc1837f220eba35ad9397fe22f SHA512 2d4e200abc8ef7f158b4b726e81a389d5018615dd04f5704f50323498f5a1991e217a05abd10f86cab791326bc95802d22a17b55656e5289cb07ca93698a1537
diff --git a/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild b/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
deleted file mode 100644
index ff42605af4c8..000000000000
--- a/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the bzip2 format"
-HOMEPAGE="https://hackage.haskell.org/package/bzlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/bzlib/metadata.xml b/dev-haskell/bzlib/metadata.xml
deleted file mode 100644
index fc15bb4e690e..000000000000
--- a/dev-haskell/bzlib/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides a pure interface for compressing and
- decompressing streams of data represented as lazy
- 'ByteString's. It uses the bz2 C library so it has high
- performance.
-
- It provides a convenient high level API suitable for most
- tasks and for the few cases where more control is needed it
- provides access to the full bzip2 feature set.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 175026369304..fdaf481f521d 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,2 +1,2 @@
-DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
+DIST c2hs-0.28.8-rev2.cabal 9397 BLAKE2B fa4f8c6394f9d86d010a2224840483a3cd154223fbd5a993dc56250f1c49629f10a630bb33db047c091fb9ea62188728b8fe71eb044e173cc77dcdce78516706 SHA512 e8db51a51d26ef8df83e0e6a2fa643e2540135f73f1ad6409304dbd1b98e340a9aaaedf858d5fe5f18f19ce4df86568d3ad540be1c257ee352c5c3d838c879ea
DIST c2hs-0.28.8.tar.gz 207816 BLAKE2B 6d912fd93c6076ccd86ed62e075f1addb7b44378c82acc0cbaf04b6b91a2ed4530cde60a9139316d928a2867474bafde5c14aedb4ab9e78e5faaa99830276a71 SHA512 ff9119acecddd853f2f797385f971c249bcd92d4b141e8e7ea5f5d3e63aa257502c80ded2720a46e3186260026b94c9e518f08f8e452a64c9f888d0183ee1749
diff --git a/dev-haskell/c2hs/c2hs-0.28.7.ebuild b/dev-haskell/c2hs/c2hs-0.28.7.ebuild
deleted file mode 100644
index 99e58a64012a..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RESTRICT=test # needs unprefixed 'cpp'
-
-RDEPEND="dev-haskell/dlist:=
- dev-haskell/fail:=
- >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
- >=dev-lang/ghc-7.4.1:=
- regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:=
- dev-haskell/text:=
- >=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/transformers
- !regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0
- dev-haskell/text ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild b/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild
new file mode 100644
index 000000000000..8e23dfe4647f
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -regression
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # needs unprefixed 'cpp'
+
+RDEPEND="
+ dev-haskell/dlist:=
+ >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.10:=
+ >=dev-lang/ghc-9.0.2:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.4.1.0
+ test? (
+ dev-haskell/hunit
+ >=dev-haskell/shelly-1.9.0
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/text
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure --flag=-regression
+}
diff --git a/dev-haskell/c2hs/c2hs-0.28.8.ebuild b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
index 38703f4aa688..94da53ad7fe3 100644
--- a/dev-haskell/c2hs/c2hs-0.28.8.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="regression"
RESTRICT=test # needs unprefixed 'cpp'
diff --git a/dev-haskell/c2hs/metadata.xml b/dev-haskell/c2hs/metadata.xml
index 057927a3d82a..7c8b6c407a28 100644
--- a/dev-haskell/c2hs/metadata.xml
+++ b/dev-haskell/c2hs/metadata.xml
@@ -5,18 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- C-&gt;Haskell assists in the development of Haskell bindings to C
- libraries. It extracts interface information from C header
- files and generates Haskell code with foreign imports and
- marshaling. Unlike writing foreign imports by hand (or using
- hsch2s), this ensures that C functions are imported with the
- correct Haskell types.
- </longdescription>
<use>
- <flag name="regression">run regression tests</flag>
+ <flag name="regression">Enable regression suite build.</flag>
</use>
<upstream>
+ <remote-id type="hackage">c2hs</remote-id>
<remote-id type="github">haskell/c2hs</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index aeb6d5f7b02c..f1d0b6f3ed6a 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1 +1,2 @@
-DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
+DIST cabal-doctest-1.0.9-rev3.cabal 1517 BLAKE2B 8d276a1be0af33c84c45af63c55f96a126d595c73ce95008a558178fb126ea534247d5a9a697af055eb8b551d16a80408fa8484380d68732367754642691a400 SHA512 9890fb6d6b3660056f9b092285e7a0af38c1355c79724438ea7346601c7bfb0b583266065db1f7015317cbd1e5e84d10009d99b3888f413841837c58c84d75a3
+DIST cabal-doctest-1.0.9.tar.gz 10770 BLAKE2B a85afe1e184a8de3f2fc641f442e420202b0b40a4f0368de365c1581648d877efbc9e771b3fec0fafc2dc29f35e9ca0fb5689975e71889286767a53580d7d1fe SHA512 e5946a300a159e9adc8dd56927437c2e1db643d0f23c69325a33075e4da011a7e681814d9ad475ee4029f8f95151b6fa350e9b6912133167baa0bfc79b49da77
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild
deleted file mode 100644
index 97eb27900f0f..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.3 && <4.14' 'base >=4.3' \
- 'Cabal >=1.10 && <3.1' 'Cabal >=1.10 && <3.3'
-}
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..d948a92eebe3
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Setup.hs helper for running doctests"
+HOMEPAGE="https://github.com/haskellari/cabal-doctest"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.12:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
new file mode 100644
index 000000000000..15c773ed0aed
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="A Setup.hs helper for running doctests"
+HOMEPAGE="https://github.com/haskellari/cabal-doctest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/cabal-doctest/metadata.xml b/dev-haskell/cabal-doctest/metadata.xml
index 012804cafb1c..4ba119032479 100644
--- a/dev-haskell/cabal-doctest/metadata.xml
+++ b/dev-haskell/cabal-doctest/metadata.xml
@@ -5,14 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Currently (beginning of 2017), there isn't @cabal doctest@
- command. Yet, to properly work doctest needs plenty of configuration.
- This library provides the common bits for writing custom Setup.hs
- See &lt;https://github.com/haskell/cabal/issues/2327 Cabal/2327&gt; for the progress
- of @cabal doctest@, i.e. whether this library is obsolete.
- </longdescription>
<upstream>
- <remote-id type="github">phadej/cabal-doctests</remote-id>
+ <remote-id type="hackage">cabal-doctest</remote-id>
+ <remote-id type="github">haskellari/cabal-doctest</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index b3ad860dcea2..a3528ee38e6c 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1 +1,4 @@
-DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
+DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae07d25eea9ba351d4ec70026ad0d9a6fb15423b066f2d998e1b702bd9acc15f9f0f90a3a4fc4b4d359bf2c4f5748a77c352ae SHA512 287f819c47a4c1b85ce35c18a299ba18bb0907662a2a5980ed84aebbee93b558ba1237c07100175e44c6b85bcd4953b39691219afb119a8a7d1b6d8aede96d1b
+DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
+DIST cabal-install-3.6.2.0-rev2.cabal 13012 BLAKE2B 06f2bd2876d97560abf7693faf0aa0648a685bea5a443fd517d32236db8dc22c100f672ec79b6e131acd441a91f8e139c46d8a1890f2656d8f2b74be57545b71 SHA512 f6422bd69ff798ac42d1b10790347bffef6e3fc3bfc8fc4be96b6ea990f77199eb388306e45810990fd090d7d7040d72c94f3d65dc6f2f69994bf6a18b4ef134
+DIST cabal-install-3.6.2.0.tar.gz 633319 BLAKE2B e7169cc852413b3cd9d7f763402a5cc4746f9412f008b9b4a456de6002fbc79c8b77835723e3819a4049fc4d5175528040cef543f6a0dfa6f38331be16eddddb SHA512 a02d72fd7d0bf7778b1d4f2925e0b78f6c321cb29d59d559da758bfa6a0cd17fc776bd64911db8d28a208189b35db50aceae109782a1011e059446c4c2d77ad3
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
deleted file mode 100644
index 085a26c438fa..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
- >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
- >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.3:=
- >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
- >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
- >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
- >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
- >=dev-haskell/hackage-security-0.6.0.0:= <dev-haskell/hackage-security-0.7:=
- >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
- >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
- >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
- >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
- >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
- >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
- >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
- >=dev-haskell/random-1:= <dev-haskell/random-1.2:=
- >=dev-haskell/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:=
- >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
- >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
- >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
- >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
- >=dev-lang/ghc-7.10.1:=
- native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.8 && < 4.14' 'base >= 4.8'
- #if use noprefs; then
- # epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
- #fi
-
- # no chance to link to -threaded on ppc64, alpha and others
- # who use UNREG, not only ARM
- if ! ghc-supports-threaded-runtime; then
- cabal_chdeps '-threaded' ' '
- fi
- eapply_user
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flags=-debug-conflict-sets \
- --flags=-debug-expensive-assertions \
- --flags=-debug-tracetree \
- $(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
new file mode 100644
index 000000000000..9e2bce608882
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES=""
+inherit haskell-cabal ghc-package
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0"
+# Keep in sync with relevant dev-haskell/cabal versions
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko +native-dns"
+
+CABAL_CHDEPS=(
+ 'base >= 4.8 && < 4.16' 'base >= 4.8'
+ 'hashable >= 1.0 && < 1.4' 'hashable >=1.0'
+ 'HTTP >= 4000.1.5 && < 4000.4' 'HTTP >= 4000.1.5 && < 4000.5'
+)
+
+RDEPEND="
+ >=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+ >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
+ >=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:=
+ >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+ >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
+ >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
+ >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
+ >=dev-haskell/hashable-1.0:=
+ >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+ >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+ >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
+ >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
+ >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
+ >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+ >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+ >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+ >=dev-lang/ghc-8.4.3:=
+ lukko? (
+ >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+ )
+ native-dns? (
+ >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_prepare() {
+ # no chance to link to -threaded on ppc64, alpha and others
+ # who use UNREG, not only ARM
+ if ! ghc-supports-threaded-runtime; then
+ export CABAL_CHDEPS+=( '-threaded' ' ' )
+ fi
+ haskell-cabal_src_prepare
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-debug-conflict-sets \
+ --flag=-debug-expensive-assertions \
+ --flag=-debug-tracetree \
+ $(cabal_flag lukko lukko) \
+ --flag=-monolithic \
+ $(cabal_flag native-dns native-dns) \
+ --flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
new file mode 100644
index 000000000000..c39a1ed229dd
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0"
+
+# Keep in sync with relevant dev-haskell/cabal versions
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko +native-dns"
+
+RDEPEND="
+ >=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+ >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
+ >=dev-haskell/cabal-3.6.1.0:= <dev-haskell/cabal-3.7:=
+ >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+ >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
+ >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
+ >=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
+ >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.5:=
+ >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+ >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+ >=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
+ >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
+ >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
+ >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+ >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+ >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+ >=dev-lang/ghc-8.4.3:=
+ lukko? (
+ >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+ )
+ native-dns? (
+ >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-debug-conflict-sets \
+ --flag=-debug-expensive-assertions \
+ --flag=-debug-tracetree \
+ $(cabal_flag lukko lukko) \
+ --flag=-monolithic \
+ $(cabal_flag native-dns native-dns) \
+ --flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
deleted file mode 100644
index c36582680a56..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 48d8d49..3a38ee1 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of
-
- extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
- Tar.NormalFile content _
- | takeFileName (Tar.entryPath entry) == "preferred-versions"
- -> Just . parsePreferredVersions
- . BS.Char8.unpack $ content
-+-}
- _ -> Nothing
-
- parsePreferredVersions :: String -> [Dependency]
diff --git a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
deleted file mode 100644
index fa98278a277d..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs
-index 66b415d..6aa71bb 100644
---- a/Distribution/Client/Sandbox.hs
-+++ b/Distribution/Client/Sandbox.hs
-@@ -1,5 +1,6 @@
- {-# LANGUAGE CPP #-}
- {-# LANGUAGE FlexibleContexts #-}
-+{-# LANGUAGE RankNTypes #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Distribution.Client.Sandbox
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 6e16048a9b72..9025779d6797 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -5,12 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The 'cabal' command-line program simplifies the process of managing
- Haskell software by automating the fetching, configuration, compilation
- and installation of Haskell libraries and programs.
- </longdescription>
<use>
- <flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
+ <flag name="lukko">Use @lukko@ for file-locking</flag>
+ <flag name="native-dns">Enable use of the [resolv](https://hackage.haskell.org/package/resolv) &amp; [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">cabal-install</remote-id>
+ <remote-id type="github">haskell/cabal</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 850a1e04ed8a..fb916d95e040 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1 +1,3 @@
-DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598
+DIST cabal-3.4.1.0-rev1.cabal 31402 BLAKE2B cfaeee44401e73fa6f80e06896ae21dcbc162a1932963ffdf44428db50a63970ef8323ae6bff0a0f11341a1d31c8b766770b6f6b892d896a27710f44dc655147 SHA512 786c52e25062b0d2934a455a623dc78f4581add2875723356ddb4ff51346e35bf9ad226bda2f25863a30e57e4e7c3ad2f2df7aed3fdbe2c888b4397841b830cc
+DIST cabal-3.4.1.0.tar.gz 836938 BLAKE2B b185d2beb91a0317b392c6f32ea47a574b8037b23f5131334bca1282359218ab94aa406be737e0fbb15458e7dfa2cba2b22f7776d42c20aeed2b87598cda0e2d SHA512 93233007b70487c76b8ceb9e475ebff0cae4c86a4694820ee505ee83d9049147d60c32c9aea5c4802faf5273adaaae66db299c1ee722aed64c716ac7a3b3aa90
+DIST cabal-3.6.3.0.tar.gz 608808 BLAKE2B 921b07d24b1f2905bd856185cdb20f519d077b729e3ae515611f6024dfbe9d8263c3f8dade6751c35ea7584b5044bf53ab5c3f5ec8dd5aa465f519c7ceb272a4 SHA512 47a2e2c6f316d49f9d20b53e6781fe0d3d874a472133d9b16c5d0be5df0fff951560974fa73dccf3fb0b53cb01c68c7f5f5d3545538d7a2c7245aca8ff602020
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
deleted file mode 100644
index 0e4d42da0f0b..000000000000
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -bundled-binary-generic
-
-# Drop test-suite due to "circular" dependencies with quickcheck
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris
-IUSE=""
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-# GHC lower bound set to 8.0 to remove semigroups and fail dependencies.
-RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.0:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Cabal bootstraps with 'ghc --make' without package cleanup in environment.
- # That causes module collisions at build:
- # - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3
- # - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5
- HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
- HCFLAGS="${HCFLAGS} -ignore-package=kinds"
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bundled-binary-generic
-}
-
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9999"
diff --git a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
new file mode 100644
index 000000000000..c6c1f1ec4d33
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_HACKAGE_REVISION=1
+CABAL_PN="Cabal"
+
+# drop tests due to circular deps
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1:=
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+# >=dev-haskell/base-compat-0.11.0 <dev-haskell/base-compat-0.12
+# >=dev-haskell/base-orphans-0.6 <dev-haskell/base-orphans-0.9
+# >=dev-haskell/clock-0.8 <dev-haskell/clock-0.9
+# >=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+# >=dev-haskell/integer-logarithms-1.0.2 <dev-haskell/integer-logarithms-1.1
+# >=dev-haskell/optparse-applicative-0.13.2.0 <dev-haskell/optparse-applicative-0.17
+# >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/rere-0.1 <dev-haskell/rere-0.3
+# >=dev-haskell/stm-2.4.5.0 <dev-haskell/stm-2.6
+# dev-haskell/tagged
+# >=dev-haskell/tar-0.5.0.3 <dev-haskell/tar-0.6
+# >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.4
+# >=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+# dev-haskell/tasty-hunit
+# dev-haskell/tasty-quickcheck
+# dev-haskell/temporary
+# >=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
+# )
+
+src_prepare() {
+ haskell-cabal_src_prepare
+
+ # Cabal bootstraps with 'ghc --make' without package cleanup in environment.
+ # That causes module collisions at build:
+ # - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3
+ # - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5
+ HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
+ HCFLAGS="${HCFLAGS} -ignore-package=kinds"
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-parsec-struct-diff
+}
+
+CABAL_CORE_LIB_GHC_PV="9.0.2"
diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
new file mode 100644
index 000000000000..45f63629ee03
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_PN="Cabal"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-lang/ghc-9.2.4:= <dev-lang/ghc-9.3:=
+"
+DEPEND="${RDEPEND}
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-parsec-struct-diff
+}
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 937381521944..ff65eca11461 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">Cabal</remote-id>
+ <remote-id type="github">haskell/cabal</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 3acd5e01e612..14b05702e273 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1 +1 @@
-DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727
+DIST cairo-0.13.10.0.tar.gz 53346 BLAKE2B dd6d4d6b4fcfe0212823bbfc01d1edef7cb0a6e776c74d85419c91d6f48757ce1d9f36855c54fa88a4eb448de3c70a9b22bec99647e5e49988770249f14a950a SHA512 86465f37999144a8330b2921eb7233a6a1e5258ac9debe4c70c515ccc183ed6cc04dca3a3ca91978e0d3d2871e4a601253e147fd5b3e76f4839a37cbf9deabfa
diff --git a/dev-haskell/cairo/cairo-0.13.10.0.ebuild b/dev-haskell/cairo/cairo-0.13.10.0.ebuild
new file mode 100644
index 000000000000..84caaa8cda97
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: +cairo_pdf,+cairo_ps,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+svg"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND=">=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+ virtual/pkgconfig
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=cairo_pdf \
+ --flag=cairo_ps \
+ $(cabal_flag svg cairo_svg)
+}
+
+GHC_BOOTSTRAP_PACKAGES=( gtk2hs-buildtools )
diff --git a/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild
deleted file mode 100644
index 5dc6456d0ed5..000000000000
--- a/dev-haskell/cairo/cairo-0.13.8.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'Cabal >= 1.24 && < 3.3' 'Cabal >= 1.24'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag pdf cairo_pdf) \
- $(cabal_flag postscript cairo_ps) \
- $(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
deleted file mode 100644
index 174a94c5d100..000000000000
--- a/dev-haskell/cairo/cairo-0.13.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag pdf cairo_pdf) \
- $(cabal_flag postscript cairo_ps) \
- $(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/metadata.xml b/dev-haskell/cairo/metadata.xml
index eccc3a56def7..3778b9cd1ba8 100644
--- a/dev-haskell/cairo/metadata.xml
+++ b/dev-haskell/cairo/metadata.xml
@@ -5,9 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Cairo is a library to render high quality vector graphics. There
- exist various backends that allows rendering to Gtk windows, PDF,
- PS, PNG and SVG documents, amongst others.
- </longdescription>
+ <use>
+ <flag name="svg">Build the Scalable Vector Graphics (SVG) backend of Cairo.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">cairo</remote-id>
+ <remote-id type="github">gtk2hs/gtk2hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/call-stack/Manifest b/dev-haskell/call-stack/Manifest
index 8788e1aa46ab..6d9ed78160c1 100644
--- a/dev-haskell/call-stack/Manifest
+++ b/dev-haskell/call-stack/Manifest
@@ -1,2 +1,2 @@
-DIST call-stack-0.2.0.tar.gz 2565 BLAKE2B f9c8440947c5bfad04d57d5865bfc82d9009dfff4b8de11c6281ef8c82a5cdb39c1bf83153f9b3ab58f0dea0b641c348b3096ae08b7368a92bc2ddfa638d2578 SHA512 c22862ca24906b07e258690da8c7f6fadf87f4216023cbe847e8ddf0c87548e5c353b5cd82c4748c6ef09604556884caafe5fdc1996be9d000d2db29aaef1537
DIST call-stack-0.3.0.tar.gz 2544 BLAKE2B 7a668213daaaae0c2ba9a1670aa0073585ea1e122149b88c2a953b4aa8960ef4221259c2a331f3a32913727373e6f7a9e99ad5cdbf747f9e84071c4da01ca522 SHA512 32d805957dbe8965c22a74f1c9fed950f5c8df599ce5d447b3eae08fbbf65a01286be95444ca9db654a5189b062b4cf121dcd771c6bd981ca9d12e0df206533d
+DIST call-stack-0.4.0.tar.gz 2757 BLAKE2B 1a62fa72f223c301995e5e74cd0797e2a5c8fef0a8a73ec589bb9047e56953f7ab5f4f1d942814e285529a71901784e7fd35e470b512eb42b06edfc01c540ff7 SHA512 ab8ead1f9d6a71a6c70d2c484de4e42f3aecdcadd6d02f447b450e58b8556c7c4c293b8865ff154ea9bc6aca71cf5182034dc46265d364c4389882ab0ee3b937
diff --git a/dev-haskell/call-stack/call-stack-0.2.0.ebuild b/dev-haskell/call-stack/call-stack-0.2.0.ebuild
deleted file mode 100644
index b3441e33b82c..000000000000
--- a/dev-haskell/call-stack/call-stack-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use GHC call-stacks in a backward compatible way"
-HOMEPAGE="https://github.com/sol/call-stack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( dev-haskell/nanospec )
-"
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 2b08e6ab8f78..89addd693abf 100644
--- a/dev-haskell/call-stack/call-stack-0.3.0.ebuild
+++ b/dev-haskell/call-stack/call-stack-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/call-stack/call-stack-0.4.0.ebuild b/dev-haskell/call-stack/call-stack-0.4.0.ebuild
new file mode 100644
index 000000000000..d3e0ebf64eed
--- /dev/null
+++ b/dev-haskell/call-stack/call-stack-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use GHC call-stacks in a backward compatible way"
+HOMEPAGE="https://github.com/sol/call-stack#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/nanospec )
+"
diff --git a/dev-haskell/call-stack/metadata.xml b/dev-haskell/call-stack/metadata.xml
index 937381521944..5cb918438566 100644
--- a/dev-haskell/call-stack/metadata.xml
+++ b/dev-haskell/call-stack/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">call-stack</remote-id>
+ <remote-id type="github">sol/call-stack</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/casa-client/Manifest b/dev-haskell/casa-client/Manifest
deleted file mode 100644
index fc16ce1244cc..000000000000
--- a/dev-haskell/casa-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST casa-client-0.0.1.tar.gz 3676 BLAKE2B d00b8fd2991863190e5fa12d852e2a0a3f3a87af4bf988d337ee703a5a7d827aa1e2681aa9b3066dd77176cf52b3564b3266b1aa9d542fb58cd0694204668031 SHA512 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa
diff --git a/dev-haskell/casa-client/casa-client-0.0.1.ebuild b/dev-haskell/casa-client/casa-client-0.0.1.ebuild
deleted file mode 100644
index a54ad3484191..000000000000
--- a/dev-haskell/casa-client/casa-client-0.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Client for Casa"
-HOMEPAGE="https://hackage.haskell.org/package/casa-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/casa-types:=[profile?]
- dev-haskell/conduit:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/exceptions:=[profile?]
- dev-haskell/http-conduit:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- dev-haskell/network-uri:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/th-lift:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/casa-client/metadata.xml b/dev-haskell/casa-client/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/casa-client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/casa-types/Manifest b/dev-haskell/casa-types/Manifest
deleted file mode 100644
index 784d0c2c9e6a..000000000000
--- a/dev-haskell/casa-types/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST casa-types-0.0.1.tar.gz 2030 BLAKE2B a1787b35cf8254118287a7415ee625dd8815011a3d444f5ef303ba4af989924e5b40e1c1e5abd43e69c299e5c7ef1cbe7b67a0f019c6d2bfd01e2bee4b1661e6 SHA512 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98
diff --git a/dev-haskell/casa-types/casa-types-0.0.1.ebuild b/dev-haskell/casa-types/casa-types-0.0.1.ebuild
deleted file mode 100644
index f82611ae42be..000000000000
--- a/dev-haskell/casa-types/casa-types-0.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for Casa"
-HOMEPAGE="https://hackage.haskell.org/package/casa-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/hashable:=[profile?]
- dev-haskell/path-pieces:=[profile?]
- dev-haskell/persistent:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/casa-types/metadata.xml b/dev-haskell/casa-types/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/casa-types/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
index 7f06b349052d..b98875ed758a 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hashable-1.0:=[profile?]
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 0255ca432c38..dea222dd9578 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1 +1,4 @@
+DIST cassava-0.5.2.0-rev7.cabal 6051 BLAKE2B 934cf9b067a8c9503f13676e3ee8f4d3a79a7ab030f39f4b652d460d89e3a739b1bb2bc231ad06e63d0cc5155e4119f91d2ea1d5d01c423c7cca2e689f07fd46 SHA512 4f8105a7298ff3a5f4dc8d579571296902d44084dce57c0136bd089de4575d75fa6a839fb568a87c7ae0b07ea3cee40a6e33ffe35ca2c8b05dd45905aa8713ea
DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
+DIST cassava-0.5.3.0-rev1.cabal 6121 BLAKE2B 17a993359521f12b5be13eb3ffa8e92d5814ecd2c6df37a97e9bd07aba6fb476ca13f62def0fc50cac2cbc7e9c7408804ab49936868f69ab2b98c06289234910 SHA512 2b97d8eb0d2a478dfacd771ff33d63e8d8ea27b8a2b721353e49a50a378739de10cb67d7e803884192357b394bcc4b9c943fa108ae71725c229f1a5eb9eae6c1
+DIST cassava-0.5.3.0.tar.gz 38224 BLAKE2B 8b82d77e7698bc608be8637894c2a57361145547f63a48d48d76027f8003d3e0c505777bd61b29f00dab117995d846f442d3de2ee56b392302fc6f57639e7f14 SHA512 6afae52a2facc013d746a83afa975a2493174e2c5bda0c0ad8cab76c13c46dd86e8d3142e0676c881a35c3c8bf5618a5c1e4b70c3ab153443b949cb84b70bcb4
diff --git a/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
new file mode 100644
index 000000000000..fa7f3d7de5e1
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="7"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+ >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0.ebuild
deleted file mode 100644
index 73aa92acc462..000000000000
--- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
- >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
- >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
- >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5'
-}
diff --git a/dev-haskell/cassava/cassava-0.5.3.0.ebuild b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
new file mode 100644
index 000000000000..822b25cc6f0f
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION=1
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/haskell-hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+ >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/cassava/metadata.xml b/dev-haskell/cassava/metadata.xml
index b5e909828986..769713f352ca 100644
--- a/dev-haskell/cassava/metadata.xml
+++ b/dev-haskell/cassava/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">tibbe/cassava</remote-id>
+ <remote-id type="hackage">cassava</remote-id>
+ <remote-id type="github">haskell-hvr/cassava</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cereal-vector/Manifest b/dev-haskell/cereal-vector/Manifest
deleted file mode 100644
index 2e523eaf198a..000000000000
--- a/dev-haskell/cereal-vector/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cereal-vector-0.2.0.1.tar.gz 3337 BLAKE2B d1829bf26bc7d54c0dcd45355c3fff957e2ff7b6e779102be021fb1be780104636a87d1e7c2f7a590a4302b9755867224c7d1f49cb26578748438f7e79774a5a SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00
diff --git a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
deleted file mode 100644
index c52b591772c9..000000000000
--- a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Serialize instances for Data.Vector types"
-HOMEPAGE="https://github.com/acfoltzer/cereal-vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/cereal-vector/metadata.xml b/dev-haskell/cereal-vector/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/cereal-vector/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
index 100cb6423413..5f2eabcb8339 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -1 +1,2 @@
DIST cereal-0.5.8.1.tar.gz 20114 BLAKE2B a71e11b9d138fcc1de7da0cfe573b3c31a263c75f62628bea70fb17af6c911fd9996c32a69fb0a9a4328241072c684dc110134a2b837643dcda2722f37869e9b SHA512 aced40e81301fbc73c6029be2c4045cf63f81d40361d5939713f3d60db196dc25a70e556e9e74e194e6a3b6cac86997d2bfc8b1f91c630676af7d066268a25b4
+DIST cereal-0.5.8.3.tar.gz 20166 BLAKE2B aafc599c0cdb872818680f4a759267fa0c9de43d10ad05f0c2c504a72eb7533af6cdfb26b1321b802192d5bf77525ff48072165e314ed902947ea5ba8cfbfe09 SHA512 2dd9e83e4659f76964c2c66eac76174d1c715cc969c2e8c818033e1d9ed5633997fcf2311c61dc4e6f10db03e65a8c80475b84cda39592849a9c1112b0c0596a
diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
index c39d43d2bc9c..a933409a6fa0 100644
--- a/dev-haskell/cereal/cereal-0.5.8.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,12 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
diff --git a/dev-haskell/cereal/cereal-0.5.8.3.ebuild b/dev-haskell/cereal/cereal-0.5.8.3.ebuild
new file mode 100644
index 000000000000..7ff8ce18af37
--- /dev/null
+++ b/dev-haskell/cereal/cereal-0.5.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A binary serialization library"
+HOMEPAGE="https://github.com/GaloisInc/cereal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/cereal/metadata.xml b/dev-haskell/cereal/metadata.xml
index 507a2e6d8f15..568c4abecef7 100644
--- a/dev-haskell/cereal/metadata.xml
+++ b/dev-haskell/cereal/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A binary serialization library, similar to binary, that introduces an isolate
- primitive for parser isolation, and replaces the asynchronous errors with a
- user-handleable Either type. Similar to binary in performance, but uses a
- strict ByteString instead of a lazy ByteString, thus restricting it to
- operating on finite inputs.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">cereal</remote-id>
+ <remote-id type="github">GaloisInc/cereal</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
deleted file mode 100644
index 266d06ebc5dc..000000000000
--- a/dev-haskell/cgi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cgi-3001.5.0.0.tar.gz 19626 BLAKE2B a84ab0e78a7d7a4902f804501e0982bb22491aa04d28db8b10b61c9f298cd2d1383b07dd7d4e3fc35c0d3d42539fc210d0e0d9334254b5dde2cae6c6b9e07c7d SHA512 460f6d1494ac731c785b1cdffec541733639749bb1ad83605acaa52332b6c9e15a25982cdbf2bba5fcd69fa0317da832e6bf60c38642e394873eb5fa87b58881
diff --git a/dev-haskell/cgi/cgi-3001.5.0.0.ebuild b/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
deleted file mode 100644
index 816add53a854..000000000000
--- a/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -old-mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples install-examples) \
- --flag=-old-mtl
-}
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
deleted file mode 100644
index f882cb5abdde..000000000000
--- a/dev-haskell/cgi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">cheecheeo/haskell-cgi</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/charset/Manifest b/dev-haskell/charset/Manifest
index 501633ffcf1a..8ecabcd0e9a9 100644
--- a/dev-haskell/charset/Manifest
+++ b/dev-haskell/charset/Manifest
@@ -1 +1,2 @@
+DIST charset-0.3.10.tar.gz 13790 BLAKE2B 335084804461f551d27a5af30fa71665f052e309015029e442159a364d6f5b261ce4eb00ea478059f861f2359f7d947b8dbf83a11d46909dab16d4ff85963724 SHA512 ad32c5380379570ec4872cc44236ab0833723f3a784c3cece7b2c8efbdf3f6930d9219a8a1a9d2b01eca9698b39294a8bae6cb44ce1d25b144ac86136da58292
DIST charset-0.3.7.1.tar.gz 12507 BLAKE2B 1ea4b189dda47e05066b800c26c62e26b92e1482e546acf8606dd98cc1b8156de350c57c3e3df2b956a96ada04a1e564d681bb9af09026d160cc4f3b919a1500 SHA512 594e71a5d6ced52e1491368611775bda106119b82025e84fc97078753358af7d9f6c22b99291dd51a990ff223c4582f913e01d829418f8918652c3c9fc495792
diff --git a/dev-haskell/charset/charset-0.3.10.ebuild b/dev-haskell/charset/charset-0.3.10.ebuild
new file mode 100644
index 000000000000..c6a79e7e2e98
--- /dev/null
+++ b/dev-haskell/charset/charset-0.3.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fast unicode character sets based on complemented PATRICIA tries"
+HOMEPAGE="https://github.com/ekmett/charset"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
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 61e7899d265a..14c630323343 100644
--- a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
+++ b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,20 +14,17 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
>=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'containers >= 0.2 && < 0.6' 'containers >= 0.2'
-}
+CABAL_CHDEPS=(
+ 'containers >= 0.2 && < 0.6' 'containers >= 0.2'
+)
diff --git a/dev-haskell/charset/metadata.xml b/dev-haskell/charset/metadata.xml
index 937381521944..7e737e501fea 100644
--- a/dev-haskell/charset/metadata.xml
+++ b/dev-haskell/charset/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">charset</remote-id>
+ <remote-id type="github">ekmett/charset</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/chaselev-deque/Manifest b/dev-haskell/chaselev-deque/Manifest
deleted file mode 100644
index 39e79a3b1d61..000000000000
--- a/dev-haskell/chaselev-deque/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chaselev-deque-0.5.0.5.tar.gz 12451 BLAKE2B 79ee460eb84286bbbe0dcd58431d5ab0b7aef1d0d186c2c919b566c6b169ab4069917a61e8bb800af3857c7e3cca09c6f698c6f9a6b5d8efdbdd5902a7042310 SHA512 1561208ec92d7765b126684677cab02ee71bd1f7d2cdc6f2acac065972c241d085a538e14f51c87555f464aadbac2795c64f9063075acdf29217fb2d70a47dfd
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
deleted file mode 100644
index 6d2416322a90..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?]
- >=dev-haskell/atomic-primops-0.5.0.2:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/abstract-deque-tests-0.3
- dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug)
-}
diff --git a/dev-haskell/chaselev-deque/metadata.xml b/dev-haskell/chaselev-deque/metadata.xml
deleted file mode 100644
index 6ea644ec8df6..000000000000
--- a/dev-haskell/chaselev-deque/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="debug">Enable the extra internal checks.</flag>
- </use>
- <longdescription>
- A queue that is push/pop on one end and pop-only on the other. These are commonly
- used for work-stealing.
- This implementation derives directly from the pseudocode in the 2005 SPAA paper:
-
- http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&amp;rep=rep1&amp;type=pdf
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/chasingbottoms/Manifest b/dev-haskell/chasingbottoms/Manifest
index c3c63dcea7db..bb336afe7388 100644
--- a/dev-haskell/chasingbottoms/Manifest
+++ b/dev-haskell/chasingbottoms/Manifest
@@ -1 +1 @@
-DIST ChasingBottoms-1.3.1.9.tar.gz 31942 BLAKE2B b94cb27358a1af57e2617ac5b967826d1f20709817622e9c8619fdc8270eb0fc12ea8630f06f012d657f03bded69231ba86039bb07d2ffd4ed3b52ae95c0bc28 SHA512 15b05c3080e7e5960d9f84d4c3a3941a08a8f15a4c8241f7fee11f24054e09092925093f88bdd7ac38eedc57a02fa76c468e61c5ad08cb0c599a2a01bbe6b88b
+DIST chasingbottoms-1.3.1.12.tar.gz 31960 BLAKE2B 0183ef16bcb79f545c97d0a18972fb5fcf964a1255b83b8f202ae96a3211b2cc07ecbc9c808200bdb887b7db8571acb7619e6ad62f8b8c3be0ef8699b635b699 SHA512 601a577ff45cb5565397fcc428073b7ce2c9a9e033950adb5af67977c719f83ce4fe2be378280108406ad2b9d436bd3e8d15e4b82846ffd8b881151fbe5941ed
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
new file mode 100644
index 000000000000..c85440c46263
--- /dev/null
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: -build-tests
+
+CABAL_PN="ChasingBottoms"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="For testing partial and infinite values"
+HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-build-tests
+}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
deleted file mode 100644
index 6b7d544696f8..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- >=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/metadata.xml b/dev-haskell/chasingbottoms/metadata.xml
index 697509ead8f5..f316b3e95e8b 100644
--- a/dev-haskell/chasingbottoms/metadata.xml
+++ b/dev-haskell/chasingbottoms/metadata.xml
@@ -5,98 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Do you ever feel the need to test code involving bottoms (e.g. calls to
- the @error@ function), or code involving infinite values? Then this
- library could be useful for you.
-
- It is usually easy to get a grip on bottoms by showing a value and
- waiting to see how much gets printed before the first exception is
- encountered. However, that quickly gets tiresome and is hard to automate
- using e.g. QuickCheck
- (&lt;http://www.cse.chalmers.se/~rjmh/QuickCheck/&gt;). With this library you
- can do the tests as simply as the following examples show.
-
- Testing explicitly for bottoms:
-
- [@&gt; isBottom (head [\])@] @True@
-
- [@&gt; isBottom bottom@] @True@
-
- [@&gt; isBottom (\\_ -&gt; bottom)@] @False@
-
- [@&gt; isBottom (bottom, bottom)@] @False@
-
- Comparing finite, partial values:
-
- [@&gt; ((bottom, 3) :: (Bool, Int)) ==! (bottom, 2+5-4)@] @True@
-
- [@&gt; ((bottom, bottom) :: (Bool, Int)) &lt;! (bottom, 8)@] @True@
-
- Showing partial and infinite values (@\\\/!@ is join and @\/\\!@ is meet):
-
- [@&gt; approxShow 4 $ (True, bottom) \\\/! (bottom, \'b\')@] @\"Just (True, \'b\')\"@
-
- [@&gt; approxShow 4 $ (True, bottom) \/\\! (bottom, \'b\')@] @\"(_|_, _|_)\"@
-
- [@&gt; approxShow 4 $ ([1..\] :: [Int\])@] @\"[1, 2, 3, _\"@
-
- [@&gt; approxShow 4 $ (cycle [bottom\] :: [Bool\])@] @\"[_|_, _|_, _|_, _\"@
-
- Approximately comparing infinite, partial values:
-
- [@&gt; approx 100 [2,4..\] ==! approx 100 (filter even [1..\] :: [Int\])@] @True@
-
- [@&gt; approx 100 [2,4..\] \/=! approx 100 (filter even [bottom..\] :: [Int\])@] @True@
-
- The code above relies on the fact that @bottom@, just as @error
- \"...\"@, @undefined@ and pattern match failures, yield
- exceptions. Sometimes we are dealing with properly non-terminating
- computations, such as the following example, and then it can be nice to
- be able to apply a time-out:
-
- [@&gt; timeOut' 1 (reverse [1..5\])@] @Value [5,4,3,2,1]@
-
- [@&gt; timeOut' 1 (reverse [1..\])@] @NonTermination@
-
- The time-out functionality can be used to treat \"slow\" computations as
- bottoms:
-
- [@&gt; let tweak = Tweak &amp;#x7b; approxDepth = Just 5, timeOutLimit = Just 2 &amp;#x7d;@]
-
- [@&gt; semanticEq tweak (reverse [1..\], [1..\]) (bottom :: [Int\], [1..\] :: [Int\])@] @True@
-
- [@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 2 &amp;#x7d;@]
-
- [@&gt; semanticJoin tweak (reverse [1..\], True) ([\] :: [Int\], bottom)@] @Just ([],True)@
-
- This can of course be dangerous:
-
- [@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 0 &amp;#x7d;@]
-
- [@&gt; semanticEq tweak (reverse [1..100000000\]) (bottom :: [Integer\])@] @True@
-
- Timeouts can also be applied to @IO@ computations:
-
- [@&gt; let primes = unfoldr (\\(x:xs) -&gt; Just (x, filter ((\/= 0) . (\`mod\` x)) xs)) [2..\]@]
-
- [@&gt; timeOutMicro 100 (print $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,9NonTermination@
-
- [@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993NonTermination@
-
- [@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993,2657]@
-
- [@ @] @Value ()@
-
- For the underlying theory and a larger example involving use of
- QuickCheck, see the article \"Chasing Bottoms, A Case Study in Program
- Verification in the Presence of Partial and Infinite Values\"
- (&lt;http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html&gt;).
-
- The code has been tested using GHC. Most parts can probably be
- ported to other Haskell compilers, but this would require some work.
- The @TimeOut@ functions require preemptive scheduling, and most of
- the rest requires @Data.Generics@; @isBottom@ only requires
- exceptions, though.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">ChasingBottoms</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
index 5a3a5edcf0be..92abca271534 100644
--- a/dev-haskell/chell/Manifest
+++ b/dev-haskell/chell/Manifest
@@ -1 +1,2 @@
DIST chell-0.4.0.2.tar.gz 12424 BLAKE2B 2e525ecacd0f703a873b89afce7c62937634021e65a54ce901b4b50e535131e1fb831173e4d2b3d52ff351df09eaa386377052b35c7e70c75028b59c87ee21ab SHA512 050c5818ad2cd954ef79b230de2f03fdfb19e99c8624a24bb7845bb20e3b5d5d427a9623491ffc706c5635f545eb99466bde7a851c4344d11df1a70bfb2bbe22
+DIST chell-0.5.0.2.tar.gz 13331 BLAKE2B 3a59f49b5117696290484ece6dad73a3b834a4fdddb62f7ef2f5b27d554a938b47dfc6da616a9d284e15412ca7428aab81371018f559a6c302b1c69e167b3111 SHA512 e2b0cd829882f1c7b18dd2e0ea036b0de27cf859864184ae4b95939d3a5c946e2aa140a49e6596f65326468016de2deb0582428db89893a1b893f25f789c2220
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
index 774e610c9b1d..ca08b3a947e4 100644
--- a/dev-haskell/chell/chell-0.4.0.2.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+color-output"
RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
@@ -28,11 +28,9 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
"
-src_prepare() {
- cabal_chdeps \
- 'ansi-terminal >= 0.5 && < 0.8' 'ansi-terminal >= 0.5'
- default
-}
+CABAL_CHDEPS=(
+ 'ansi-terminal >= 0.5 && < 0.8' 'ansi-terminal >= 0.5'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/chell/chell-0.5.0.2.ebuild b/dev-haskell/chell/chell-0.5.0.2.ebuild
new file mode 100644
index 000000000000..985d88859ab1
--- /dev/null
+++ b/dev-haskell/chell/chell-0.5.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple and intuitive library for automated testing"
+HOMEPAGE="https://github.com/typeclasses/chell"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+color-output"
+
+CABAL_CHDEPS=(
+ 'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+ 'bytestring ^>= 0.11.4 || ^>= 0.12' 'bytestring >= 0.10'
+ 'template-haskell ^>=2.18 || ^>= 2.19 || ^>= 2.20' 'template-haskell >= 2.16'
+ 'text ^>= 1.2.5 || ^>= 2.0' 'text >= 1.2'
+ 'transformers ^>= 0.5.6 || ^>= 0.6' 'transformers >= 0.5.6'
+)
+
+RDEPEND="
+ >=dev-haskell/options-1.2.1:=[profile?] <dev-haskell/options-1.3:=[profile?]
+ >=dev-haskell/patience-0.3:=[profile?] <dev-haskell/patience-0.4:=[profile?]
+ >=dev-haskell/random-1.2.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ color-output? (
+ >=dev-haskell/ansi-terminal-1.0:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag color-output color-output)
+}
diff --git a/dev-haskell/chell/metadata.xml b/dev-haskell/chell/metadata.xml
index 321e6543e1d7..231ab15f33f1 100644
--- a/dev-haskell/chell/metadata.xml
+++ b/dev-haskell/chell/metadata.xml
@@ -5,44 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Chell is a simple and intuitive library for automated testing. It natively
- supports assertion-based testing, and can use companion libraries
- such as @chell-quickcheck@ to support more complex testing strategies.
-
- An example test suite, which verifies the behavior of artithmetic operators.
-
- @
- &amp;#x7b;-\# LANGUAGE TemplateHaskell \#-&amp;#x7d;
-
- import Test.Chell
-
- tests_Math :: Suite
- tests_Math = suite \"math\"
- &amp;#x20; test_Addition
- &amp;#x20; test_Subtraction
-
- test_Addition :: Test
- test_Addition = assertions \"addition\" $ do
- &amp;#x20; $expect (equal (2 + 1) 3)
- &amp;#x20; $expect (equal (1 + 2) 3)
-
- test_Subtraction :: Test
- test_Subtraction = assertions \"subtraction\" $ do
- &amp;#x20; $expect (equal (2 - 1) 1)
- &amp;#x20; $expect (equal (1 - 2) (-1))
-
- main :: IO ()
- main = defaultMain [tests_Math]
- @
-
- @
- $ ghc --make chell-example.hs
- $ ./chell-example
- PASS: 2 tests run, 2 tests passed
- @
- </longdescription>
<use>
<flag name="color-output">use colors in program output</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">chell</remote-id>
+ <remote-id type="github">typeclasses/chell</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/chimera/Manifest b/dev-haskell/chimera/Manifest
deleted file mode 100644
index 649fe3ec37eb..000000000000
--- a/dev-haskell/chimera/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chimera-0.3.1.0.tar.gz 13809 BLAKE2B 64a343f84de1cd535676934c26e43994062ea24fdf27463a22b3ff1086480a277fc3f0f87905f9060bca80e46ab0a553e5091cb27065ba0e3321e62800a7756d SHA512 7f155bb3d938331760e8e06c47d67a985588e1817e8b151f6a58074d77a71ce0a70537c55ab3d97c02867d9f2a3ae2f31ed87432e833930b3be6c2f92a8947fc
diff --git a/dev-haskell/chimera/chimera-0.3.1.0.ebuild b/dev-haskell/chimera/chimera-0.3.1.0.ebuild
deleted file mode 100644
index 68d9b6f55253..000000000000
--- a/dev-haskell/chimera/chimera-0.3.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lazy infinite streams with O(1) indexing"
-HOMEPAGE="https://github.com/Bodigrim/chimera#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+representable"
-
-RDEPEND="dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- representable? ( dev-haskell/adjunctions:=[profile?]
- dev-haskell/distributive:=[profile?]
- dev-haskell/mtl:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/quickcheck-2.10
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck
- dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag representable representable)
-}
diff --git a/dev-haskell/chimera/metadata.xml b/dev-haskell/chimera/metadata.xml
deleted file mode 100644
index 3cc879fea818..000000000000
--- a/dev-haskell/chimera/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="representable">Define Representable instance from adjunctions package</flag>
- </use>
- <longdescription>
- There are plenty of memoizing libraries on Hackage, but they
- usually fall into two categories:
-
- * Store cache as a flat array, enabling us
- to obtain cached values in O(1) time, which is nice.
- The drawback is that one must specify the size
- of the array beforehand,
- limiting an interval of inputs,
- and actually allocate it at once.
- * Store cache as a lazy binary tree.
- Thanks to laziness, one can freely use the full range of inputs.
- The drawback is that obtaining values from a tree
- takes logarithmic time and is unfriendly to CPU cache,
- which kinda defeats the purpose.
-
- This package intends to tackle both issues,
- providing a data type 'Chimera' for
- lazy infinite compact streams with cache-friendly O(1) indexing.
-
- Additional features include:
-
- * memoization of recursive functions and recurrent sequences,
- * memoization of functions of several, possibly signed arguments,
- * efficient memoization of boolean predicates.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/chunked-data/Manifest b/dev-haskell/chunked-data/Manifest
deleted file mode 100644
index b6f682fae63d..000000000000
--- a/dev-haskell/chunked-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chunked-data-0.3.0.tar.gz 4349 BLAKE2B f2392f2ba4bdc3f3cccd7a2a45be51e70da388be39ff35fc7688c9825c70c058c03f80252ffad388d0f5768bd941aa9d04024bf2b511439fac7d6298b7d1a76a SHA512 cbce790f1898b2aed6309d8eee14c3461bf99e8adbb27bfb563be86ccbcb3f4b3bca55e82b71e87c2b451ccad829cd4cf276c5b1a40934f32b065e176bbb5617
diff --git a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild b/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
deleted file mode 100644
index 15128cef8fcf..000000000000
--- a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for dealing with various chunked data representations"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/semigroups:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/chunked-data/metadata.xml b/dev-haskell/chunked-data/metadata.xml
deleted file mode 100644
index f3f432120e0b..000000000000
--- a/dev-haskell/chunked-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/chunked-data</remote-id>
- </upstream>
-</pkgmetadata>
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 a529161857d7..4b6f18c5f6af 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: support_aesni:cpu_flags_x86_aes
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/cipher-aes128/Manifest b/dev-haskell/cipher-aes128/Manifest
deleted file mode 100644
index f4340e1ff714..000000000000
--- a/dev-haskell/cipher-aes128/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-aes128-0.7.0.5.tar.gz 26228 BLAKE2B 8ef1aa343563d7889154b5f0b96b5b457ed21afbcad4f90f82e95a080c19f50d8ad2500ef4b8caa1509ca953aba3ca1941c61656417ed527943858a9d6cfd652 SHA512 8479dec68d6fa35e8d615bcc8c6336459fa537f1962b7af87e63b0c38d544ed26e6d30e980f90bb3585513bd618e01330d3e008e77404dae8d2e27954d7a535a
diff --git a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild b/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
deleted file mode 100644
index fea7988f16ec..000000000000
--- a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-#hackport: flags: -test,-halvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="AES and common modes using AES-NI when available"
-HOMEPAGE="https://github.com/TomMD/cipher-aes128"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
- >=dev-haskell/crypto-api-0.13:=[profile?]
- dev-haskell/tagged:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'Cabal >= 1.10 && < 3.1' 'Cabal >= 1.10 && < 3.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-halvm \
- --flag=-test
-}
diff --git a/dev-haskell/cipher-aes128/metadata.xml b/dev-haskell/cipher-aes128/metadata.xml
deleted file mode 100644
index 2409a1b703b0..000000000000
--- a/dev-haskell/cipher-aes128/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Cipher-aes128 is an implementation of AES and common modes of operation. It borrows Hanquez's C AES code (see 'cipher-aes') but
- is unique due to including compile-time detection of
- NI compiler support, a slightly more functional interface
- for GCM operations, exposure of 'Ptr' based operations via the .Internal module, and build-in crypto-api support.
- Cipher-aes128 was originally developed as "'cipher-aes' plus trampolines", which has since been adopted into cipher-aes.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-camellia/Manifest b/dev-haskell/cipher-camellia/Manifest
deleted file mode 100644
index f24cf7f59ce8..000000000000
--- a/dev-haskell/cipher-camellia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-camellia-0.0.2.tar.gz 6230 BLAKE2B d40fc1cc549d6150a10154fc68e134dbad0c451a60632be081e94c95b75053ff64a26ffca7fc899b3df88294341b4a9f209e10ac91f39de368dd3466cf017717 SHA512 d3094d2b190023b6afbab20f7d1c01826f56b7c99ea0c9613fcb14c8d3f3f3c3e16b57c2643a9df2bcf12cc97596cd32dd717fedf81fd84a9cdb9f46f308e130
diff --git a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild b/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
deleted file mode 100644
index 35bab2342d0a..000000000000
--- a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Camellia block cipher primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
- >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
- >=dev-haskell/securemem-0.1.2:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/crypto-cipher-tests
- >=dev-haskell/quickcheck-2
- >=dev-haskell/test-framework-0.3.3
- >=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-camellia/metadata.xml b/dev-haskell/cipher-camellia/metadata.xml
deleted file mode 100644
index 2485d8951fed..000000000000
--- a/dev-haskell/cipher-camellia/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-des/Manifest b/dev-haskell/cipher-des/Manifest
deleted file mode 100644
index d6e5a5d5e294..000000000000
--- a/dev-haskell/cipher-des/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-des-0.0.6.tar.gz 7857 BLAKE2B 333c629ba2e4c9ca80d3caf29400e805abd774a23f9823fbededc74e3997602702b78066034e24d32313a42e7409d430835f918e1c8c5baf62ef404fe9792f91 SHA512 290b72fb9d6da58450e43742b313ff295cf3bf88242de33069e3183df7f726b69174dae35572a3d7d3a356aef4d4067104c41c1bd06fead8fec227ff92ba10c9
diff --git a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
deleted file mode 100644
index 9a5cc8cee9ec..000000000000
--- a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DES and 3DES primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
- >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
- >=dev-haskell/securemem-0.1.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/crypto-cipher-tests
- >=dev-haskell/quickcheck-2
- >=dev-haskell/test-framework-0.3.3
- >=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-des/metadata.xml b/dev-haskell/cipher-des/metadata.xml
deleted file mode 100644
index 2485d8951fed..000000000000
--- a/dev-haskell/cipher-des/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-rc4/Manifest b/dev-haskell/cipher-rc4/Manifest
deleted file mode 100644
index 8a0dab908592..000000000000
--- a/dev-haskell/cipher-rc4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-rc4-0.1.4.tar.gz 4315 BLAKE2B 1af510c3689d578efcd84830a9d0cbebefcb6c78436be384fc73367d62b559ad0bba77b767a106cf97928cccfc282f85b4e8d16fdeb348cad913dccf78a2e735 SHA512 68415b4327371b4ea6fec9064f76c3a3372e223c3c717ee066941823cbbcdc50a7cd02c3fa7268dce4128e7b088e8a88012dd8478126d3f9d6a4e5b99f990d95
diff --git a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
deleted file mode 100644
index dd96859ca8d4..000000000000
--- a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast RC4 cipher implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-rc4"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
- >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/crypto-cipher-tests-0.0.7
- >=dev-haskell/quickcheck-2
- >=dev-haskell/test-framework-0.3.3
- >=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-rc4/metadata.xml b/dev-haskell/cipher-rc4/metadata.xml
deleted file mode 100644
index ec41ea736d0f..000000000000
--- a/dev-haskell/cipher-rc4/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">vincenthz/hs-cipher-rc4</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
index f8f5b0bf5577..557496d77e0d 100644
--- a/dev-haskell/citeproc/Manifest
+++ b/dev-haskell/citeproc/Manifest
@@ -1 +1,2 @@
-DIST citeproc-0.3.0.9.tar.gz 572112 BLAKE2B df1ff046f4356f5feebf3551b3be9807b3bfca6ef927805efeb2ff5133968f1bd0ae14923ec83309ad2b8dd50d674f4506b1f62adc53a78f6afccea7cb6da5fa SHA512 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f
+DIST citeproc-0.7.tar.gz 528208 BLAKE2B 9ad395c2c3ba7bc957554b37af1a514c3deb3247a55a41b35c88b25f25db474043d18de5909e67ac5723fbfb0a5ed8161a16eb851f59c5648cfa3b30149c46fe SHA512 e24675c0d9227bd6ff5f13788c251647df1e61a65a1b0fe94d80c0bf064bd3018285ace6397d0c5f2b5d6e4ee9b91de8b90e6e4251e9914fb8fcbf58ed3c4539
+DIST citeproc-0.8.1.tar.gz 549947 BLAKE2B 055ec6466ec96cd44bf64d3cb9a9f92c5f9e825aaab93147905d3a69c5040807c1bf048196cede7d341608c96b39d9054545987b9de11be622aad6176895805e SHA512 7bce91a19e8db475b7c0c7f1f324e356dfb895fddc575b59d3fcdb8955b1ee17a82d3943edc383669a7bb5cc9fb14b3ff1cea766a2d322157017a97acddeee32
diff --git a/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild b/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild
deleted file mode 100644
index ee9b06f64280..000000000000
--- a/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generates citations and bibliography from CSL styles"
-HOMEPAGE="https://hackage.haskell.org/package/citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable icu"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- >=dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- dev-haskell/data-default:=[profile?]
- dev-haskell/file-embed:=[profile?]
- >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/uniplate:=[profile?]
- dev-haskell/vector:=[profile?]
- dev-haskell/xml-conduit:=[profile?]
- >=dev-lang/ghc-8.6.5:=
- executable? ( dev-haskell/aeson-pretty:=[profile?] )
- icu? ( dev-haskell/text-icu:=[profile?] )
- !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/diff-0.4
- dev-haskell/mtl
- dev-haskell/timeit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- $(cabal_flag icu icu)
-}
diff --git a/dev-haskell/citeproc/citeproc-0.7.ebuild b/dev-haskell/citeproc/citeproc-0.7.ebuild
new file mode 100644
index 000000000000..343d4f47a2ba
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 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="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable icu"
+
+# Many tests for this package are known to fail and this is acceptable for
+# upstream:
+# <https://github.com/jgm/citeproc#known-bugs-and-limitations>
+# The author seems to know which tests are expected to fail, but I
+# can't find documentation for exactly which ones.
+RESTRICT="test"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ >=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.3:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ dev-haskell/uniplate:=[profile?]
+ dev-haskell/vector:=[profile?]
+ dev-haskell/xml-conduit:=[profile?]
+ >=dev-lang/ghc-8.6.5:=
+ executable? ( dev-haskell/aeson-pretty:=[profile?] )
+ icu? ( >=dev-haskell/text-icu-0.7.1.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/diff-0.4
+ dev-haskell/timeit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ $(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/citeproc-0.8.1.ebuild b/dev-haskell/citeproc/citeproc-0.8.1.ebuild
new file mode 100644
index 000000000000..2aa2e572cfc2
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable icu"
+
+# Many tests for this package are known to fail and this is acceptable for
+# upstream:
+# <https://github.com/jgm/citeproc#known-bugs-and-limitations>
+# The author seems to know which tests are expected to fail, but I
+# can't find documentation for exactly which ones.
+RESTRICT="test"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/data-default-0.5.2:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.3:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ dev-haskell/uniplate:=[profile?]
+ dev-haskell/vector:=[profile?]
+ dev-haskell/xml-conduit:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ executable? ( dev-haskell/aeson-pretty:=[profile?] )
+ icu? ( >=dev-haskell/text-icu-0.7.1.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/diff-0.4
+ dev-haskell/timeit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ $(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/metadata.xml b/dev-haskell/citeproc/metadata.xml
index 68e37597bcd1..0066044cfb40 100644
--- a/dev-haskell/citeproc/metadata.xml
+++ b/dev-haskell/citeproc/metadata.xml
@@ -9,10 +9,8 @@
<flag name="executable">Build citeproc executable</flag>
<flag name="icu">Use Haskell bindings to the ICU library</flag>
</use>
- <longdescription>
- citeproc parses CSL style files and uses them to
- generate a list of formatted citations and bibliography
- entries. For more information about CSL, see
- &lt;https://citationstyles.org/&gt;.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">citeproc</remote-id>
+ <remote-id type="github">jgm/citeproc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/classy-prelude/Manifest b/dev-haskell/classy-prelude/Manifest
deleted file mode 100644
index adf89dfaa9cf..000000000000
--- a/dev-haskell/classy-prelude/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST classy-prelude-1.5.0.tar.gz 12053 BLAKE2B 20bf1f3807ec372813b1d2783fe1bb4a215e5dde52c2d98f09c26e30b2868c2126a078d8290b0f43c3afa4209ff1543a51842383cecb999634f6632aae2d33e3 SHA512 eb8afb8a8988d0b251f6b3c2046f3ad943201d35379bfcd21f024afa67031c1b43677f43b22a0dd88e5e586a669bf5cb0b7348e13f40bbef624d09a3c6c62dfd
diff --git a/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild
deleted file mode 100644
index 78e8012786ad..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
- >=dev-haskell/basic-prelude-0.7:=[profile?]
- dev-haskell/bifunctors:=[profile?]
- >=dev-haskell/chunked-data-0.3:=[profile?]
- >=dev-haskell/dlist-0.7:=[profile?]
- dev-haskell/hashable:=[profile?]
- >=dev-haskell/mono-traversable-1.0:=[profile?]
- dev-haskell/mono-traversable-instances:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
- dev-haskell/primitive:=[profile?]
- dev-haskell/say:=[profile?]
- dev-haskell/semigroups:=[profile?]
- dev-haskell/stm:=[profile?]
- >=dev-haskell/stm-chans-3:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/unliftio-0.2.1.0:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- dev-haskell/vector-instances:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/metadata.xml b/dev-haskell/classy-prelude/metadata.xml
deleted file mode 100644
index 6f1cbfde5398..000000000000
--- a/dev-haskell/classy-prelude/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Focuses on using common typeclasses when possible, and creating new ones to avoid name clashing. Exposes many recommended datastructures (Map, ByteString, etc) directly without requiring long import lists and qualified modules.
- </longdescription>
- <upstream>
- <remote-id type="github">snoyberg/classy-prelude</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
index d7eda1465937..8fffed17f39f 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/clock/Manifest
index bcae42d40410..c3a4c3b08e76 100644
--- a/dev-haskell/clock/Manifest
+++ b/dev-haskell/clock/Manifest
@@ -1 +1,2 @@
DIST clock-0.7.2.tar.gz 7465 BLAKE2B 209e720ba6e856fb5e56cc2d2dd48aa4e7b63ab15f356bcddbd5ee0936495a158ecd2c1cbdf9ce54ed89bcbd047091b3a515bcb04b6a30796bc9d659d610f187 SHA512 cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf
+DIST clock-0.8.3.tar.gz 9099 BLAKE2B 4bbe0c68c76339f16af45424a9aa3698ee8c6b743c4e4cc6e38cab2e69ad1e0094e6bdb335a589a9fe496d4c4d4a0dfe49b1d08f66aa13910b474dda319d0bc1 SHA512 86424c9593b9851a3c59ceb23a1665526a0f7e47a18322aa772feff2babb8799c1c2187005639882e4a1553cc327e78a25e85ebe87dec6de17cad050b526ff6f
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index 7974591baf77..b96ef2d8ce38 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # circular depend: tasty->clock[test]->tasty
diff --git a/dev-haskell/clock/clock-0.8.3.ebuild b/dev-haskell/clock/clock-0.8.3.ebuild
new file mode 100644
index 000000000000..297b45081c79
--- /dev/null
+++ b/dev-haskell/clock/clock-0.8.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
+HOMEPAGE="https://github.com/corsis/clock"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/tasty-0.10
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-llvm
+}
diff --git a/dev-haskell/clock/metadata.xml b/dev-haskell/clock/metadata.xml
index 8bef1ab73dcf..695bb9d2cd91 100644
--- a/dev-haskell/clock/metadata.xml
+++ b/dev-haskell/clock/metadata.xml
@@ -5,30 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A package for convenient access to high-resolution
- clock and timer functions of different operating
- systems.
-
- It is planned to consist of two layers. The lower
- layer will provide direct access to OS-specific
- clock and timer functions like clock_gettime of
- Posix or GetTickCount of Windows and its upper
- layer shall then provide a common API for all
- supported systems. Currently only the lower level
- is being developed.
-
-
- POSIX reference: IEEE Std 1003.1-2008
- &lt;http://www.opengroup.org/onlinepubs/9699919799/&gt;,
- &lt;http://www.opengroup.org/onlinepubs/9699919799/functions/clock_getres.html#&gt;
-
- WINDOWS reference: ...
-
- For more information, see:
- &lt;http://corsis.sourceforge.net/index.php/Haskell/Clock&gt;
- </longdescription>
<upstream>
+ <remote-id type="hackage">clock</remote-id>
<remote-id type="github">corsis/clock</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cmark-gfm/Manifest b/dev-haskell/cmark-gfm/Manifest
deleted file mode 100644
index 4358152281e7..000000000000
--- a/dev-haskell/cmark-gfm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cmark-gfm-0.2.1.tar.gz 200812 BLAKE2B aab0142db460139392fa1922bbf090b0222c039f3795e28c1b91024ca9c159cc977a5be645f91f94a0d147a8713c770e4608a6504b68c10263dfe46f2605b84f SHA512 46c0847608f741df689e5b213ecd023bedc4c79ee9b91bff55eae11ad600b248e5816b7c259d5c862b3c9742c6f5d08b16d1a6cf1b8724f7831e77788d4df70d
diff --git a/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild b/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
deleted file mode 100644
index ee7ace0f10f7..000000000000
--- a/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -pkgconfig
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate GitHub Flavored Markdown parser and renderer"
-HOMEPAGE="https://github.com/kivikakk/cmark-gfm-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.14
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-pkgconfig
-}
diff --git a/dev-haskell/cmark-gfm/metadata.xml b/dev-haskell/cmark-gfm/metadata.xml
deleted file mode 100644
index 2692cbc63560..000000000000
--- a/dev-haskell/cmark-gfm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides Haskell bindings for
- &lt;https://github.com/github/cmark libcmark-gfm&gt;, the reference
- parser for &lt;https://github.github.com/gfm/ GitHub Flavored Markdown&gt;, a fully
- specified variant of Markdown. It includes sources for
- libcmark-gfm (0.28.0) and does not require prior installation of the
- C library.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cmark/Manifest b/dev-haskell/cmark/Manifest
deleted file mode 100644
index 98138b5dd5e4..000000000000
--- a/dev-haskell/cmark/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cmark-0.6.tar.gz 169132 BLAKE2B d6c72aa17216f89e90a269d2fcd6639f25ac2e9aa02a0799108a85247b5ccb5211ee02dc078cdbccfbd6295705799d5b49e2af70d50cd6a791fbf4ddcea70a01 SHA512 35d2851bb1d3305000527cfce81253c9492a3e3205e73418fe42fcc9f8e5f8e396a7ecf81ad4a003a2dd4a571c4f7d051bc6812c07a5c79dc30eac1d45fca4f5
diff --git a/dev-haskell/cmark/cmark-0.6.ebuild b/dev-haskell/cmark/cmark-0.6.ebuild
deleted file mode 100644
index ebd870a5758e..000000000000
--- a/dev-haskell/cmark/cmark-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: pkgconfig:system-cmark
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="system-cmark"
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- system-cmark? ( app-text/cmark )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.14
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
- system-cmark? ( virtual/pkgconfig )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag system-cmark pkgconfig)
-}
diff --git a/dev-haskell/cmark/metadata.xml b/dev-haskell/cmark/metadata.xml
deleted file mode 100644
index 0331282b8416..000000000000
--- a/dev-haskell/cmark/metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="system-cmark">use <pkg>app-text/cmark</pkg> instead of bundled copy</flag>
- </use>
- <longdescription>
- This package provides Haskell bindings for
- &lt;https://github.com/jgm/cmark libcmark&gt;, the reference
- parser for &lt;http://commonmark.org CommonMark&gt;, a fully
- specified variant of Markdown. It includes sources for
- libcmark (0.19.0) and does not require prior installation of the
- C library.
-
- cmark provides the following advantages over existing
- Markdown libraries for Haskell:
-
- - Speed: Conversion speed is on par with the
- &lt;https://hackage.haskell.org/package/sundown sundown&gt;
- library. We were unable to measure precisely
- against
- &lt;https://hackage.haskell.org/package/sundown sundown&gt;,
- which raised a malloc error when compiled into our
- benchmark suite. Relative to other implementations:
- cmark was 82 times faster than
- &lt;https://hackage.haskell.org/package/cheapskate cheapskate&gt;,
- 59 times faster than
- &lt;https://hackage.haskell.org/package/markdown markdown&gt;,
- 105 times faster than
- &lt;https://hackage.haskell.org/package/pandoc pandoc&gt;,
- and 2.8 times faster than
- &lt;https://hackage.haskell.org/package/discount discount&gt;.
-
- - Memory footprint: Memory footprint is on par with
- &lt;https://hackage.haskell.org/package/sundown sundown&gt;.
- On one sample, the library uses a fourth the memory that
- &lt;https://hackage.haskell.org/package/markdown markdown&gt;
- uses, and less than a tenth the memory that
- &lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
- uses.
-
- - Robustness: cmark can handle whatever is thrown
- at it, without the exponential blowups in parsing
- time one can sometimes get with other libraries.
- (The input @bench\/full-sample.md@, for example,
- causes both
- &lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
- and
- &lt;https://hackage.haskell.org/package/markdown markdown&gt;
- to grind to a halt.)
-
- - Accuracy: cmark passes the CommonMark spec\'s
- suite of over 500 conformance tests.
-
- - Standardization: Since there is a spec and a
- comprehensive suite of tests, we can have a high
- degree of confidence that any two CommonMark
- implementations will behave the same. Thus, for
- example, one could use this library for server-side
- rendering and
- &lt;https://github.com/jgm/commonmark.js commonmark.js&gt;
- for client-side previewing.
-
- - Ease of installation: cmark is portable and has
- minimal dependencies.
-
- cmark does not provide Haskell versions of the whole
- &lt;https://github.com/jgm/cmark libcmark&gt; API, which is
- built around mutable @cmark_node@ objects. Instead, it
- provides functions for converting CommonMark to HTML
- (and other formats), and a function for converting
- CommonMark to a @Node@ tree that can be processed
- further using Haskell.
-
- A note on security: This library does not attempt
- to sanitize HTML output. We recommend using
- &lt;https://hackage.haskell.org/package/xss-sanitize xss-sanitize&gt;
- to filter the output.
-
- A note on stability: There is a good chance the API
- will change significantly after this early release.
- </longdescription>
- <upstream>
- <remote-id type="github">jgm/commonmark-hs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index c6c327bc5b2f..20c948578523 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1 +1,2 @@
DIST cmdargs-0.10.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
+DIST cmdargs-0.10.22.tar.gz 65154 BLAKE2B a6f05c4a186dc4dbb9de3c754f9100138d3954b1537b1ecb81e2fec2c6bd293dd381a2a666dae0bcbbc631e9ab95d8a65d85d68d3e2c80bb2d6ad87baf9906b1 SHA512 571d9584769fdb5bb77a57607c2f432b365604a2ca2e9b5c044c319499004f7fcb12f2f6e61091a245f1bf6a5d321d38ade1a54d5bc86831136fa85b9b898faa
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
index 0562f4b765fc..082cc75e06aa 100644
--- a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+quotation testprog"
RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
new file mode 100644
index 000000000000..2ce0041ab470
--- /dev/null
+++ b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: testprog:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples +quotation"
+REQUIRED_USE="examples? ( quotation )"
+
+CABAL_CHDEPS=(
+ 'executable cmdargs' 'executable cmdargs-demo'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag quotation quotation) \
+ $(cabal_flag examples testprog)
+}
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index 4ba506a01472..4a2ade06e3ba 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -5,31 +5,13 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides an easy way to define command line parsers. Most users
- will want to use the "System.Console.CmdArgs.Implicit" module, whose
- documentation contains an example.
-
- * "System.Console.CmdArgs.Explicit" provides a way to write command line
- parsers for both single mode programs (most programs) and multiple
- mode programs (e.g. darcs or cabal). Parsers are defined by constructing
- a data structure.
-
- * "System.Console.CmdArgs.Implicit" provides a way to concisely define
- command line parsers, up to three times shorter than getopt. These parsers
- are translated into the Explicit data type.
-
- * "System.Console.CmdArgs.GetOpt" provides a wrapper allowing compatiblity
- with existing getopt parsers, mapping to the Explicit data type.
-
- For a general reference on what command line flags are commonly used,
- see &lt;http://www.faqs.org/docs/artu/ch10s05.html&gt;.
- </longdescription>
<use>
+ <flag name="examples">Build the cmdargs-demo program</flag>
<flag name="testprog">Build the test program</flag>
- <flag name="quotation">Build quote module</flag>
+ <flag name="quotation">Build the Quote module</flag>
</use>
<upstream>
+ <remote-id type="hackage">cmdargs</remote-id>
<remote-id type="github">ndmitchell/cmdargs</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
index 3e6abb0ad19b..a1d8003541cf 100644
--- a/dev-haskell/code-page/Manifest
+++ b/dev-haskell/code-page/Manifest
@@ -1 +1,2 @@
DIST code-page-0.1.3.tar.gz 4718 BLAKE2B 0062024dd536b23359d84a8f6aa5bb66a241ae41190a59c9c2cdde34f3ee1664ad180a1d7b8332904b761956bbb73bb85f74f818763a37021dfa5fa09d36a040 SHA512 1a8f650051d749840562d4ac8789f9834afa73e64582f2781d542d281d894c420cdb7a5b8a2bf30c983bec99a27bec8b63a32b1cabd3ab26a964e0a9b9b647bc
+DIST code-page-0.2.1.tar.gz 6859 BLAKE2B 0413a5b4fd846d473a3f3151830bac07bf3c73e4068d1d65aeb522d919d9606370fc6cf7887bc5f485147b2959116391b95227b9562ad0530abd9c0124a33902 SHA512 5a1ff550892bb315d2c0645d325e8b8914342d0da9726dd3798eba9655bd79cca7a75927e9312c44d4be1cff8e2c69b8f1734c3662fabb14760036228aedb768
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 0206747c43bf..957bc38aecb2 100644
--- a/dev-haskell/code-page/code-page-0.1.3.ebuild
+++ b/dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/code-page/code-page-0.2.1.ebuild b/dev-haskell/code-page/code-page-0.2.1.ebuild
new file mode 100644
index 000000000000..3826f3df3906
--- /dev/null
+++ b/dev-haskell/code-page/code-page-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Windows code page library for Haskell"
+HOMEPAGE="https://github.com/RyanGlScott/code-page"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/code-page/metadata.xml b/dev-haskell/code-page/metadata.xml
index 53009fa0e624..0154aaccd7b6 100644
--- a/dev-haskell/code-page/metadata.xml
+++ b/dev-haskell/code-page/metadata.xml
@@ -5,18 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides two modules:
-
- * "System.IO.CodePage": a cross-platform module that exports
- functions which adjust code pages on Windows, and do nothing
- on other operating systems.
-
- * "System.Win32.CodePage": On Windows, this exports functions
- for getting, setting, and analyzing code pages. On other
- operating systems, this module exports nothing.
- </longdescription>
<upstream>
+ <remote-id type="hackage">code-page</remote-id>
<remote-id type="github">RyanGlScott/code-page</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
index cf429d3caa65..6b9c4080fd43 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1 +1,2 @@
DIST colour-2.3.5.tar.gz 20485 BLAKE2B 64cc4df8f7b36fa4c7a9b474db566b7623f9c7b0892f379acc866f384aa5e557cab5965869b0ba84167232658375ab568a3f5e90a0a1deba81520717899637c6 SHA512 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8
+DIST colour-2.3.6.tar.gz 20675 BLAKE2B 9104d414cf01842cb74e20cb3b9052b109767b3a7e53552ddafd877b4c30d65c5a154e9235a280698e5096d82e523d1c01d54846d7a73ec5de0e62fcb6c04642 SHA512 82f7d92e46f7235706832be9d3a981bc09f729ef4e7f891dae85bf808f342e498aa152bc106f9c011ab0e79e5cc2d57067de596d774ad5010e9845df521ed275
diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild
index 69088c21c11a..f339e2c0e280 100644
--- a/dev-haskell/colour/colour-2.3.5.ebuild
+++ b/dev-haskell/colour/colour-2.3.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
# circular dependencies: colour -> ansi-terminal -> test-framework -> colour
RESTRICT=test
diff --git a/dev-haskell/colour/colour-2.3.6.ebuild b/dev-haskell/colour/colour-2.3.6.ebuild
new file mode 100644
index 000000000000..5095e74b2b59
--- /dev/null
+++ b/dev-haskell/colour/colour-2.3.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A model for human colour/color perception"
+HOMEPAGE="https://www.haskell.org/haskellwiki/Colour"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'random >= 1.0 && < 1.2' 'random >= 1.0'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/random-1.0
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/colour/metadata.xml b/dev-haskell/colour/metadata.xml
index 2773d58cddf5..6b3d1d04daf5 100644
--- a/dev-haskell/colour/metadata.xml
+++ b/dev-haskell/colour/metadata.xml
@@ -5,10 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides a data type for colours and transparency.
- Colours can be blended and composed.
- Various colour spaces are supported.
- A module of colour names ("Data.Colour.Names") is provided.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">colour</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
index c98f1254596e..bf5fc3a74f9f 100644
--- a/dev-haskell/commonmark-extensions/Manifest
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -1 +1,2 @@
-DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
+DIST commonmark-extensions-0.2.3.2.tar.gz 37074 BLAKE2B e3519ad4ec8bdb9db5ab8cbb57ffeccf2512621c7e5fe423dab1c5afb075f55fcf348dabcd770ab84abf1efae24ad73c013ab76d080122e55736e59fca2ea7c6 SHA512 93b6c856f8aa5858e2700e8ffd98dd56a294cae95430b0ec1ea1c6a48f952eb5c1ce8223a10a36f4249933e2efc92d8110ba54463af467535b435c236b03f619
+DIST commonmark-extensions-0.2.3.5.tar.gz 37915 BLAKE2B c0a29517910da9de24e99ac25b2b38e9a894f3bde9bb144be07b5b0c2463e07ff5407bf40748e1ff1489fce82a1f4dbf7a5e2c205c33d7199ef0b7a17ea6ddcc SHA512 c7eff871f9413e5f9b32f979f8d09fae4a0e509439231b8959f56ece7e6083264b58154f9869f0757bc85cbb4f9fc726c9bffad0da0fbe9742a8cd86822c96d6
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
deleted file mode 100644
index 4af1c67261ac..000000000000
--- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
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
new file mode 100644
index 000000000000..a8a6e7ac35e8
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ dev-haskell/network-uri:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild
new file mode 100644
index 000000000000..ac5693694b97
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ dev-haskell/network-uri:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/commonmark-extensions/metadata.xml b/dev-haskell/commonmark-extensions/metadata.xml
index 937381521944..78c30d625c50 100644
--- a/dev-haskell/commonmark-extensions/metadata.xml
+++ b/dev-haskell/commonmark-extensions/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">commonmark-extensions</remote-id>
+ <remote-id type="github">jgm/commonmark-hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
index c075f06dc9bd..e519d86450a1 100644
--- a/dev-haskell/commonmark-pandoc/Manifest
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -1 +1,2 @@
-DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
+DIST commonmark-pandoc-0.2.1.2.tar.gz 4937 BLAKE2B 26f46b663051aecc204f2e67f66e62a6943909d496542d31b0238cd6bdecda4e0c8594d8ed3f8147fea5bbab4680c147379feddecb59f93be810bc3a9015d08a SHA512 85c7505b29c99e38bbadf93764e51ec40da3bff0799e99eecd011962f1103b81970cb5ffb7399b48927e0024c07554ee0e7d420a88bd2f37149a4777d8bca032
+DIST commonmark-pandoc-0.2.1.3.tar.gz 4907 BLAKE2B 7b93e6ebf39d9da457cc6dac127f0f440172f738aa59f6484cdc29fc48426e6d84c5deb61cc64b569e7128bc50560980afc6022c64a9e533699a23a98b7a77c0 SHA512 d5d91748501cdb4fcb738f89ee32135eed83ff1a41a3665f86ad36286a346b4751a355cd81d29e43a47500913b94796330df9b35201586d2610dbdb4ef4fa544
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
deleted file mode 100644
index 3fc16f6d2a8f..000000000000
--- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bridge between commonmark and pandoc AST"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/commonmark-extensions-0.2:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
- >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
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
new file mode 100644
index 000000000000..8e9c40e5c4e4
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild
new file mode 100644
index 000000000000..0d0515289bb0
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/commonmark-pandoc/metadata.xml b/dev-haskell/commonmark-pandoc/metadata.xml
index 937381521944..f6c8b5febd59 100644
--- a/dev-haskell/commonmark-pandoc/metadata.xml
+++ b/dev-haskell/commonmark-pandoc/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">commonmark-pandoc</remote-id>
+ <remote-id type="github">jgm/commonmark-hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
index c72f93bc6db1..14827b715c55 100644
--- a/dev-haskell/commonmark/Manifest
+++ b/dev-haskell/commonmark/Manifest
@@ -1 +1,2 @@
-DIST commonmark-0.1.1.4.tar.gz 99102 BLAKE2B 28fd60d2ddb385856ad824cbc73f9f20a35616312e2a4b340e4f0b7fd4311f35155a6fe3d6255a3e2e75a2058627c44119620e0e2caa917e5608cf1284a19641 SHA512 d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657
+DIST commonmark-0.2.2.tar.gz 101438 BLAKE2B 1e6183e2a9a3d90fb3347bd03779c77314e51d817de7740ae933f328a144a22d729a5dca90f40e1a35967a335d03aaf8e6836b8fe42d12c8d2f52963378c8f6f SHA512 fb1e9d8774c7a2682af8702b94ea4b255ff9dd38fcaba96048d037b3c75051509332ef80631165670a513280e984abf1fa08dd53e85d13f1b4e46941cceadc96
+DIST commonmark-0.2.3.tar.gz 102342 BLAKE2B 1675cb4f995cd76613c9d6fa6ac8f5884a55258b2c76387e286e2cca581946865f3780046332d0dfa9fcb1bf60ca9bd6dce0882ebc7273073261c1104fdd6b9a SHA512 7e3371f6b1aaf4aca3db4ae91894c1e6bd6ea8736babb32de902fba89c2e1f44369bee836fcb1a229948dd72fab25e930bc0cdc143e94d6b136734b9fff3d3df
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
deleted file mode 100644
index f6eee2250939..000000000000
--- a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/parsec:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/commonmark/commonmark-0.2.2.ebuild b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
new file mode 100644
index 000000000000..c2186a916523
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/unicode-data-0.3:=[profile?]
+ dev-haskell/unicode-transforms:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark/commonmark-0.2.3.ebuild b/dev-haskell/commonmark/commonmark-0.2.3.ebuild
new file mode 100644
index 000000000000..d83dbe85c596
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/unicode-data-0.3:=[profile?]
+ dev-haskell/unicode-transforms:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark/metadata.xml b/dev-haskell/commonmark/metadata.xml
index 937381521944..769758cc2ca3 100644
--- a/dev-haskell/commonmark/metadata.xml
+++ b/dev-haskell/commonmark/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">commonmark</remote-id>
+ <remote-id type="github">jgm/commonmark-hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/comonad-transformers/Manifest b/dev-haskell/comonad-transformers/Manifest
deleted file mode 100644
index 348d1f3e897b..000000000000
--- a/dev-haskell/comonad-transformers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST comonad-transformers-4.0.tar.gz 2430 BLAKE2B 40de77da2839445abe984293d105fbadede706b32909119d941a49946f941d694a8f0278d1bd4d48560dee382bba75d820e1d49e249f445c5de2ed2285ebbc2b SHA512 5b35e80798691ba7defd030e03030491ffd6b4721b85f88f7596e75442b33c13eb6d2b8a91fdb47b76b05629a9008fde61ed0e1c87324f673a9de84510d2a668
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
deleted file mode 100644
index 9d6d8fbdb524..000000000000
--- a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonad-transformers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/comonad-transformers/metadata.xml b/dev-haskell/comonad-transformers/metadata.xml
deleted file mode 100644
index 8f9544d19fca..000000000000
--- a/dev-haskell/comonad-transformers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ekmett/comonad-transformers</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index f9254d2aff45..002329448c93 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1 +1,2 @@
-DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
+DIST comonad-5.0.8-rev1.cabal 3631 BLAKE2B fe4a2a4fd61f0dc157004155b0f3e8ab00a0bd653d56d6f92408fdbf8d5a1d15ef7fb6cdd4d7572d9731cb4be1cbc898e6fdda9bb1d4227538a4cd0903010207 SHA512 425f0fadb85e99dc4047fff47dfbae9d4d33a9bb1d3f26493c7b14af03ca26b29f4f57693c5670ddafa9d48c9315ca34072cd76c6e2eaf47d9c5d14e5ebb5d61
+DIST comonad-5.0.8.tar.gz 15227 BLAKE2B 5f316ed68d35fcc2857cb7250f2d181ed77d2e87cc5d7dfb671cdec0c602080a6e3c0ac28541bd4cac43b954f96af0e1077bf2b28c040202bd3e66a820c5ccb1 SHA512 b823ea36826da74c6ec46cb835493224f62da66516841b9660a04c391dee803c31e140b2c523b563fb51f46509d99cce157b456a88fbaf2371da11933d5d787e
diff --git a/dev-haskell/comonad/comonad-5.0.7.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
deleted file mode 100644
index 3480cf6e57e2..000000000000
--- a/dev-haskell/comonad/comonad-5.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +distributive,+containers,test-doctests:test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell package providing comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+indexed-traversable"
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=containers \
- --flag=distributive \
- $(cabal_flag indexed-traversable indexed-traversable) \
- $(cabal_flag test test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-5.0.8-r1.ebuild b/dev-haskell/comonad/comonad-5.0.8-r1.ebuild
new file mode 100644
index 000000000000..4f102ae0ede0
--- /dev/null
+++ b/dev-haskell/comonad/comonad-5.0.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +distributive,+containers,test-doctests:test
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Comonads package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/comonad/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+indexed-traversable"
+
+RDEPEND=">=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=containers \
+ --flag=distributive \
+ $(cabal_flag indexed-traversable indexed-traversable)
+}
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index ae990844bc6a..83baf83fe01a 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -8,4 +8,8 @@
<use>
<flag name="indexed-traversable">You can disable the use of the `indexed-traversable` package using `-f-indexed-traversable`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `FunctorWithIndex`</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">comonad</remote-id>
+ <remote-id type="github">ekmett/comonad</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/comonads-fd/Manifest b/dev-haskell/comonads-fd/Manifest
deleted file mode 100644
index fa6f9ad6ea90..000000000000
--- a/dev-haskell/comonads-fd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST comonads-fd-4.0.tar.gz 2605 BLAKE2B 3d498483964cf10f3622aaa4097adabf70c2ef1d82c28025697e775fb4b6d88b33332235772001f6180279876bfd4fa1b3720762c7297c3c9c9d00f031d2cf5c SHA512 290a137c7485c5cbebc7994737a0c2a70ffb2463188cd491bf86b4e02edb5cc3a8c4fd7b7cfcfc999c6dfbed6bb437a63f44959ec34e4addaffd0a81a20125a1
diff --git a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild b/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
deleted file mode 100644
index 578bc84089cf..000000000000
--- a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonads-fd/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/comonads-fd/metadata.xml b/dev-haskell/comonads-fd/metadata.xml
deleted file mode 100644
index b0dfa4501d0c..000000000000
--- a/dev-haskell/comonads-fd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ekmett/comonads-fd</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-extra/Manifest b/dev-haskell/concurrent-extra/Manifest
deleted file mode 100644
index 2f1602d8caa5..000000000000
--- a/dev-haskell/concurrent-extra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST concurrent-extra-0.7.0.12.tar.gz 15844 BLAKE2B 1220bdaa6bbc364c4a2e12adc3dd953459d8dcbc251db776e906facc2b80aa4239d35cc29c19fea767e27c0a451b5b29c3010f8a97943db6e73801980888b7c7 SHA512 b02bfa8473faeba15bf26f4c243190dee7820dd961bc86cb7cd1eb856451a9351899eea59b3668f0b811c95f828cd8c36744dfa03144ca0a949e3b663ae84ad2
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
deleted file mode 100644
index c8301f605c70..000000000000
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra concurrency primitives"
-HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #stresstest fails, all others pass
-
-RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?]
- >=dev-haskell/unbounded-delays-0.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/async-2.0
- >=dev-haskell/hunit-1.2.2
- >=dev-haskell/random-1.0
- >=dev-haskell/test-framework-0.2.4
- >=dev-haskell/test-framework-hunit-0.2.4 )
-"
diff --git a/dev-haskell/concurrent-extra/metadata.xml b/dev-haskell/concurrent-extra/metadata.xml
deleted file mode 100644
index 34510840b00c..000000000000
--- a/dev-haskell/concurrent-extra/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The @concurrent-extra@ package offers among other things the
- following selection of synchronisation primitives:
-
- * @Broadcast@: Wake multiple threads by broadcasting a value.
-
- * @Event@: Wake multiple threads by signalling an event.
-
- * @Lock@: Enforce exclusive access to a resource. Also known as a
- binary semaphore or mutex. The package additionally provides an
- alternative that works in the @STM@ monad.
-
- * @RLock@: A lock which can be acquired multiple times by the same
- thread. Also known as a reentrant mutex.
-
- * @ReadWriteLock@: Multiple-reader, single-writer locks. Used to
- protect shared resources which may be concurrently read, but only
- sequentially written.
-
- * @ReadWriteVar@: Concurrent read, sequential write variables.
-
- Please consult the API documentation of the individual modules for
- more detailed information.
-
- This package was inspired by the concurrency libraries of Java and
- Python.
- </longdescription>
- <upstream>
- <remote-id type="github">basvandijk/concurrent-extra</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-output/Manifest b/dev-haskell/concurrent-output/Manifest
index 3b9dd32f1be6..5cfffba45e1e 100644
--- a/dev-haskell/concurrent-output/Manifest
+++ b/dev-haskell/concurrent-output/Manifest
@@ -1 +1,2 @@
DIST concurrent-output-1.10.11.tar.gz 22514 BLAKE2B 19b31ed65ac0a553ad8f60d08d9919428e0cb40be151b43e7a91dd2c9d28d61ed79fab75efef43e8a0f44e66ef652ddaff0aa8275bf2884d4db59fa2bfde8e47 SHA512 2ed0415562c37cedc035adac06430e397369bf13ff5375f855c9b3a34c122437b3f92137b593d8fd0384d575822ee5287ca0b2c2b3daab8de95a5c63b991760d
+DIST concurrent-output-1.10.19.tar.gz 23835 BLAKE2B d78c91791bb2a668c24863313a5e6af9d35eea5b27bca3fca14eab75f8749c3f037926b6a0f278be32b82f684c785aa0068e19ef49ea1d22ba57dc64c6319b57 SHA512 6d51b364842fe399eff15e2bbec8756ed94bb1090f2125a71186c2c0e597696dd8955efe17e8017beaee260564829ab4f3afb495bbb706423c6b13c61d462b44
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 ace99cc98d56..03a2852512c7 100644
--- a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/concurrent-output/concurrent-output-1.10.19.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild
new file mode 100644
index 000000000000..8a72b9bbad4c
--- /dev/null
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Ungarble output from several threads or commands"
+HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] <dev-haskell/ansi-terminal-1.1.0:=[profile?]
+ >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
+ >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/concurrent-output/metadata.xml b/dev-haskell/concurrent-output/metadata.xml
index 9c22cc6f0d89..a2b732140d20 100644
--- a/dev-haskell/concurrent-output/metadata.xml
+++ b/dev-haskell/concurrent-output/metadata.xml
@@ -5,16 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides a simple interface for writing concurrent programs that
- need to output a lot of status messages to the console, or display
- multiple progress bars for different activities at the same time,
- or concurrently run external commands that output to the console.
-
- Built on top of that is a way of defining multiple output regions,
- which are automatically laid out on the screen and can be individually
- updated. Can be used for progress displays etc.
-
- &lt;&lt;https://joeyh.name/code/concurrent-output/demo2.gif&gt;&gt;
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">concurrent-output</remote-id>
+ </upstream>
</pkgmetadata>
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 d0673fa1d0ee..828daae11b9e 100644
--- a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
+++ b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/conduit-combinators/metadata.xml b/dev-haskell/conduit-combinators/metadata.xml
index 937381521944..a1de5e8eb364 100644
--- a/dev-haskell/conduit-combinators/metadata.xml
+++ b/dev-haskell/conduit-combinators/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">snoyberg/mono-traversable</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
index 3d15415ac67f..4c177df3e8e0 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -1 +1,2 @@
DIST conduit-extra-1.3.4.tar.gz 33170 BLAKE2B 27d9adc403be4479e06c47737e9770ffa63fa306278ca20374e7fde8005a70553df28a4959bca0148c4607a0317fddcbde693bd1b0a11c45ea1b58f086a66876 SHA512 cd5d6d754871ba9558f495074066cff0d116d71af71a6260c9cfe53244a03513813f93ed985af25c6eb7849f1d4dbb4f6b9a17140c2bf12236206b9e9925efee
+DIST conduit-extra-1.3.6.tar.gz 33321 BLAKE2B c310fe8c11377e39204fee247fefb0bd7ac49b82395e187c6c0f36f8e5717b293a0a48dfde782562204ae1ca8c6370881ff358414032fd750440d9c7ff85790c SHA512 56f6abf0663734c0e40b3d21fed6d0942fe30acc8960105ac93ddbb15d10c9074213e0ead575cc4422824832beae026376d04a13f6a045efc2a695676cf03546
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 cc3b589f4212..d0a60c578758 100644
--- a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # requires network
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..b2153db91a1b
--- /dev/null
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Batteries included conduit: adapters for common libraries"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/async:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/network-2.3:=[profile?]
+ >=dev-haskell/primitive-0.5:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?]
+ dev-haskell/stm:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.16:=[profile?]
+ >=dev-haskell/typed-process-0.2.6:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? (
+ dev-haskell/exceptions
+ >=dev-haskell/hspec-1.3
+ dev-haskell/quickcheck
+ dev-haskell/transformers-base
+ )
+"
diff --git a/dev-haskell/conduit-extra/metadata.xml b/dev-haskell/conduit-extra/metadata.xml
index 2009edb10ea1..5077db0ea615 100644
--- a/dev-haskell/conduit-extra/metadata.xml
+++ b/dev-haskell/conduit-extra/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package will soon contain much more functionality. This is a placeholder until the next release is ready.
- </longdescription>
<upstream>
+ <remote-id type="hackage">conduit-extra</remote-id>
<remote-id type="github">snoyberg/conduit</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index d87d1eb762c5..2719a2ea53ea 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -1 +1,2 @@
-DIST conduit-1.3.4.tar.gz 88861 BLAKE2B 79821013c6177ed2d555c6ad0c42a694f927c069b11c637c881d3cbcdf99c6ed8238bb8fd2d846fe1e89199dd7a35a4d75ddbb7e4c44ac2edb5314e9062229e7 SHA512 a70f41f45b9014fcd4155167114e0c42b98f33ffe5111ecfe12f3d7f579fcfe82b76e27c16670538f71883bb10af159a2e56eee322e0a1f1cf79bbf862db7611
+DIST conduit-1.3.4.2.tar.gz 88962 BLAKE2B 0c4ade4df87c8ace3206e7d4f6b52ae472828f0ad67d5cf970797054f4423c86256c50fdd20f4a7d215b0f1b5ac424ce9431927732c17b1c7c73fd98707e9cfd SHA512 8caf67020e33ddaadc5f05ad3f1aa38d436388f0cb3dac66cb9a645c1693bcd134f1cb8d311eca7b64f9c5ace9ca97681511e5dc28bb70b7b52c43c62d5f3e03
+DIST conduit-1.3.4.3.tar.gz 88820 BLAKE2B af5b1c68c19d1c4428c06e123dc3aec4107dd230e61dae9aa99d96ea448f158136cd4d844edec3e97de65e9093363356b08bb5d4950fdd13393df74e84676063 SHA512 14d4557c1018514da4ae7ae41ec8a381ae57aabd86d84e2c961dce0b784ca4fb8aec5a2757c6fe6d815ce552f25bcc462c208226ca33094e0210b06651846e59
diff --git a/dev-haskell/conduit/conduit-1.3.4.2.ebuild b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
new file mode 100644
index 000000000000..eada6d7aee07
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+ >=dev-haskell/mono-traversable-1.0.7:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.6.3:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/exceptions-0.6
+ >=dev-haskell/hspec-1.3
+ >=dev-haskell/quickcheck-2.7
+ dev-haskell/safe
+ dev-haskell/silently
+ >=dev-haskell/split-0.2.0.0
+ >=dev-haskell/unliftio-0.2.4.0 )
+"
diff --git a/dev-haskell/conduit/conduit-1.3.4.3.ebuild b/dev-haskell/conduit/conduit-1.3.4.3.ebuild
new file mode 100644
index 000000000000..be625410fa1d
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.3.4.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/mono-traversable-1.0.7:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hspec-1.3
+ >=dev-haskell/quickcheck-2.7
+ dev-haskell/safe
+ dev-haskell/silently
+ >=dev-haskell/split-0.2.0.0
+ >=dev-haskell/unliftio-0.2.4.0 )
+"
diff --git a/dev-haskell/conduit/conduit-1.3.4.ebuild b/dev-haskell/conduit/conduit-1.3.4.ebuild
deleted file mode 100644
index be3bc3632468..000000000000
--- a/dev-haskell/conduit/conduit-1.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
- >=dev-haskell/mono-traversable-1.0.7:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/primitive:=[profile?]
- >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/exceptions-0.6
- >=dev-haskell/hspec-1.3
- >=dev-haskell/quickcheck-2.7
- dev-haskell/safe
- dev-haskell/silently
- >=dev-haskell/split-0.2.0.0
- >=dev-haskell/unliftio-0.2.4.0 )
-"
diff --git a/dev-haskell/conduit/metadata.xml b/dev-haskell/conduit/metadata.xml
index 119586ddfe53..9d00781cb34b 100644
--- a/dev-haskell/conduit/metadata.xml
+++ b/dev-haskell/conduit/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Conduits are an approach to the streaming data problem. It is meant as an alternative to enumerators\/iterators, hoping to address the same issues with different trade-offs based on real-world experience with enumerators. For more information, see &lt;http://www.yesodweb.com/blog/2011/12/conduits&gt;.
- </longdescription>
<upstream>
+ <remote-id type="hackage">conduit</remote-id>
<remote-id type="github">snoyberg/conduit</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/configfile/Manifest b/dev-haskell/configfile/Manifest
deleted file mode 100644
index ccd0b3c145f4..000000000000
--- a/dev-haskell/configfile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ConfigFile-1.1.4.tar.gz 28969 BLAKE2B 8cd70d207a26fabab3d7b124d17857ee8004a38388bba921fb658b9f09df4d082ea73149ee1d8fc7f5737f521f4f81727f60034b507265e7bd5ec89683d88965 SHA512 4455110c95172461b2d82ae88ba4f386d5e49ddd7f7def83714d2f6198090f0d121166eece3efa735341da9bbc0029e704be00d3e671d24ad27e838dfe913776
diff --git a/dev-haskell/configfile/configfile-1.1.4.ebuild b/dev-haskell/configfile/configfile-1.1.4.ebuild
deleted file mode 100644
index 5e1022976cf6..000000000000
--- a/dev-haskell/configfile/configfile-1.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ConfigFile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Configuration file reading & writing"
-HOMEPAGE="http://software.complete.org/configfile"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/missingh-1.0.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/parsec:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-buildtests
-}
diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/configfile/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
index 6fbdc4a01a11..e181e674aea9 100644
--- a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
+++ b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/attoparsec-0.10.0.2:=[profile?]
diff --git a/dev-haskell/connection/Manifest b/dev-haskell/connection/Manifest
index 63e865131a45..b7021fbaa7cd 100644
--- a/dev-haskell/connection/Manifest
+++ b/dev-haskell/connection/Manifest
@@ -1 +1,2 @@
+DIST connection-0.3.1-rev2.cabal 1563 BLAKE2B c7d4bc435cd85e2c7a45eddecf0ab0b9ab94b924e5a4af88d154b177d78ac6194d255a75b2a6707b3b4e12b924654affce38ee4523920fb84b2e419b0ae8d051 SHA512 ca1adba80ffd3437151b76eccc978008b0adb590f37cd2399e0b7b53e2873ff61615d206f15a4901e44b766ac6936f1e705f335a3d926f9dde7175e4a24cc91b
DIST connection-0.3.1.tar.gz 9051 BLAKE2B 8758906a266180c9c81969c13b7a5e19bcb01757222ba21e1cd258a50180c52288a1a1e1e2486a3fea6fc3c6fd516ebcf4ade984dde822609ac962edfec4d610 SHA512 06da91d39e0d9a556a78da77a7ca31d520d5e7e8fd65509f82be926ad2c34282ef1f4d03aa6065c5834bc89417cf51b573f3cf4529fe3ead72eb1e80cc6d7a98
diff --git a/dev-haskell/connection/connection-0.3.1-r1.ebuild b/dev-haskell/connection/connection-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..260b23c45e13
--- /dev/null
+++ b/dev-haskell/connection/connection-0.3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and easy network connections API"
+HOMEPAGE="https://github.com/vincenthz/hs-connection"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/basement:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/network-2.6.3:=[profile?]
+ >=dev-haskell/socks-0.6:=[profile?]
+ >=dev-haskell/tls-1.4:=[profile?] <dev-haskell/tls-1.7:=[profile?]
+ >=dev-haskell/x509-1.5:=[profile?]
+ >=dev-haskell/x509-store-1.5:=[profile?]
+ >=dev-haskell/x509-system-1.5:=[profile?]
+ >=dev-haskell/x509-validation-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/connection/connection-0.3.1.ebuild b/dev-haskell/connection/connection-0.3.1.ebuild
deleted file mode 100644
index e5e1fa480a86..000000000000
--- a/dev-haskell/connection/connection-0.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/basement:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- >=dev-haskell/network-2.6.3:=[profile?]
- >=dev-haskell/socks-0.6:=[profile?]
- >=dev-haskell/tls-1.4:=[profile?]
- >=dev-haskell/x509-1.5:=[profile?]
- >=dev-haskell/x509-store-1.5:=[profile?]
- >=dev-haskell/x509-system-1.5:=[profile?]
- >=dev-haskell/x509-validation-1.5:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/connection/metadata.xml b/dev-haskell/connection/metadata.xml
index fb144a47822f..bb7ee867c16c 100644
--- a/dev-haskell/connection/metadata.xml
+++ b/dev-haskell/connection/metadata.xml
@@ -5,15 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Simple network library for all your connection need.
-
- Features: Really simple to use, SSL/TLS, SOCKS.
-
- This library provides a very simple api to create sockets
- to a destination with the choice of SSL/TLS, and SOCKS.
- </longdescription>
<upstream>
+ <remote-id type="hackage">connection</remote-id>
<remote-id type="github">vincenthz/hs-connection</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
index c9b22350c176..f734ae9ca59f 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1 +1,2 @@
-DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed
+DIST constraints-0.13.3.tar.gz 21574 BLAKE2B 444015cbf61b6e017b08339558c2c0a0ed26157b15d64621deec0e564fb97cff5e246acafc8e75917d21c0865805c96adc5c4f8f8aea3978cd6f6707a3fda62c SHA512 c592d1b60c5606c6dbd883b8acc9e2b68addfc71d28a6df184fb3739791759fdf1d8f0ed243acd694d54a6d9bfac8271ddac2e72e4dbfcb9a8622c2178999472
+DIST constraints-0.13.4.tar.gz 21673 BLAKE2B 47d1d824b85883980202d88699b114a8ecd9256c02b3cf2375bc251b9a4e3065ed334225781c1a74895d409d46f7d431c03f48774529ecacb341589e46d80b71 SHA512 3e4cf62ee897cc103332ae1823552c52568fe090968ee763b83a0cc95c978c6766db02a4cbc4e2c9d6f83d04bb731a91421d5078904847d204e5cc8d8ee59d5f
diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.11.2.ebuild
deleted file mode 100644
index 3f327d93f4a9..000000000000
--- a/dev-haskell/constraints/constraints-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2 )
-"
diff --git a/dev-haskell/constraints/constraints-0.13.3.ebuild b/dev-haskell/constraints/constraints-0.13.3.ebuild
new file mode 100644
index 000000000000..91fa470eea45
--- /dev/null
+++ b/dev-haskell/constraints/constraints-0.13.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 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="Constraint manipulation"
+HOMEPAGE="https://github.com/ekmett/constraints/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2 )
+"
diff --git a/dev-haskell/constraints/constraints-0.13.4.ebuild b/dev-haskell/constraints/constraints-0.13.4.ebuild
new file mode 100644
index 000000000000..8be2959872f7
--- /dev/null
+++ b/dev-haskell/constraints/constraints-0.13.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Constraint manipulation"
+HOMEPAGE="https://github.com/ekmett/constraints/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2 )
+"
diff --git a/dev-haskell/constraints/metadata.xml b/dev-haskell/constraints/metadata.xml
index 4e3ee273ceda..ec6cf5d8dc58 100644
--- a/dev-haskell/constraints/metadata.xml
+++ b/dev-haskell/constraints/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">constraints</remote-id>
<remote-id type="github">ekmett/constraints</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/contravariant-extras/Manifest b/dev-haskell/contravariant-extras/Manifest
deleted file mode 100644
index 046ac74bac88..000000000000
--- a/dev-haskell/contravariant-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST contravariant-extras-0.3.5.2.tar.gz 5426 BLAKE2B 152271da74a36054c641a31e49ddad866b2eeab0bf732d0ba94a1af2fa98e59f8cdfa8f5c6c280ede7bc222934c61efca44f7e97a9f3c585e1bfdc12f3941a29 SHA512 79b9be33cd173320f0aee1e764bd667a97e104a03653ec671d9a5fb767deb49163baa40fb331e79324a2ac1cdc5eb1aa565ac1f7d7414dbc1424b0778d34efca
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
deleted file mode 100644
index 7e81e8fd31d3..000000000000
--- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extras for the \"contravariant\" package"
-HOMEPAGE="https://github.com/nikita-volkov/contravariant-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/contravariant-extras/metadata.xml b/dev-haskell/contravariant-extras/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/contravariant-extras/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index d006a9f01cbd..e50bb6ca92bf 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -1 +1,2 @@
-DIST contravariant-1.5.2.tar.gz 16006 BLAKE2B 251d3f8e0d30176eef224000e2c9185d6161ca6de38c7f8737864d72921e75d715ccf286028c4079781ff25f0e2f2de9c01038f13f3052532eae7d7c9fa23836 SHA512 f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410
+DIST contravariant-1.5.3.tar.gz 13726 BLAKE2B 89dd8d2265c50a848a52ae21022b9a63781e2ff8945d767349f3d14c0b9dd9fe221c564014ae516bc074c2ac6eabbfc4d114378ac81c107a403e15f78655c5bc SHA512 f84e534ea208ebb949e6e1114233e56f284b94ceb756bddeb5786d2c1ed7ed7ec93defcabfa285887316cf880e7b6d2575a76c72bdd9ad73530b4397f5466c87
+DIST contravariant-1.5.5.tar.gz 13815 BLAKE2B 10509c6d5e747a0c2569ec3372b49defa994f6f24a407579604155d2dc6538fece1bce827b56dddf76460e8d0ad867a14f9b4c1b02609f731104b384a4c839ff SHA512 c5e14525cb44fe24ddaa8b1b2b5eb983e602513887119a9fb9eaed3ec1d5af28b9e858a6e461caa8d3793d52ded135459bf95a15b43b2e07e15aea33d3634bc3
diff --git a/dev-haskell/contravariant/contravariant-1.5.2.ebuild b/dev-haskell/contravariant/contravariant-1.5.2.ebuild
deleted file mode 100644
index 4406606f91bd..000000000000
--- a/dev-haskell/contravariant/contravariant-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
- statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag semigroups semigroups) \
- $(cabal_flag statevar statevar) \
- $(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.5.3.ebuild b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
new file mode 100644
index 000000000000..34880e35f6cd
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/void-0.6.1:=[profile?] <dev-haskell/void-1:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+ semigroups? ( >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+ statevar? ( >=dev-haskell/statevar-1.2.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semigroups semigroups) \
+ $(cabal_flag statevar statevar) \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/contravariant/contravariant-1.5.5.ebuild b/dev-haskell/contravariant/contravariant-1.5.5.ebuild
new file mode 100644
index 000000000000..803057b12ecc
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.5.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ statevar? ( >=dev-haskell/statevar-1.2.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semigroups semigroups) \
+ $(cabal_flag statevar statevar) \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
index 269c2f94d2c6..dee8e98b653e 100644
--- a/dev-haskell/contravariant/metadata.xml
+++ b/dev-haskell/contravariant/metadata.xml
@@ -26,6 +26,7 @@
</flag>
</use>
<upstream>
+ <remote-id type="hackage">contravariant</remote-id>
<remote-id type="github">ekmett/contravariant</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/control-monad-loop/Manifest b/dev-haskell/control-monad-loop/Manifest
deleted file mode 100644
index afda9924b588..000000000000
--- a/dev-haskell/control-monad-loop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST control-monad-loop-0.1.tar.gz 5081 BLAKE2B 8e9b755a7b37d90f8422794cc590cfc826665aac267bf28565d475adffd167ef29c806b644c87e9834eefa6d24ff7e554aa727a2a4069120d52a80112d57f8ec SHA512 a3eb80b06762ecf442b23fd39a35393a5754a7d71f4ba21e8a3a2457d8ee34a9b5d4b6c8f20d5c5fa19a42beb863bc2a7602bffd06db6ddc99f9b94ae2ec74dd
diff --git a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild b/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
deleted file mode 100644
index 1b2062001ee0..000000000000
--- a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monad transformer for imperative-style loops"
-HOMEPAGE="https://github.com/joeyadams/haskell-control-monad-loop"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers-base:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/control-monad-loop/metadata.xml b/dev-haskell/control-monad-loop/metadata.xml
deleted file mode 100644
index 9604fe7fc346..000000000000
--- a/dev-haskell/control-monad-loop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">joeyadams/haskell-control-monad-loop</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
index c21d5d909b2a..c9bd4d4dc659 100644
--- a/dev-haskell/convertible/Manifest
+++ b/dev-haskell/convertible/Manifest
@@ -1 +1,2 @@
DIST convertible-1.1.1.0.tar.gz 14354 BLAKE2B 8d60f3ed29732dddf68d9b0221aae12300533c79d2d2763fe09af143296bfda93bc1781b7d21034b4747b5bc18894db033ce16a7c4a3967f8c7c4f4429cb1f52 SHA512 cd36107b686c56a5d374efbb9be4fa8a0ec3504f0cd807870d34f279707b36721ce5639e22939d11d1795354e453fabe4f1b6130b06ec20ad597287f62959dba
+DIST convertible-1.1.1.1.tar.gz 14071 BLAKE2B ff5fa7a667b5a65eca95f888c6d1abcebe5a28a53c542a24b7618295cbbd73c0e76a32e274f6cd59a699e9df860ac20d787359556fcab4dfea6623da37ded7b6 SHA512 c0af12974022dfdd539c12e80cecd20682452e2e33018456c531ad50117ef7d961412bb049335c362763355e6ddef25cbaed8560490712a48d8c54bfb30a978a
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
index f45791f8a35d..0396aeb5a84b 100644
--- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild
+++ b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: -buildtests
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/convertible/convertible-1.1.1.1.ebuild b/dev-haskell/convertible/convertible-1.1.1.1.ebuild
new file mode 100644
index 000000000000..f6b261a6a13e
--- /dev/null
+++ b/dev-haskell/convertible/convertible-1.1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Typeclasses and instances for converting between types"
+HOMEPAGE="https://hackage.haskell.org/package/convertible"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/old-time:=[profile?]
+ >=dev-haskell/text-0.8:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/quickcheck-2.8 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-buildtests
+}
diff --git a/dev-haskell/convertible/metadata.xml b/dev-haskell/convertible/metadata.xml
index 937381521944..c0287d64a1e5 100644
--- a/dev-haskell/convertible/metadata.xml
+++ b/dev-haskell/convertible/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">convertible</remote-id>
+ <remote-id type="github">hdbc/convertible</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cookie/Manifest b/dev-haskell/cookie/Manifest
index 0ab35ca3f09b..b4a2924cf783 100644
--- a/dev-haskell/cookie/Manifest
+++ b/dev-haskell/cookie/Manifest
@@ -1 +1,2 @@
DIST cookie-0.4.4.tar.gz 5996 BLAKE2B 11ba2d50e004ae498525948c4eb68c470659e306e7a59794fefa8a0441960d2c956f356ef7eb9089866d336f856b30ee208589690767ccfdb886d2920f44b9c2 SHA512 3e17c7c3190602154a196c13b9e65eb139adfe5258441e48ebe5bd9e880af66a7c206f0eca441eeb9ab1700fa49c639adb9414d93f36147c11a1fe3f9fb4a775
+DIST cookie-0.4.5.tar.gz 6048 BLAKE2B 3955c3ebb7e451e2cce7d447dfddc9ba66e97c128ef7cadafd26ad1b490b35e852c07eb17fc64f4f39e1468af19318cde6620fc14d6b0d4c2f91cbd798375ba3 SHA512 b3d4c12b4683f4f02e4d59b47ec3867554dee2fcb106fe59a073b8ead63a220458b91e8b5a2321e46a91666ba61e88798361448a7bc86e496a47d6731b8c0b93
diff --git a/dev-haskell/cookie/cookie-0.4.4.ebuild b/dev-haskell/cookie/cookie-0.4.4.ebuild
index ddbacaffbeb5..d3b351a304ca 100644
--- a/dev-haskell/cookie/cookie-0.4.4.ebuild
+++ b/dev-haskell/cookie/cookie-0.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/cookie/cookie-0.4.5.ebuild b/dev-haskell/cookie/cookie-0.4.5.ebuild
new file mode 100644
index 000000000000..f3f9dd104892
--- /dev/null
+++ b/dev-haskell/cookie/cookie-0.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP cookie parsing and rendering"
+HOMEPAGE="https://github.com/snoyberg/cookie"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/text-1.1:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/cookie/metadata.xml b/dev-haskell/cookie/metadata.xml
index a03950629332..43110484d2d9 100644
--- a/dev-haskell/cookie/metadata.xml
+++ b/dev-haskell/cookie/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">cookie</remote-id>
<remote-id type="github">snoyberg/cookie</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
deleted file mode 100644
index 74070c97b96a..000000000000
--- a/dev-haskell/cpphs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpphs-1.20.9.1.tar.gz 45496 BLAKE2B 1a964c011628f260d1c7ad6653c03776a36a014ff6717f877796de0d0139dcd3454bd8d935e3fffda2d6dd9823fd5fc5be58b73bb9590de248381755b446148e SHA512 bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
diff --git a/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
deleted file mode 100644
index 3a05d030dc34..000000000000
--- a/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cpphs/metadata.xml b/dev-haskell/cpphs/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/cpphs/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
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 4d824d9ab9a5..aeae8e048e01 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
index 937381521944..ecbbc91b7874 100644
--- a/dev-haskell/cprng-aes/metadata.xml
+++ b/dev-haskell/cprng-aes/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/hs-cprng-aes</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cpu/Manifest b/dev-haskell/cpu/Manifest
deleted file mode 100644
index 473c37bae1e5..000000000000
--- a/dev-haskell/cpu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpu-0.1.2.tar.gz 4317 BLAKE2B 17d34e81432a2487e74ff0297b8126c815d0034809290d28557bcbb5180b161fc474703de29f4bbd1fcf18887a291bbd2608f362752028f910a9c61d51847517 SHA512 2dab5b956619cad1a6a99f16a6156d5f2539ef4882204e3cb1ec3e86bc00cd4d948e3a5eba4948fd0cc37dd98a27eeebc77957f87af6e51f86a65a84db1d25d3
diff --git a/dev-haskell/cpu/cpu-0.1.2.ebuild b/dev-haskell/cpu/cpu-0.1.2.ebuild
deleted file mode 100644
index 50373b2b7aeb..000000000000
--- a/dev-haskell/cpu/cpu-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -executable
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cpu information and properties helpers"
-HOMEPAGE="https://github.com/vincenthz/hs-cpu"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-executable
-}
diff --git a/dev-haskell/cpu/metadata.xml b/dev-haskell/cpu/metadata.xml
deleted file mode 100644
index e0431b24e612..000000000000
--- a/dev-haskell/cpu/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">vincenthz/hs-cpu</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/criterion-measurement/Manifest b/dev-haskell/criterion-measurement/Manifest
index a75f8e7d35fd..e9459b44d706 100644
--- a/dev-haskell/criterion-measurement/Manifest
+++ b/dev-haskell/criterion-measurement/Manifest
@@ -1 +1,2 @@
DIST criterion-measurement-0.1.2.0.tar.gz 16650 BLAKE2B ec4379e6ea016d23e5ee4b0c61404421bf3ba207ecc29063e426f136e1a56ef93a5c5e6f404f17796088e773ab9c4a0e971a587977c57d8ecd3edf33ba72b23d SHA512 d82196d0b4a501795e8f3498b17db89c5febf6cfd2131da262aacc7b268248bb21c7d4e6530789a40a47c4e74e28e34ab5ff3477b2e28f54ddafd01e7cd5993a
+DIST criterion-measurement-0.2.0.0.tar.gz 17593 BLAKE2B 96219613c24a9d41c6a4fd2ba0aa90da6b7d8e521761e6e912201832c86e335c43dde1320f248c0e0a767d6735c9ba8d4edfdd618239fe4b362463586cefdbe9 SHA512 a5d4e5e7d1c6313067faac38d64230c5647c9e61a572c20cada6db29f478279599b6f0f81f000ef4754e5cc02a34ee674ea08c8b9606ce60b90791f8b33445fe
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 3c10a5145290..44bcf757e5bb 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
#hackport: flags: -fast
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild
new file mode 100644
index 000000000000..84869923f789
--- /dev/null
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Criterion measurement functionality and associated types"
+HOMEPAGE="https://github.com/haskell/criterion"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+ >=dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/vector-0.7.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-fast
+}
diff --git a/dev-haskell/criterion-measurement/metadata.xml b/dev-haskell/criterion-measurement/metadata.xml
index f3741a090c11..54d806209f58 100644
--- a/dev-haskell/criterion-measurement/metadata.xml
+++ b/dev-haskell/criterion-measurement/metadata.xml
@@ -5,7 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Measurement-related functionality extracted from Criterion, with minimal dependencies. The rationale for this is to enable alternative analysis front-ends.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">criterion-measurement</remote-id>
+ <remote-id type="github">haskell/criterion</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
index 597fd058a7be..eb5cd2de63ef 100644
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@@ -1 +1,2 @@
-DIST criterion-1.5.6.2.tar.gz 120212 BLAKE2B cd21eb95013eb4eb80ecbf13cdd599efc6f08e26522ed876fda54b97744a75330fbf2bfff8b626feadb2627d0445749aea0d6412ff5d901a922433a88b952ee8 SHA512 48e4c0803480fa21830342ff7fd016e15de1b598fb8c4541710c6a9d81e4919bfcb22bc5fbd1ac417e79df902f1154f20aa3e3081efcf6a9af872f00142c3af0
+DIST criterion-1.5.11.0.tar.gz 46082 BLAKE2B 8cca7ce2d7257cbf471efc1a5c00dcacfb26fe1ff1d5badf1544b2018a33aca43585f7c3afd3e661b67ee443ee424a897a5aa9ac0f653ae37ed2682eb784e558 SHA512 6efc1c59ebe2ca1c03e83174aa6cb742d8070c3c69d4a071187ff6a3abe09b42ba329dba09283fd483b75a6b4e61840af3596d0ab14648f86887cdd44e1480ce
+DIST criterion-1.6.3.0.tar.gz 47217 BLAKE2B d54d1271e870f8d0d976e90812943d6d62185c2ba66b176434c28bbca81a197df93f57c3bf02bf5bc11bff8d799ccdef4275490e142845b02824fc59bf895e6a SHA512 e753562678073c7686958f3649d959fae7946e02958ee9f8b0803aa6fe5fc64c66fda2524fd79777e976836f2c9b465675f3be2eca813e6b14986317543a8b46
diff --git a/dev-haskell/criterion/criterion-1.5.11.0.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
new file mode 100644
index 000000000000..56d3b23f8959
--- /dev/null
+++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Robust, reliable performance measurement and analysis"
+HOMEPAGE="https://www.serpentine.com/criterion"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RDEPEND=">=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
+ >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+ >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
+ >=dev-haskell/cassava-0.3.0.0:=[profile?]
+ dev-haskell/code-page:=[profile?]
+ >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?]
+ >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+ >=dev-haskell/glob-0.7.2:=[profile?]
+ >=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?]
+ >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
+ >=dev-haskell/mtl-2:=[profile?]
+ >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
+ >=dev-haskell/optparse-applicative-0.13:=[profile?]
+ >=dev-haskell/parsec-3.1.0:=[profile?]
+ >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.4:=[profile?]
+ >=dev-haskell/vector-0.7.1:=[profile?]
+ >=dev-haskell/vector-algorithms-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/base-compat
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.4
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag embed-data-files embed-data-files) \
+ --flag=-fast
+}
diff --git a/dev-haskell/criterion/criterion-1.5.6.2.ebuild b/dev-haskell/criterion/criterion-1.5.6.2.ebuild
deleted file mode 100644
index 23f8a110dba2..000000000000
--- a/dev-haskell/criterion/criterion-1.5.6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-#hackport: flags: -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files"
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
- >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
- >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
- >=dev-haskell/cassava-0.3.0.0:=[profile?]
- dev-haskell/code-page:=[profile?]
- >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/glob-0.7.2:=[profile?]
- dev-haskell/js-flot:=[profile?]
- dev-haskell/js-jquery:=[profile?]
- >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
- >=dev-haskell/optparse-applicative-0.13:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- dev-haskell/semigroups:=[profile?]
- >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/transformers-compat-0.6.4:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/base-compat
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.4
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed-data-files embed-data-files) \
- --flag=-fast
-}
diff --git a/dev-haskell/criterion/criterion-1.6.3.0.ebuild b/dev-haskell/criterion/criterion-1.6.3.0.ebuild
new file mode 100644
index 000000000000..fdbe7d1c0daa
--- /dev/null
+++ b/dev-haskell/criterion/criterion-1.6.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Robust, reliable performance measurement and analysis"
+HOMEPAGE="https://www.serpentine.com/criterion"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RDEPEND="
+ >=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+ >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
+ >=dev-haskell/cassava-0.3.0.0:=[profile?]
+ dev-haskell/code-page:=[profile?]
+ >=dev-haskell/criterion-measurement-0.2:=[profile?] <dev-haskell/criterion-measurement-0.3:=[profile?]
+ >=dev-haskell/glob-0.7.2:=[profile?]
+ >=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?]
+ >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
+ >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
+ >=dev-haskell/optparse-applicative-0.18:=[profile?] <dev-haskell/optparse-applicative-0.19:=[profile?]
+ >=dev-haskell/parsec-3.1.0:=[profile?]
+ >=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+ >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-1.2:=[profile?]
+ >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.17:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.4:=[profile?]
+ >=dev-haskell/vector-0.7.1:=[profile?]
+ >=dev-haskell/vector-algorithms-0.4:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ dev-haskell/base-compat
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.4
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag embed-data-files embed-data-files) \
+ --flag=-fast
+}
diff --git a/dev-haskell/criterion/metadata.xml b/dev-haskell/criterion/metadata.xml
index 670130417065..9356cfed7c07 100644
--- a/dev-haskell/criterion/metadata.xml
+++ b/dev-haskell/criterion/metadata.xml
@@ -6,19 +6,14 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="embed-data-files">Embed the data files in the binary for a relocatable executable</flag>
+ <flag name="embed-data-files">
+ Embed the data files in the binary for a relocatable
+ executable. (Warning: This will increase the executabl
+ size significantly.)
+ </flag>
</use>
- <longdescription>
- This library provides a powerful but simple way to measure the
- performance of Haskell code. It provides both a framework for
- executing and analysing benchmarks and a set of driver functions
- that makes it easy to build and run benchmarks, and to analyse their
- results.
-
- The fastest way to get started is to read the documentation and
- examples in the Criterion.Main module.
- </longdescription>
<upstream>
- <remote-id type="github">bos/criterion</remote-id>
+ <remote-id type="hackage">criterion</remote-id>
+ <remote-id type="github">haskell/criterion</remote-id>
</upstream>
</pkgmetadata>
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 3a97aada6a03..c37ef83492c8 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,13 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/cereal:=[profile?]
>=dev-haskell/crypto-api-0.13:=[profile?]
dev-haskell/hunit:=[profile?]
- >=dev-haskell/quickcheck-2.4:2=[profile?]
+ >=dev-haskell/quickcheck-2.4:=[profile?]
>=dev-haskell/test-framework-0.4:=[profile?]
>=dev-haskell/test-framework-hunit-0.2:=[profile?]
>=dev-haskell/test-framework-quickcheck2-0.3:=[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 4b61011d2c68..11b8ea52c64a 100644
--- a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
+++ b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="all-cpolys"
RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
index be1aa2e99734..1d7d6bf55284 100644
--- a/dev-haskell/crypto-api/metadata.xml
+++ b/dev-haskell/crypto-api/metadata.xml
@@ -19,4 +19,7 @@
one cryptographic algorithm (ex: padding) is within
scope of this package.
</longdescription>
+ <upstream>
+ <remote-id type="github">haskell-github-trust/crypto-api</remote-id>
+ </upstream>
</pkgmetadata>
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 d693d59019f7..67d209fcec66 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,14 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
dev-haskell/hunit:=[profile?]
dev-haskell/mtl:=[profile?]
- >=dev-haskell/quickcheck-2:2=[profile?]
+ >=dev-haskell/quickcheck-2:=[profile?]
>=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?]
dev-haskell/test-framework:=[profile?]
dev-haskell/test-framework-hunit:=[profile?]
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
index 937381521944..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ b/dev-haskell/crypto-cipher-tests/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
+ </upstream>
</pkgmetadata>
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 c1aa468bbc5c..d1ab368b7d9e 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
index 937381521944..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ b/dev-haskell/crypto-cipher-types/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/crypto-numbers/Manifest b/dev-haskell/crypto-numbers/Manifest
deleted file mode 100644
index 3cd53782615f..000000000000
--- a/dev-haskell/crypto-numbers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-numbers-0.2.7.tar.gz 16064 BLAKE2B 52e7373d56f87d46f585e36019e2fc1ba3f1710ec2530a14069a839b348859e1f9ba784ea91c7241d767d488a15433f0381e5249775f9501197ecbcd051f8aeb SHA512 4fac18f6d76d5cc9ae82d177a45c155847264494dd112db80a76c955faee4917b4b3c563bb76eb3a08923bb020138307a7115d78fe0caa20fd3fb2b12d679947
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
deleted file mode 100644
index 0ef405416f76..000000000000
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptographic numbers: functions and algorithms"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-numbers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gmp"
-
-RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/byteable
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag gmp integer-gmp)
-}
diff --git a/dev-haskell/crypto-numbers/metadata.xml b/dev-haskell/crypto-numbers/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/crypto-numbers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey-types/Manifest b/dev-haskell/crypto-pubkey-types/Manifest
deleted file mode 100644
index fc71d2eaa116..000000000000
--- a/dev-haskell/crypto-pubkey-types/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-pubkey-types-0.4.3.tar.gz 11234 BLAKE2B 8b2b0fc64c6b4355264826d01de7457fddf82003748a29d636d52368874dbbd53f303e3bbad5316e9c5ac9fec3cb9021f60e0b749bc2147c15a6ffc9afc11ff8 SHA512 08e6b74ded0decaaf87b4b9ec15af2e8bbeb7095701b5e2062b570af1ecb3d25eb706d6bd91795acfaaf7d09d0e9040359736a0a06a1bc593ef0d8aaf3e374d6
diff --git a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
deleted file mode 100644
index 244c93521778..000000000000
--- a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic cryptography Public keys algorithm types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
- >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/crypto-pubkey-types/metadata.xml b/dev-haskell/crypto-pubkey-types/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/crypto-pubkey-types/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey/Manifest b/dev-haskell/crypto-pubkey/Manifest
deleted file mode 100644
index 9cc3b9c05285..000000000000
--- a/dev-haskell/crypto-pubkey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-pubkey-0.2.8.tar.gz 46405 BLAKE2B ee04b805204899ec6fdc1cfcda7a1ac83010805396308f9be7b2e885d52245f7ac77ad9caa7028afc2a3deaa594126a36ab4b93631227cf274e40dacb252b56a SHA512 9e7d54421fdb3c53964688831a2ca5f5379e141e7924af76916d868300833c0dbde22392e1452f80aaf2ec7a9a52de6b429a6f8f78b8fbef6c32f2f31202ed06
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
deleted file mode 100644
index a73652cf8df2..000000000000
--- a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Public Key cryptography"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/byteable:=[profile?]
- >=dev-haskell/crypto-numbers-0.2.2:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
- >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
- >=dev-haskell/cryptohash-0.9.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-kat
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/crypto-pubkey/metadata.xml b/dev-haskell/crypto-pubkey/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/crypto-pubkey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random-api/Manifest b/dev-haskell/crypto-random-api/Manifest
deleted file mode 100644
index 4ae8f0ab8972..000000000000
--- a/dev-haskell/crypto-random-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-random-api-0.2.0.tar.gz 3397 BLAKE2B b0a895186bf6c4f9487777eb7a86404d5972fa5af6002f2692a234ff608fe6c4f28f2d6cd69f2fe4c60953f2fdf67aad5293ffc7396b729e478bb59fa060c416 SHA512 8f7df05e54e053456e3ebe9394b19beb2a37dfed30cfb5fb673f591415dc6fabe105af51e838fbe73ef078906d94562080ca465b0c6b4e1537bd4a6e066244f7
diff --git a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild b/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
deleted file mode 100644
index 5d54d7736e7a..000000000000
--- a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple random generators API for cryptography related code"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random-api"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/entropy:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/crypto-random-api/metadata.xml b/dev-haskell/crypto-random-api/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/crypto-random-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index 2e6583961759..50fbd85a0783 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/securemem:=[profile?]
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
index 937381521944..44cc6c6dcf10 100644
--- a/dev-haskell/crypto-random/metadata.xml
+++ b/dev-haskell/crypto-random/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/hs-crypto-random</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
deleted file mode 100644
index f95b01db2e49..000000000000
--- a/dev-haskell/crypto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Crypto-4.2.5.1.tar.gz 56474 BLAKE2B a5e86c4e161b1e89c37b3feff1fc3a30911cf6401a7bb6c3cb1d605fb2ebb5bb145ff2a398fa6fab59e194e1b5f235eb8212f3ac70b21c32202173d0d15dff65 SHA512 3b965f6a06784d3e8996aaae2622fa5b8e4a645a324618ff497f565230a8db525a0a5305d5cc5166283b2a24242df4554b29eb015326d416dc705f252ef456ac
diff --git a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
deleted file mode 100644
index f7d2aca9c061..000000000000
--- a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Crypto"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collects together existing Haskell cryptographic functions into a package"
-HOMEPAGE="https://hackage.haskell.org/package/Crypto"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
- >=dev-haskell/quickcheck-2.4.0.1:2=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
- TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
-
- for t in $TESTS; do
- einfo "Running test $t..."
- # the quickcheck tests doesn't fail when the test fails...
- "${S}/dist/build/$t/$t" || die "Test $t failed"
- done
-}
-
-src_install() {
- haskell-cabal_src_install
-
- rm -rf "${D}/usr/bin" 2>/dev/null
-}
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/crypto/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-conduit/Manifest b/dev-haskell/cryptohash-conduit/Manifest
deleted file mode 100644
index b645fc50207a..000000000000
--- a/dev-haskell/cryptohash-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptohash-conduit-0.1.1.tar.gz 2318 BLAKE2B 3bc4d926d020b899c34169211b4b74394260e222e098d5afbc886898a45205b13cb89661699ae169f20a8ac092439463e74b5dffeb65131b891126ece5e80c6e SHA512 6382a05b35bae34b53fd1ad6d897c25ca149ed852360c8f775587efcd3c29e45ff854f96ddbc9b446e04a4dd5698b1f5e2af754345f7d5af8f587b73b57fdec0
diff --git a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild b/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
deleted file mode 100644
index 068862d1158d..000000000000
--- a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="cryptohash conduit"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptohash:=[profile?]
- dev-haskell/resourcet:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/cryptohash-conduit/metadata.xml b/dev-haskell/cryptohash-conduit/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/cryptohash-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-cryptoapi/Manifest b/dev-haskell/cryptohash-cryptoapi/Manifest
deleted file mode 100644
index c5f65e7d79ce..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptohash-cryptoapi-0.1.4.tar.gz 3094 BLAKE2B afd5169c172965eadacf9113a03a58cfff9350b63c339170788585437777deb41998322ea3d33f5d9c2c77b4f927e4457bfcaf8f4f92c6f77e85bffc51c02a47 SHA512 f5add1c8922e682d5d08073d0a3d03c6d5545f38edd90821bad7a92f354203ca380ca7e302b4b259bb9e2ce6ae09b1a2428e981e2d745a4a1b1a5cff696621e2
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
deleted file mode 100644
index dfb8b98df70d..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto-api interfaces for cryptohash"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
- >=dev-haskell/crypto-api-0.11:=[profile?]
- >=dev-haskell/cryptonite-0.13:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/tagged-0.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cryptohash-cryptoapi/metadata.xml b/dev-haskell/cryptohash-cryptoapi/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
index 125b0c8915bf..238f8eb82871 100644
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1 +1,4 @@
+DIST cryptohash-md5-0.11.100.1-rev6.cabal 3964 BLAKE2B 377323b2129dc35c1345226cffce3de90e1b584681c2c500d42767364057aafcc27825e1b524b7c65b27cb623c3fc4f9a0ec6bdd0cb65c36ce7e0768849511a6 SHA512 6b7be0bd0b5e663fd6cce73de16b6396818762a892cf30f6cf9cd08425f06c8c078cc4ee5634d843ffe4014c55c207535589a323dae1c5ff3f76883805e55b54
DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
+DIST cryptohash-md5-0.11.101.0-rev2.cabal 3104 BLAKE2B 7ee2a97bd67c9d39adb4dac059b142083ce807b1bf9e2bec8012dca3a223cce23f28ffd1f2c8587dd1c3215a2387c2d6b3f13cd3d30838183dd0bd31d233ecf1 SHA512 f1cc76e5e00197085ba8cc10eb7a771ac8a55117b51f4eac992f40f65237c70b5e4ab9b25b9312b667d4efdaea289e3f5cdc33b493ff96c9c3819efa60e67a26
+DIST cryptohash-md5-0.11.101.0.tar.gz 11872 BLAKE2B b2aafbfef1ecc51a7a21262210df478ea0d0c33539b940d71ffcb4cf28b31ff801f6fde5fb27c70a99f7ea9a1682cbbb4cf13ebbe015ee3712dda76318563643 SHA512 6116b384e76927aed06748fac6088280d1ecc7eb5886692c287e971761b98960657b106ba8a700bd0c5b2e552797079e143836af3463acd75bbac207633867a4
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 dec386faa85a..9a1918cd2dbc 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
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Fast, pure and practical MD5 implementation"
HOMEPAGE="https://github.com/hvr/cryptohash-md5"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
@@ -28,11 +28,10 @@ DEPEND="${RDEPEND}
>=dev-haskell/tasty-quickcheck-0.8 )
"
-src_prepare() {
- cabal_chdeps \
- 'base >= 4.5 && < 4.10' 'base >= 4.5' \
- 'tasty == 0.11.*' 'tasty >= 0.11' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
- 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
- default
-}
+CABAL_CHDEPS=(
+ 'base >= 4.5 && < 4.16' 'base >= 4.5'
+ 'tasty == 0.11.*' 'tasty >= 0.11'
+ 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
+ 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
+ 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
+)
diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild
new file mode 100644
index 000000000000..f23597a5d998
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical MD5 implementation"
+HOMEPAGE="https://github.com/haskell-hvr/cryptohash-md5"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/base16-bytestring-1.0.1.0 <dev-haskell/base16-bytestring-1.1
+ >=dev-haskell/puremd5-2.1.3 <dev-haskell/puremd5-2.2
+ =dev-haskell/tasty-1.4*
+ =dev-haskell/tasty-hunit-0.10*
+ =dev-haskell/tasty-quickcheck-0.10*
+ )
+"
diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml
index 1b38ed3b7e04..ce013d3a56a1 100644
--- a/dev-haskell/cryptohash-md5/metadata.xml
+++ b/dev-haskell/cryptohash-md5/metadata.xml
@@ -5,20 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A practical incremental and one-pass, pure API to the
- &lt;https://en.wikipedia.org/wiki/MD5 MD5 hash algorithm&gt;
- (including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
- with performance close to the fastest implementations available in other languages.
-
- The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-
- NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package
- has been deprecated and so this package continues to satisfy the need for a lightweight package
- providing the MD5 hash algorithm without any dependencies on packages other than
- @base@ and @bytestring@.
-
- Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
- "Crypto.Hash.MD5" module, though with a clearly smaller footprint.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">cryptohash-md5</remote-id>
+ <remote-id type="github">hvr/cryptohash-md5</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest
index 763430616331..8691986056e1 100644
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1 +1,4 @@
+DIST cryptohash-sha1-0.11.100.1-rev6.cabal 4354 BLAKE2B f89a3045c1ea145f3ac2af440eeea2d213a69c5abaa0f9eb1407a2da34a08aabb7df966f014a9b903eff5ae9ee3262703097e6b5f5df0b13252d3889c8a2776c SHA512 3077375cbff05b415168152eeb213a9ec1c0d0d48f63b394f65399f7ae1421adc8f0e760e1ec7f7a5f83c78377151209c77d23ab01cf0ceb36e899aa000310f3
DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
+DIST cryptohash-sha1-0.11.101.0-rev2.cabal 3094 BLAKE2B fc048a5eaefca1df4b1748f46f48f69e7571f90fdfdb3524b7556a8b6a9b3f7b58d363209ec20d9f4892b1b3e69dc1394287e7e70e7009f06dd75bc02e267910 SHA512 1dbf660ca81c2d8633dd6255602fa6b5f2999f55400bd75391be0049ca8bcf221d14b5d294999427ed193aa0514d68e05509b85fc5a2fe9c8be574b0a0542f9a
+DIST cryptohash-sha1-0.11.101.0.tar.gz 11563 BLAKE2B 4da99b2b4943e3909d3af24f62fb0ecf4c87370075f280a7e9ea44956cd58df9f49076a0d90b60bec9a7dcb3d24df032f6b5ef07644a4b63bdf1099458996163 SHA512 4384fc2f63750400561b5dbea0a343510306d755131121346d6a52cb9420cb12fc7d20247f044beb0ea55ae254ce666edc982d76e999c0762894f405e9b6441e
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 52cc584727a8..7781ccfebaec 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
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Fast, pure and practical SHA-1 implementation"
HOMEPAGE="https://github.com/hvr/cryptohash-sha1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
@@ -28,11 +28,10 @@ DEPEND="${RDEPEND}
>=dev-haskell/tasty-quickcheck-0.8 )
"
-src_prepare() {
- cabal_chdeps \
- 'base >= 4.5 && < 4.10' 'base >= 4.5' \
- 'tasty == 0.11.*' 'tasty >= 0.11' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
- 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
- default
-}
+CABAL_CHDEPS=(
+ 'base >= 4.5 && < 4.16' 'base >= 4.5'
+ 'tasty == 0.11.*' 'tasty >= 0.11'
+ 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
+ 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
+ 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
+)
diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild
new file mode 100644
index 000000000000..5c3d3f9e7023
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical SHA-1 implementation"
+HOMEPAGE="https://github.com/haskell-hvr/cryptohash-sha1"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/base16-bytestring-1.0.1.0 <dev-haskell/base16-bytestring-1.1
+ >=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+ >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml
index 9f3f3141af03..fede62a037d9 100644
--- a/dev-haskell/cryptohash-sha1/metadata.xml
+++ b/dev-haskell/cryptohash-sha1/metadata.xml
@@ -5,20 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A practical incremental and one-pass, pure API to the
- &lt;https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash algorithm&gt;
- (including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
- with performance close to the fastest implementations available in other languages.
-
- The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-
- NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package has been
- deprecated and so this package continues to satisfy the need for a lightweight package
- providing the SHA1 hash algorithm without any dependencies on packages other than
- @base@ and @bytestring@.
-
- Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
- "Crypto.Hash.SHA1" module, though with a clearly smaller footprint.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">cryptohash-sha1</remote-id>
+ <remote-id type="github">hvr/cryptohash-sha1</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
index 2f3fa9b976b1..0f862c30cc24 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1 +1,3 @@
DIST cryptohash-sha256-0.11.101.0.tar.gz 14996 BLAKE2B 9caccc3eea4ad25c6ebbdd507771d86264a853f282d03399917b42a5311dcad0501bd0b4ea6fa00d039f67bcea3f81c116b9ec016d65cb2ed6f086b0448894c0 SHA512 c755f1354fb5f1d6cfb54f73e39692392517954118d98b39ac4be7460e75a9ddc91ad641fed0f17e5fa33b62b7b0734af66526ea757e00716832572bb383c612
+DIST cryptohash-sha256-0.11.102.1-rev3.cabal 5457 BLAKE2B ed2c47aaed406a62bff372abf9f7768a7a40dc3a84d9ccd16c50dc5a0a05957f6885a87619d463ef546bd804b406f9a632963ec60818efc12582dac6edca46af SHA512 b1a3807ce57eb3f24b343a903b6849c08e4de90d33f77504723b8c5b18138ab527a953fee3ff06d6a55e4af1360494289149e199182422a9734b209bfe9f37c1
+DIST cryptohash-sha256-0.11.102.1.tar.gz 15707 BLAKE2B 16f7b8c39df3eac22af30ea14c98b0a6ef8056118dbc8236dd8951f7d35e32ba07fbf5f318a0896b0ef70ff1459f03937df4ef30b0247835e7550fedaf42386e SHA512 fb4432050ab1236fc913ba50949ee52a117b0d74509b58868e8ade69bfc6e89e1379dfea48afc76d8527d4fdbaee9dd1d2dcea4530ba95a42441491df005e78c
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 f509f41b5d4e..f931823ec69e 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -29,14 +29,13 @@ DEPEND="${RDEPEND}
>=dev-haskell/tasty-quickcheck-0.8 )
"
-src_prepare() {
- cabal_chdeps \
- 'base >= 4.5 && < 4.11' 'base >= 4.5' \
- 'tasty == 0.11.*' 'tasty >= 0.11' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
- 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
- default
-}
+CABAL_CHDEPS=(
+ 'base >= 4.5 && < 4.11' 'base >= 4.5'
+ 'tasty == 0.11.*' 'tasty >= 0.11'
+ 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
+ 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9'
+ 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild
new file mode 100644
index 000000000000..0e9b0ff14db7
--- /dev/null
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: exe:executable,+use-cbits
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical SHA-256 implementation"
+HOMEPAGE="https://github.com/hvr/cryptohash-sha256"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+CABAL_CHBINS=(
+ 'sha256sum' 'cryptohash-sha256sum'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+ executable? (
+ || (
+ ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 )
+ =dev-haskell/base16-bytestring-1.0*
+ )
+ dev-haskell/base16-bytestring:=[profile?]
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+ >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.6
+ =dev-haskell/tasty-hunit-0.10*
+ =dev-haskell/tasty-quickcheck-0.10*
+ || (
+ ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 )
+ =dev-haskell/base16-bytestring-1.0*
+ )
+ )
+"
+
+src_configure() {
+ local conf_flags=(
+ $(cabal_flag executable exe)
+ --flag=use-cbits
+ )
+
+ haskell-cabal_src_configure "${conf_flags[@]}"
+}
diff --git a/dev-haskell/cryptohash-sha256/metadata.xml b/dev-haskell/cryptohash-sha256/metadata.xml
index eaac8fbe800a..0abeaaf769d6 100644
--- a/dev-haskell/cryptohash-sha256/metadata.xml
+++ b/dev-haskell/cryptohash-sha256/metadata.xml
@@ -5,22 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A practical incremental and one-pass, pure API to the
- &lt;https://en.wikipedia.org/wiki/SHA-2 SHA-256 hash algorithm&gt;
- with performance close to the fastest implementations available in other languages.
-
- The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-
- NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ has been
- deprecated and so this package continues to satisfy the need for a lightweight package
- providing the SHA256 hash algorithm without any dependencies on packages other than
- @base@ and @bytestring@.
-
- Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
- "Crypto.Hash.SHA256" module, though with a clearly smaller footprint.
- </longdescription>
+ <use>
+ <flag name="executable">Build the cryptohash-sha256sum executable</flag>
+ </use>
<upstream>
+ <remote-id type="hackage">cryptohash-sha256</remote-id>
<remote-id type="github">hvr/cryptohash-sha256</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
deleted file mode 100644
index a3f7349276d1..000000000000
--- a/dev-haskell/cryptohash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptohash-0.11.9.tar.gz 25762 BLAKE2B a97de6b08f58ead9d51ae2042a52237d3cbea4eeb5d0138f4a90b1d65d545990297fd55ebb53d8458582790289b5a00eb3a82d1d08288e8ab100afa910a488e9 SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
deleted file mode 100644
index a4925105ed4d..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
- >=dev-haskell/cryptonite-0.13:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cryptohash/metadata.xml b/dev-haskell/cryptohash/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/cryptohash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/crypton-connection/Manifest b/dev-haskell/crypton-connection/Manifest
new file mode 100644
index 000000000000..8086567443ba
--- /dev/null
+++ b/dev-haskell/crypton-connection/Manifest
@@ -0,0 +1 @@
+DIST crypton-connection-0.3.1.tar.gz 9112 BLAKE2B c8915815d2ae6b7e1c24010d44851a13323cc4211d8e35bcbaa71cb7f07af5ca2b041d90586b243af45a20d56753f361231015bffb2f82c42abe73c6caa13717 SHA512 5ec88d45be285398493aff416be1e40f7a1fff989d472f860ffe05671c2cc2261e244a15a30f79851a4c2a38509a2ecb2959af1e8ae2cf66aee5958c817245a0
diff --git a/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild b/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild
new file mode 100644
index 000000000000..dedf37569ad2
--- /dev/null
+++ b/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and easy network connections API"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-connection"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/basement:=[profile?]
+ >=dev-haskell/crypton-x509-1.5:=[profile?]
+ >=dev-haskell/crypton-x509-store-1.5:=[profile?]
+ >=dev-haskell/crypton-x509-system-1.5:=[profile?]
+ >=dev-haskell/crypton-x509-validation-1.5:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/network-2.6.3:=[profile?]
+ >=dev-haskell/socks-0.6:=[profile?]
+ >=dev-haskell/tls-1.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/crypton-connection/metadata.xml b/dev-haskell/crypton-connection/metadata.xml
new file mode 100644
index 000000000000..fca43110a14d
--- /dev/null
+++ b/dev-haskell/crypton-connection/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">crypton-connection</remote-id>
+ <remote-id type="github">kazu-yamamoto/crypton-connection</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-store/Manifest b/dev-haskell/crypton-x509-store/Manifest
new file mode 100644
index 000000000000..f5618d107dc3
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-store-1.6.9.tar.gz 12735 BLAKE2B 2c609676ff1fbb6e25a9d1794ac067cac4fc34ac8b7a6339ef73e5f8d52671be87b6f68a8ff8398bc6084353a084f6dddbf8669f3114604ee5dd732235a847f4 SHA512 3aefa6d204868b7adbe34608575ad782b28f4e6d1431d61e794c1923e0fd933d87a10791b1727ec49eb15e376ffa8e4540404bce581a90e3164239cf8760295e
diff --git a/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild b/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild
new file mode 100644
index 000000000000..cdcc01989183
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 collection accessing and storing methods"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ dev-haskell/crypton:=[profile?]
+ >=dev-haskell/crypton-x509-1.7.2:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/crypton-x509-store/metadata.xml b/dev-haskell/crypton-x509-store/metadata.xml
new file mode 100644
index 000000000000..d41f77abf931
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">crypton-x509-store</remote-id>
+ <remote-id type="github">vincenthz/hs-certificate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-system/Manifest b/dev-haskell/crypton-x509-system/Manifest
new file mode 100644
index 000000000000..87083e58fe58
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-system-1.6.7.tar.gz 3496 BLAKE2B 340d45433de35f292112ffd27ec54042895d24143f6f92e037c902c09c69ed0ff7bb6e8b26d389d9818baf8733aa8578d7bb3132080738831b3fce554d121e2b SHA512 fc6edbea995df5d56228413452157fac2349cafdb5cb85a38625cb3e43f46aa519d5a0fe47c1b25a9eb6fbba7b498538e173d276224dab331a8a19193df80f75
diff --git a/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild b/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild
new file mode 100644
index 000000000000..9881ca5e14df
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/crypton-x509-1.6:=[profile?]
+ >=dev-haskell/crypton-x509-store-1.6.2:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/crypton-x509-system/metadata.xml b/dev-haskell/crypton-x509-system/metadata.xml
new file mode 100644
index 000000000000..ff9b461d97bb
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">crypton-x509-system</remote-id>
+ <remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-validation/Manifest b/dev-haskell/crypton-x509-validation/Manifest
new file mode 100644
index 000000000000..74fa76870bcc
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-validation-1.6.12.tar.gz 19573 BLAKE2B 1eb5ebc9405e865e49f94aa7d44ed3d0d6773fccd60808f57e1e79e14c36edeb8dfd5d2261b97b956cd528467e4c4c1c8a53d9ce2ec2f8a36d7c1fdc7393726d SHA512 3f6e24f4c3c0ebe2a6dd6371d3abf6739fbb571a47d6918a380fe18f68fb33aec4503f826fd1b1a8bda484d91fe5c8cef2ec3d21fbbf3394eb6f77059a7094c2
diff --git a/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild b/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild
new file mode 100644
index 000000000000..9e005ad7c92b
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 Certificate and CRL validation"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ >=dev-haskell/crypton-0.24:=[profile?]
+ >=dev-haskell/crypton-x509-1.7.5:=[profile?]
+ >=dev-haskell/crypton-x509-store-1.6:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/crypton-x509-validation/metadata.xml b/dev-haskell/crypton-x509-validation/metadata.xml
new file mode 100644
index 000000000000..264c7cf3bf35
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">crypton-x509-validation</remote-id>
+ <remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509/Manifest b/dev-haskell/crypton-x509/Manifest
new file mode 100644
index 000000000000..6350cd400a87
--- /dev/null
+++ b/dev-haskell/crypton-x509/Manifest
@@ -0,0 +1,2 @@
+DIST crypton-x509-1.7.6-rev1.cabal 2339 BLAKE2B 9b8a6a13fb5cd16b3ceed37fa0ada3ba1045fcc92a87e7ec6719f89b6f7a9e098e696119a9249f67b279a789e29b4b87d35c996092f58fdb7f279e0504d66f28 SHA512 fd876eb88fd54107ddb3c1836e24af92a1e3d321a5c114826e308b537fe65be54c01742e373202e3dfa7317945ad2393f89c5562956331cba9624aa43f0e7f1a
+DIST crypton-x509-1.7.6.tar.gz 21557 BLAKE2B 856fbf08b7eaff32f4562def1511f74d30f5f6a92fcb7d07c0049efff956787d840774a0d1fe66c14eed9702885b2be3ab58a49c2c071c31701534606e8f0276 SHA512 add965b5c85355f0081597a48430661c8e8a9922dd597a1bf7270f2ed38e855bda9bf5028065e0becf09fbb7a36dbf7fddd4f1e4d747777f26f4b1f8b2c87476
diff --git a/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild b/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild
new file mode 100644
index 000000000000..17df09e6ff4d
--- /dev/null
+++ b/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite fails to build
+inherit haskell-cabal
+
+DESCRIPTION="X509 reader and writer"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # fails to build
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ >=dev-haskell/crypton-0.24:=[profile?]
+ dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+# test? ( dev-haskell/tasty
+# dev-haskell/tasty-quickcheck
+# dev-haskell/x509 )
+# "
diff --git a/dev-haskell/crypton-x509/metadata.xml b/dev-haskell/crypton-x509/metadata.xml
new file mode 100644
index 000000000000..1f52a557a49c
--- /dev/null
+++ b/dev-haskell/crypton-x509/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">crypton-x509</remote-id>
+ <remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton/Manifest b/dev-haskell/crypton/Manifest
new file mode 100644
index 000000000000..45032e8a403e
--- /dev/null
+++ b/dev-haskell/crypton/Manifest
@@ -0,0 +1 @@
+DIST crypton-0.32.tar.gz 618042 BLAKE2B 685f8db1be7b7ffffa79e3eea6b66a6ffe573c70268a15c0b34717c369ff15a17c24b6edd275f6e21a64eb9bcf5646f18e77599eec6796191ae9126d50b466ce SHA512 0c544f8213c607c9d063569b45491bced3bd9b1d6aaf59c414a80b6a9f887e75c2da00c539d2ef8abd770f52e03122640fe5219361d1fad0c0b3fb52dc636590
diff --git a/dev-haskell/crypton/crypton-0.32.ebuild b/dev-haskell/crypton/crypton-0.32.ebuild
new file mode 100644
index 000000000000..baf8e2b05f65
--- /dev/null
+++ b/dev-haskell/crypton/crypton-0.32.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="check-alignment +integer-gmp old-toolchain-inliner +support-aesni +support-deepseq +support-pclmuldq +support-rdrand support-sse +target-attributes"
+
+RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
+ >=dev-haskell/memory-0.14.18:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ virtual/libc
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-kat
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag check-alignment check_alignment) \
+ $(cabal_flag integer-gmp integer-gmp) \
+ $(cabal_flag old-toolchain-inliner old_toolchain_inliner) \
+ $(cabal_flag support-aesni support_aesni) \
+ $(cabal_flag support-deepseq support_deepseq) \
+ $(cabal_flag support-pclmuldq support_pclmuldq) \
+ $(cabal_flag support-rdrand support_rdrand) \
+ $(cabal_flag support-sse support_sse) \
+ $(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/crypton/metadata.xml b/dev-haskell/crypton/metadata.xml
new file mode 100644
index 000000000000..79ded3fd0fa2
--- /dev/null
+++ b/dev-haskell/crypton/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="check-alignment">extra check on alignment in C layers, which cause lowlevel assert errors. for debugging only.</flag>
+ <flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
+ <flag name="old-toolchain-inliner">use -fgnu89-inline to workaround an old compiler / linker / glibc issue.</flag>
+ <flag name="support-aesni">allow compilation with AESNI on system and architecture that supports it</flag>
+ <flag name="support-deepseq">add deepseq instances for cryptographic types</flag>
+ <flag name="support-pclmuldq">Allow compilation with pclmuldq on architecture that supports it</flag>
+ <flag name="support-rdrand">allow compilation with RDRAND on system and architecture that supports it</flag>
+ <flag name="support-sse">Use SSE optimized version of (BLAKE2, ARGON2)</flag>
+ <flag name="target-attributes">use GCC / clang function attributes instead of global target options.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">crypton</remote-id>
+ <remote-id type="github">kazu-yamamoto/crypton</remote-id>
+ </upstream>
+</pkgmetadata>
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 049b3930c32f..e2ac23533e13 100644
--- a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
+++ b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # test suite fails to build
diff --git a/dev-haskell/cryptonite-conduit/metadata.xml b/dev-haskell/cryptonite-conduit/metadata.xml
index 74cb13dc7992..f1f67cdd6f23 100644
--- a/dev-haskell/cryptonite-conduit/metadata.xml
+++ b/dev-haskell/cryptonite-conduit/metadata.xml
@@ -12,4 +12,7 @@
with contribution, this could provide cipher conduits too,
and probably other things.
</longdescription>
+ <upstream>
+ <remote-id type="github">haskell-crypto/cryptonite-conduit</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index 155a3ff2a2b2..ac7bee5184c5 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1 +1,3 @@
-DIST cryptonite-0.26.tar.gz 581153 BLAKE2B 2becdd3d0c6f1e037fd4d38143a2a8644e38e9826faa271c971d4feff8a4ab1e4c0a04df338c99a8454cff626f79f3334a0a37b19cc136f33e7c8f53e66bd33a SHA512 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0
+DIST cryptonite-0.28.tar.gz 616309 BLAKE2B 3fa11777574fab06c264709d4de7b56fd4b276fbee93f4731683a9a18f83cf77d2042679f2eac3044d336c5be382e1e4eb0c90862c20b0f452eaafdee401e616 SHA512 c1e485522938f94f15910a5b5a4a3e4dfecbb62df463c80faaa51e9d883c2612611b8486bd0fd13660766cfb6d62d366fbbd03df2db874d525514aae247b6242
+DIST cryptonite-0.30.tar.gz 621062 BLAKE2B cf955f83b72a4fe4ce4aac4d1b3bb322922e9e3e76ab6c6119c359c304c060ccb706a7b7df4d06817be6914535ede6c46f45cc3b2ef76d3a7404881531cebe35 SHA512 519120263fb7c2b9f910e48cf43feaca07f7e705ea70c578da362dafa637b654cab90e3b9484497e33a6fdd5b8f867c0ede60d0dddba02602044b9b3de502d16
+DIST cryptonite-338.patch 1823 BLAKE2B 99a502e16ec061b37e1d3dc343760c86c1eb1cecf23a9061ef3198082d2777fa129196af3322153558e1da7e87b125bfa3a1e32501482767bbbe2e4ca874d65f SHA512 1f00a31791fef52e7bdb2b052912f8ede9022ee4013d1f74321ff10517c4c8df68be9b97d4bfd88140f5686b3b9d01e0937909dd5a2c462920e559accde8e72d
diff --git a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild b/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild
deleted file mode 100644
index 8728bac1d522..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp"
-
-RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
- >=dev-haskell/memory-0.14.18:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- virtual/libc
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( dev-haskell/memory
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-kat
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-check_alignment \
- $(cabal_flag integer-gmp integer-gmp) \
- --flag=-old_toolchain_inliner \
- $(cabal_flag cpu_flags_x86_aes support_aesni) \
- --flag=support_deepseq \
- $(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
- $(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
- $(cabal_flag cpu_flags_x86_sse support_sse)
-}
diff --git a/dev-haskell/cryptonite/cryptonite-0.28.ebuild b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
new file mode 100644
index 000000000000..618c5f1e6b33
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit flag-o-matic haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://github.com/haskell-crypto/cryptonite/pull/338.patch -> ${PN}-338.patch"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/memory-0.14.18:=[profile?]
+ >=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
+ virtual/libc
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-kat
+ dev-haskell/tasty-quickcheck )
+"
+
+PATCHES=( "${DISTDIR}"/${PN}-338.patch )
+
+src_prepare() {
+ default
+
+ # On AVX2 cryptonite's own test suite crashes on unaligned access:
+ # https://github.com/haskell-crypto/cryptonite/issues/347
+ # Disable extensions that might require extra alignment.
+ use amd64 && append-flags -mno-avx2
+ use x86 && append-flags -mno-avx2
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-check_alignment \
+ $(cabal_flag integer-gmp integer-gmp) \
+ --flag=-old_toolchain_inliner \
+ $(cabal_flag cpu_flags_x86_aes support_aesni) \
+ --flag=support_deepseq \
+ $(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
+ $(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
+ $(cabal_flag cpu_flags_x86_sse support_sse) \
+ $(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/cryptonite/cryptonite-0.30.ebuild b/dev-haskell/cryptonite/cryptonite-0.30.ebuild
new file mode 100644
index 000000000000..e32cfe9178c8
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.30.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit flag-o-matic haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_rdrand cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp +target-attributes"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ >=dev-haskell/memory-0.14.18:=[profile?]
+ >=dev-haskell/basement-0.0.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-kat
+ dev-haskell/tasty-quickcheck )
+"
+
+src_prepare() {
+ default
+
+ # On AVX2 cryptonite's own test suite crashes on unaligned access:
+ # https://github.com/haskell-crypto/cryptonite/issues/347
+ # Disable extensions that might require extra alignment.
+ use amd64 && append-flags -mno-avx2
+ use x86 && append-flags -mno-avx2
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-check_alignment \
+ $(cabal_flag integer-gmp integer-gmp) \
+ --flag=-old_toolchain_inliner \
+ $(cabal_flag cpu_flags_x86_aes support_aesni) \
+ --flag=support_deepseq \
+ $(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
+ $(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
+ $(cabal_flag cpu_flags_x86_sse support_sse) \
+ $(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml
index 11b4001ffcbf..d75d89255758 100644
--- a/dev-haskell/cryptonite/metadata.xml
+++ b/dev-haskell/cryptonite/metadata.xml
@@ -5,33 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A repository of cryptographic primitives.
-
- * Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, ChaCha.
-
- * Hash: SHA1, SHA2, SHA3, MD2, MD4, MD5, Kekkak, Skein, Ripemd, Tiger, Whirlpool
-
- * MAC: HMAC, Poly1305
-
- * Assymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Ed25519
-
- * Key Derivation Function: PBKDF2, Scrypt
-
- * Cryptographic Random generation: System Entropy, Deterministic Random Generator
-
- * Data related: Anti-Forensic Information Splitter (AFIS)
-
- If anything cryptographic related is missing from here, submit
- a pull request to have it added. This package strive to be a
- cryptographic kitchen sink that provides cryptography for everyone.
-
- Evaluate the security related to your requirements before using.
- </longdescription>
<use>
<flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
+ <flag name="target-attributes">use GCC / clang function attributes instead of global target options.</flag>
</use>
<upstream>
+ <remote-id type="hackage">cryptonite</remote-id>
<remote-id type="github">haskell-crypto/cryptonite</remote-id>
</upstream>
</pkgmetadata>
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 e521e1877908..9d80b51c0c37 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # fails test, not sure if it's severe
diff --git a/dev-haskell/css-text/metadata.xml b/dev-haskell/css-text/metadata.xml
index 937381521944..6df1c65f3dd9 100644
--- a/dev-haskell/css-text/metadata.xml
+++ b/dev-haskell/css-text/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">yesodweb/css-text</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/curl/Manifest b/dev-haskell/curl/Manifest
deleted file mode 100644
index e4985a98feb3..000000000000
--- a/dev-haskell/curl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST curl-1.3.8.tar.gz 47704 BLAKE2B da95451318561b9d8ab478479f8f6c147c36f86c4a89b112eb597202e2ff6305597ab200ba1e89b953dbde77cd043a3299614d5c19b83242059bd6e89906eddb SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382
diff --git a/dev-haskell/curl/curl-1.3.8.ebuild b/dev-haskell/curl/curl-1.3.8.ebuild
deleted file mode 100644
index f87b9a2c5847..000000000000
--- a/dev-haskell/curl/curl-1.3.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to libcurl"
-HOMEPAGE="https://hackage.haskell.org/package/curl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- net-misc/curl
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/curl/metadata.xml b/dev-haskell/curl/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/curl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/data-accessor/Manifest b/dev-haskell/data-accessor/Manifest
deleted file mode 100644
index b85839ce9bdd..000000000000
--- a/dev-haskell/data-accessor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-accessor-0.2.3.tar.gz 10324 BLAKE2B 1db06e59b36c882310d3cf597a3642c3fb7b1b30df41d4fc0eb7f21087fd1f55ce70c8d7b460cd64384034395ab98ebc9ddf1059060f9dbfbf70012a11da0ee3 SHA512 7e875010f9835e3706d9d760e9490e567d14498cb86d485a6b29793d95172e1c5d767aee181eef7e0f160966b93144164cd5b6dc474fb44c1367b4a90d1490b4
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
deleted file mode 100644
index 6f1e60db11b7..000000000000
--- a/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities for accessing and manipulating fields of records"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Record_access"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/data-accessor/metadata.xml b/dev-haskell/data-accessor/metadata.xml
deleted file mode 100644
index c5088ca5b3fe..000000000000
--- a/dev-haskell/data-accessor/metadata.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- In Haskell 98 the name of a record field
- is automatically also the name of a function which gets the value
- of the according field.
- E.g. if we have
-
- data Pair a b = Pair
- first :: a, second :: b
-
- then
-
- &gt; first :: Pair a b -&gt; a
- &gt; second :: Pair a b -&gt; b
-
- However for setting or modifying a field value
- we need to use some syntactic sugar, which is often clumsy.
-
- modifyFirst :: (a -&gt; a) -&gt; (Pair a b -&gt; Pair a b)
- modifyFirst f r\@(Pair
- first=a
- ) = r
- first = f a
-
- With this package you can define record field accessors
- which allow setting, getting and modifying values easily.
- The package clearly demonstrates the power of the functional approach:
- You can combine accessors of a record and sub-records,
- to make the access look like the fields of the sub-record belong to the main record.
-
- Example:
-
- &gt; *Data.Accessor.Example&gt; (first^:second^=10) (('b',7),"hallo")
- &gt; (('b',10),"hallo")
-
- You can easily manipulate record fields in a 'Control.Monad.State.State' monad,
- you can easily code 'Show' instances that use the Accessor syntax
- and you can parse binary streams into records.
- See @Data.Accessor.Example@ for demonstration of all features.
-
- It would be great if in revised Haskell versions the names of record fields
- are automatically 'Data.Accessor.Accessor's
- rather than plain @get@ functions.
- For now, the package @data-accessor-template@ provides Template Haskell functions
- for automated generation of 'Data.Acesssor.Accessor's.
- See also the other @data-accessor@ packages
- that provide an Accessor interface to other data types.
- The package @enumset@ provides accessors to bit-packed records.
-
- For similar packages see @lenses@ and @fclabel@.
- A related concept are editors
- &lt;http://conal.net/blog/posts/semantic-editor-combinators/&gt;.
- Editors only consist of a modify method
- (and @modify@ applied to a 'const' function is a @set@ function).
- This way, they can modify all function values of a function at once,
- whereas an accessor can only change a single function value,
- say, it can change @f 0 = 1@ to @f 0 = 2@.
- This way, editors can even change the type of a record or a function.
- An Arrow instance can be defined for editors,
- but for accessors only a Category instance is possible ('(.)' method).
- The reason is the @arr@ method of the @Arrow@ class,
- that conflicts with the two-way nature (set and get) of accessors.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-array-byte/Manifest b/dev-haskell/data-array-byte/Manifest
new file mode 100644
index 000000000000..f4d26ec1a3d4
--- /dev/null
+++ b/dev-haskell/data-array-byte/Manifest
@@ -0,0 +1,2 @@
+DIST data-array-byte-0.1.0.1-rev1.cabal 1989 BLAKE2B 4cc949daa674be3691072d87b1bc158dbda8e03edb1cdc8d839fe88761b3758a285150a3ed6c297343b93cdf49123584aa8d54cc6bce585d6f7ef008c94afdea SHA512 dda81cb1f8e04a762bad70af5f5cc566c2228322ac277296e1492db57757eedebc39133a35f2daca499593bb4f855e2548c0c400eac3d7ab0ebf7d646dfa06e7
+DIST data-array-byte-0.1.0.1.tar.gz 6784 BLAKE2B 5b53eeee371b4463c4c140b153fd5b806db0385c4fba647c158cecd3168f739f97c292ef70bee03b74e4d34f9ef5c58d9cfa6d20e0b11f2f38399b04657d3c12 SHA512 f06e369803fadca57c0782b45c97f914e0e28c512bb3f36be35a06686ac1c3ab45da150143a1be3b0b5633c3d4105570acc4c0482e9692a4ef35568922a303e7
diff --git a/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild b/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild
new file mode 100644
index 000000000000..322e73d7a889
--- /dev/null
+++ b/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility layer for Data.Array.Byte"
+HOMEPAGE="https://github.com/Bodigrim/data-array-byte"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/quickcheck-classes-base-0.6 <dev-haskell/quickcheck-classes-base-0.7
+ >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/data-array-byte/metadata.xml b/dev-haskell/data-array-byte/metadata.xml
new file mode 100644
index 000000000000..b095f14949bd
--- /dev/null
+++ b/dev-haskell/data-array-byte/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">data-array-byte</remote-id>
+ <remote-id type="github">Bodigrim/data-array-byte</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/data-binary-ieee754/Manifest b/dev-haskell/data-binary-ieee754/Manifest
deleted file mode 100644
index 05236542d114..000000000000
--- a/dev-haskell/data-binary-ieee754/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-binary-ieee754-0.4.4.tar.gz 4117 BLAKE2B 012ccb5cb3bd94b15a8326011563b1a2e3c28699d3819675822cd27372e6b81d527ad84fc20a054a2a4e8d14ba821bdce25393ab12042eedc64cb88064076d0c SHA512 af280e164b4b4a21d5d3cd489d8b2ff43e86fbf1d3896aabe9a8e3558b15549f4efc4497d99d6877b7d9547bf26a4a8ed422cbe00abbea73b2e936b30a71009f
diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
deleted file mode 100644
index d4fb704a32a0..000000000000
--- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser/Serialiser for IEEE-754 floating-point values"
-HOMEPAGE="https://john-millikin.com/software/data-binary-ieee754/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-binary-ieee754/metadata.xml b/dev-haskell/data-binary-ieee754/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/data-binary-ieee754/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/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 45e7089978a2..8ce1a10e8a4d 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-base/Manifest b/dev-haskell/data-default-instances-base/Manifest
deleted file mode 100644
index 17decd1ce12c..000000000000
--- a/dev-haskell/data-default-instances-base/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-default-instances-base-0.1.0.1.tar.gz 1554 BLAKE2B 3dd2c2dd09790e96ca0921af32f2c384b40a9ae9978f25843e32710545be1715b19b2bc25324c8a541986bf1b620d8aeef879ad282e0124d48bbc45daa5378a2 SHA512 32d25a84dc22be5fc0145a32eb4bb8879c4ab43ec08cba9a6e48084e668ca704b1fa69b82f756759a467c23958878c0dfe00620a6a8763e95e319ef71dcbb46d
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
deleted file mode 100644
index fbca1e149a50..000000000000
--- a/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in base"
-HOMEPAGE="https://hackage.haskell.org/package/data-default-instances-base"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-default-instances-base/metadata.xml b/dev-haskell/data-default-instances-base/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/data-default-instances-base/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/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 bb40bc69477e..1c3681cd29d3 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 6fbc7ae0ea60..b30a9d18b555 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 c10b95079d9d..f675c7df4418 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 290d9ff69506..16b73301ebd2 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-endian/Manifest b/dev-haskell/data-endian/Manifest
deleted file mode 100644
index 7fe5b9d36477..000000000000
--- a/dev-haskell/data-endian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-endian-0.1.1.tar.gz 2788 BLAKE2B 6f2bcf0f1074a07953027f7d29b99db995f0cbce0cee59aa81556fee0b69419ddf5727f6c27c4548c7c6f3b62a7e3b85c23983505c77c539cbcce395492a63ea SHA512 a8e94f996a0b1c929cd01b8f38c52149cf3bac0f50449d327ba66ac4a378ba5c3826860abe4d1592aa83ed9ca81dba6083c63a66e6ee0655c27521cb87977a90
diff --git a/dev-haskell/data-endian/data-endian-0.1.1.ebuild b/dev-haskell/data-endian/data-endian-0.1.1.ebuild
deleted file mode 100644
index 729cf0999818..000000000000
--- a/dev-haskell/data-endian/data-endian-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/data-endian/metadata.xml b/dev-haskell/data-endian/metadata.xml
deleted file mode 100644
index f31f5f9702d2..000000000000
--- a/dev-haskell/data-endian/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">mvv/data-endian</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/data-fix/Manifest b/dev-haskell/data-fix/Manifest
new file mode 100644
index 000000000000..844a1504279d
--- /dev/null
+++ b/dev-haskell/data-fix/Manifest
@@ -0,0 +1,2 @@
+DIST data-fix-0.3.2-rev4.cabal 1720 BLAKE2B 804bae8c1788c3ad572e128274b24e62cd8c53cd44d3079acec348f5d3f0a663b258c040b9d3b8fa1463b1b292a30c954121e5f4aea697115f416557a1b5fa59 SHA512 6577a28f2451c9fe88fe5dbabdcfccabad8e5654491f00cace75df8273ec3c0e2fd2dc3fbc9347051a67214499ff56b077c29f020753e5fee647e52f2083b4d0
+DIST data-fix-0.3.2.tar.gz 5842 BLAKE2B b59f0e2abd572945219355206f24f689835026d4adb6ce4d85073f11a8742701463dfe6029376d5a65959c61115483cfb00f557213c222b18a28e9336a4f3879 SHA512 70b0c15522ea1fa623397bd399d83cc0921736012e6daaad21a9940ec9f447373f7e0e3915369127c7c54def7cb1d066c4641e676fa5f444f3d5dd761c258b63
diff --git a/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild b/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..9bf501127acd
--- /dev/null
+++ b/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fixpoint data types"
+HOMEPAGE="https://github.com/spell-music/data-fix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/data-fix/metadata.xml b/dev-haskell/data-fix/metadata.xml
new file mode 100644
index 000000000000..29898652b264
--- /dev/null
+++ b/dev-haskell/data-fix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">data-fix</remote-id>
+ <remote-id type="github">spell-music/data-fix</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/data-hash/Manifest b/dev-haskell/data-hash/Manifest
deleted file mode 100644
index b7722a4aa12c..000000000000
--- a/dev-haskell/data-hash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-hash-0.2.0.1.tar.gz 8504 BLAKE2B e48e6be1e7074c415df85e1ff65311ad5cbd6e73b74bcea095e3d407f035b18c73370ea264cc4f617150f2c0aeb4a82619ac18e169ea2d4909f14570852b5bbb SHA512 daea098b9c808396606d90ae70e5156c492463db929b563a6195ee648ad72fc2949ab231ad67758fe0c68991826ea2292109a5d1f46d0cfc27c16e2e2b0666fa
diff --git a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
deleted file mode 100644
index 0977eafb57c5..000000000000
--- a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for building fast hashing functions"
-HOMEPAGE="https://hackage.haskell.org/package/data-hash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/data-hash/metadata.xml b/dev-haskell/data-hash/metadata.xml
deleted file mode 100644
index c635d7dbab3b..000000000000
--- a/dev-haskell/data-hash/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Combinators for building fast hashing functions. Includes
- hashing functions for all basic Haskell98 types.
- </longdescription>
-</pkgmetadata>
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 afead2b93813..6af9d9b4718b 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/dataenc/Manifest b/dev-haskell/dataenc/Manifest
deleted file mode 100644
index b4c51a331e1c..000000000000
--- a/dev-haskell/dataenc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dataenc-0.14.0.7.tar.gz 12813 BLAKE2B 3f213d73121c7973c706ad0d81d2e0153d7ac9cb242aa8d5b3bcd093dd8611d9476263a4893c43ce95aa642893d8b1b2ac2baf26d0f33c0fa3d64d7d0bb0722d SHA512 82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
deleted file mode 100644
index 536a1c74f483..000000000000
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Library/Data_encoding"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
- test? ( dev-haskell/hunit:=[profile?]
- >=dev-haskell/quickcheck-2.5:2=[profile?]
- dev-haskell/test-framework:=[profile?]
- dev-haskell/test-framework-hunit:=[profile?]
- dev-haskell/test-framework-quickcheck2:=[profile?]
- dev-haskell/test-framework-th:=[profile?] )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
- 'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
- 'executable tests' 'executable dataenc-tests'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag test tests)
-}
diff --git a/dev-haskell/dataenc/metadata.xml b/dev-haskell/dataenc/metadata.xml
deleted file mode 100644
index 2d6eeae6bb86..000000000000
--- a/dev-haskell/dataenc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Data encoding library currently providing Base16, Base32,
- Base32Hex, Base64, Base64Url, Base85, Python string escaping,
- Quoted-Printable, URL encoding, uuencode, xxencode, and yEncoding.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/date-cache/Manifest b/dev-haskell/date-cache/Manifest
deleted file mode 100644
index 67c3506e77d2..000000000000
--- a/dev-haskell/date-cache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST date-cache-0.3.0.tar.gz 2126 BLAKE2B 51f0686bee8a72a0286c7ab03cc39346e4f4998ab0069a69586ae183fa8e9d9f4a707a5932bd3895d5fb7b895f206a643f097882a40a8127eb2a38bb49bbbefc SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be
diff --git a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
deleted file mode 100644
index 5f0a6a09eddb..000000000000
--- a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Date cacher"
-HOMEPAGE="https://hackage.haskell.org/package/date-cache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/date-cache/metadata.xml b/dev-haskell/date-cache/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/date-cache/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 9faf65b3f594..07cbde20cad9 100644
--- a/dev-haskell/dav/dav-1.3.4.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.3
#hackport: flags: -mtl-compat
@@ -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 ~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 5d8457279b57..37e66badbff1 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1 +1,2 @@
-DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
+DIST dbus-1.2.27.tar.gz 78017 BLAKE2B 396739e7e6af0fe1921c9d3857c0650db9532d00a3fd2eda18042d42ce8336631d93d0c0ce75681b695f9e90c7205e38aea7c4f984544460ecab19c7d5090478 SHA512 2c6b87b4a793b555ef617e3f3f89695116180f0e1df2f84ee3da62c819c05c10a78d328644b84c8c9796354ee6dd1c6ad6b0430a1b9a2d7fe112b251d4606e8d
+DIST dbus-1.3.0.tar.gz 82155 BLAKE2B 46b5500294e93b2614e66fa99962917e3a27030e178f0b3734a764089d5ba2a72afd203d2b1afcc2227c7b0953e1f324af62b6d537148e32a7527677ae017a8b SHA512 e59b11910a4e4288c89955dbbd2a135cb81dc263aacb331477e4f70403f53d70340af3a280eee9be8b2ee70eef8c06813381ab1dcb36927d059c90a726992cc7
diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.16.ebuild
deleted file mode 100644
index 978131cedba6..000000000000
--- a/dev-haskell/dbus/dbus-1.2.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.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 ~x86"
-IUSE=""
-
-RESTRICT=test # requires access to dbus
-
-RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
- <dev-haskell/exceptions-0.11:=[profile?]
- <dev-haskell/lens-4.20:=[profile?]
- >=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
- <dev-haskell/parsec-3.2:=[profile?]
- <dev-haskell/random-1.3:=[profile?]
- <dev-haskell/split-0.3:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/th-lift-0.9:=[profile?]
- <dev-haskell/vector-0.13:=[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-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( <dev-haskell/extra-1.8
- <dev-haskell/quickcheck-2.15
- <dev-haskell/resourcet-1.3
- <dev-haskell/tasty-1.4
- <dev-haskell/tasty-hunit-0.11
- <dev-haskell/tasty-quickcheck-0.11 )
-"
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 000000000000..414024615fea
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.2.27.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 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 )
+"
+
+CABAL_CHDEPS=(
+ "base >=4.16 && <5" "base >=4 && <5"
+ "template-haskell >= 2.18 && < 2.20" "template-haskell"
+)
diff --git a/dev-haskell/dbus/dbus-1.3.0.ebuild b/dev-haskell/dbus/dbus-1.3.0.ebuild
new file mode 100644
index 000000000000..ce2a08ef691d
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.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"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+# exotic keywords require ghc bump to 9.2 series
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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/parsec-3.2:=[profile?]
+ <dev-haskell/random-1.3:=[profile?]
+ <dev-haskell/split-0.3:=[profile?]
+ <dev-haskell/text-2.1:=[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-9.2.4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.6.3.0
+ test? ( <dev-haskell/extra-1.8
+ <dev-haskell/quickcheck-2.15
+ <dev-haskell/resourcet-1.4
+ <dev-haskell/tasty-1.5
+ <dev-haskell/tasty-hunit-0.11
+ <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
+"
diff --git a/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
new file mode 100644
index 000000000000..d5c509ca58e3
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
@@ -0,0 +1,28 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+dev-haskell/dbus: Disable integration tests
+
+These tests try to spin up an instance of dbus-daemon
+
+diff -urN dbus-1.2.22/tests/DBusTests.hs dbus-1.2.22-r1/tests/DBusTests.hs
+--- dbus-1.2.22/tests/DBusTests.hs 2021-12-16 12:34:16.000000000 -0700
++++ dbus-1.2.22-r1/tests/DBusTests.hs 2022-08-05 12:51:12.447871229 -0600
+@@ -23,7 +23,7 @@
+ import DBusTests.BusName
+ import DBusTests.Client
+ import DBusTests.ErrorName
+-import DBusTests.Integration
++--import DBusTests.Integration
+ import DBusTests.InterfaceName
+ import DBusTests.Introspection
+ import DBusTests.MemberName
+@@ -55,7 +55,7 @@
+ , test_BusName
+ , test_Client
+ , test_ErrorName
+- , test_Integration
++-- , test_Integration
+ , test_InterfaceName
+ , test_Introspection
+ , test_MemberName
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 000000000000..dab7aaff6aef
--- /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 5063563f544d..b6c5efc4fb09 100644
--- a/dev-haskell/dbus/metadata.xml
+++ b/dev-haskell/dbus/metadata.xml
@@ -3,57 +3,10 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- 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; //
- &amp;#x20; \-- Request a list of connected clients from the bus
- &amp;#x20; reply &lt;- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
- &amp;#x20; &amp;#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
- &amp;#x20; &amp;#x7d;
- &amp;#x20; //
- &amp;#x20; \-- org.freedesktop.DBus.ListNames() returns a single value, which is
- &amp;#x20; \-- a list of names (here represented as [String])
- &amp;#x20; let Just names = fromVariant (methodReturnBody reply !! 0)
- &amp;#x20; //
- &amp;#x20; \-- Print each name on a line, sorted so reserved names are below
- &amp;#x20; \-- temporary names.
- &amp;#x20; mapM_ putStrLn (sort names)
- @
-
- &gt;$ ghc --make list-names.hs
- &gt;$ ./list-names
- &gt;:1.0
- &gt;:1.1
- &gt;:1.10
- &gt;:1.106
- &gt;:1.109
- &gt;:1.110
- &gt;ca.desrt.dconf
- &gt;org.freedesktop.DBus
- &gt;org.freedesktop.Notifications
- &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/Manifest b/dev-haskell/dec/Manifest
index 6dd83586955d..e05e17968b7e 100644
--- a/dev-haskell/dec/Manifest
+++ b/dev-haskell/dec/Manifest
@@ -1 +1,3 @@
DIST dec-0.0.3.tar.gz 2629 BLAKE2B 558b559cf5d92afad637f61ae82549e200a6042740d78ef25be5bf32212dac5027e4f1b3cb9104c65d589927e1ff8b65e62b7f46d6fd5ff707f175cf920bb206 SHA512 446911a59287b48d8b98acf588671e6ed19fc12ed8adeabdab8f21c1fefb80cac7b59b9fea52a4671b997aa63d2eadda5181490e6901e99e9882de572abdc595
+DIST dec-0.0.5-rev1.cabal 1468 BLAKE2B df9584455ad01170b770c2342d8a5ac9f43383ebad9f87ac6f0abe7ee65e4165048b2ff1c5b401fa8af25dcc3532f04812a383fb50eb0a4f8b9e1c5bb9bd7089 SHA512 eb8b36f86b7266f1afdb57da4c7eb1b440cb347b9540d15acf217c3dcc432486154bc388adb98f720640fe765bd8acb80d09db7ea2cc27d5b2fa53f5210757e7
+DIST dec-0.0.5.tar.gz 3224 BLAKE2B b6d744a118f895e403d777cbc68b4913e8cd01e9f9e230b693b9d6dc2c6a6896f97e05e0bece5a22ff393da8b0cb9d29f78a8314af4d3799505ffd56d4591b22 SHA512 895085bb95bd8cec482f771d37f75221c12b50326bfeadeb6466d365c69756fef2faffcb557e0fee3861ec5318d8d27ad140ef6296217a80dda9a121f1be931a
diff --git a/dev-haskell/dec/dec-0.0.3.ebuild b/dev-haskell/dec/dec-0.0.3.ebuild
index 8a3cebbc9cf5..e5527d33dfb6 100644
--- a/dev-haskell/dec/dec-0.0.3.ebuild
+++ b/dev-haskell/dec/dec-0.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
@@ -24,8 +24,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
"
-src_prepare() {
- default
- cabal_chdeps \
- 'base >=4.7 && <4.13' 'base >=4.7'
-}
+CABAL_CHDEPS=(
+ 'base >=4.7 && <4.13' 'base >=4.7'
+)
diff --git a/dev-haskell/dec/dec-0.0.5.ebuild b/dev-haskell/dec/dec-0.0.5.ebuild
new file mode 100644
index 000000000000..01a3511200b8
--- /dev/null
+++ b/dev-haskell/dec/dec-0.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Decidable propositions"
+HOMEPAGE="https://github.com/phadej/dec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/boring-0.2:=[profile?] <dev-haskell/boring-0.3:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/dec/metadata.xml b/dev-haskell/dec/metadata.xml
index 937381521944..a0f6ba3a9a33 100644
--- a/dev-haskell/dec/metadata.xml
+++ b/dev-haskell/dec/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">dec</remote-id>
+ <remote-id type="github">phadej/dec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/deepseq-generics/Manifest b/dev-haskell/deepseq-generics/Manifest
deleted file mode 100644
index 763f4c69d332..000000000000
--- a/dev-haskell/deepseq-generics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST deepseq-generics-0.2.0.0.tar.gz 5192 BLAKE2B c1711c69267a92749803f71cdb0738bf465d63a1cd91c0f26afefa52a7806711c7de75b52a1fa0421ec84a8f9165743fb7f2c5371dc3e4bd5e340ae0bfc4f532 SHA512 403d5fd9d8bee827ec2434841d06e78520f6ff5709e4b8e1223d926e819cb99727162d7004f98bff795beaff1dc7d42d07534300c11d453ac559a743a4d70e7e
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
deleted file mode 100644
index 72295880e3a5..000000000000
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GHC.Generics-based Control.DeepSeq.rnf implementation"
-HOMEPAGE="https://github.com/hvr/deepseq-generics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.10' 'base >= 4.5' \
- 'ghc-prim >= 0.2 && < 0.6' 'ghc-prim >= 0.2'
-}
diff --git a/dev-haskell/deepseq-generics/metadata.xml b/dev-haskell/deepseq-generics/metadata.xml
deleted file mode 100644
index cbd891b4ed9f..000000000000
--- a/dev-haskell/deepseq-generics/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides a "GHC.Generics"-based
- 'Control.DeepSeq.Generics.genericRnf' function which can be used
- for providing a 'rnf' implementation. See the documentation for
- the 'genericRnf' function in the "Control.DeepSeq.Generics" module
- to get started.
-
- The original idea was pioneered in the @generic-deepseq@ package
- (see &lt;http://www.haskell.org/pipermail/haskell-cafe/2012-February/099551.html&gt;
- for more information).
-
- This package differs from the @generic-deepseq@ package by working
- in combination with the existing @deepseq@ package as opposed to defining a
- conflicting drop-in replacement for @deepseq@'s @Control.Deepseq@ module.
- </longdescription>
- <upstream>
- <remote-id type="github">hvr/deepseq-generics</remote-id>
- </upstream>
-</pkgmetadata>
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 0a6a6c4d3fe3..d6408e85fdc2 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/math-functions-0.1.7:=[profile?]
diff --git a/dev-haskell/deriving-compat/Manifest b/dev-haskell/deriving-compat/Manifest
index dac611631efc..a8ed78fa35a1 100644
--- a/dev-haskell/deriving-compat/Manifest
+++ b/dev-haskell/deriving-compat/Manifest
@@ -1 +1,2 @@
-DIST deriving-compat-0.5.8.tar.gz 67468 BLAKE2B 0d5ea2e882e598590b69e8682d6a751fadd8cc78cbadc97d884db74730972e93b4045276aa86369d744d4edd9db4942acbdde4abae18002c599d7b0728112be1 SHA512 e0a807142bc324a0205bd3b98fc9c68292100808d448edaf800ed41c073ec0745329458dbbb6c1fe33cc86872a9d2555d76f57c6b9d8a1dcd891dda1a9fcf158
+DIST deriving-compat-0.6.5.tar.gz 74588 BLAKE2B a20c58f97e02d5b17aab2c561e09d6e7b147dbe3c2321fd0d8125ad2c12e0040a380a4b7f9150fe44905c802326017080a6bfcd0c79ad28816d01632d5af766e SHA512 7e4d20eac97c6deb95067163fef0f2032eaa642dc3ef3044046a5a2b3de4acd8deb8f4d07365c57b831fbada8fd4dd5752a0570d04b97533f07a870d9e728e69
+DIST deriving-compat-0.6.tar.gz 73015 BLAKE2B d0694fad9873617eff1581a239a6470248cfd2ed0372590cf5757b1f569dfcfcfb52e44f7096998f98c762735c5c54acd86ef3338271d9dec88d52fede1d698e SHA512 631a9eea6a2546f6f10b1365f8f2acf77611af41c1823583b3365d9def3d355b8596dbfe552d88feae2aa4e3d2aa5b30417e57191ace3c53b05f26890528f51c
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
deleted file mode 100644
index 8b27d4f7f63f..000000000000
--- a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backports of GHC deriving extensions"
-HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
- >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
- >=dev-haskell/hspec-1.8
- >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
- >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 )
-"
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild
new file mode 100644
index 000000000000..420bda40c27e
--- /dev/null
+++ b/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backports of GHC deriving extensions"
+HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+ >=dev-haskell/transformers-compat-0.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
+ >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
+ >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1
+ >=dev-haskell/void-0.5.10 <dev-haskell/void-1 )
+"
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
new file mode 100644
index 000000000000..f3fcf6e2a46b
--- /dev/null
+++ b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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="Backports of GHC deriving extensions"
+HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
+ >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
+ >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1
+ >=dev-haskell/void-0.5.10 <dev-haskell/void-1 )
+"
diff --git a/dev-haskell/deriving-compat/metadata.xml b/dev-haskell/deriving-compat/metadata.xml
index 704693498e4c..ed9245f629c2 100644
--- a/dev-haskell/deriving-compat/metadata.xml
+++ b/dev-haskell/deriving-compat/metadata.xml
@@ -5,50 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides Template Haskell functions that mimic deriving
- extensions that were introduced or modified in recent versions
- of GHC. Currently, the following extensions are covered:
-
- * @DeriveFoldable@
-
- * @DeriveFunctor@
-
- * @DeriveTraversable@
-
- The following changes have been backported:
-
- * In GHC 8.0, @DeriveFoldable@ was changed to allow folding
- over data types with existential constraints.
-
- * In GHC 8.0, @DeriveFoldable@ and @DeriveTraversable@ were
- changed so as not to generate superfluous @mempty@ or @pure@
- expressions in generated code. As a result, this allows
- deriving @Traversable@ instances for datatypes with unlifted
- argument types.
-
- * In GHC 8.0, deriving @Show@ was changed so that constructor fields
- with unlifted types are no longer shown with parentheses, and
- the output of showing an unlifted type is suffixed with the same
- number of hash signs as the corresponding primitive literals.
-
- * In GHC 8.2, deriving `Ord` was changed so that it generates concrete
- @if@-expressions that are not subject to @RebindableSyntax@.
-
- Note that some recent GHC extensions are not covered by this package:
-
- * @DeriveGeneric@, which was introducted in GHC 7.2 for deriving
- @Generic@ instances, and modified in GHC 7.6 to allow derivation
- of @Generic1@ instances. Use @Generics.Deriving.TH@ from
- @&lt;http://hackage.haskell.org/package/generic-deriving generic-deriving&gt;@
- to derive @Generic(1)@ using Template Haskell.
-
- * @DeriveLift@, which was introduced in GHC 8.0 for deriving
- @Lift@ instances. Use @Language.Haskell.TH.Lift@ from
- @&lt;http://hackage.haskell.org/package/th-lift th-lift&gt;@
- to derive @Lift@ using Template Haskell.
- </longdescription>
<upstream>
+ <remote-id type="hackage">deriving-compat</remote-id>
<remote-id type="github">haskell-compat/deriving-compat</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/dictionary-sharing/Manifest b/dev-haskell/dictionary-sharing/Manifest
deleted file mode 100644
index 8ee7eef9198c..000000000000
--- a/dev-haskell/dictionary-sharing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dictionary-sharing-0.1.0.0.tar.gz 2524 BLAKE2B d8a5a942749add31b4622b8bcea9784273fde2cb87865f5d7103f06f2fe9dbd82f247101b235ed7b716a8fb5e3dc813e897776778ee377442685d2b7d08d37b8 SHA512 5af84caae1339ddb006ba77f2505da63e0977368f93f4d84dbd8f31c0e45cea988a9175b5273cc2280b8d8f44dd8c921385ea2c38b239f08a565cae7c1fd6415
diff --git a/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild b/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
deleted file mode 100644
index 925356c70df5..000000000000
--- a/dev-haskell/dictionary-sharing/dictionary-sharing-0.1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Sharing/memoization of class members"
-HOMEPAGE="https://hackage.haskell.org/package/dictionary-sharing"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-src_prepare() {
- default
-
- #https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/revisions/
- cabal_chdeps \
- 'containers >=0.5 && <0.6' 'containers >= 0.5'
-}
diff --git a/dev-haskell/dictionary-sharing/metadata.xml b/dev-haskell/dictionary-sharing/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/dictionary-sharing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/diff/Manifest b/dev-haskell/diff/Manifest
index 38fbab56db40..167b1a5437f7 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1 +1,2 @@
DIST Diff-0.4.0.tar.gz 8065 BLAKE2B ab29983e8f1322d45a0e2e2551d4f762328bfb3ae92b0bf0cc14c8126f8e6fae87eb3a591c4e9667b6f5a4f6a149630471e64a1da0f1b306f6b6d0e002583320 SHA512 6a48a234d3140bc8c641cdf649a1f0daa39ab4de4064435dcbb15a9ea52994c967aadc8584f70aab89ef78e17ecc66b8ce3d8dd2157eb5b85277dfff80fd608c
+DIST diff-0.4.1.tar.gz 8759 BLAKE2B 0f3ec0afd0643ebb2f1a4580b087af01fa2dadce12aa9503b7daef1191427f95f567a1d69a250a7415f58b6d246f6e55016b9fc4e3a672eb84a86a4d347c7b37 SHA512 54a3743635812be22747a50db44a1519f6aabd695bb586a406fb917cf328b7036d379fddd93d361f93b4e29cca817cc551a0329367bf6847ae54f91f87c8895f
diff --git a/dev-haskell/diff/diff-0.4.0.ebuild b/dev-haskell/diff/diff-0.4.0.ebuild
index c3c1a49c4e78..b639bf14c398 100644
--- a/dev-haskell/diff/diff-0.4.0.ebuild
+++ b/dev-haskell/diff/diff-0.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/diff/diff-0.4.1.ebuild b/dev-haskell/diff/diff-0.4.1.ebuild
new file mode 100644
index 000000000000..6d276a997ec7
--- /dev/null
+++ b/dev-haskell/diff/diff-0.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_PN="Diff"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="O(ND) diff algorithm in haskell"
+HOMEPAGE="https://hackage.haskell.org/package/Diff"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-quickcheck2
+ )
+"
diff --git a/dev-haskell/diff/metadata.xml b/dev-haskell/diff/metadata.xml
index 937381521944..ccaabb918e1b 100644
--- a/dev-haskell/diff/metadata.xml
+++ b/dev-haskell/diff/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">Diff</remote-id>
+ <remote-id type="github">seereason/Diff</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/digest/Manifest b/dev-haskell/digest/Manifest
index f9b70b4005ac..b839e549f7d6 100644
--- a/dev-haskell/digest/Manifest
+++ b/dev-haskell/digest/Manifest
@@ -1 +1,2 @@
DIST digest-0.0.1.2.tar.gz 3790 BLAKE2B 6fa19f1967dc6c8597d0ce2a1b29d3fecc8e47b0f652ca1319e4a7a10d3e9f8a299869ef43df2307f822568e04e109d946abe481aebd2decf8f72cafce4d6446 SHA512 f7961c098677c0e75561e3706446b073f60c6a8646aca6d139d6559952b2cba189221ac8af59f2dc6e4da65ee4a789f703e2ebbcf1e9c3df3f98167409bdf7c9
+DIST digest-0.0.1.3.tar.gz 3792 BLAKE2B 4506977e388a0ccc5d244e4af915c3393c963e06d3899706fd1abbb737b576795d46b53907edc3142980ac470852faa16ca7e4db5c64cf4d2bcbc7f7c61462ea SHA512 2b4a6f58dc70ea18e359ddaa93088bfbefa96c6c37f256cf0c75bdd61087a874584d8a1d47176adb114a4399400b866d7911c12a2c8c1ebafee3398ca58caba2
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index 45b7a198e8d7..9eb6dfc796e9 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/digest/digest-0.0.1.3.ebuild b/dev-haskell/digest/digest-0.0.1.3.ebuild
new file mode 100644
index 000000000000..a0b9dd81d18f
--- /dev/null
+++ b/dev-haskell/digest/digest-0.0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"
+HOMEPAGE="https://hackage.haskell.org/package/digest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/digits/Manifest b/dev-haskell/digits/Manifest
new file mode 100644
index 000000000000..e866ac3cdab8
--- /dev/null
+++ b/dev-haskell/digits/Manifest
@@ -0,0 +1 @@
+DIST digits-0.3.1.tar.gz 2480 BLAKE2B 92fee6671d5dade7a37b7faa4ea363c42b3ad810ec6cd486000148b9f6972a1b33122d5cf0ac8507cf097b1b1394d12d20414abf52ca1ed418c1a77553bf29ca SHA512 73dea874513585b1ccd5af1aa31fca2dbbbc7916ce1dce5a89fa0c842e86c0ae5f742ac345b77aed843591eec2f1408619ea44c876030d4dd626730d5c999099
diff --git a/dev-haskell/digits/digits-0.3.1.ebuild b/dev-haskell/digits/digits-0.3.1.ebuild
new file mode 100644
index 000000000000..b8587eb01530
--- /dev/null
+++ b/dev-haskell/digits/digits-0.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converts integers to lists of digits and back"
+HOMEPAGE="https://hackage.haskell.org/package/digits"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/quickcheck:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+ default
+ # not compatible to Cabal-3
+ rm Setup.lhs || die
+}
diff --git a/dev-haskell/abstract-deque-tests/metadata.xml b/dev-haskell/digits/metadata.xml
index 937381521944..937381521944 100644
--- a/dev-haskell/abstract-deque-tests/metadata.xml
+++ b/dev-haskell/digits/metadata.xml
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 1d0e064b63b4..efaf8e259764 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest
index 9b3ec5819e2b..e8d845fc10a6 100644
--- a/dev-haskell/distributive/Manifest
+++ b/dev-haskell/distributive/Manifest
@@ -1 +1 @@
-DIST distributive-0.6.1.tar.gz 11256 BLAKE2B b8c964137613b828f2908b210964be06a39bcd360727edf816c9921d6f7c16c245fcc6cec702ff8f98e0f63c90396796af0bfc7964f25d589ca5616aa30eb934 SHA512 6f14660e14ff5dfe90eb44386ed111829d4a621f77908049197ce1802b4d5ddd67ec66dadb92f8726c03f455e077ea6a5b8503e24bd5d205883d53f13cceb630
+DIST distributive-0.6.2.1.tar.gz 8140 BLAKE2B 34cdca12089cc097619469e8f559e978ac6d96c7dd8156cd92ea3ef7a3219afb11af6dd78dd30f7aa72405ae90cd37860d845d7f0b5c7ce6055316d8c3f429bc SHA512 387c7b6e0b2f917fd68d52ffbc79b9db21e488629309bfaf0dc77450bfd37c0f7f8a29458532616b5395552f84f3727b462cb2876e5aca79101e2c752b26e0a7
diff --git a/dev-haskell/distributive/distributive-0.6.1.ebuild b/dev-haskell/distributive/distributive-0.6.1.ebuild
deleted file mode 100644
index 2389f0d37e23..000000000000
--- a/dev-haskell/distributive/distributive-0.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +tagged,+semigroups
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
- >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
- >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=semigroups \
- --flag=tagged
-}
diff --git a/dev-haskell/distributive/distributive-0.6.2.1.ebuild b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
new file mode 100644
index 000000000000..8c9907e5a2d3
--- /dev/null
+++ b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +tagged,+semigroups
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Distributive functors -- Dual to Traversable"
+HOMEPAGE="https://github.com/ekmett/distributive/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=semigroups \
+ --flag=tagged
+}
diff --git a/dev-haskell/djinn-ghc/Manifest b/dev-haskell/djinn-ghc/Manifest
deleted file mode 100644
index 59fada36b2e3..000000000000
--- a/dev-haskell/djinn-ghc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST djinn-ghc-0.0.2.3.tar.gz 3330 BLAKE2B 87a8b2671805b84eca1e67cace7fe2bdb9e18886a873ccbb25bb1e64aae716dc00ab4e1235c5e81b60b41e52ea8f4988691cbc91893aa1054382f0d690b998f6 SHA512 441b6ce7f5d7e4672394bcc6654db9405406540e68855c41b7db33ef9e267178aa56f20209c4a91ffda59a7e44847c7bfebfa3f0c3df3d0868600f34912d9ae8
diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
deleted file mode 100644
index 2af6d2945e1d..000000000000
--- a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Bridge from Djinn to GHC API"
-HOMEPAGE="https://hackage.haskell.org/package/djinn-ghc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
- >=dev-haskell/djinn-lib-0.0.1.2:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/djinn-ghc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/djinn-lib/Manifest b/dev-haskell/djinn-lib/Manifest
deleted file mode 100644
index 9edaadbfddca..000000000000
--- a/dev-haskell/djinn-lib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST djinn-lib-0.0.1.3.tar.gz 14791 BLAKE2B 2c690f8224fd6e00839f2047893238a6801d44bef6e3b66874ca33d4cf2539fdd65a2846277affc8ea568991e380666eab62e425bb77c97c0079ebf0f28ea199 SHA512 9e531055f499a160fc1c32adeba26ef1c90aa92419140ee5659ea70100d51a1e376b2c2e87dc3816928362778dfb20362371aebdd53ad557a1bf09467d33b190
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
deleted file mode 100644
index 907729836620..000000000000
--- a/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Library extracted from djinn package"
-HOMEPAGE="http://www.augustsson.net/Darcs/Djinn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/djinn-lib/metadata.xml b/dev-haskell/djinn-lib/metadata.xml
deleted file mode 100644
index f45004f3b7c3..000000000000
--- a/dev-haskell/djinn-lib/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Djinn uses an theorem prover for intuitionistic propositional logic
- to generate a Haskell expression when given a type.
- This is a library extracted from Djinn sources.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dlist-instances/Manifest b/dev-haskell/dlist-instances/Manifest
deleted file mode 100644
index 14848185eab0..000000000000
--- a/dev-haskell/dlist-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dlist-instances-0.1.1.1.tar.gz 1749 BLAKE2B a7a5f04fc3ee2586d5e51d9ef31a1d3429f403c9d119a643156f798501d39c63e284fe6be172cac5a7d37f1457eaded77541007c286c5469aa600c241eb83f6d SHA512 9a66f9f3d73466731c1b1a3f208c564f0fd8fe990e81dd274a86441e94b48c40d778535a9d346e9ff8160b23c19efa73cc836b4dcb3a6cb0e81817348bc5041a
diff --git a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild b/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
deleted file mode 100644
index 5ae3896194d7..000000000000
--- a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists instances"
-HOMEPAGE="https://github.com/gregwebs/dlist-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/dlist:=[profile?]
- dev-haskell/semigroups:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/dlist-instances/metadata.xml b/dev-haskell/dlist-instances/metadata.xml
deleted file mode 100644
index e40ef3c6f2cc..000000000000
--- a/dev-haskell/dlist-instances/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- See the dlist packages.
- This package is the canonical source for some orphan instances.
- Orphan instances are placed here to avoid dependencies elsewhere.
- </longdescription>
- <upstream>
- <remote-id type="github">gregwebs/dlist-instances</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index 383d9b67e9f0..4ea719a988f7 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -1 +1 @@
-DIST dlist-0.8.0.7.tar.gz 9228 BLAKE2B 11d32271f9a4254eef04cf2b4de2cb68471a3194add8bd8ba87995c7098a5c80e54a62e2637ec6482ce671e7674b33ed2339a7bb2b52b4f302a41aab89b86c6b SHA512 e98ce96819bc8c7a86f1eb402ba7c6aea95fc87502afbb40a4b61ac6dc9a9793ca6f6042f633733c9e0e7c7f3f77711809767ecd213639bfa3b77e71bd6bd806
+DIST dlist-1.0.tar.gz 18667 BLAKE2B 7ed951b866463c55b7f59d8224096528ee7a1c6a055a6b31e9d2a095409dc68bb3fb9e683922479c7cffe687796ebaf029f51a2da4469beec68b29b2c98ad2f0 SHA512 8985b9e775e8d99c3d8cf59eabfb7ed13c395482186b086831a79afea9b980ee59e386856df82dcc030f430be55cc95fa057e962776fe37a371e8be5ae19abef
diff --git a/dev-haskell/dlist/dlist-0.8.0.7.ebuild b/dev-haskell/dlist/dlist-0.8.0.7.ebuild
deleted file mode 100644
index e66be00e58cb..000000000000
--- a/dev-haskell/dlist/dlist-0.8.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.9.2
- test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/dlist/dlist-1.0.ebuild b/dev-haskell/dlist/dlist-1.0.ebuild
new file mode 100644
index 000000000000..82ddb700de2f
--- /dev/null
+++ b/dev-haskell/dlist/dlist-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Difference lists"
+HOMEPAGE="https://github.com/spl/dlist"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="werror"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.15 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag werror werror)
+}
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
index f326386e7cea..a7236f4e18f7 100644
--- a/dev-haskell/dlist/metadata.xml
+++ b/dev-haskell/dlist/metadata.xml
@@ -5,12 +5,9 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Differences lists: a list-like type supporting O(1) append.
- This is particularly useful for efficient logging and pretty
- printing, (e.g. with the Writer monad), where list append
- quickly becomes too expensive.
- </longdescription>
+ <use>
+ <flag name="werror">Enable -Werror</flag>
+ </use>
<upstream>
<remote-id type="github">spl/dlist</remote-id>
</upstream>
diff --git a/dev-haskell/dns/dns-4.0.1.ebuild b/dev-haskell/dns/dns-4.0.1.ebuild
index 18e2a2d7703f..e4cd602c43f9 100644
--- a/dev-haskell/dns/dns-4.0.1.ebuild
+++ b/dev-haskell/dns/dns-4.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # uses internet to test resolver
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
index 4f24893d33c9..c73f3bce0de6 100644
--- a/dev-haskell/doclayout/Manifest
+++ b/dev-haskell/doclayout/Manifest
@@ -1 +1,2 @@
-DIST doclayout-0.3.0.2.tar.gz 12140 BLAKE2B 831517277dad7cbec04335fa69a83a1fb7bbd90edfc14cdf4ea5a340f28416eaf28639c8388b9c305daf60097871d1c5454e28600374dab176aa3babe4449a98 SHA512 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0
+DIST doclayout-0.4.tar.gz 38804 BLAKE2B fab7c7090c0416a0d6a377673892ffdd684703f773416fd08ff95e418637caf7a61242931a492f321c09374c020374630e6223d2838650c5078408a041fc9bfb SHA512 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4
+DIST doclayout-0.4.0.1.tar.gz 38465 BLAKE2B dc21503946cbfca5dee1db1aaccd2ed07517ae7390fbcca58f6181abd5e53604a125ff6272c0779cb716e7e71651fe6808a20d02a38a9361d2dd717ac69dd07d SHA512 7af503194e513b4586442e850959a247cada1a375964e458cdf8f1df7ecb35f0c350eba3bf55c904107c89f7cc584ea957f218930f41229df62a9528ace4aab2
diff --git a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild b/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
deleted file mode 100644
index 7ddee0ab5658..000000000000
--- a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A prettyprinting library for laying out text documents"
-HOMEPAGE="https://github.com/jgm/doclayout"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild b/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild
new file mode 100644
index 000000000000..6fadf9384c49
--- /dev/null
+++ b/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A prettyprinting library for laying out text documents"
+HOMEPAGE="https://github.com/jgm/doclayout"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/doclayout/doclayout-0.4.ebuild b/dev-haskell/doclayout/doclayout-0.4.ebuild
new file mode 100644
index 000000000000..0b7e7f9b5531
--- /dev/null
+++ b/dev-haskell/doclayout/doclayout-0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 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 prettyprinting library for laying out text documents"
+HOMEPAGE="https://github.com/jgm/doclayout"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?]
+ dev-haskell/safe:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/doclayout/metadata.xml b/dev-haskell/doclayout/metadata.xml
index 2b6a72a3e300..eae51fcd09cc 100644
--- a/dev-haskell/doclayout/metadata.xml
+++ b/dev-haskell/doclayout/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- doclayout is a prettyprinting library for laying out
- text documents, with several features not present
- in prettyprinting libraries designed for code. It
- was designed for use in pandoc.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">doclayout</remote-id>
+ <remote-id type="github">jgm/doclayout</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index c479a2395b2a..bc3b509ad5e5 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,2 +1,2 @@
-DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
-DIST doctemplates-0.9.tar.gz 27366 BLAKE2B e4c88e3abce07f6fa94e51e63124a7a6f1fa054a1f70595fe81b058a5fd6c87a25085cc5373eb6ee191fcdabd34650d30f9ce6251bfedaa2e16961ce3b74a816 SHA512 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
+DIST doctemplates-0.10.0.2.tar.gz 27788 BLAKE2B b4c2d505dde62123177c87b7302095a02a6e27cc3f4e311e9a4464fe4eddb43e520146fdf6758cacdb8a9b348ae0b8a46b0485bc105366776e6bfa60b31209cc SHA512 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a
+DIST doctemplates-0.11.tar.gz 25255 BLAKE2B bcdda272b1cd3e745b87029b9802fe225a86405237713fb263eb315ab4dcba1a3c128d5fb77f0623c64638d024b7bc1bbaeeeff54fdb8f4ac0d897dd19791c31 SHA512 f6e99c7fdc1c2ce4bdac3ff7bd92ad032d9d545f45300bdea46ca09518942adf6ba9b23b002f145d7f4841e119248dc51f61a99949816f7093fb15dddf441433
diff --git a/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
new file mode 100644
index 000000000000..739450ddb5cd
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 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="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text-conversions:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/glob
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/temporary )
+"
diff --git a/dev-haskell/doctemplates/doctemplates-0.11.ebuild b/dev-haskell/doctemplates/doctemplates-0.11.ebuild
new file mode 100644
index 000000000000..725a61ce5eea
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/text-conversions:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/glob
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/temporary )
+"
diff --git a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
deleted file mode 100644
index 5fc32b279a83..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- dev-haskell/hsyaml:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/text-conversions:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/glob
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
deleted file mode 100644
index 88f81e5d48bc..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/text-conversions:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/glob
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctemplates/metadata.xml b/dev-haskell/doctemplates/metadata.xml
index 3dcc69655b53..36be86b11bb1 100644
--- a/dev-haskell/doctemplates/metadata.xml
+++ b/dev-haskell/doctemplates/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">doctemplates</remote-id>
<remote-id type="github">jgm/doctemplates</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/doctest-driver-gen/Manifest b/dev-haskell/doctest-driver-gen/Manifest
new file mode 100644
index 000000000000..23203e5c86d1
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/Manifest
@@ -0,0 +1 @@
+DIST doctest-driver-gen-0.3.0.7.tar.gz 3299 BLAKE2B 74012e950328df902b6021496f554c418df797b2b08c01cc93f2b4bd182cb6f7dbc0afaf2c906fcbe2dbec5ee47210bc790e9be43a2835d3bc034d6f7f8209ce SHA512 892a713d7a3d22e1bc25b6722d74ae37be3db90c439f70a19baf2ef6f5dc6acd60359e101c222c1b736614a53fef0928399c6fa4e6e35deecf4994c6973954ca
diff --git a/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild
new file mode 100644
index 000000000000..eca005fa90d4
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generate driver file for doctest's cabal integration"
+HOMEPAGE="https://github.com/Hexirp/doctest-driver-gen#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.0.7-add-executable-flag.patch"
+)
+
+CABAL_TEST_REQUIRED_BINS=(
+ "${PN}"
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ dev-haskell/doctest
+ )
+"
+
+src_configure() {
+ if use executable || use test; then
+ local exe_flag=--flag=executable
+ else
+ local exe_flag=--flag=-executable
+ fi
+
+ # test-suite preprocessor needs the newly built components
+ export LD_LIBRARY_PATH="${S}/dist/build/${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ export PATH="${S}/dist/build/${PN}${PATH+:}${PATH}"
+
+ haskell-cabal_src_configure "${exe_flag}"
+}
+
+src_install() {
+ local components=( "lib:${PN}" )
+ use executable && components+=( "exe:${PN}" )
+ haskell-cabal_src_install "${components[@]}"
+}
diff --git a/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch b/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch
new file mode 100644
index 000000000000..b71afe410d91
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch
@@ -0,0 +1,31 @@
+From c1d00ee310adf30211150ad9a9444afb3b957889 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@protonmail.com>
+Date: Thu, 5 Oct 2023 22:47:26 -0600
+Subject: [PATCH 1/1] Add executable flag
+
+Toggled on by default
+
+Signed-off-by: hololeap <hololeap@protonmail.com>
+---
+ doctest-driver-gen.cabal | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/doctest-driver-gen.cabal b/doctest-driver-gen.cabal
+index cbe5aff..d86d001 100644
+--- a/doctest-driver-gen.cabal
++++ b/doctest-driver-gen.cabal
+@@ -43,6 +43,11 @@ library
+ ghc-options: -Wall
+ default-language: Haskell2010
+
++flag executable
++ description: Build the doctest-driver-gen executable
++ default: True
++ manual: True
++
+ executable doctest-driver-gen
+ hs-source-dirs: app
+ main-is: Main.hs
+--
+2.41.0
+
diff --git a/dev-haskell/doctest-driver-gen/metadata.xml b/dev-haskell/doctest-driver-gen/metadata.xml
new file mode 100644
index 000000000000..8adc887f2bfb
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="executable">Build the doctest-driver-gen executable</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">doctest-driver-gen</remote-id>
+ <remote-id type="github">Hexirp/doctest-driver-gen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index a5d722a789fe..a99680e4fb23 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1 +1,3 @@
-DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
+DIST doctest-0.20.0.cabal 7121 BLAKE2B c9f87ca2f1a2250d042004ece7d6957683f487e2e87dca74e564792839019ce017ebdc19afa3742163cc1006177524ef130bc4ec701c3ac49e5a5918880af102 SHA512 08a3fcb4572b6c07266ae93505bc4a5ca0b52b03f1268dffcac291c5603babb9072503c7103a6b1f591235d26a52cdc66b86b2932f56b52d2beb06595510469a
+DIST doctest-0.20.0.tar.gz 43796 BLAKE2B 7fe8b54ea9be6983cc3ce8d4c340528df533e48eafcd4c36d1cc38813b1b17469f4702064205a05e356e41d3dcefa3ba8ad556596851970edf639a5e50104d4d SHA512 037866d709fdd371941132aea31d15c65cbfcad7832cec4fa98ed580b939930cc2ef87eb77e8bdbf77bee40088b673afe66d9021d6e227416ede25159f8d93fa
+DIST doctest-0.22.0.tar.gz 45053 BLAKE2B c0f04a2d0b00790e1057cefdab4953e58b651551f3d03b4b211b9901f43f4b7dc4cc3bb51fcc01f96ef28d4a64fe84a2351a2f5123a6c0ce1380027b71f3dbdf SHA512 9da37402421243367ca307517c63abe93e93cdd10564c56d510e6a43345b4934a52c3201d0bfb3a2459d7c000d0ff5776a0cbd8e5db67f7e3a87bbac0172cd14
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.16.3.ebuild
deleted file mode 100644
index 012b822c494f..000000000000
--- a/dev-haskell/doctest/doctest-0.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Upstream has no intention of fixing it:
-# https://github.com/sol/doctest/pull/135
-RESTRICT=test # module conflicts
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
- >=dev-haskell/code-page-0.1:=[profile?]
- >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
- >=dev-haskell/syb-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.3.0
- >=dev-haskell/hspec-core-2.3.0
- dev-haskell/hunit
- dev-haskell/mockery
- >=dev-haskell/quickcheck-2.13.1
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/doctest-0.20.0.ebuild b/dev-haskell/doctest/doctest-0.20.0.ebuild
new file mode 100644
index 000000000000..04772720fc13
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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
+
+# Buggy tests
+# May be related: <https://github.com/sol/doctest/pull/135>
+RESTRICT="test"
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+HACKAGE_REV="5"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+ >=dev-haskell/code-page-0.1:=[profile?]
+ >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+ >=dev-haskell/syb-0.3:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0"
+# test? ( >=dev-haskell/hspec-2.3.0
+# >=dev-haskell/hspec-core-2.3.0
+# dev-haskell/hunit
+# dev-haskell/mockery
+# >=dev-haskell/quickcheck-2.13.1
+# dev-haskell/setenv
+# >=dev-haskell/silently-1.2.4
+# >=dev-haskell/stringbuilder-0.4 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/doctest/doctest-0.22.0.ebuild b/dev-haskell/doctest/doctest-0.22.0.ebuild
new file mode 100644
index 000000000000..dc7c9f3630e0
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.22.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+ >=dev-haskell/code-page-0.1:=[profile?]
+ >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+ >=dev-haskell/syb-0.3:=[profile?]
+ >=dev-lang/ghc-8.0:=[profile?] <dev-lang/ghc-9.7:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/hspec-2.3.0
+ >=dev-haskell/hspec-core-2.3.0
+ dev-haskell/hunit
+ dev-haskell/mockery
+ >=dev-haskell/quickcheck-2.13.1
+ dev-haskell/setenv
+ >=dev-haskell/silently-1.2.4
+ >=dev-haskell/stringbuilder-0.4 )
+"
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
index a51c87a6949b..eba755763568 100644
--- a/dev-haskell/doctest/metadata.xml
+++ b/dev-haskell/doctest/metadata.xml
@@ -5,15 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The doctest program checks examples in source code comments.
- It is modeled after doctest for Python
- (&lt;http://docs.python.org/library/doctest.html&gt;).
-
- Documentation is at
- &lt;https://github.com/sol/doctest-haskell#readme&gt;.
- </longdescription>
<upstream>
- <remote-id type="github">sol/doctest-haskell#readme</remote-id>
+ <remote-id type="hackage">doctest</remote-id>
+ <remote-id type="github">sol/doctest</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/double-conversion/Manifest b/dev-haskell/double-conversion/Manifest
deleted file mode 100644
index 5b877438b889..000000000000
--- a/dev-haskell/double-conversion/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST double-conversion-2.0.2.0.tar.gz 7023616 BLAKE2B ecdd9ff171a976f48390626eda39a23f3e6b9f3ec204515a9730ebc22bb6a49b40baf77f5c12dc01f47c90225055d5c1199b00e739ef809861bf564d3aaa38df SHA512 1713c4e8a28de2ee85e1f312dc12d30a9c6d7a139d89f04ea88048578ce65c8bdf62ded90b92bce011955b95867ca95a623a5109758276a29ba7b6843fbe37eb
diff --git a/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild b/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild
deleted file mode 100644
index 98c7ffb620f0..000000000000
--- a/dev-haskell/double-conversion/double-conversion-2.0.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast conversion between double precision floating point and text"
-HOMEPAGE="https://github.com/bos/double-conversion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to compare 0.0 with 0.0
-
-RDEPEND=">=dev-haskell/text-0.11.0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- sys-devel/gcc:*[cxx]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/double-conversion/metadata.xml b/dev-haskell/double-conversion/metadata.xml
deleted file mode 100644
index b662e3dbe08a..000000000000
--- a/dev-haskell/double-conversion/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library that performs fast, accurate conversion between double
- precision floating point and text.
-
- This library is implemented as bindings to the C++
- @double-conversion@ library written by Florian Loitsch at Google:
- &lt;http://code.google.com/p/double-conversion/&gt;.
-
- The 'Text' versions of these functions are about 30 times faster
- than the default 'show' implementation for the 'Double' type.
-
- The 'ByteString' versions are /slower/ than the 'Text' versions;
- roughly half the speed. (This seems to be due to the cost of
- allocating 'ByteString' values via @malloc@.)
-
- As a final note, be aware that the @bytestring-show@ package is
- about 50% slower than simply using 'show'.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/drbg/Manifest b/dev-haskell/drbg/Manifest
deleted file mode 100644
index 95c74888284a..000000000000
--- a/dev-haskell/drbg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DRBG-0.5.5.tar.gz 1547022 BLAKE2B ca70a605334a60a0c4fcb1bf55c5e2f30065e55387372bfe0068b4ffa69e79607432b5eeef395126c00801e45a39a34b94c96e526357c8bec6fce077484c1c15 SHA512 e71fc158a7961729ce10d2ca795a935d6a103f31e864f0446cc4faf2b0edb3a5938a4cc79135cf043a375e63f9be4401ce092951b4e8f47c1c3b1c2070c118be
diff --git a/dev-haskell/drbg/drbg-0.5.5.ebuild b/dev-haskell/drbg/drbg-0.5.5.ebuild
deleted file mode 100644
index 092def8c5f83..000000000000
--- a/dev-haskell/drbg/drbg-0.5.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="DRBG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers"
-HOMEPAGE="https://hackage.haskell.org/package/DRBG"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT=test # fails own tests
-
-RDEPEND=">=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/cipher-aes128-0.6:=[profile?]
- >=dev-haskell/crypto-api-0.13:=[profile?]
- >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?]
- dev-haskell/entropy:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- dev-haskell/parallel:=[profile?]
- dev-haskell/prettyclass:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/crypto-api-tests
- dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag test test)
-}
diff --git a/dev-haskell/drbg/metadata.xml b/dev-haskell/drbg/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/drbg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/easy-file/easy-file-0.2.2.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
index e396dc548411..6e7c1d70c461 100644
--- a/dev-haskell/easy-file/easy-file-0.2.2.ebuild
+++ b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 937381521944..fcbe62e67545 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">kazu-yamamoto/easy-file</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/echo/Manifest b/dev-haskell/echo/Manifest
index 6baae75f099a..f8fc2b0513fb 100644
--- a/dev-haskell/echo/Manifest
+++ b/dev-haskell/echo/Manifest
@@ -1 +1,2 @@
DIST echo-0.1.3.tar.gz 5373 BLAKE2B 3710de35b42e39f7ff9d2e5c2e32ae4c1e863f9ae844ada25dbb653aafd6ed261357c3b5046e9e0cabb03dd4de4f6252272a2b643087a61d1df5f26de329e588 SHA512 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f
+DIST echo-0.1.4.tar.gz 5501 BLAKE2B 948f5894bc67ab80423ac725c3202fcfb8e032ca73440f16c658486219ab63bd8181f1120a4bbd92834bb3a8695222cb5e3491d5dbd26045d012a90370b1a80a SHA512 25fa868be5cbbc96adb4457b0e6a2fb7060b889e0dead9acef21038fd438d1ca1ee3c57ee03d91f75271e97cfea71b1d3589f800af70e15cb8cee6a60e041477
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
index 4f0b6db6d698..6a5b274cefc7 100644
--- a/dev-haskell/echo/echo-0.1.3.ebuild
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -24,12 +24,9 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'process >= 1.0.1.1 && < 1.5' 'process >= 1.0.1.1'
-}
+CABAL_CHDEPS=(
+ 'process >= 1.0.1.1 && < 1.5' 'process >= 1.0.1.1'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/echo/echo-0.1.4-r1.ebuild b/dev-haskell/echo/echo-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..e79965cb0d4c
--- /dev/null
+++ b/dev-haskell/echo/echo-0.1.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A cross-platform, cross-console way to handle echoing terminal input"
+HOMEPAGE="https://github.com/RyanGlScott/echo"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+# Change example name to avoid name collisions
+CABAL_CHDEPS=(
+ 'executable password' 'executable haskell-echo-example'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples example)
+}
diff --git a/dev-haskell/echo/metadata.xml b/dev-haskell/echo/metadata.xml
index 9d0d8cfdb8a6..db0e8f939661 100644
--- a/dev-haskell/echo/metadata.xml
+++ b/dev-haskell/echo/metadata.xml
@@ -5,18 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The @base@ library exposes the @hGetEcho@ and @hSetEcho@ functions
- for querying and setting echo status, but unfortunately, neither
- function works with MinTTY consoles on Windows. This is a serious
- issue, since @hGetEcho@ and @hSetEcho@ are often used to disable
- input echoing when a program prompts for a password, so many
- programs will reveal your password as you type it on MinTTY!
-
- This library provides an alternative interface which works
- with both MinTTY and other consoles. An example is included
- which demonstrates how one might prompt for a password using
- this library. To build it, make sure to configure with the
- @-fexample@ flag.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">echo</remote-id>
+ <remote-id type="github">RyanGlScott/echo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/ed25519/Manifest b/dev-haskell/ed25519/Manifest
index 26abe3c2205e..a6bc774fb60f 100644
--- a/dev-haskell/ed25519/Manifest
+++ b/dev-haskell/ed25519/Manifest
@@ -1 +1,2 @@
+DIST ed25519-0.0.5.0-rev7.cabal 4166 BLAKE2B 8e86fedbb2731e1065786dd0e09ed1a0abb92ebc2f4f290dc5b2d59ad3cfa046d275d9cdc1c36c4d9006e4884c35f823c5a9de3881545f85d1fabf4ebc5a0bf4 SHA512 470430ef4a5a44c842f79cff8d0a632dfd43de500027e511fc17920262d881e310331e30d29c02bda9e2f84c1565fc00d795a7c1bf19a4bedf408366e6df8c7c
DIST ed25519-0.0.5.0.tar.gz 80034 BLAKE2B 4de73a76576bc63a7c5e4e8c0d195d48c65901ad417a306ca0001856a3a37975cfbb527dd466c2a737006e44e8d440e9831c360c8c3063b45a704af79c165cbb SHA512 cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild
new file mode 100644
index 000000000000..bd2c7ce0b63e
--- /dev/null
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
+
+CABAL_HACKAGE_REVISION=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Ed25519 cryptographic signatures"
+HOMEPAGE="https://thoughtpolice.github.com/hs-ed25519"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # bitrotten test suite
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+# test? (
+# >=dev-haskell/doctest-0.10 <dev-haskell/doctest-0.12
+# >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+# )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=no-donna \
+ --flag=test-doctests \
+ --flag=-test-hlint \
+ --flag=test-properties
+}
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
deleted file mode 100644
index 67ab4bd32f93..000000000000
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs update
-inherit haskell-cabal
-
-DESCRIPTION="Ed25519 cryptographic signatures"
-HOMEPAGE="http://thoughtpolice.github.com/hs-ed25519"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'ghc-prim >= 0.1 && < 0.5' 'ghc-prim >= 0.1' \
- 'doctest >= 0.10 && < 0.11' 'doctest >= 0.10' \
- 'QuickCheck >= 2.4 && < 2.9' 'QuickCheck >= 2.4' \
- 'directory >= 1.0 && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=no-donna \
- --flag=test-doctests \
- --flag=-test-hlint \
- --flag=test-properties
-}
diff --git a/dev-haskell/ed25519/metadata.xml b/dev-haskell/ed25519/metadata.xml
index 03e52cbfefbf..1b178c5d2d4d 100644
--- a/dev-haskell/ed25519/metadata.xml
+++ b/dev-haskell/ed25519/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides a simple, fast, self-contained copy of the
- Ed25519 public-key signature system with a clean interface. It also
- includes support for detached signatures, and thorough documentation
- on the design and implementation, including usage guidelines.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">ed25519</remote-id>
+ <remote-id type="github">thoughtpolice/hs-ed25519</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/edisonapi/Manifest b/dev-haskell/edisonapi/Manifest
deleted file mode 100644
index 85d68596a11e..000000000000
--- a/dev-haskell/edisonapi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST EdisonAPI-1.3.1.tar.gz 30512 BLAKE2B 7ed05eccc78814672538e3be05fa3d265cd883f080b3e0b10ef57a73473e26597c7c01673d842a9c16306ef67f17a5fed78b7a5060dfe73bbd68a5cdd4d9ea41 SHA512 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42
diff --git a/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild b/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
deleted file mode 100644
index 6469f7fa5423..000000000000
--- a/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonAPI"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficient, purely-functional data structures (API)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch b/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
deleted file mode 100644
index 81035f311357..000000000000
--- a/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-commit 8da6c0f7d8666766e2f0693425c347c0adb492dc
-Author: Andrés Sicard-Ramírez <asr@eafit.edu.co>
-Date: Thu Jul 4 18:15:17 2019 -0500
-
- Supported GHC 8.8.1.
-
- All changes were required by the MonadFail proposal.
-
-diff --git a/EdisonAPI.cabal b/EdisonAPI.cabal
-index 0f8f161..072cbd2 100644
---- a/EdisonAPI.cabal
-+++ b/EdisonAPI.cabal
-@@ -40,6 +40,8 @@ Library
- Build-Depends:
- base == 4.*,
- mtl >= 1.0
-+ if impl(ghc < 8.0)
-+ build-depends: fail
- Default-Language: Haskell2010
- Default-Extensions:
- MultiParamTypeClasses
-diff --git a/src/Data/Edison/Assoc.hs b/src/Data/Edison/Assoc.hs
-index fac1c59..3993dce 100644
---- a/src/Data/Edison/Assoc.hs
-+++ b/src/Data/Edison/Assoc.hs
-@@ -71,6 +71,8 @@ module Data.Edison.Assoc (
-
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
-
-+import qualified Control.Monad.Fail as Fail
-+
- import Data.Edison.Prelude
-
- import Data.Edison.Seq(Sequence)
-@@ -212,7 +214,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
- --
- -- This function is /ambiguous/ at finite relation types if the key appears
- -- more than once in the finite relation. Otherwise, it is /unambiguous/.
-- lookupM :: (Monad rm) => k -> m a -> rm a
-+ lookupM :: (Fail.MonadFail rm) => k -> m a -> rm a
-
- -- | Return all elements bound by the given key in an unspecified order.
- --
-@@ -236,7 +238,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
- --
- -- This function is /ambiguous/ at finite relation types if the key appears
- -- more than once in the finite relation. Otherwise, it is /unambiguous/.
-- lookupAndDeleteM :: (Monad rm) => k -> m a -> rm (a, m a)
-+ lookupAndDeleteM :: (Fail.MonadFail rm) => k -> m a -> rm (a, m a)
-
- -- | Find all elements bound by the given key; return a sequence containing
- -- all such bound elements in an unspecified order and the collection
-@@ -395,7 +397,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
- --
- -- This function is /ambiguous/ at finite relation types if the finite relation
- -- contains more than one minimum key. Otherwise it is /unambiguous/.
-- minView :: (Monad rm) => m a -> rm (a, m a)
-+ minView :: (Fail.MonadFail rm) => m a -> rm (a, m a)
-
- -- | Find the binding with the minimum key and return its element. Signals
- -- an error if the associative collection is empty. Which element is chosen
-@@ -426,7 +428,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
- --
- -- This function is /ambiguous/ at finite relation types if the finite relation
- -- contains more than one minimum key. Otherwise it is /unambiguous/.
-- maxView :: (Monad rm) => m a -> rm (a, m a)
-+ maxView :: (Fail.MonadFail rm) => m a -> rm (a, m a)
-
- -- | Find the binding with the maximum key and return its element. Signals
- -- an error if the associative collection is empty. Which element is chosen
-@@ -777,7 +779,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
- -- minimum key exists in the relation. Furthermore, it is /ambiguous/
- -- with respect to the actual key observed unless the @Eq@ instance on
- -- keys corresponds to indistinguisability.
-- minViewWithKey :: (Monad rm) => m a -> rm ((k, a), m a)
-+ minViewWithKey :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
-
- -- | Find the binding with the minimum key in an associative collection and
- -- return the key and the element. Signals an error if the associative
-@@ -800,7 +802,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
- -- maximum key exists in the relation. Furthermore, it is /ambiguous/
- -- with respect to the actual key observed unless the @Eq@ instance on
- -- keys corresponds to indistinguisability.
-- maxViewWithKey :: (Monad rm) => m a -> rm ((k, a), m a)
-+ maxViewWithKey :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
-
- -- | Find the binding with the maximum key in an associative collection and
- -- return the key and the element. Signals an error if the associative
-diff --git a/src/Data/Edison/Coll.hs b/src/Data/Edison/Coll.hs
-index 88ae755..be4df08 100644
---- a/src/Data/Edison/Coll.hs
-+++ b/src/Data/Edison/Coll.hs
-@@ -97,6 +97,7 @@ module Data.Edison.Coll (
- ) where
-
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
-
- import Data.Edison.Prelude
-@@ -421,7 +422,7 @@ class CollX c a => Coll c a | c -> a where
- -- This function is /ambiguous/ at bag types, when more than one
- -- element equivalent to the given item is in the bag. Otherwise
- -- it is /unambiguous/.
-- lookupM :: (Monad m) => a -> c -> m a
-+ lookupM :: (Fail.MonadFail m) => a -> c -> m a
-
- -- | Return a sequence containing all elements in the collection equal to
- -- the given element in an unspecified order.
-@@ -504,7 +505,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
- --
- -- This function is /ambiguous/ at bag types, if more than one minimum
- -- element exists in the bag. Otherwise, it is /unambiguous/.
-- minView :: (Monad m) => c -> m (a, c)
-+ minView :: (Fail.MonadFail m) => c -> m (a, c)
-
- -- | Return the minimum element in the collection. If there are multiple
- -- copies of the minimum element, it is unspecified which is chosen.
-@@ -523,7 +524,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
- --
- -- This function is /ambiguous/ at bag types, if more than one maximum
- -- element exists in the bag. Otherwise, it is /unambiguous/.
-- maxView :: (Monad m) => c -> m (a, c)
-+ maxView :: (Fail.MonadFail m) => c -> m (a, c)
-
- -- | Return the maximum element in the collection. If there are multiple
- -- copies of the maximum element, it is unspecified which is chosen.
-diff --git a/src/Data/Edison/Prelude.hs b/src/Data/Edison/Prelude.hs
-index 2ac6968..8281f46 100644
---- a/src/Data/Edison/Prelude.hs
-+++ b/src/Data/Edison/Prelude.hs
-@@ -10,14 +10,19 @@
- -- This module is a central depository of common definitions
- -- used throughout Edison.
-
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+
- module Data.Edison.Prelude (
- -- * Hashing classes
- Hash (..)
- , UniqueHash
- , ReversibleHash (..)
- , Measured (..)
-+-- * Pure MonadFail
-+, runFail_
- ) where
-
-+import Control.Monad.Fail
- import Data.Monoid
-
- -- | This class represents hashable objects. If obeys the
-@@ -62,3 +67,14 @@ class UniqueHash a => ReversibleHash a where
- -- the computation.
- class (Monoid v) => Measured v a | a -> v where
- measure :: a -> v
-+
-+-- From Agda source code: src/full/Agda/Utils/Fail.hs
-+-- | A pure MonadFail.
-+newtype Fail a = Fail { runFail :: Either String a }
-+ deriving (Functor, Applicative, Monad)
-+
-+instance MonadFail Fail where
-+ fail = Fail . Left
-+
-+runFail_ :: Fail a -> a
-+runFail_ = either error id . runFail
-diff --git a/src/Data/Edison/Seq.hs b/src/Data/Edison/Seq.hs
-index 78ca245..0394d58 100644
---- a/src/Data/Edison/Seq.hs
-+++ b/src/Data/Edison/Seq.hs
-@@ -58,6 +58,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
-
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
-
- import Data.Edison.Prelude
-@@ -221,7 +222,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( 1 )@
-- lview :: (Monad m) => s a -> m (a, s a)
-+ lview :: (Fail.MonadFail m) => s a -> m (a, s a)
-
- -- | Return the first element of a sequence.
- -- Signals an error if the sequence is empty.
-@@ -249,7 +250,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( 1 )@
-- lheadM :: (Monad m) => s a -> m a
-+ lheadM :: (Fail.MonadFail m) => s a -> m a
-
- -- | Delete the first element of the sequence.
- -- Signals error if sequence is empty.
-@@ -277,7 +278,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( 1 )@
-- ltailM :: (Monad m) => s a -> m (s a)
-+ ltailM :: (Fail.MonadFail m) => s a -> m (s a)
-
- -- | Separate a sequence into its last (rightmost) element and the
- -- remaining sequence. Calls 'fail' if the sequence is empty.
-@@ -291,7 +292,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( n )@
-- rview :: (Monad m) => s a -> m (a, s a)
-+ rview :: (Fail.MonadFail m) => s a -> m (a, s a)
-
- -- | Return the last (rightmost) element of the sequence.
- -- Signals error if sequence is empty.
-@@ -319,7 +320,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( n )@
-- rheadM :: (Monad m) => s a -> m a
-+ rheadM :: (Fail.MonadFail m) => s a -> m a
-
- -- | Delete the last (rightmost) element of the sequence.
- -- Signals an error if the sequence is empty.
-@@ -347,7 +348,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( n )@
-- rtailM :: (Monad m) => s a -> m (s a)
-+ rtailM :: (Fail.MonadFail m) => s a -> m (s a)
-
- -- | Returns 'True' if the sequence is empty and 'False' otherwise.
- --
-@@ -948,7 +949,7 @@ class (Functor s, MonadPlus s) => Sequence s where
- -- This function is always /unambiguous/.
- --
- -- Default running time: @O( i )@
-- lookupM :: (Monad m) => Int -> s a -> m a
-+ lookupM :: (Fail.MonadFail m) => Int -> s a -> m a
-
- -- | Return the element at the given index, or the
- -- default argument if the index is out of bounds. All indexes are
-diff --git a/src/Data/Edison/Seq/ListSeq.hs b/src/Data/Edison/Seq/ListSeq.hs
-index 1ad677f..890b66f 100644
---- a/src/Data/Edison/Seq/ListSeq.hs
-+++ b/src/Data/Edison/Seq/ListSeq.hs
-@@ -40,9 +40,9 @@ module Data.Edison.Seq.ListSeq (
- import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
- zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
--import qualified Control.Monad.Identity as ID
-+import qualified Control.Monad.Fail as Fail
- import qualified Prelude
--import Data.Edison.Prelude
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.List
- import Data.Monoid
- import qualified Data.Edison.Seq as S ( Sequence(..) )
-@@ -54,16 +54,16 @@ singleton :: a -> [a]
- lcons :: a -> [a] -> [a]
- rcons :: a -> [a] -> [a]
- append :: [a] -> [a] -> [a]
--lview :: (Monad rm) => [a] -> rm (a, [a])
-+lview :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
- lhead :: [a] -> a
--lheadM :: (Monad rm) => [a] -> rm a
-+lheadM :: (Fail.MonadFail rm) => [a] -> rm a
- ltail :: [a] -> [a]
--ltailM :: (Monad rm) => [a] -> rm [a]
--rview :: (Monad rm) => [a] -> rm (a, [a])
-+ltailM :: (Fail.MonadFail rm) => [a] -> rm [a]
-+rview :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
- rhead :: [a] -> a
--rheadM :: (Monad rm) => [a] -> rm a
-+rheadM :: (Fail.MonadFail rm) => [a] -> rm a
- rtail :: [a] -> [a]
--rtailM :: (Monad rm) => [a] -> rm [a]
-+rtailM :: (Fail.MonadFail rm) => [a] -> rm [a]
- null :: [a] -> Bool
- size :: [a] -> Int
- concat :: [[a]] -> [a]
-@@ -92,7 +92,7 @@ reduce1' :: (a -> a -> a) -> [a] -> a
- copy :: Int -> a -> [a]
- inBounds :: Int -> [a] -> Bool
- lookup :: Int -> [a] -> a
--lookupM :: (Monad m) => Int -> [a] -> m a
-+lookupM :: (Fail.MonadFail m) => Int -> [a] -> m a
- lookupWithDefault :: a -> Int -> [a] -> a
- update :: Int -> a -> [a] -> [a]
- adjust :: (a -> a) -> Int -> [a] -> [a]
-@@ -252,7 +252,7 @@ inBounds i xs
- | i >= 0 = not (null (drop i xs))
- | otherwise = False
-
--lookup i xs = ID.runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
-
- lookupM i xs
- | i < 0 = fail "ListSeq.lookup: not found"
diff --git a/dev-haskell/edisonapi/metadata.xml b/dev-haskell/edisonapi/metadata.xml
deleted file mode 100644
index 974acb251515..000000000000
--- a/dev-haskell/edisonapi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Edison is a library of purely functional data structures written by
- Chris Okasaki. It is named after Thomas Alva Edison and for the
- mnemonic value EDiSon (Efficent Data Structures).
- Edison provides several families of abstractions, each with
- multiple implementations. The main abstractions provided by Edison are:
- Sequences such as stacks, queues, and dequeues;
- Collections such as sets, bags and heaps; and
- Associative Collections such as finite maps and priority queues
- where the priority and element are distinct.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
deleted file mode 100644
index a583e0ce2d10..000000000000
--- a/dev-haskell/edisoncore/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
-DIST edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
deleted file mode 100644
index 7dfca738778e..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="
- https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz
- https://dev.gentoo.org/~sam/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
-"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${DISTDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisoncore/metadata.xml b/dev-haskell/edisoncore/metadata.xml
deleted file mode 100644
index 740196cfe902..000000000000
--- a/dev-haskell/edisoncore/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides the core Edison data structure implementations,
- including multiple sequence, set, bag, and finite map concrete
- implementations with various performance characteristics. The
- implementations in this package have no dependencies other than those
- commonly bundled with Haskell compilers.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edit-distance-vector/Manifest b/dev-haskell/edit-distance-vector/Manifest
deleted file mode 100644
index aaa317c3b3af..000000000000
--- a/dev-haskell/edit-distance-vector/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST edit-distance-vector-1.0.0.4.tar.gz 5819 BLAKE2B 8658c52e64e704dd5c52bae0e63ae0b4d84c88d6cb1e3ecdafb05191dc70e3dfdec34001b2c287ec62703eb7ecdbac9b127b3dd084bc4e484e70cd778d31913f SHA512 8d7ef7c6ca971aec5efc2e90adff2584c1e4f996df3ad4f6111f790fd88fcce1814111eb3a3bbe07d8455b03ade98f11e6343c4746e895be2ba9b82a86a33e6d
diff --git a/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild b/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
deleted file mode 100644
index e61c98b7c569..000000000000
--- a/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate edit distances and edit scripts between vectors"
-HOMEPAGE="https://github.com/thsutton/edit-distance-vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/quickcheck
- dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/edit-distance-vector/metadata.xml b/dev-haskell/edit-distance-vector/metadata.xml
deleted file mode 100644
index 4a106d34464e..000000000000
--- a/dev-haskell/edit-distance-vector/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- An implementation of the Wagner-Fischer dynamic programming algorithm to
- find the optimal edit script and cost between two sequences.
-
- The implementation in this package is specialised to sequences represented
- with "Data.Vector" but is otherwise agnostic to:
-
- * The type of values in the vectors;
-
- * The type representing edit operations; and
-
- * The type representing the cost of operations.
-
- </longdescription>
-</pkgmetadata>
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 30e1b8aee32d..a1a1bdefc150 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-haskell/random-1.0:=[profile?]
@@ -27,9 +27,6 @@ DEPEND="${RDEPEND}
dev-haskell/test-framework-quickcheck2 )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
-}
+CABAL_CHDEPS=(
+ 'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
+)
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index 937381521944..aeaa481635c7 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">haskellari/edit-distance</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/editline/Manifest b/dev-haskell/editline/Manifest
deleted file mode 100644
index dcdf19288b00..000000000000
--- a/dev-haskell/editline/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST editline-0.2.1.1.tar.gz 47240 BLAKE2B 7bd9d4d894856653e14a3ebde954ad17bb8b8e3ec03151edf8107c0ad5095e9bd467fa737d8b6af00fbe50da3fef54521e2ec32c214a6362df27e3f0137c0f6c SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6
diff --git a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
deleted file mode 100644
index b7d24228f2c3..000000000000
--- a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Bindings to the editline library (libedit)"
-HOMEPAGE="http://code.haskell.org/editline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
- dev-libs/libedit"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc-7.8.patch
- "${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
- default
- eautoconf
-
- # default file, not compatible to cabal-3
- rm Setup.lhs || die
-
- cabal_chdeps \
- 'base < 4.7' 'base'
-}
diff --git a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch b/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
deleted file mode 100644
index 4a55ecd5626b..000000000000
--- a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/System/Console/Editline/Readline.hsc b/System/Console/Editline/Readline.hsc
-index 1ea9d6c..3b95b59 100644
---- a/System/Console/Editline/Readline.hsc
-+++ b/System/Console/Editline/Readline.hsc
-@@ -173,7 +173,7 @@ import Foreign.Marshal.Array ( mallocArray, peekArray0, pokeArray0 )
- import Foreign.C.Types ( CInt(..), CChar, CFile )
- import Foreign.C.String ( newCString, peekCString, withCString,
- castCharToCChar, castCCharToChar )
--import GHC.Handle ( fdToHandle )
-+import GHC.IO.Handle.FD ( fdToHandle )
-
- {-# CFILES HsReadline_cbits.c #-}
-
diff --git a/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch b/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch
deleted file mode 100644
index 2f073b6a2c72..000000000000
--- a/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/689988
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,8 @@ dnl does it.
- AC_CHECK_LIB(curses, tgetent, HaveLibTermcap=YES; LibTermcap=curses,
- [AC_CHECK_LIB(ncurses, tgetent, HaveLibTermcap=YES; LibTermcap=ncurses,
- [AC_CHECK_LIB(termcap, tgetent, HaveLibTermcap=YES; LibTermcap=termcap,
-- HaveLibTermcap=NO; LibTermcap=not-installed)])])
-+ [AC_CHECK_LIB(tinfo, tgetent, HaveLibTermcap=YES; LibTermcap=tinfo,
-+ HaveLibTermcap=NO; LibTermcap=not-installed)])])])
-
- if test "x$HaveLibTermcap" = xYES ; then
- HaveLibEdit=YES
diff --git a/dev-haskell/editline/metadata.xml b/dev-haskell/editline/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/editline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/either/Manifest b/dev-haskell/either/Manifest
deleted file mode 100644
index 15ac212c5c03..000000000000
--- a/dev-haskell/either/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST either-5.0.1.1.tar.gz 10162 BLAKE2B c3489b2957a8c0081cfeecbf5ed247417c0e1f52fdaeaedcc4eb757d31574f17cdcb02a2c1808aa4aeea7a2f8b177f959f58b799039cbcef0b6ec875a620ee06 SHA512 96b23a9d5f1d2d4dd256251c488e06fa0e8642d849cf61c9de2a4089d2cbe86763062e69f83344eba2f75b30992f3e90ec195bd054f8de386c4c6b477a025c01
diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1.ebuild
deleted file mode 100644
index 0918386df358..000000000000
--- a/dev-haskell/either/either-5.0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
- >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/either/metadata.xml b/dev-haskell/either/metadata.xml
deleted file mode 100644
index 8d649d0e9768..000000000000
--- a/dev-haskell/either/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ekmett/either</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
deleted file mode 100644
index d1e49c514d55..000000000000
--- a/dev-haskell/ekg-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ekg-core-0.1.1.7.tar.gz 13612 BLAKE2B d630fca0277890b6798c28ae83339d4de8491439edbe1ffbdb09177d382b9e3bb2f2ff43c12741061ae78e8c7e2b8bf499bb5748721df3378b3e78d19a5004bb SHA512 68915d62d7851ff99877a478b948ed119462883463949f551a0d94efa60209f734af0578b1437fcefead3e2cc80570d1a844f6be3b5b90b2fc804f9c85aaca90
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
deleted file mode 100644
index 18d209e7e28c..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.6 && < 4.14' 'base >= 4.6' \
- 'ghc-prim < 0.6' 'ghc-prim'
-}
diff --git a/dev-haskell/ekg-core/metadata.xml b/dev-haskell/ekg-core/metadata.xml
deleted file mode 100644
index 20c8aaea4064..000000000000
--- a/dev-haskell/ekg-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">tibbe/ekg-core</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
deleted file mode 100644
index bb515fd7487f..000000000000
--- a/dev-haskell/ekg-json/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ekg-json-0.1.0.6.tar.gz 3094 BLAKE2B ea5755f2cabb8c898a6632fdf0cebca99a8eccc4a9ba2e3f844781d029b5c11d618c67bbcadbece93a69e092c03cfedef7e435fbed2998497ab44ab034a82a34 SHA512 c1996214f3d41202dd51a3bf335fa6c67488a3b3625acba196839bef36eff1443907c010b6887845cf759addc769b45d1bcc648554bb2a7942a13337cf40c60e
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
deleted file mode 100644
index d6e52f813839..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?]
- >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.11' 'base >= 4.5' \
- 'aeson >=0.4 && < 1.3' 'aeson >=0.4'
-}
diff --git a/dev-haskell/ekg-json/metadata.xml b/dev-haskell/ekg-json/metadata.xml
deleted file mode 100644
index 4d56c8fa3b8b..000000000000
--- a/dev-haskell/ekg-json/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Encodes ekg metrics as JSON, using the same encoding as used by the
- ekg package, thus allowing ekg metrics to be served by other HTTP
- servers than the one used by the ekg package.
- </longdescription>
- <upstream>
- <remote-id type="github">tibbe/ekg-json</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg/Manifest b/dev-haskell/ekg/Manifest
deleted file mode 100644
index b612ac18b39e..000000000000
--- a/dev-haskell/ekg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ekg-0.4.0.15.tar.gz 171305 BLAKE2B 41184045d138f0dc8a925c81d1c15b09b0af10e5dfe80600206bbb4b4cb460521fa71fb09ca2cc32fe4abad28e38183a2f8a168c4ea22c22e3ffdf4668693fc3 SHA512 da7f776e8eedcf0d038495535ca2953d0d813a8a90c2bdb18898932d59ce1b2181e66f06188afea95c14e8b9910b5d6a07930952b2172f67e1bf5b94dbb4967f
diff --git a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild b/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
deleted file mode 100644
index 533c5a2cd191..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:=
- >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
- >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?]
- <dev-haskell/network-3.2:=[profile?]
- <dev-haskell/snap-core-1.1:=[profile?]
- <dev-haskell/snap-server-1.2:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-src_prepare() {
- default
-
- # As per https://hackage.haskell.org/package/ekg-0.4.0.15/revisions/
- cabal_chdeps \
- 'base >= 4.5 && < 4.12' 'base >=4.5' \
- 'aeson >= 0.4 && < 1.3' 'aeson >= 0.4' \
- 'network < 2.7' 'network' \
- 'time < 1.9' 'time'
-}
diff --git a/dev-haskell/ekg/metadata.xml b/dev-haskell/ekg/metadata.xml
deleted file mode 100644
index c5d86409f641..000000000000
--- a/dev-haskell/ekg/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library lets you remotely monitor a running process over HTTP.
- It provides a simple way to integrate a monitoring server into any
- application.
- </longdescription>
- <upstream>
- <remote-id type="github">tibbe/ekg</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index b5bc8cca6768..ed0e6d7a6534 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1 +1,2 @@
-DIST email-validate-2.3.2.13.tar.gz 9635 BLAKE2B fecdc9017dcb00847662043774920b09e65a24876efdc1248f24b942bbd79b9d6b79640b479bbbf44c2d80349cfc3511b63884f4e3947949346773dbca9c8a06 SHA512 22cf7517ae38aa264198288449946cc7da6bda7f799a652050de9544c9e07c5bbe6bf8c8b53526be227288214bf3144055effd858fb993704942eeda3410ba3d
+DIST email-validate-2.3.2.15.tar.gz 9568 BLAKE2B 1ff8c3e5ce71f3ff39dec02e0cbc211ffea3386646a77b2c176cc0af47a61d13996b2bb68d36e77ccf3114c53facc9b121202cc5d70916a4aa2992fa3956a60e SHA512 0b852771cdf0851bc7024fbb612488bd7721cbce25b551f52932b234e57bc70ded2e5904853f2ca0f68cfb9da02057d4a1903d081ce81a382cf90d0d3ba25001
+DIST email-validate-2.3.2.19.tar.gz 9446 BLAKE2B 596619fc70b8f48d01af57b02ae05f88ab0b47b706c93cc533ebe4f9541399122c48b8444f006d3c8630cfa6b22af838d347526cea2b039013315c4c46d1bc15 SHA512 0a4ad0579cbcf18920703bb12eb296280b6f8dffd57ceefc7fb211ca48e792d17ea8fa37dc4a256a26f01816eb812081b571325803ceb64a7b9d7ae748526b09
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
deleted file mode 100644
index 18fbf2c80376..000000000000
--- a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Email address validation"
-HOMEPAGE="https://github.com/Porges/email-validate-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17
- >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 )
-"
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
new file mode 100644
index 000000000000..728adbf91c85
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.2.15-fix-doctest.patch" )
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/doctest-0.8
+ >=dev-haskell/hspec-2.2.3
+ >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 )
+"
+
+CABAL_CHDEPS=(
+ 'hspec >= 2.2.3 && < 2.9' 'hspec >= 2.2.3'
+ 'doctest >= 0.8 && < 0.19' 'doctest >=0.8'
+ 'template-haskell >= 2.10.0.0 && < 2.18' 'template-haskell >=2.10'
+)
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.19.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.19.ebuild
new file mode 100644
index 000000000000..32b9164dfe5a
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.12
+ >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+ )
+"
diff --git a/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch b/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch
new file mode 100644
index 000000000000..d60b0c6a7844
--- /dev/null
+++ b/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch
@@ -0,0 +1,26 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1231
+
+Small fix to get doctest working
+
+diff -urN email-validate-2.3.2.15/src/Text/Email/QuasiQuotation.hs email-validate-2.3.2.15-r1/src/Text/Email/QuasiQuotation.hs
+--- email-validate-2.3.2.15/src/Text/Email/QuasiQuotation.hs 2021-07-04 14:50:48.000000000 -0600
++++ email-validate-2.3.2.15-r1/src/Text/Email/QuasiQuotation.hs 2022-03-17 17:33:15.666925125 -0600
+@@ -4,6 +4,7 @@
+ #else
+ {-# LANGUAGE TemplateHaskell #-}
+ #endif
++{-# LANGUAGE PackageImports #-}
+
+ module Text.Email.QuasiQuotation
+ ( email
+@@ -11,7 +12,7 @@
+
+ import qualified Data.ByteString.Char8 as BS8
+
+-import Language.Haskell.TH.Quote (QuasiQuoter(..))
++import "template-haskell" Language.Haskell.TH.Quote (QuasiQuoter(..))
+
+ import Text.Email.Validate (validate, localPart, domainPart, unsafeEmailAddress)
+
diff --git a/dev-haskell/email-validate/metadata.xml b/dev-haskell/email-validate/metadata.xml
index 937381521944..eee47cac0b27 100644
--- a/dev-haskell/email-validate/metadata.xml
+++ b/dev-haskell/email-validate/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">email-validate</remote-id>
+ <remote-id type="github">Porges/email-validate-hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/emojis/Manifest b/dev-haskell/emojis/Manifest
index 95fd69c11692..7dd795025b3f 100644
--- a/dev-haskell/emojis/Manifest
+++ b/dev-haskell/emojis/Manifest
@@ -1 +1,2 @@
-DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
+DIST emojis-0.1.2.tar.gz 49333 BLAKE2B c67e578cd356c2e7edc4f7880dc3235eff33dd98f773a24c4791442c4d0243b59cd775d8fb2bf4c53c6943434f340104183a99544d16a6d6c8f56c7d0d402dd3 SHA512 e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d
+DIST emojis-0.1.3.tar.gz 50494 BLAKE2B 98130715f21c11fd463952ef8a2e4e4d85ddde4b0380351b83821c8ed62649793d4adb0c0a45e99d288ee954cdd3247fa4fdf22f82d016e9fbf6baf87854b59a SHA512 b9552e8be60a84282d7ce160ecdedb0fdc7549b01ea207d4bb1fd5327163c3cb75762ed6b16f2832841e3258a9b85718ea5a0ec6801c53c395f5ff070a31fe07
diff --git a/dev-haskell/emojis/emojis-0.1.2.ebuild b/dev-haskell/emojis/emojis-0.1.2.ebuild
new file mode 100644
index 000000000000..e900ffa0a34c
--- /dev/null
+++ b/dev-haskell/emojis/emojis-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between emoji characters and their names"
+HOMEPAGE="https://github.com/jgm/emojis#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/emojis/emojis-0.1.3.ebuild b/dev-haskell/emojis/emojis-0.1.3.ebuild
new file mode 100644
index 000000000000..705dc0dcb102
--- /dev/null
+++ b/dev-haskell/emojis/emojis-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between emoji characters and their names"
+HOMEPAGE="https://github.com/jgm/emojis#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.ebuild
deleted file mode 100644
index 7b74ee4c2e43..000000000000
--- a/dev-haskell/emojis/emojis-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between emoji characters and their names"
-HOMEPAGE="https://github.com/jgm/emojis#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
diff --git a/dev-haskell/emojis/metadata.xml b/dev-haskell/emojis/metadata.xml
index c1f9bb5934f4..7a08a8701db1 100644
--- a/dev-haskell/emojis/metadata.xml
+++ b/dev-haskell/emojis/metadata.xml
@@ -5,18 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides functions for converting
- emoji names to emoji characters and vice versa.
-
- How does it differ from the @emoji@ package?
-
- - It supports a fuller range of emojis, including all those
- supported by GitHub
- - It supports lookup of emoji aliases from emoji
- - It uses Text rather than String
- - It has a lighter dependency footprint: in particular, it
- does not require aeson
- - It does not require TemplateHaskell
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">emojis</remote-id>
+ <remote-id type="github">jgm/emojis</remote-id>
+ </upstream>
</pkgmetadata>
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 4d881d42a520..23dc546eb2f4 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
index 1297b08b5444..da4dd15454f2 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -1 +1,3 @@
+DIST entropy-0.4.1.10-rev1.cabal 2952 BLAKE2B f47134454269b5fbb554feec81ff6eccd66290fedd2615ea424ffe4dbaa955930310c575c64b006e6827586724bdc9358fadaf1f54ecfa0d872b3852556f07d6 SHA512 d384d2aeb12d2484455b4be8ee68f9a29dcdd949e62aa0f9baf81d9326cd189d6938b7baf35b0db0e70e2a954a9677611a6193607ede3366d26351c7ee74efc6
+DIST entropy-0.4.1.10.tar.gz 9060 BLAKE2B f1f9d80af0e8ad7d9bf34f8d13af6323ac530ec294d5d7ea5484cddf087b271638daf25f8b119ce426bfebae4f9d5d2a430b316fc4c01c5b282ff6a0a0bda9e6 SHA512 521dded7ae41cc532993236d0ced394f98f495c0c8950201064d17430ee6599d9cd6f3a4f17a19429396ee4a34a3fa17b39af49f4fee730efdae3d42d134c96e
DIST entropy-0.4.1.6.tar.gz 9464 BLAKE2B 484e72ba8b6413b6205db4660f52d183dcd075bce836de6b339e2019d584a90b9f650d6b808b46855c9a423e41f21d814e10026efec050f507edc68106568893 SHA512 201a75efe210be5728a1c94ba9ec62514b96c388b6791d9301b34d2fce0208a9fa4ef25965c7840d052fd6221f15a1bec196a6eb209e6d03c3e1f971161df1b1
diff --git a/dev-haskell/entropy/entropy-0.4.1.10.ebuild b/dev-haskell/entropy/entropy-0.4.1.10.ebuild
new file mode 100644
index 000000000000..ac64d0821c9e
--- /dev/null
+++ b/dev-haskell/entropy/entropy-0.4.1.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A platform independent entropy source"
+HOMEPAGE="https://github.com/TomMD/entropy"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="donotgetentropy"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0 <dev-haskell/cabal-3.11
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag donotgetentropy donotgetentropy)
+}
diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
new file mode 100644
index 000000000000..997952325dbb
--- /dev/null
+++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A platform independent entropy source"
+HOMEPAGE="https://github.com/TomMD/entropy"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="halvm"
+
+RDEPEND=">=dev-lang/ghc-7.10.1:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
+
+CABAL_CHDEPS=(
+ 'Cabal >= 1.10 && < 3.3' 'Cabal >= 1.10'
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag halvm halvm)
+}
diff --git a/dev-haskell/entropy/entropy-0.4.1.6.ebuild b/dev-haskell/entropy/entropy-0.4.1.6.ebuild
deleted file mode 100644
index f7b946c45c95..000000000000
--- a/dev-haskell/entropy/entropy-0.4.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="halvm"
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag halvm halvm)
-}
diff --git a/dev-haskell/entropy/metadata.xml b/dev-haskell/entropy/metadata.xml
index 7c276f275a7c..9cfa8f15bfcb 100644
--- a/dev-haskell/entropy/metadata.xml
+++ b/dev-haskell/entropy/metadata.xml
@@ -5,16 +5,16 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A platform independent method to obtain cryptographically strong entropy
- (RDRAND when available anywhere, urandom on nix, CryptAPI on Windows, patches welcome).
- Users looking for cryptographically strong (number-theoretically
- sound) PRNGs should see the 'DRBG' package too.
- </longdescription>
<use>
+ <flag name="donotgetentropy">
+ Avoid use of the getentropy() *nix function. By default
+ getentropy will be used if detected during compilation
+ (this plays poorly with cross compilation).
+ </flag>
<flag name="halvm">Build for the HaLVM.</flag>
</use>
<upstream>
+ <remote-id type="hackage">entropy</remote-id>
<remote-id type="github">TomMD/entropy</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/enumerator/Manifest b/dev-haskell/enumerator/Manifest
deleted file mode 100644
index 012687f5d414..000000000000
--- a/dev-haskell/enumerator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enumerator-0.4.20.tar.gz 53986 BLAKE2B dcb98c31e862194f712c2fe23193557c837d5ba658b89ea50005c2e62d2080d06740793fd4e4629d8dab5000062ef2e3908fea7071ca499e8a2e3f7ca0c1d085 SHA512 90711142b61cee2184420f4d5c9de9563afe6198cccbf5d9d8a75253b307c3df9fee388dc7770e8151f8d7b5570afdb30d8e4e597ce462302dda8430e64050ad
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
deleted file mode 100644
index c8d35ee60ce3..000000000000
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, high-performance processing with left-fold enumerators"
-HOMEPAGE="https://john-millikin.com/software/enumerator/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
deleted file mode 100644
index d992228d2e5c..000000000000
--- a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/enumerator.cabal
-+++ b/enumerator.cabal
-@@ -152,2 +152,5 @@ library
-
-+ if !impl(ghc >= 8.0)
-+ build-depends: semigroups == 0.18.*
-+
- exposed-modules:
---- a/lib/Data/Enumerator/Internal.hs
-+++ b/lib/Data/Enumerator/Internal.hs
-@@ -50,2 +50,3 @@ import Data.Function (fix)
- import Data.Monoid (Monoid, mempty, mappend, mconcat)
-+import qualified Data.Semigroup as S
-
-@@ -73,2 +74,6 @@ instance Monad Stream where
-
-+instance S.Semigroup (Stream a) where
-+ (<>) (Chunks xs) (Chunks ys) = Chunks (xs ++ ys)
-+ (<>) _ _ = EOF
-+
- instance Monoid (Stream a) where
diff --git a/dev-haskell/enumerator/metadata.xml b/dev-haskell/enumerator/metadata.xml
deleted file mode 100644
index 3e0ee48d3525..000000000000
--- a/dev-haskell/enumerator/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Typical buffer&amp;#x2013;based incremental I/O is based around a single loop,
- which reads data from some source (such as a socket or file), transforms
- it, and generates one or more outputs (such as a line count, HTTP
- responses, or modified file). Although efficient and safe, these loops are
- all single&amp;#x2013;purpose; it is difficult or impossible to compose
- buffer&amp;#x2013;based processing loops.
-
- Haskell&amp;#x2019;s concept of &amp;#x201C;lazy I/O&amp;#x201D; allows pure code to
- operate on data from an external source. However, lazy I/O has several
- shortcomings. Most notably, resources such as memory and file handles can
- be retained for arbitrarily long periods of time, causing unpredictable
- performance and error conditions.
-
- Enumerators are an efficient, predictable, and safe alternative to lazy
- I/O. Discovered by Oleg Kiselyov, they allow large datasets to be processed
- in near&amp;#x2013;constant space by pure code. Although somewhat more complex
- to write, using enumerators instead of lazy I/O produces more correct
- programs.
-
- This library contains an enumerator implementation for Haskell, designed to
- be both simple and efficient. Three core types are defined, along with
- numerous helper functions:
-
- * /Iteratee/: Data sinks, analogous to left folds. Iteratees consume
- a sequence of /input/ values, and generate a single /output/ value.
- Many iteratees are designed to perform side effects (such as printing to
- @stdout@), so they can also be used as monad transformers.
-
- * /Enumerator/: Data sources, which generate input sequences. Typical
- enumerators read from a file handle, socket, random number generator, or
- other external stream. To operate, enumerators are passed an iteratee, and
- provide that iteratee with input until either the iteratee has completed its
- computation, or EOF.
-
- * /Enumeratee/: Data transformers, which operate as both enumerators and
- iteratees. Enumeratees read from an /outer/ enumerator, and provide the
- transformed data to an /inner/ iteratee.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/equivalence/Manifest b/dev-haskell/equivalence/Manifest
deleted file mode 100644
index d851ad88d02f..000000000000
--- a/dev-haskell/equivalence/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST equivalence-0.3.5.tar.gz 8313 BLAKE2B 779fb3c57f7a9f06f18349b94d6afbcca8aa442af1426a513f47718bbf76e9202f10fb6f76cff693f8e9fe72b68bd04a1198d9ef52643dce6049e010384b3ac2 SHA512 f8a073c9ddc49a8c1d60a280b84f97947a23ed6a021b92d4028100ed308cf1dfcd0b26889a6cbbde0e77f00b777b2d1af0fa2410422641e0a03395692a9ebefc
diff --git a/dev-haskell/equivalence/equivalence-0.3.5.ebuild b/dev-haskell/equivalence/equivalence-0.3.5.ebuild
deleted file mode 100644
index a0f7e03b7d52..000000000000
--- a/dev-haskell/equivalence/equivalence-0.3.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://github.com/pa-ba/equivalence"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?]
- >=dev-haskell/stmonadtrans-0.4.3:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2 )
-"
diff --git a/dev-haskell/equivalence/metadata.xml b/dev-haskell/equivalence/metadata.xml
deleted file mode 100644
index 63301e7efb50..000000000000
--- a/dev-haskell/equivalence/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is an implementation of Tarjan's Union-Find algorithm (Robert
- E. Tarjan. "Efficiency of a Good But Not Linear Set Union
- Algorithm", JACM 22(2), 1975) in order to maintain an equivalence
- relation.
- This implementation is a port of the /union-find/ package using the
- ST monad transformer (instead of the IO monad).
- </longdescription>
- <upstream>
- <remote-id type="bitbucket">paba/equivalence</remote-id>
- </upstream>
-</pkgmetadata>
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 576c8c059cfd..2366ffe04800 100644
--- a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
+++ b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# ebuild generated by hackport 0.4.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="The error function, erf, and related functions"
HOMEPAGE="https://hackage.haskell.org/package/erf"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
"
DEPEND="${RDEPEND}
- dev-haskell/cabal
+ >=dev-haskell/cabal-3.0.0.0
"
diff --git a/dev-haskell/erf/metadata.xml b/dev-haskell/erf/metadata.xml
index 937381521944..48d1cb487e62 100644
--- a/dev-haskell/erf/metadata.xml
+++ b/dev-haskell/erf/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">erf</remote-id>
+ </upstream>
</pkgmetadata>
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 e63ef2b19c3e..df97563f60b1 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-orphans:=[profile?]
diff --git a/dev-haskell/errors/Manifest b/dev-haskell/errors/Manifest
index 7371edafb5a3..922370452f67 100644
--- a/dev-haskell/errors/Manifest
+++ b/dev-haskell/errors/Manifest
@@ -1 +1,2 @@
+DIST errors-2.3.0-rev4.cabal 1443 BLAKE2B 0aa39605b9138ba7becdbf36a78f761484a4dd11b4674c195f212d35132e2ce7933e197df7b3fdc3c1dbf5e798bca8758af63a1d6b4b1a43a6ff0e9e4ba9f9a3 SHA512 b6253614337376750f886e37e1663097b2a5f434784bf42f42c32eb857f87740f88930e36d34badcb320abf11b71bddcba42570c7222808ecf4ad377d20452c0
DIST errors-2.3.0.tar.gz 9184 BLAKE2B 7a44adaa0dfb5ba623df16b79db469804def23ea8d00ed2b6cbc5995c75b79ef72de095e333428525a1ac5e24cf7bcc81346eb319ad7d343e5d58af2a8449e2c SHA512 dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
diff --git a/dev-haskell/errors/errors-2.3.0-r1.ebuild b/dev-haskell/errors/errors-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..0a31bf09b5d3
--- /dev/null
+++ b/dev-haskell/errors/errors-2.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simplified error-handling"
+HOMEPAGE="https://hackage.haskell.org/package/errors"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/errors/errors-2.3.0.ebuild b/dev-haskell/errors/errors-2.3.0.ebuild
index 7dd91e3a8926..00e0e7924135 100644
--- a/dev-haskell/errors/errors-2.3.0.ebuild
+++ b/dev-haskell/errors/errors-2.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/errors/metadata.xml b/dev-haskell/errors/metadata.xml
index e00d59d5eb02..c409a0d89779 100644
--- a/dev-haskell/errors/metadata.xml
+++ b/dev-haskell/errors/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The one-stop shop for all your error-handling needs! Just import
- "Control.Error".
-
- This library encourages an error-handling style that directly uses the type
- system, rather than out-of-band exceptions.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">errors</remote-id>
+ <remote-id type="github">Gabriella439/Haskell-Errors-Library</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
deleted file mode 100644
index d5e9d4990502..000000000000
--- a/dev-haskell/esqueleto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST esqueleto-3.3.4.0.tar.gz 91243 BLAKE2B cf2741a6b4887216072985ebd9752a5e1380607d912ca98da018f530aa74863c62a9d6d5ba311ca156cc4aa06c10250e693807121c2a279433e9063085e4bdc9 SHA512 e120c656bf7b6029cf4833cfbeadab516dcd66bb4c27cf834a95a53f333193095c6e9921b2b230608aa052fd6b181a0ae2bd371575509b0bb269d8bd239dbfd2
diff --git a/dev-haskell/esqueleto/esqueleto-3.3.4.0.ebuild b/dev-haskell/esqueleto/esqueleto-3.3.4.0.ebuild
deleted file mode 100644
index 72c7e224d40c..000000000000
--- a/dev-haskell/esqueleto/esqueleto-3.3.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/bitemyapp/esqueleto"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tries to access network
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- >=dev-haskell/attoparsec-0.13:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- dev-haskell/blaze-html:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
- >=dev-haskell/resourcet-1.2:=[profile?]
- >=dev-haskell/tagged-0.2:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- dev-haskell/unliftio:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/exceptions
- dev-haskell/hspec
- dev-haskell/mtl
- dev-haskell/mysql
- dev-haskell/mysql-simple
- dev-haskell/persistent-mysql
- >=dev-haskell/persistent-postgresql-2.10.0 <dev-haskell/persistent-postgresql-2.11
- dev-haskell/persistent-sqlite
- dev-haskell/persistent-template
- dev-haskell/postgresql-libpq
- dev-haskell/postgresql-simple
- dev-haskell/vector )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-mysql \
- --flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/metadata.xml b/dev-haskell/esqueleto/metadata.xml
deleted file mode 100644
index 7e335b4c5bb0..000000000000
--- a/dev-haskell/esqueleto/metadata.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- @persistent@ is a library for type-safe data serialization. It
- has many kinds of backends, such as SQL backends
- (@persistent-mysql@, @persistent-postgresql@,
- @persistent-sqlite@) and NoSQL backends (@persistent-mongoDB@).
-
- While @persistent@ is a nice library for storing and retrieving
- records, currently it has a poor interface for SQL backends
- compared to SQL itself. For example, it's extremely hard to do
- a type-safe @JOIN@ on a many-to-one relation, and simply
- impossible to do any other kinds of @JOIN@s (including for the
- very common many-to-many relations). Users have the option of
- writing raw SQL, but that's error prone and not type-checked.
-
- @esqueleto@ is a bare bones, type-safe EDSL for SQL queries
- that works with unmodified @persistent@ SQL backends. Its
- language closely resembles SQL, so (a) you don't have to learn
- new concepts, just new syntax, and (b) it's fairly easy to
- predict the generated SQL and optimize it for your backend.
- Most kinds of errors committed when writing SQL are caught as
- compile-time errors---although it is possible to write
- type-checked @esqueleto@ queries that fail at runtime.
-
- Currently only @SELECT@s are supported. Not all SQL features
- are available, but most of them can be easily added (especially
- functions), so please open an issue or send a pull request if
- you need anything that is not covered by @esqueleto@ on
- &lt;https://github.com/meteficha/esqueleto/&gt;.
-
- The name of this library means \"skeleton\" in Portuguese and
- contains all three SQL letters in the correct order =). It was
- inspired by Scala's Squeryl but created from scratch.
- </longdescription>
- <upstream>
- <remote-id type="github">prowdsponsor/esqueleto</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/exact-pi/Manifest b/dev-haskell/exact-pi/Manifest
deleted file mode 100644
index 0a8a9dea3527..000000000000
--- a/dev-haskell/exact-pi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST exact-pi-0.5.0.1.tar.gz 9329 BLAKE2B 3f3a92f7dbf6bfcf629d5f978fcc5a6db3e24f0e42c854b3769b671ca301deb358993de7ef94e524373c73a967b7ea92c8da0fd812f7de85903cae4ddbd306c1 SHA512 873c445ff1044ce8f464b29d5bbe7bc02e2df8e267323f29870c8f816800dc403837852586c950725a871c78b1900db45b8172bb67c1da361e7b1b2bf3a56026
diff --git a/dev-haskell/exact-pi/exact-pi-0.5.0.1.ebuild b/dev-haskell/exact-pi/exact-pi-0.5.0.1.ebuild
deleted file mode 100644
index fa7a53cbd593..000000000000
--- a/dev-haskell/exact-pi/exact-pi-0.5.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Exact rational multiples of pi (and integer powers of pi)"
-HOMEPAGE="https://github.com/dmcclean/exact-pi/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/numtype-dk-0.5:=[profile?]
- >=dev-haskell/semigroups-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.10
- >=dev-haskell/semigroups-0.9 <dev-haskell/semigroups-1.0
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'tasty >=0.10 && <1.2' 'tasty >=0.10' \
- 'QuickCheck >=2.10 && <2.12' 'QuickCheck >=2.10' \
- 'base >=4.7 && <4.13' 'base >=4.7'
-}
diff --git a/dev-haskell/exact-pi/metadata.xml b/dev-haskell/exact-pi/metadata.xml
deleted file mode 100644
index e22792029651..000000000000
--- a/dev-haskell/exact-pi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Provides an exact representation for rational multiples of pi alongside an approximate representation of all reals.
- Useful for storing and computing with conversion factors between physical units.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index 149802f810fb..d1987ad1ac87 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1 +1,2 @@
+DIST exceptions-0.10.4-rev3.cabal 2796 BLAKE2B c6c3acf942b522666d88467a0b90940d5272568a1eea114c2ac7711b5ebea832e8e5ad3bf220b5270e2898230a890fe598878314e543b2c5d7d59c5abbf1206e SHA512 b49eb865b4f3f12afe0b8b4fb41f50d2f03b47f6a704f026cf34bbe513e7b31510aeec7948e224cef37a2f5261cc27973b920e58201a4a2de8e62ea137828f30
DIST exceptions-0.10.4.tar.gz 20819 BLAKE2B 16873edfeb540ddf5b950f81772c7d162e3fc37d286dcf6608c4c3017516a4255fb7cad247025aa9b0970508613038a3d0b42eccf22e74a0c4efffdfa22be5d3 SHA512 3df1edb4abab8e2e2dbd7387809d9768efca36c6840225ce33bee8679a4efdcf86d28beafb54a9a40e512163e4d088f94e788341bf614869bbdbd9d701bca4a2
diff --git a/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild b/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild
new file mode 100644
index 000000000000..a86f8a666f65
--- /dev/null
+++ b/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+# Disable test suite on bundled packages (haskell-cabal.eclass won't allow them
+# to be rebuilt because of CABAL_CORE_LIB_GHC_PV)
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test"
+
+DESCRIPTION="Extensible optionally-pure exceptions"
+HOMEPAGE="https://github.com/ekmett/exceptions/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? (
+# >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+# >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+# >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
+# )
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
deleted file mode 100644
index bfc8bbcbe39c..000000000000
--- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
- >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.5 && < 2.14' 'QuickCheck >= 2.5'
-}
diff --git a/dev-haskell/exceptions/metadata.xml b/dev-haskell/exceptions/metadata.xml
index 0143342131b7..ae412adc8134 100644
--- a/dev-haskell/exceptions/metadata.xml
+++ b/dev-haskell/exceptions/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">exceptions</remote-id>
<remote-id type="github">ekmett/exceptions</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/executable-path/Manifest b/dev-haskell/executable-path/Manifest
deleted file mode 100644
index 6beed3312239..000000000000
--- a/dev-haskell/executable-path/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST executable-path-0.0.3.1.tar.gz 6658 BLAKE2B 2671aa3b98c019785501ad853ed883e8f8a9572b6c5d847a5f0684d5203e07807562c6feb97085ccaec17ab5ff54d320b430e8c4e55bd99d55916653be2d6328 SHA512 e11e3a1fcc8a987c8720b80e6bc61eb9f61a6319d9d0cc88c841ef293aa9e51f7fbcbad2aa4beb52d50fed5148545591dc0627cc82c9b78b9990e038c9c3d020
diff --git a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
deleted file mode 100644
index 916fe5071c1a..000000000000
--- a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Finding out the full path of the executable"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/executable-path/metadata.xml b/dev-haskell/executable-path/metadata.xml
deleted file mode 100644
index bec7ce134210..000000000000
--- a/dev-haskell/executable-path/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The documentation of "System.Environment.getProgName" says that
- \"However, this is hard-to-impossible to implement on some non-Unix OSes,
- so instead, for maximum portability, we just return the leafname
- of the program as invoked.\"
- This library tries to provide the missing path.
- </longdescription>
-</pkgmetadata>
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 70b160ff2813..2441d247fe37 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+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/extra/Manifest b/dev-haskell/extra/Manifest
index 40c4ef14dd97..dceeec947cee 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1 +1,2 @@
-DIST extra-1.7.8.tar.gz 43588 BLAKE2B 5ea318ad88fc61b8ad243c42c84aff4ed3fbcbb2f0f2897ed632b86ffc2045154986ffa850a087bba2b0dbee6f3537806d743c74ce4fc67de7762a825f65a60f SHA512 1af19a86824f2aee054debadf35ae2b7f3b2448edbab2df6e2d0a7badab9be167b7982c320a9438cef38afef3cf5b59151f244f6131174d74477dc3980e71d36
+DIST extra-1.7.10.tar.gz 44872 BLAKE2B cdab5f08bf7f2de216aeacacf994b6008aee91900244101c0a0c1bc78f2fe5fc595d03dcab1a13196b885b639320e00fdb2117f93f85ca037b970a8d6a71f480 SHA512 02ce08f7f22defd1db81bfb407361e18b6d98295f561652880d3ee6e91477a7cd89126cb507e7362fe90ed7b46e57b55400ae0ad94f40de39749926efe3018cd
+DIST extra-1.7.14.tar.gz 45971 BLAKE2B 4ee978204771ad3198fa3b3abf8bc6b63d4be86d7a6b917e8a40a8524c6f947c6ae2298a469c2a4d844e4b0e43ce0cf8a02eb24458dff1b012006331b4d62da7 SHA512 9505a6b2b6aecdb0400a4bdf79e1888a2f5db30242903c50f0653df90960f53b8484ea782cde1e7aa5339bcc6e5b3417aa3494efeafebfa49fe318b57878b00b
diff --git a/dev-haskell/extra/extra-1.7.10.ebuild b/dev-haskell/extra/extra-1.7.10.ebuild
new file mode 100644
index 000000000000..ca17f8702594
--- /dev/null
+++ b/dev-haskell/extra/extra-1.7.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+
+# Tests do not work correctly on >=ghc-9.2
+RDEPEND+="
+ test? (
+ <dev-lang/ghc-9.1
+ )
+"
+
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.10
+ >=dev-haskell/quickcheck-instances-0.3.17 )
+"
diff --git a/dev-haskell/extra/extra-1.7.14.ebuild b/dev-haskell/extra/extra-1.7.14.ebuild
new file mode 100644
index 000000000000..ad8d56eb55b3
--- /dev/null
+++ b/dev-haskell/extra/extra-1.7.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/quickcheck-2.10
+ >=dev-haskell/quickcheck-instances-0.3.17 )
+"
diff --git a/dev-haskell/extra/extra-1.7.8.ebuild b/dev-haskell/extra/extra-1.7.8.ebuild
deleted file mode 100644
index 4acec8c5bc8e..000000000000
--- a/dev-haskell/extra/extra-1.7.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/quickcheck-2.10
- >=dev-haskell/quickcheck-instances-0.3.17 )
-"
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index 0766973aeadb..32e763f92ad8 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">extra</remote-id>
<remote-id type="github">ndmitchell/extra</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index 1b3b9b74b71f..c09d8ed3be50 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.7.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/failure/Manifest b/dev-haskell/failure/Manifest
deleted file mode 100644
index d23c530c55a2..000000000000
--- a/dev-haskell/failure/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST failure-0.2.0.3.tar.gz 1797 BLAKE2B a25a3276cdd8c5f68be61effb2f65a94fe1ebe612e1aecc3d6dd697e998fb60f81d9e07dfe1e5b57c79da7111a442ac648af4bf55128340350eb1acf3e7088be SHA512 ef8c9904d899381a281ee79235054af6bd156d2b2819e70bcd2a122c1c505c10311189f9280c39bd836c0f3ba35bc7536ce83b58a42978616ebd89c64d692c96
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
deleted file mode 100644
index aab5f36c3771..000000000000
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple type class for success/failure computations. (deprecated)"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Failure"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/failure/metadata.xml b/dev-haskell/failure/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/failure/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/fast-logger/Manifest b/dev-haskell/fast-logger/Manifest
index dfd419758e93..33f4ba94a9e6 100644
--- a/dev-haskell/fast-logger/Manifest
+++ b/dev-haskell/fast-logger/Manifest
@@ -1 +1,2 @@
DIST fast-logger-3.0.1.tar.gz 11700 BLAKE2B 8544f6c131822b39c2583c02554de4ca5cd08865e8f963406d035257eb59bbc27867b70282d5c3cef385873a7b6e7bf88d4baeb1edf77055752704fdf422cc44 SHA512 e646840b50496e86c24753267e0c0c7b0ff3a619032f69881d63e19c17394d2c5b248cb6b7f752100b253f58d7f493aac9ac77a754736474fbd83fe95ab9f6fd
+DIST fast-logger-3.2.2.tar.gz 14570 BLAKE2B 95eddb0117bfa564781c0d821569d71a86bc4ebfee2a23fdffbd5246164fd5da099d53222f307ce7506001bc169e80da6b3cd9bba77115d377294aee850393db SHA512 2a132b3c6eea08a127ad32d376ea749e1efc9fb7a9dc08272dd21945e3c6c5a966a73afb3ed13a1f427d5a63d5c6846cd3a025f9e7eb2c1a347c0c57d916bd3e
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 511958b15561..3e5c4a811bed 100644
--- a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
+++ b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
diff --git a/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild b/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild
new file mode 100644
index 000000000000..4e863134563a
--- /dev/null
+++ b/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast logging system"
+HOMEPAGE="https://github.com/kazu-yamamoto/logger"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
+ >=dev-haskell/easy-file-0.2:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/unix-compat-0.2:=[profile?]
+ >=dev-haskell/unix-time-0.4.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/async
+ dev-haskell/hspec )
+"
diff --git a/dev-haskell/fast-logger/metadata.xml b/dev-haskell/fast-logger/metadata.xml
index ed25a7a6ba69..841e5340ab1d 100644
--- a/dev-haskell/fast-logger/metadata.xml
+++ b/dev-haskell/fast-logger/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">fast-logger</remote-id>
<remote-id type="github">kazu-yamamoto/logger</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
deleted file mode 100644
index 045e8b8ee4fa..000000000000
--- a/dev-haskell/fclabels/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fclabels-2.0.5.tar.gz 24612 BLAKE2B 48742838f7d7e6194da0556c55ecfe80512f412f0cf03e30092199917f9037bdd3ce55d2744330e43a11a7c63b007ae8b25c2f2e92a277b7f6d2a65a54c439f7 SHA512 f6cc731d68cdf1e5867340a0b73385492008c2729a144dc685136ee6bf80ee0d0e07ddb80f83a18e6a1989d7f8a8755211aadcc92debffd5fe8c178a834021e4
diff --git a/dev-haskell/fclabels/fclabels-2.0.5.ebuild b/dev-haskell/fclabels/fclabels-2.0.5.ebuild
deleted file mode 100644
index f0dbe54240a8..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.2:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
deleted file mode 100644
index 7e5124aabf8d..000000000000
--- a/dev-haskell/fclabels/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides first class labels that can act as
- bidirectional record fields. The labels can be derived
- automatically using Template Haskell which means you don't have
- to write any boilerplate yourself. The labels are implemented as
- lenses and are fully composable. Labels can be used to /get/,
- /set/ and /modify/ parts of a datatype in a consistent way.
-
- See "Data.Label" for an introductory explanation.
-
- Internally lenses are not tied to Haskell functions directly,
- but are implemented as arrows. Arrows allow the lenses to be run
- in custom computational contexts. This approach allows us to
- make partial lenses that point to fields of multi-constructor
- datatypes in an elegant way.
-
- See the "Data.Label.Maybe" module for the use of partial labels.
-
- &gt; 1.0.3 -&gt; 1.0.4
- &gt; - Bugfix to compile on GHC 6.12 again.
- </longdescription>
- <upstream>
- <remote-id type="github">sebastiaanvisser/fclabels</remote-id>
- </upstream>
-</pkgmetadata>
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 4bca228c937b..f7426ecf651d 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="http://bitbucket.org/taejo/fdo-notify/"
+HOMEPAGE="https://hackage.haskell.org/package/fdo-notify"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 29c505411fc1..566241aa016a 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1 +1,2 @@
-DIST feed-1.3.0.1.tar.gz 107230 BLAKE2B 5ed36f28c63e2af4669a37cac0715891b96d37570dfa99404df5764ad1e5b4e512d3d1a54e263c838875cc4a29ce00b3a022b3a2647983cbda4011ba5accd855 SHA512 73662018affac036bcd3c48a8a5b6fcd4e752231d805c12e977c6097a47691c2eca07eb8d6e6840a592bf35892b4b4ec44fb1f73f8a14ecb47fc6904b406f767
+DIST feed-1.3.2.1-rev2.cabal 4607 BLAKE2B fb55afd490af9997dbb17b9b38ef7cdd6d375b62cafd96800af593b6157cc39c7e585ef8c5543151608d22a4332e7c4530e223fc745b60863276990a508c83f2 SHA512 76a02c57cbbbf9bbd4bedef063eb636a029ba32dbff4c580561f6472d6d54d3caf1afe7b98fb2d4423ac9352160cd25b7b1ad965c51f5280ab786b9fc9a4bddb
+DIST feed-1.3.2.1.tar.gz 107015 BLAKE2B 4a40441b17f50b9e7d43aee629fa0bc44f5b5cd1ca6281f3f5a8930b9cc5c2acdbdff05e9db4cc96c0e40681ecb15896655d8bbc708dc0bc4e3734b6e9f563bd SHA512 2175201ff9eaab5732e1c4e8dda6a35e8fa0dea5c58cd379348c97cd61a5eaf76e88f8d58d22df0a4b16681017e7ad01657ad60a63d90dab88df3b644ccb1ea0
diff --git a/dev-haskell/feed/feed-1.3.0.1.ebuild b/dev-haskell/feed/feed-1.3.0.1.ebuild
deleted file mode 100644
index 909b96ff32b8..000000000000
--- a/dev-haskell/feed/feed-1.3.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # markdown-unlit fals to generate a test: "test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
-HOMEPAGE="https://github.com/bergmark/feed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ghc: could not execute: markdown-unlit
-
-RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
- <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
- <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
- >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4 && < 4.14' 'base >= 4'
-}
diff --git a/dev-haskell/feed/feed-1.3.2.1-r2.ebuild b/dev-haskell/feed/feed-1.3.2.1-r2.ebuild
new file mode 100644
index 000000000000..35f9c5f9796d
--- /dev/null
+++ b/dev-haskell/feed/feed-1.3.2.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/haskell-party/feed"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
+
+RDEPEND="
+ >=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.14
+ =dev-haskell/old-locale-1.0*:=[profile?]
+ >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2
+ =dev-haskell/safe-0.3*:=[profile?]
+ =dev-haskell/time-locale-compat-0.1*:=[profile?]
+ <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10
+ >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4
+ || (
+ <dev-haskell/text-1.3
+ =dev-haskell/text-2.0*
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ dev-haskell/text
+ dev-haskell/doctest
+ dev-haskell/doctest-driver-gen
+ >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ dev-haskell/syb
+ =dev-haskell/test-framework-0.8*
+ =dev-haskell/test-framework-hunit-0.3*
+ )
+"
+BDEPEND="test? (
+ dev-haskell/doctest-driver-gen[executable(+)]
+ dev-haskell/markdown-unlit[executable(+)]
+)"
diff --git a/dev-haskell/feed/feed-1.3.2.1.ebuild b/dev-haskell/feed/feed-1.3.2.1.ebuild
new file mode 100644
index 000000000000..f4ae6cc810f3
--- /dev/null
+++ b/dev-haskell/feed/feed-1.3.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 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="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/haskell-party/feed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+ >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+ >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+ <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/doctest
+ >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/markdown-unlit-0.4 <dev-haskell/markdown-unlit-0.6
+ dev-haskell/syb
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
+"
diff --git a/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch b/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch
new file mode 100644
index 000000000000..01ebc6537499
--- /dev/null
+++ b/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+These doctests are difficult to run successfully and aren't worth the effort.
+
+diff -urN feed-1.3.2.1/feed.cabal feed-1.3.2.1-r1/feed.cabal
+--- feed-1.3.2.1/feed.cabal 2022-03-28 20:36:31.561223247 -0600
++++ feed-1.3.2.1-r1/feed.cabal 2022-03-28 21:05:49.501202376 -0600
+@@ -153,8 +153,7 @@
+ main-is: doctest-driver.hs
+ type: exitcode-stdio-1.0
+ default-language: Haskell2010
+- if impl(ghc < 8)
+- buildable: False
++ buildable: False
+ build-depends:
+ base >= 4.6
+ , doctest
diff --git a/dev-haskell/feed/metadata.xml b/dev-haskell/feed/metadata.xml
index e7fd109bb29d..ef8599691279 100644
--- a/dev-haskell/feed/metadata.xml
+++ b/dev-haskell/feed/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">sof/feed</remote-id>
+ <remote-id type="hackage">feed</remote-id>
+ <remote-id type="github">haskell-party/feed</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/fgl-arbitrary/Manifest b/dev-haskell/fgl-arbitrary/Manifest
deleted file mode 100644
index f40bc0027d3f..000000000000
--- a/dev-haskell/fgl-arbitrary/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fgl-arbitrary-0.2.0.3.tar.gz 6079 BLAKE2B 13fadb149568115d8a31138d9c92c039a369e8e4cbce68156434ecc5ed6ed1ed86cd1ada17567103b57073ff402a5f768bd54779593bfda6d776853a7cc94349 SHA512 d944f9c6ec7e116cec9df84d7b0ef2750e3aa255bed74f6450d9d6fa9786c50de20cf37b4f8725e1303b465583a7a6c3f3d4fd48517ddbb2b7354f01d728d830
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
deleted file mode 100644
index 5f9dbecc6cdf..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="https://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
- >=dev-haskell/quickcheck-2.3:2=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/hspec-2.1 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
- 'hspec >= 2.1 && < 2.5' 'hspec >= 2.1'
-}
diff --git a/dev-haskell/fgl-arbitrary/metadata.xml b/dev-haskell/fgl-arbitrary/metadata.xml
deleted file mode 100644
index 51a0d3c304ae..000000000000
--- a/dev-haskell/fgl-arbitrary/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Provides Arbitrary instances for fgl graphs (to avoid adding a
- QuickCheck dependency for fgl whilst still making the instances
- available to others).
-
- Also available are non-fgl-specific functions for generating
- graph-like data structures.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index a8ae73dde777..51c59fb399d9 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1 +1,2 @@
-DIST fgl-5.7.0.2.tar.gz 56399 BLAKE2B 0972a1db67f1e1e4910afc6d2cdd974715647ca0e3e0d8bbb1d2ac4bcf36afe9a4d36033c0bc2246d8bc87c5795494776173878e9c17f479f702722fc0fdf9f7 SHA512 a259cd9abe236cfec892d520b27e293293071ce1b435055cd009087d7d1fc2a87b71306e362020d3e8f6460c538da4e686c6b08b13361fc07c1e978b49a775fd
+DIST fgl-5.7.0.3.tar.gz 56415 BLAKE2B 6b7f5d3d2fd93494f3c2f9fbf69dd38c0358ced8a4f488f31d4904a375e21b4d12b974fe78868be8184a989b43fa6f345ca84ed74ea8c5970416c2903dd7a024 SHA512 f77ee1a66fe02b0a01e70b6fcb16baaba67be5433e4310bfb0862cec66855fc0413de586ca111e2e1569898b890fe93faf7c9f079dc569ca2d32b6c087762bbd
+DIST fgl-5.8.1.1.tar.gz 56829 BLAKE2B ad698d62e0961ebc19800225128053eae5d559a952504025f76c783392e699605abf009eccb7a69b8084009309a9252a29d3efb2b022941de895f7ce2064c610 SHA512 c1d82f2cbce89bb8088dda0e57a6787de0f83834b44f3b7e88393fa79f706dc7b5bff254ee4f2479a90c35a99cedc12c1691770c7c78c48362322b48b02b4873
diff --git a/dev-haskell/fgl/fgl-5.7.0.2.ebuild b/dev-haskell/fgl/fgl-5.7.0.2.ebuild
deleted file mode 100644
index 26d3c88482dd..000000000000
--- a/dev-haskell/fgl/fgl-5.7.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="https://hackage.haskell.org/package/fgl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
- >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/fgl/fgl-5.7.0.3.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
new file mode 100644
index 000000000000..dbf509ee6bbd
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="https://hackage.haskell.org/package/fgl"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/hspec-2.1
+ >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
+
+CABAL_CHDEPS=(
+ 'hspec >= 2.1 && < 2.8' 'hspec >= 2.1'
+)
diff --git a/dev-haskell/fgl/fgl-5.8.1.1.ebuild b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
new file mode 100644
index 000000000000..c65b125d96d3
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="https://hackage.haskell.org/package/fgl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.11
+ >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index 937381521944..e5868c189376 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">fgl</remote-id>
+ <remote-id type="github">haskell/fgl</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index b587933c07c8..60bb9f425f19 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1 +1,2 @@
DIST file-embed-0.0.11.2.tar.gz 6493 BLAKE2B 5e24d8a46fc40619943086fc9f5b211b35c19862a9346cffda4d4afd7c63f273127ca5dc652d40169438ccbef38f45abd77a394575f13aba023f18adc7746620 SHA512 48ea61d41d1f0ac855a446c64830b15904f2a696c16a0abec4407d6f74b61d333ed4854d3c75c2402c7a834704c063793a6660ef4e4fdd0ce9195492a34f8361
+DIST file-embed-0.0.15.0.tar.gz 7119 BLAKE2B 22c64efd1b4edd029c7e76aaa4b53f8f6233930f2e487cb7e3618436794287d90c0919a2d86074782412743ae389dea23f330d3b4a5ec8009be062056879d659 SHA512 49020f4f7d28ad57d72d0a91853cb85bf905baa86df4f48f3992114a30d97edecb889fb21eb95de3bc3edab206379aad783b79fabde2e06fbe9d0984f92a83ce
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 f225d60cb20a..25e42f1f6258 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.2:=
diff --git a/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild b/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild
new file mode 100644
index 000000000000..80d706194212
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use Template Haskell to embed file contents directly"
+HOMEPAGE="https://github.com/snoyberg/file-embed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/file-embed/metadata.xml b/dev-haskell/file-embed/metadata.xml
index d4524444d977..0424cddf616a 100644
--- a/dev-haskell/file-embed/metadata.xml
+++ b/dev-haskell/file-embed/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">file-embed</remote-id>
<remote-id type="github">snoyberg/file-embed</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/file-location/Manifest b/dev-haskell/file-location/Manifest
deleted file mode 100644
index 21f9f2a01aef..000000000000
--- a/dev-haskell/file-location/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST file-location-0.4.9.1.tar.gz 6961 BLAKE2B 5b3248db2a03ad699ba1354a88b6d0aa4e124e607be6692e7be7a9cec403d42dcb2e304a60c85e879855a9e5e3e49309d8aa112edaa12986f79b8408fa49b781 SHA512 a84a6ed3ff1a786331e202ae505df3981e81b3ce085e588632868357626b82a559dc649aa1623a09462741c5133ee0e5d5deb10713d94cc8286b82aa2e706d94
diff --git a/dev-haskell/file-location/file-location-0.4.9.1.ebuild b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
deleted file mode 100644
index fbf5ddd465cf..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # error stack changed from ghc-7.10
-
-RDEPEND="dev-haskell/hunit:=[profile?]
- dev-haskell/lifted-base:=[profile?]
- >=dev-haskell/th-orphans-0.9:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/file-location/metadata.xml b/dev-haskell/file-location/metadata.xml
deleted file mode 100644
index 26c45b3b64ae..000000000000
--- a/dev-haskell/file-location/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Common debugging/error/exception functions that give file location information
-
- &gt; $(err "OH NO!")
- &gt;
- &gt; main:Main main.hs:16:1 OH NO!
-
- Notice how it displays package:module file:line:character
- It exposes the functions err (error), undef (undefined), and trc (Debug.Trace.trace). All of these behave the same as their normal counterpart but also spit out a location.
-
- Here is my favorite helper, debug, which is like trace but just show the value.
-
- &gt; debug [1,2,3]
- &gt;
- &gt; DEBUG: [1,2,3]
- &gt; [1,2,3]
-
- And The Template Haskell version.
-
- &gt; $(dbg) [1,2,3]
- &gt;
- &gt; DEBUG main:Main main.hs:1:3 [1,2,3]
- &gt; [1,2,3]
-
- Also there is a version of thrwIO that gives location information
- &gt; ($(thrwIO) $ AException) `catch` \e -&gt; putStrLn ("Caught " ++ show (e :: AException))
- &gt;
- &gt; Caught AException "main:Main test/main.hs:25:6"
-
- See module for a listing of all the functions with short descriptions, and the homepage for some more examples https://github.com/gregwebs/ErrorLocation.hs
- </longdescription>
- <upstream>
- <remote-id type="github">gregwebs/FileLocation.hs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
deleted file mode 100644
index 96a798f4e552..000000000000
--- a/dev-haskell/filelock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST filelock-0.1.1.5.tar.gz 7839 BLAKE2B 2ac99711315fe11ddf49d680a851b147ee8f2d55c3b5a3fdb1b57edf6e7e6fec1cb5232cf1e2b1eccfe497a50756994cf1c5bf2ef624f5777c55fde9de9f6a30 SHA512 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048
diff --git a/dev-haskell/filelock/filelock-0.1.1.5.ebuild b/dev-haskell/filelock/filelock-0.1.1.5.ebuild
deleted file mode 100644
index 5297c74c1da5..000000000000
--- a/dev-haskell/filelock/filelock-0.1.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
-HOMEPAGE="https://github.com/takano-akio/filelock"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/async )
-"
diff --git a/dev-haskell/filelock/metadata.xml b/dev-haskell/filelock/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/filelock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index bc5f91a4df5e..814058ba3aee 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 937381521944..2e2ee1d112c6 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">bos/filemanip</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
index bf733c9e0061..26f295beb4ed 100644
--- a/dev-haskell/filepath-bytestring/Manifest
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -1 +1 @@
-DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
+DIST filepath-bytestring-1.4.2.1.9.tar.gz 25901 BLAKE2B f8cc6b01daa2a89ba9c4cfc448675ba00a203ba7eee7f966380e84daa56cf83899ea471d4b0b17f2d10b4fe8efccdca8dd188f4bdc842eee85a1f81e31a59b6a SHA512 814ca8e733afb85187055bf8fdf7381cba4de8587141eff678ec78aca76cd3042a40c3046d5fe4adaaa3575701c2a4172202ef9580ad66d87c92ee4a4e66fe87
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
deleted file mode 100644
index 5c15d58f56c7..000000000000
--- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
-HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 )
-"
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
new file mode 100644
index 000000000000..b70db22f9b9c
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
+HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'filepath >= 1.4.2 && <= 1.4.2.1' 'filepath >= 1.4.2'
+)
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/filepath-bytestring/metadata.xml b/dev-haskell/filepath-bytestring/metadata.xml
index 3a20cee1af99..2701978d8784 100644
--- a/dev-haskell/filepath-bytestring/metadata.xml
+++ b/dev-haskell/filepath-bytestring/metadata.xml
@@ -5,17 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides functionality for manipulating @RawFilePath@
- values. It can be used as a drop in replacement for the filepath library
- to get the benefits of using ByteStrings. It provides three modules:
-
- * "System.FilePath.Posix.ByteString" manipulates POSIX\/Linux style @RawFilePath@ values (with @\/@ as the path separator).
-
- * "System.FilePath.Windows.ByteString" manipulates Windows style @RawFilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
-
- * "System.FilePath.ByteString" is an alias for the module appropriate to your platform.
-
- All three modules provide the same API, and the same documentation (calling out differences in the different variants).
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">filepath-bytestring</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/filepattern/Manifest b/dev-haskell/filepattern/Manifest
deleted file mode 100644
index b239371aaa91..000000000000
--- a/dev-haskell/filepattern/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST filepattern-0.1.2.tar.gz 15737 BLAKE2B c90064a18115538cf7e1d5b26cb46971b86b0c7fb4f8e503db7cf7097cf1f19c8c1fdc3e89a0a90dbf915c95b71109359e94ad8f225a4cb450ad6a5fa71994d7 SHA512 16866d70efdf55ee4e6b246eb7f7300c9ad4c148d8136d817f601b9c0cac95eb1ddaf57ab0b6fad539298b55128fe5c255c31fd152a713bf312488eae823da23
diff --git a/dev-haskell/filepattern/filepattern-0.1.2.ebuild b/dev-haskell/filepattern/filepattern-0.1.2.ebuild
deleted file mode 100644
index 148807303154..000000000000
--- a/dev-haskell/filepattern/filepattern-0.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="File path glob-like matching"
-HOMEPAGE="https://github.com/ndmitchell/filepattern#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extra-1.6.2:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( >=dev-haskell/quickcheck-2.0 )
-"
diff --git a/dev-haskell/filepattern/metadata.xml b/dev-haskell/filepattern/metadata.xml
deleted file mode 100644
index 540da5bde272..000000000000
--- a/dev-haskell/filepattern/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library for matching files using patterns such as @\&quot;src\/**\/*.png\&quot;@ for all @.png@ files
- recursively under the @src@ directory. Features:
-
- * All matching is /O(n)/.
-
- * See &quot;System.FilePattern&quot; and @?==@ simple matching and semantics.
-
- * Use @match@ and @substitute@ to extract suitable
- strings from the @*@ and @**@ matches, and substitute them back into other patterns.
-
- * Use @step@ and @matchMany@ to perform bulk matching
- of many patterns against many paths simultaneously.
-
- * Use &quot;System.FilePattern.Directory&quot; to perform optimised directory traverals using patterns.
-
- Originally taken from the &lt;https://hackage.haskell.org/package/shake Shake library&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
deleted file mode 100644
index d40505a11cc0..000000000000
--- a/dev-haskell/filestore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST filestore-0.6.5.tar.gz 32338 BLAKE2B 534d2eb492fb6a6b3db460c181616d401f9f045772e91758249480ecf838ff56a210ab40dfaa1e360891f2509352268b50046dbd4d0f2f9d46c40a295f1a9fbc SHA512 e4710e1e01cf0eb25a60e48961679009f7d1838104ec81ef1444c39fb25f1426e8d9e2ab557d69a2196d503b829d3bc2791f18083cf39ca623efc6fc0d070dcc
diff --git a/dev-haskell/filestore/filestore-0.6.5.ebuild b/dev-haskell/filestore/filestore-0.6.5.ebuild
deleted file mode 100644
index 31604b341ad1..000000000000
--- a/dev-haskell/filestore/filestore-0.6.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://hackage.haskell.org/package/filestore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # requires mercurial
-
-RDEPEND=">=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- dev-haskell/mtl )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/metadata.xml b/dev-haskell/filestore/metadata.xml
deleted file mode 100644
index 0a9b3f45147c..000000000000
--- a/dev-haskell/filestore/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The filestore library provides an abstract interface for a versioning
- file store, and modules that instantiate this interface. Currently
- Git, Darcs, and Mercurial modules are provided, and other VCSs
- or databases could be added.
- </longdescription>
- <use>
- <flag name="maxcount">Make use of a recent (&gt;= 2.3.0) Darcs feature which vastly improves the performance
- of 'latest'. You should disable this flag if you plan to use gitit with an
- older version of Darcs, or 'latest' will raise an error.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index 10f4eebd39b7..24ade6c11dec 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index 937381521944..0675fb9d0bb8 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">audreyt/findbin</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/fingertree/Manifest b/dev-haskell/fingertree/Manifest
index b3caf94871c5..7d6ff2a1588c 100644
--- a/dev-haskell/fingertree/Manifest
+++ b/dev-haskell/fingertree/Manifest
@@ -1 +1,2 @@
DIST fingertree-0.1.4.2.tar.gz 18978 BLAKE2B 25eafe2e25ac00121c29bf6e54d6dd754e3672bb321451dcbc89594123b4f71b263fa8584bfeaaa63362d9901af7263c8028ea2f75684e2f2f960f31feecbb9a SHA512 016a772830c0bb27ec15fa99c9dff280c210f288a1f2dc15828224a6a8cdad87ade816191320aa59c876eba6b33cdb47a778572e66a8f3c989984cea2f4970ac
+DIST fingertree-0.1.5.0.tar.gz 20656 BLAKE2B b6c34b90932f8427586bf5901a2ace8c3e556c5997035edf5116f996b4b093b4b58c441ec05c115866ee38800eb2726d07431de094ca054aaebf58241a7eea9a SHA512 c5a580c64dfe374fe818f1388e4a8870ebfc27bd09137a58fb72afee18d73b8217afe722cbe5f0017990ab28ff630cda512ca4c3c3f28e8f24622d3d15b59325
diff --git a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
index 7da5f5314315..ab1247d9cfa8 100644
--- a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
+++ b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild b/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild
new file mode 100644
index 000000000000..4d398e4dd11c
--- /dev/null
+++ b/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic finger-tree structure, with example instances"
+HOMEPAGE="https://hackage.haskell.org/package/fingertree"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/fingertree/metadata.xml b/dev-haskell/fingertree/metadata.xml
index 9483c27eeca0..cc7fb249a61a 100644
--- a/dev-haskell/fingertree/metadata.xml
+++ b/dev-haskell/fingertree/metadata.xml
@@ -5,19 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A general sequence representation with arbitrary
- annotations, for use as a base for implementations of
- various collection types, with examples, as described
- in section 4 of
-
- * Ralf Hinze and Ross Paterson,
- \"Finger trees: a simple general-purpose data structure\",
- /Journal of Functional Programming/ 16:2 (2006) pp 197-217.
- &lt;http://www.soi.city.ac.uk/~ross/papers/FingerTree.html&gt;
-
- For a tuned sequence type, see @Data.Sequence@ in the
- @containers@ package, which is a specialization of
- this structure.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">fingertree</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/fixed/Manifest b/dev-haskell/fixed/Manifest
deleted file mode 100644
index f1ea463ad9d3..000000000000
--- a/dev-haskell/fixed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fixed-0.3.tar.gz 4384 BLAKE2B 403f0315b45fcd7519d47a34e62b99b77eabc683bbb650b6fc66d3366d6160bbd86cb58723cc309dcce14cc1f96260df8e38ea32876754e528f2d4c66a066e09 SHA512 f7a87aa63105acf33790f022ae1f1d8201febbfeb90f8c14f05c081899614db74adbe8abbfe144fe374316a1f4d9b84bf9b091d3bbc21b0e2c8f2f33376ffefa
diff --git a/dev-haskell/fixed/fixed-0.3.ebuild b/dev-haskell/fixed/fixed-0.3.ebuild
deleted file mode 100644
index 8fdf2de68e36..000000000000
--- a/dev-haskell/fixed/fixed-0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Signed 15.16 precision fixed point arithmetic"
-HOMEPAGE="https://github.com/ekmett/fixed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/fixed/metadata.xml b/dev-haskell/fixed/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/fixed/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/fmlist/Manifest b/dev-haskell/fmlist/Manifest
deleted file mode 100644
index 0c967ea5cb07..000000000000
--- a/dev-haskell/fmlist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fmlist-0.9.3.tar.gz 4428 BLAKE2B 818911f2e670e7b371e0dd58bb9ee661a7f0fd4130e611606d393aeea7b5c4d0eddb8ce04babb2d85cac54a4d3511457c2291eeb5b548967a4409291e18990a9 SHA512 1dba120af3c06d22b41269b22aad7950dd1d567daee213eeaa316f8dcd9e97a2f4499372b310561bb3a25909c38060c0aefacfe640d85ec3c90c5f5503db8915
diff --git a/dev-haskell/fmlist/fmlist-0.9.3.ebuild b/dev-haskell/fmlist/fmlist-0.9.3.ebuild
deleted file mode 100644
index 0ff4a019eb12..000000000000
--- a/dev-haskell/fmlist/fmlist-0.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FoldMap lists"
-HOMEPAGE="https://github.com/sjoerdvisscher/fmlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/fmlist/metadata.xml b/dev-haskell/fmlist/metadata.xml
deleted file mode 100644
index 788d9bed6d64..000000000000
--- a/dev-haskell/fmlist/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- FoldMap lists are lists represented by their foldMap function.
- FoldMap lists have O(1) cons, snoc and append, just like DLists,
- but other operations might have favorable performance
- characteristics as well. These wild claims are still completely
- unverified though.
- </longdescription>
- <upstream>
- <remote-id type="github">sjoerdvisscher/fmlist</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/foldable1-classes-compat/Manifest b/dev-haskell/foldable1-classes-compat/Manifest
new file mode 100644
index 000000000000..4e951639fe2b
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/Manifest
@@ -0,0 +1,2 @@
+DIST foldable1-classes-compat-0.1-rev2.cabal 3782 BLAKE2B 9c65f54ba9b286ced95c21736fed729262b0d2fb8e20b48c09f73ca3816b5aea4cfcf17b1736f89ec688d5822610f6f720c86746977ea5433bb450ad1e904456 SHA512 32b425c491c4e7085d3e0579c889c800ebc8263305d76984356fa8148d899ec9380e2c528f237d9544af2d89384511ded0c39d8255a2193f06350343fdda7668
+DIST foldable1-classes-compat-0.1.tar.gz 10484 BLAKE2B 66931399cb468536bca797d62a65afeaa936dcddafbaea39cadda9c1b3e47ac132ad3928339e76c9870228426df0eae2eea0333068c2f6d67e35d662e2abb3cd SHA512 680404e62d2d5bfec75c76c53b7178b548e4471fc6125ce86f404ddc1626e45ab448a3ff9e8fe902186c424b07d92635406f90c44586ed937d934e8c68ab0b8c
diff --git a/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild b/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild
new file mode 100644
index 000000000000..c11814e12bc9
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for the Foldable1 and Bifoldable1 type classes"
+HOMEPAGE="https://github.com/haskell-compat/foldable1-classes-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+ tagged? (
+ >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.27 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-quickcheck2-0.3.0.5 <dev-haskell/test-framework-quickcheck2-0.4
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/foldable1-classes-compat/metadata.xml b/dev-haskell/foldable1-classes-compat/metadata.xml
new file mode 100644
index 000000000000..d8751542cc3b
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">foldable1-classes-compat</remote-id>
+ <remote-id type="github">haskell-compat/foldable1-classes-compat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index 16dbde48ee43..342d69e7b402 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1 +1,3 @@
-DIST foldl-1.4.7.tar.gz 21602 BLAKE2B 617f16b0b5ce18c12d5807daf973beb7e5fcd01591ff057d6ec66e8c6fae3cec140949ac87bd5c7d23bbd5ac86cd4355f5c96b8f4d703fa26f291975ff6bac8c SHA512 e1c8569214ee58d1d5333018a50832e8be53fa2751c18b5d93c7c8d393f722248050fc56c6a5243a0f9f8ff94a0cd2f475c03107e70d601bf6bf3a81c509b58d
+DIST foldl-1.4.12-rev5.cabal 2682 BLAKE2B 616f3b1d69892cdf30039db5c82842d858b58d227f96e301b594e51b2052c7f423264b11a82c82669cc736b337dca901e242177064b0bf2b4cf128da619935b2 SHA512 394fe8ba15a59a270bc70deed3438a2d1e5193bfa3ec266dbdc3bac48e0b32279cbaab6dfb550cc551f48ce466a9bc553d1ea3748f90836f95f158818d267bd5
+DIST foldl-1.4.12.tar.gz 23210 BLAKE2B bbdd9a0b74d5b27b4b8800090a1b2dc717d023d860af8f26846a86866756211b30c755f6a1c3e604d6d1db91e5afa35ee943e014672c0a6e65712e0fbcfd29d0 SHA512 6b345b59c52039e914ea703ab88a08a8bba0a18bea91fcf4cf379ce678e5a97044f563c7b285cb656a764068756b4fae8321308e86813f86d04c462e9889e6e0
+DIST foldl-1.4.15.tar.gz 24449 BLAKE2B c8656bc7231e110dccf44e465acf33f9a61ad91020c8cb0b27debacde2ed4ba8c0de98d17c47db3218de4b56f3f026a8da74d092caca0b9fa66db4998a3017d4 SHA512 a0fb401313d8cb1911cc64e93cee7446a1785fac531f77b5f56a1165617c8adca8470be8a60555a07b48156924c657f4eee3094ad7a043fc383b459fa0006328
diff --git a/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch b/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch
new file mode 100644
index 000000000000..648b8f77cbc3
--- /dev/null
+++ b/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch
@@ -0,0 +1,83 @@
+diff -urN foldl-1.4.12/Setup.hs foldl-1.4.12-r1/Setup.hs
+--- foldl-1.4.12/Setup.hs 2001-09-08 19:46:40.000000000 -0600
++++ foldl-1.4.12-r1/Setup.hs 2022-03-23 03:20:48.427151688 -0600
+@@ -1,2 +1,6 @@
+-import Distribution.Simple
+-main = defaultMain
++module Main (main) where
++
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "doctest"
+diff -urN foldl-1.4.12/foldl.cabal foldl-1.4.12-r1/foldl.cabal
+--- foldl-1.4.12/foldl.cabal 2022-03-23 03:17:07.317151581 -0600
++++ foldl-1.4.12-r1/foldl.cabal 2022-03-23 03:20:10.187151669 -0600
+@@ -2,7 +2,7 @@
+ Version: 1.4.12
+ x-revision: 2
+ Cabal-Version: >=1.10
+-Build-Type: Simple
++Build-Type: Custom
+ License: BSD3
+ License-File: LICENSE
+ Copyright: 2013 Gabriel Gonzalez
+@@ -22,6 +22,12 @@
+ Type: git
+ Location: https://github.com/Gabriel439/Haskell-Foldl-Library
+
++custom-setup
++ setup-depends:
++ base
++ , Cabal
++ , cabal-doctest
++
+ Library
+ HS-Source-Dirs: src
+ Build-Depends:
+@@ -83,6 +89,9 @@
+ Main-Is: doctest.hs
+ Build-Depends:
+ base,
+- doctest >= 0.16
++ doctest >= 0.16,
++ directory,
++ filepath,
++ base-compat
+ GHC-Options: -threaded
+ Default-Language: Haskell2010
+diff -urN foldl-1.4.12/test/doctest.hs foldl-1.4.12-r1/test/doctest.hs
+--- foldl-1.4.12/test/doctest.hs 2001-09-08 19:46:40.000000000 -0600
++++ foldl-1.4.12-r1/test/doctest.hs 2022-03-23 03:22:41.077151743 -0600
+@@ -1,4 +1,29 @@
+ import Test.DocTest
++import GHC.IO.Encoding (setLocaleEncoding)
++import System.Directory (getCurrentDirectory, makeAbsolute)
++import System.FilePath.Posix ((</>))
++import System.IO (utf8)
++import Build_doctests (pkgs)
++
++main = do
++ setLocaleEncoding utf8
++ pwd <- getCurrentDirectory
++ prefix <- makeAbsolute pwd
+
+-main :: IO ()
+-main = doctest ["-isrc", "src/Control/Foldl.hs", "src/Control/Scanl.hs"]
++ let customFlags =
++ [ "-package-env=-"
++ , "-hide-all-packages"
++ , "-no-user-package-db"
++ , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
++ ]
++
++ let origFlags =
++ [ "-isrc"
++ ]
++
++ let modules =
++ [ "src/Control/Foldl.hs"
++ , "src/Control/Scanl.hs"
++ ]
++
++ doctest $ customFlags ++ pkgs ++ origFlags ++ modules
diff --git a/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
new file mode 100644
index 000000000000..a5fad758b449
--- /dev/null
+++ b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
@@ -0,0 +1,120 @@
+From 7dc9bf5a311c56408f5f102c09d36ab127e64b94 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@protonmail.com>
+Date: Sat, 4 Nov 2023 14:43:01 -0600
+Subject: [PATCH 1/1] Migrate to cabal-doctest
+
+doctest pulls in the out-of-scope packages if they are installed on the
+system. The best current workaround is to migrate to cabal-doctest.
+
+Bug: https://bugs.gentoo.org/916851
+Signed-off-by: hololeap <hololeap@protonmail.com>
+---
+ Setup.hs | 17 +++++++++++++++++
+ foldl.cabal | 13 +++++++++++--
+ test/doctest.hs | 29 +++++++++++++++++++++++++++--
+ 3 files changed, 55 insertions(+), 4 deletions(-)
+
+diff --git a/Setup.hs b/Setup.hs
+index 9a994af..f21ad76 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,2 +1,23 @@
++{-# LANGUAGE CPP #-}
++
++module Main (main) where
++
++#ifndef MIN_VERSION_cabal_doctest
++#define MIN_VERSION_cabal_doctest(x,y,z) 0
++#endif
++
++#if MIN_VERSION_cabal_doctest(1,0,0)
++
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "doctest"
++
++#else
++
+ import Distribution.Simple
++
++main :: IO ()
+ main = defaultMain
++
++#endif
+diff --git a/foldl.cabal b/foldl.cabal
+index 08715aa..ec2983e 100644
+--- a/foldl.cabal
++++ b/foldl.cabal
+@@ -1,7 +1,7 @@
+ Name: foldl
+ Version: 1.4.15
+ Cabal-Version: >=1.10
+-Build-Type: Simple
++Build-Type: Custom
+ License: BSD3
+ License-File: LICENSE
+ Copyright: 2013 Gabriella Gonzalez
+@@ -21,6 +21,12 @@ Source-Repository head
+ Type: git
+ Location: https://github.com/Gabriella439/Haskell-Foldl-Library
+
++custom-setup
++ setup-depends:
++ base
++ , Cabal
++ , cabal-doctest >= 1.0.0
++
+ Library
+ HS-Source-Dirs: src
+ Build-Depends:
+@@ -83,6 +89,9 @@ Test-Suite doctest
+ Main-Is: doctest.hs
+ Build-Depends:
+ base,
+- doctest >= 0.16
++ doctest >= 0.16,
++ directory,
++ filepath,
++ base-compat
+ GHC-Options: -threaded
+ Default-Language: Haskell2010
+diff --git a/test/doctest.hs b/test/doctest.hs
+index 5981eb4..847b897 100644
+--- a/test/doctest.hs
++++ b/test/doctest.hs
+@@ -1,4 +1,29 @@
+ import Test.DocTest
++import GHC.IO.Encoding (setLocaleEncoding)
++import System.Directory (getCurrentDirectory, makeAbsolute)
++import System.FilePath.Posix ((</>))
++import System.IO (utf8)
++import Build_doctests (pkgs)
++
++main = do
++ setLocaleEncoding utf8
++ pwd <- getCurrentDirectory
++ prefix <- makeAbsolute pwd
+
+-main :: IO ()
+-main = doctest ["-isrc", "src/Control/Foldl.hs", "src/Control/Scanl.hs"]
++ let customFlags =
++ [ "-package-env=-"
++ , "-hide-all-packages"
++ , "-no-user-package-db"
++ , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
++ ]
++
++ let origFlags =
++ [ "-isrc"
++ ]
++
++ let modules =
++ [ "src/Control/Foldl.hs"
++ , "src/Control/Scanl.hs"
++ ]
++
++ doctest $ customFlags ++ pkgs ++ origFlags ++ modules
+--
+2.41.0
+
diff --git a/dev-haskell/foldl/foldl-1.4.12-r1.ebuild b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
new file mode 100644
index 000000000000..d8eb59428ef9
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="https://hackage.haskell.org/package/foldl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.12-cabal-doctest.patch" )
+
+GHC_BOOTSTRAP_PACKAGES=(
+ cabal-doctest
+)
+
+RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ <dev-haskell/contravariant-1.6:=[profile?]
+ <dev-haskell/hashable-1.5:=[profile?]
+ <dev-haskell/primitive-0.8:=[profile?]
+ <dev-haskell/profunctors-5.7:=[profile?]
+ >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+ <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ dev-haskell/cabal-doctest
+ test? (
+ >=dev-haskell/doctest-0.16
+ dev-haskell/base-compat
+ )
+"
diff --git a/dev-haskell/foldl/foldl-1.4.15.ebuild b/dev-haskell/foldl/foldl-1.4.15.ebuild
new file mode 100644
index 000000000000..b18f0c7da8e3
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.4.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="https://hackage.haskell.org/package/foldl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.15-cabal-doctest.patch"
+)
+
+RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ <dev-haskell/contravariant-1.6:=[profile?]
+ <dev-haskell/hashable-1.5:=[profile?]
+ <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-haskell/profunctors-4.3.2:=[profile?] <dev-haskell/profunctors-5.7:=[profile?]
+ >=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-6.1:=[profile?]
+ >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/cabal-doctest-1.0.0
+ >=dev-haskell/doctest-0.16
+ )
+"
+
+src_configure() {
+ use test && export GHC_BOOTSTRAP_PACKAGES+=( cabal-doctest )
+
+ haskell-cabal_src_configure
+}
diff --git a/dev-haskell/foldl/foldl-1.4.7.ebuild b/dev-haskell/foldl/foldl-1.4.7.ebuild
deleted file mode 100644
index 943ea2b45db8..000000000000
--- a/dev-haskell/foldl/foldl-1.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # it was found in multiple packages: hashmap-1.3.3 unordered-containers-0.2.10.0
-
-RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
- <dev-haskell/contravariant-1.6:=[profile?]
- <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?]
- <dev-haskell/primitive-0.8:=[profile?]
- <dev-haskell/profunctors-5.6:=[profile?]
- >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
- >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?]
- >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- <dev-haskell/vector-builder-0.4:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/doctest-0.16 )
-"
diff --git a/dev-haskell/foldl/metadata.xml b/dev-haskell/foldl/metadata.xml
index f258fcc54de0..1582dd67b890 100644
--- a/dev-haskell/foldl/metadata.xml
+++ b/dev-haskell/foldl/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides strict left folds that stream in constant
- memory, and you can combine folds using @Applicative@ style to derive new
- folds. Derived folds still traverse the container just once and are often as
- efficient as hand-written folds.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">foldl</remote-id>
+ <remote-id type="github">Gabriella439/Haskell-Foldl-Library</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index a0dae253bcc2..f2b9f641976b 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1 +1,2 @@
-DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60
+DIST foundation-0.0.26.1.tar.gz 120487 BLAKE2B 9ded2f69712de5f3af7fd6a2457defaaf7643c8eee51ad27c863ba0f00a39d05c768a3ae03cb9b8401c63e545161f194237e6bd346e6e6e8858ac7d8a33c6cc1 SHA512 56285e445dbf58204fffb3824a2f6144c3ef8eeb1630a5f5e9a658bc216a9bbb4db6f215e1e9b11bb516a389e23a9fc3275242d060b42db6b82b6a449224988a
+DIST foundation-0.0.30.tar.gz 120423 BLAKE2B bc9f63b3b25d01eee2b3ce3f648987d8f040385759638103574821ffc0d124455f574755105e54af2f338c036edd50c36101bec8f0cb9afaaf2086bdb3365cf9 SHA512 5b7a193a03f6f86f125a95363705c760f3ce8686720aa91e815daf131b42cb84a8fd39d448f4b2e803654e1e4764fdfea28918c4558c5f87451aa7c05714efda
diff --git a/dev-haskell/foundation/foundation-0.0.25.ebuild b/dev-haskell/foundation/foundation-0.0.25.ebuild
deleted file mode 100644
index 1f75b31ea271..000000000000
--- a/dev-haskell/foundation/foundation-0.0.25.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Alternative prelude with batteries and no dependencies"
-HOMEPAGE="https://github.com/haskell-foundation/foundation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RESTRICT="test" # fails to doctest
-
-RDEPEND="~dev-haskell/basement-0.0.11:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/basement
- >=dev-haskell/doctest-0.9 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bench-all \
- --flag=-bounds-check \
- --flag=doctest \
- $(cabal_flag experimental experimental) \
- --flag=-linktest \
- --flag=-minimal-deps
-}
diff --git a/dev-haskell/foundation/foundation-0.0.26.1.ebuild b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
new file mode 100644
index 000000000000..e5dc055fb793
--- /dev/null
+++ b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alternative prelude with batteries and no dependencies"
+HOMEPAGE="https://github.com/haskell-foundation/foundation"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="experimental"
+
+RESTRICT=test # hangs indefinitely
+
+RDEPEND="~dev-haskell/basement-0.0.12:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/basement
+ >=dev-haskell/doctest-0.9 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bench-all \
+ --flag=-bounds-check \
+ --flag=doctest \
+ $(cabal_flag experimental experimental) \
+ --flag=-linktest \
+ --flag=-minimal-deps
+}
diff --git a/dev-haskell/foundation/foundation-0.0.30.ebuild b/dev-haskell/foundation/foundation-0.0.30.ebuild
new file mode 100644
index 000000000000..34c119a9149c
--- /dev/null
+++ b/dev-haskell/foundation/foundation-0.0.30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alternative prelude with batteries and no dependencies"
+HOMEPAGE="https://github.com/haskell-foundation/foundation"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="experimental"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ ~dev-haskell/basement-0.0.16
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bench-all \
+ --flag=-bounds-check \
+ --flag=-doctest \
+ $(cabal_flag experimental experimental) \
+ --flag=-linktest \
+ --flag=-minimal-deps
+}
diff --git a/dev-haskell/foundation/metadata.xml b/dev-haskell/foundation/metadata.xml
index 0150690448f8..78fbc1c25ade 100644
--- a/dev-haskell/foundation/metadata.xml
+++ b/dev-haskell/foundation/metadata.xml
@@ -6,25 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="experimental">enable building experimental features, known as highly unstable or without good support cross-platform</flag>
+ <flag name="experimental">Enable building experimental features, known as highly unstable or without good support cross-platform</flag>
</use>
- <longdescription>
- A custom prelude with no dependencies apart from base.
-
- This package has the following goals:
-
- * provide a base like sets of modules that provide a consistent set of features and bugfixes across multiple versions of GHC (unlike base).
-
- * provide a better and more efficient prelude than base's prelude.
-
- * be self-sufficient: no external dependencies apart from base.
-
- * provide better data-types: packed unicode string by default, arrays.
-
- * Better numerical classes that better represent mathematical thing (No more all-in-one Num).
-
- * Better I/O system with less Lazy IO
-
- * Usual partial functions distinguished through type system
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">foundation</remote-id>
+ <remote-id type="github">haskell-foundation/foundation</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index c2e62e6912ed..90e7d97c6b0a 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -1 +1,3 @@
-DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91
+DIST free-5.1.9.tar.gz 61606 BLAKE2B 0cf1e666f281c1610411a4f34a94cf1b887522db64d9957db36761ee596cc2d97c5bb7ebfa7c8ed40f42a5ab561d1fa8e2309843bf024e95cbef27a077ec02aa SHA512 925d9271adf5d16a48efaeebd65d54a9c5b4e042f1733382ee2269eee1f62d4b184e54209b384bdd145b76b093d7866f0115a56156c73f85bacb04cb7b265ec0
+DIST free-5.2-rev1.cabal 4176 BLAKE2B 5e4ff25305dcd903805a63be8704159f76f7c3e7208f4ecd6c0a4ef8f6d7a9827e1eaaaa7d35788202447e78af665a73973a51d7a2734fd44a07804305d64bd3 SHA512 670f2bc0bc7cbc4bb1bc6a5bbb823ba3507430a3b732e1d2346326e763cdffd8740ffd9228c455ba28a4ac285594cccbcf588434f0c6b55d36d3aefaa0d36ec9
+DIST free-5.2.tar.gz 58781 BLAKE2B b2813e74b6dfaac376d7221b75c73315cb9c1fd1bfb7bb281429668bea6cba20d6316bdc722f91425d950962ee3687a6bff491e44ff77e5f56cf07a2c564e443 SHA512 f27a9cd9d2f29c442a8ae036be53cd22cd28279e15f394212713ad12be05e9a35dce72ae53647cad415833ff356228e5707b6ed85c1195f94cb57493f9341175
diff --git a/dev-haskell/free/free-5.1.3.ebuild b/dev-haskell/free/free-5.1.3.ebuild
deleted file mode 100644
index 3bc8d782882f..000000000000
--- a/dev-haskell/free/free-5.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/distributive-0.2.1:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/free/free-5.1.9.ebuild b/dev-haskell/free/free-5.1.9.ebuild
new file mode 100644
index 000000000000..1b69c1f1e04c
--- /dev/null
+++ b/dev-haskell/free/free-5.1.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/profunctors-5.6.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/semigroupoids-5.3.5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/free/free-5.2.ebuild b/dev-haskell/free/free-5.2.ebuild
new file mode 100644
index 000000000000..772fb5f0beb5
--- /dev/null
+++ b/dev-haskell/free/free-5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/profunctors-5.6.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/semigroupoids-5.3.5:=[profile?] <dev-haskell/semigroupoids-7:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/free/metadata.xml b/dev-haskell/free/metadata.xml
index bd0f3da7da23..6b6998bdca9a 100644
--- a/dev-haskell/free/metadata.xml
+++ b/dev-haskell/free/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">free</remote-id>
<remote-id type="github">ekmett/free</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/fsnotify/Manifest b/dev-haskell/fsnotify/Manifest
deleted file mode 100644
index 4ec15d05e7c4..000000000000
--- a/dev-haskell/fsnotify/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fsnotify-0.3.0.1.tar.gz 20638 BLAKE2B 8b897ed716e17ff4e22da274eacf03770ddf69661ea74a3ce2c284c21668a429ef92fd1f437fd104a82e02608a13fbc7e1a1bd5a5e8cc524fe2c70fbc3697ac6 SHA512 d5c96a54c1b4788e1d50f259d11d4e2d6eb7224552b50cb359a1f4cdcc2a9b7270f9b5ccdfe9738a163b54ab7ab5a0114de9cabc56660a7324cdfc4b16179e1a
diff --git a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
deleted file mode 100644
index 376479a62aa3..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://github.com/haskell-fswatch/hfsnotify"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
- >=dev-haskell/hinotify-0.3.0:=[profile?]
- >=dev-haskell/shelly-1.6.5:=[profile?]
- >=dev-haskell/text-0.11.0:=[profile?]
- >=dev-haskell/unix-compat-0.2:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/random
- >=dev-haskell/tasty-0.5
- dev-haskell/tasty-hunit
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/fsnotify/metadata.xml b/dev-haskell/fsnotify/metadata.xml
deleted file mode 100644
index 9bd21277f794..000000000000
--- a/dev-haskell/fsnotify/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Cross platform library for file creation, modification,
- and deletion notification. This library builds upon
- existing libraries for platform-specific Window, Mac,
- and Linux filesystem event notification.
- </longdescription>
- <upstream>
- <remote-id type="github">haskell-fswatch/hfsnotify</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest
index 7ad1739e19bf..0c6159c7f8e3 100644
--- a/dev-haskell/generic-deriving/Manifest
+++ b/dev-haskell/generic-deriving/Manifest
@@ -1 +1,2 @@
-DIST generic-deriving-1.13.1.tar.gz 68256 BLAKE2B 419e50b07d72066a13016c9c0d2cb7f7ad995956ea07763c3345d2e6057e7b428cffa5ba7b58df0230195a05f97f58360640a28a020c41bc3f78dc6f3bb8f924 SHA512 946e3a4da31141fb1156690e0fb51cd3ef0a4f62c0e5b68d0e0d31953d8999885011acb743edd5d0bf88985422c9c74a727dd7f775316911da57ff49716103e2
+DIST generic-deriving-1.14.1.tar.gz 74474 BLAKE2B 9d43cf67c50eb06c73ee50441700752ec757082312dfd660b48ca6f4e722f581ef43b62e0d20e80c3eca6f0844712ad28c9dee621e46475449d55e7980a436b8 SHA512 b7a0dd63ee59d9d8df64bd622aede65943cd83875df6bc4eb3775822ff3c5b476c6179da4fa8fcbc029f4b5e93244e12d5af3d7f7499ebc11488d59f72f6e322
+DIST generic-deriving-1.14.5.tar.gz 76918 BLAKE2B 9e6b5abb27860743e9aa65d703df3ca89c6b78cb5b7240f29871e699e64b45faee7710a1f4ef31fa011aca8195c1ebd505b62f14a20e02fb21510c99d3651605 SHA512 d3fc4e77a9c81ee570b20db6666f1c8bf32d1362cd045731401ff43db65b96c741752deec9f6239e8478d480e7d22e9bbc195fb473498cc380d7f94339563e3c
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
deleted file mode 100644
index 100fd00432eb..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://github.com/dreixel/generic-deriving"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
new file mode 100644
index 000000000000..7345ea5611b0
--- /dev/null
+++ b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 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="Generic programming library for generalised deriving"
+HOMEPAGE="https://github.com/dreixel/generic-deriving"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild
new file mode 100644
index 000000000000..c6d1bc1aa821
--- /dev/null
+++ b/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic programming library for generalised deriving"
+HOMEPAGE="https://github.com/dreixel/generic-deriving"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
index 208017b74634..d5157eeb0a9e 100644
--- a/dev-haskell/generic-deriving/metadata.xml
+++ b/dev-haskell/generic-deriving/metadata.xml
@@ -5,19 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides functionality for generalizing the deriving mechanism
- in Haskell to arbitrary classes. It was first described in the paper:
-
- * /A generic deriving mechanism for Haskell/.
- Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh.
- Haskell'10.
-
- The current implementation integrates with the new GHC Generics. See
- &lt;http://www.haskell.org/haskellwiki/Generics&gt; for more information.
- Template Haskell code is provided for supporting GHC before version 7.2.
- </longdescription>
<upstream>
+ <remote-id type="hackage">generic-deriving</remote-id>
<remote-id type="github">dreixel/generic-deriving</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/generically/Manifest b/dev-haskell/generically/Manifest
new file mode 100644
index 000000000000..11edf5d9211b
--- /dev/null
+++ b/dev-haskell/generically/Manifest
@@ -0,0 +1,2 @@
+DIST generically-0.1.1-rev1.cabal 1155 BLAKE2B 3554bfa3f08f83840c06ab6008f004304a28b1390585642ebe218e77e92bf02d4a716747c1a069ce1f00dce095c41469c0aa879cffce74c7e3165986e00ae4c7 SHA512 d07323461cf572b9867ae324a623b877c662f4df4ff5c97a06b895f17875d5648ae4683d1351e274b81d7dc240d1a441c759d8c0a77668e0b0f7384d32b8f358
+DIST generically-0.1.1.tar.gz 2870 BLAKE2B a67ab7a1d5aab5ad83ee3fbaecb77639caad96fb8ab7ff2385c843a6631c6ea7056d75f37caab60b5b942242c3f89751490ad3273cbe2068d4ea136dcdf66567 SHA512 029c96a5567fea56572ad5522c70d3b41a22ddac15483aee0045f4aa15bc45bf177a69bf42986391de681ab98aedf5b748a91d5bd5486427062f72e2a22a1844
diff --git a/dev-haskell/generically/generically-0.1.1-r1.ebuild b/dev-haskell/generically/generically-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..847822061c13
--- /dev/null
+++ b/dev-haskell/generically/generically-0.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Generically newtype to use with DerivingVia"
+HOMEPAGE="https://hackage.haskell.org/package/generically"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.8:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/generically/metadata.xml b/dev-haskell/generically/metadata.xml
new file mode 100644
index 000000000000..2e243cd4145c
--- /dev/null
+++ b/dev-haskell/generically/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">generically</remote-id>
+ <remote-id type="github">haskell-compat/generically</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest
index 5082bf3c9f05..3f169d0d7f22 100644
--- a/dev-haskell/generics-sop/Manifest
+++ b/dev-haskell/generics-sop/Manifest
@@ -1 +1,2 @@
-DIST generics-sop-0.5.1.0.tar.gz 29797 BLAKE2B 8e61bf85d8541f9f54aa0ae908f37cba380b68a40d83c42ff7b1cf1931eebc3d8671c22714bd18addad9aa59fd0f0b9e3bd000f033911dd7b96d32ee4dc5d5e5 SHA512 454cb30800e4c6b225df6464970746ca51028ffbfe50143559eebf16918dd783ef2e7690c4877b568d1835043ec733ec0ca9a39e0ae88c3136c82d0afb42bda8
+DIST generics-sop-0.5.1.1.tar.gz 29898 BLAKE2B c5d98a338d3cae2bd64abae2d2cace4c87a80d3f194b96ec8c31cbb5e660fd17c9a11fe6cd56eeea8af8d720c1fac9f7ce278338276458de019251157ea27418 SHA512 8514a4aef263c2c38928a716c1755db7f2f52243d742b944bb718bf3458ae0969b451836e889075a2c4ea5893720dbb146212d1960a9573851d3ad6c66fb0d8d
+DIST generics-sop-0.5.1.3.tar.gz 30062 BLAKE2B 6a487a9d514d879ea85a66e032b7446809df34af1a1699490445620c15b60b00abe8cf77f83a9e33acf3471652e2d7e37f5f4948a61e1ee6c9b06ba51596f2b0 SHA512 a4354012ade5d34d8640ce10847088f56f5722b5ee0122cfb3b5adac74675e7445ee3f47c1587174c661525d460e09b3251d70170892577446a404d6cdc68e47
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
deleted file mode 100644
index af5a8ad6dadc..000000000000
--- a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic Programming using True Sums of Products"
-HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?]
- >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
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
new file mode 100644
index 000000000000..5ff74fa11c63
--- /dev/null
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic Programming using True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild
new file mode 100644
index 000000000000..303874e80f41
--- /dev/null
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic Programming using True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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.6:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/generics-sop/metadata.xml b/dev-haskell/generics-sop/metadata.xml
index e8e45b95ba77..72bf2acafccc 100644
--- a/dev-haskell/generics-sop/metadata.xml
+++ b/dev-haskell/generics-sop/metadata.xml
@@ -5,33 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A library to support the definition of generic functions.
- Datatypes are viewed in a uniform, structured way:
- the choice between constructors is represented using an n-ary
- sum, and the arguments of each constructor are represented using
- an n-ary product.
-
- The module "Generics.SOP" is the main module of this library and contains
- more detailed documentation.
-
- Examples of using this library are provided by the following
- packages:
-
- * @&lt;https://hackage.haskell.org/package/basic-sop basic-sop&gt;@ basic examples,
-
- * @&lt;https://hackage.haskell.org/package/pretty-sop pretty-sop&gt;@ generic pretty printing,
-
- * @&lt;https://hackage.haskell.org/package/lens-sop lens-sop&gt;@ generically computed lenses,
-
- * @&lt;https://hackage.haskell.org/package/json-sop json-sop&gt;@ generic JSON conversions.
-
- A detailed description of the ideas behind this library is provided by
- the paper:
-
- * Edsko de Vries and Andres Löh.
- &lt;http://www.andres-loeh.de/TrueSumsOfProducts True Sums of Products&gt;.
- Workshop on Generic Programming (WGP) 2014.
-
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">generics-sop</remote-id>
+ <remote-id type="github">well-typed/generics-sop</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/geniplate-mirror/Manifest b/dev-haskell/geniplate-mirror/Manifest
deleted file mode 100644
index 4e7ea04f13cb..000000000000
--- a/dev-haskell/geniplate-mirror/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST geniplate-mirror-0.7.7.tar.gz 9448 BLAKE2B bca1181f2342feda0dc6b111cd3c56f3145b1360f1066d2dfa4c142e81f44a9517a79c6afd18ccae7f7239a19f3d4d788c9a213c3f357491f1629ca274acd8a4 SHA512 8976e874372e29edb468a07bab5a524173d0daa6d48834349279d6ba0f4a79d890a1be23a7af7cd92485f44df08e9d32c54c4bbd8ae081aba5c705fdc652907e
diff --git a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.7.ebuild b/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.7.ebuild
deleted file mode 100644
index a590595193ce..000000000000
--- a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://github.com/danr/geniplate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell < 2.17' 'template-haskell'
-}
diff --git a/dev-haskell/geniplate-mirror/metadata.xml b/dev-haskell/geniplate-mirror/metadata.xml
deleted file mode 100644
index 90b8e9590879..000000000000
--- a/dev-haskell/geniplate-mirror/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Use Template Haskell to generate Uniplate-like functions.
-
- This is a maintained mirror of the
- &lt;http://hackage.haskell.org/package/geniplate geniplate&gt; package,
- written by Lennart Augustsson.
- </longdescription>
- <upstream>
- <remote-id type="github">danr/geniplate</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest
deleted file mode 100644
index ac80c70e8685..000000000000
--- a/dev-haskell/genvalidity-hspec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
deleted file mode 100644
index 803a16b0fd27..000000000000
--- a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Standard spec's for GenValidity instances"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?]
- >=dev-haskell/genvalidity-property-0.5:=[profile?]
- dev-haskell/hspec:=[profile?]
- dev-haskell/hspec-core:=[profile?]
- dev-haskell/quickcheck:2=[profile?]
- >=dev-haskell/validity-0.5:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/genvalidity-hspec/metadata.xml b/dev-haskell/genvalidity-hspec/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/genvalidity-hspec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest
deleted file mode 100644
index 6fb0fb06ee9e..000000000000
--- a/dev-haskell/genvalidity-property/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
deleted file mode 100644
index 5af378911aee..000000000000
--- a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Standard properties for functions on 'Validity' types"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?]
- >=dev-haskell/hspec-2.1:=[profile?]
- dev-haskell/pretty-show:=[profile?]
- dev-haskell/quickcheck:2=[profile?]
- >=dev-haskell/validity-0.9:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/doctest )
-"
diff --git a/dev-haskell/genvalidity-property/metadata.xml b/dev-haskell/genvalidity-property/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/genvalidity-property/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest
deleted file mode 100644
index 4e36afd05fcc..000000000000
--- a/dev-haskell/genvalidity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
deleted file mode 100644
index a8b688efd42b..000000000000
--- a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Testing utilities for the validity library"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/validity-0.9:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/hspec
- dev-haskell/hspec-core )
-"
diff --git a/dev-haskell/genvalidity/metadata.xml b/dev-haskell/genvalidity/metadata.xml
deleted file mode 100644
index 7c837abd3408..000000000000
--- a/dev-haskell/genvalidity/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Note: There are companion instance packages for this library:
-
- * &lt;https://hackage.haskell.org/package/genvalidity-text genvalidity-text&gt;
-
- * &lt;https://hackage.haskell.org/package/genvalidity-containers genvalidity-containers&gt;
- </longdescription>
-</pkgmetadata>
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 4b16299b9e02..38c4e932d38c 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
diff --git a/dev-haskell/getopt-generics/metadata.xml b/dev-haskell/getopt-generics/metadata.xml
index 937381521944..7029bd0edc65 100644
--- a/dev-haskell/getopt-generics/metadata.xml
+++ b/dev-haskell/getopt-generics/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">soenkehahn/getopt-generics</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/ghc-byteorder/Manifest b/dev-haskell/ghc-byteorder/Manifest
new file mode 100644
index 000000000000..e932ce741e0a
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/Manifest
@@ -0,0 +1 @@
+DIST ghc-byteorder-4.11.0.0.10.tar.gz 2445 BLAKE2B d5da6fcc1ef39ae05cd5b044416e4caa829507312663e0388134547b086ee8e2528935665d03d98a5815ae36c63593901d1cee665957d1a36148f14358f09910 SHA512 d589aa5cf31772e013527ce404959afb75b8bc9bc922b038b6bf4704d584fbaa4de3fd044351b5a7e8df32e96c8414f02573c78643a1fbe9559a66530ff985a1
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
new file mode 100644
index 000000000000..9764333d9327
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="\"GHC.ByteOrder\" API Compatibility Layer"
+HOMEPAGE="http://hackage.haskell.org/package/ghc-byteorder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+ 'base >=4.11 && <4.15' 'base >=4.11'
+)
diff --git a/dev-haskell/ghc-byteorder/metadata.xml b/dev-haskell/ghc-byteorder/metadata.xml
new file mode 100644
index 000000000000..a23c2f79664e
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <longdescription>
+ This package transparently supplies the &quot;GHC.ByteOrder&quot; API as provided in @base-4.11.0.0@ for legacy GHC releases which didn&#39;t provide it yet (i.e. GHC 7.0 through GHC 8.2).
+
+ This release reexports [GHC.ByteOrder from base](https://hackage.haskell.org/package/base-4.11.1.0/docs/GHC-ByteOrder.html) via Cabal&#39;s @reexported-modules@ mechanism. For GHC 8.2 and earlier a different release of @ghc-byteorder@ (with the same minor version) is eligible by the Cabal solver with a backported &quot;GHC.ByteOrder&quot; module.
+
+ In order to use this compatibility layer, simply declare a dependency on @ghc-byteorder@ in your @.cabal@ package description like so
+
+ &gt; build-depends: ghc-byteorder ^&gt;= 4.11.0.0
+
+ And your code will be able to access this respective API version of the module via the usual
+
+ &gt; import GHC.ByteOrder
+
+ mechanism.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/ghc-lib-parser-ex/Manifest b/dev-haskell/ghc-lib-parser-ex/Manifest
deleted file mode 100644
index fff6c7000599..000000000000
--- a/dev-haskell/ghc-lib-parser-ex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ghc-lib-parser-ex-8.10.0.19.tar.gz 21193 BLAKE2B 83bbc7f8ef439960cc075d12bfc64e36a44444be5a415d90a5cc3630b51c766158d12459cc9a4f1afc0a615ce1afcac8017333e388ba0c4c622f880dc56faa59 SHA512 a286a0874191e7e10484279e9a70e1dc1add602ee6180718e7936f9ac0714ad0997a0398d1879ae0b1d1864f5976c26eb05d8db621343885630e37739e6cc17f
diff --git a/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild b/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild
deleted file mode 100644
index 8df43a19e93f..000000000000
--- a/dev-haskell/ghc-lib-parser-ex/ghc-lib-parser-ex-8.10.0.19.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -no-ghc-lib,+auto
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Algorithms on GHC parse trees"
-HOMEPAGE="https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/ghc-lib-parser-8.10:=[profile?] <dev-haskell/ghc-lib-parser-8.11:=[profile?]
- >=dev-haskell/uniplate-1.5:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/extra-1.6
- >=dev-haskell/tasty-1.2
- >=dev-haskell/tasty-hunit-0.10.0
- >=dev-haskell/uniplate-1.6.12 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=auto \
- --flag=-no-ghc-lib
-}
diff --git a/dev-haskell/ghc-lib-parser-ex/metadata.xml b/dev-haskell/ghc-lib-parser-ex/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/ghc-lib-parser-ex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ghc-lib-parser/Manifest b/dev-haskell/ghc-lib-parser/Manifest
deleted file mode 100644
index 5d394c53ccfa..000000000000
--- a/dev-haskell/ghc-lib-parser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ghc-lib-parser-8.10.2.20200916.tar.gz 1627245 BLAKE2B 35290880c01acb455b3f6f1f65e5904f82a472dc6b5491aed397a063f38257c0ecb1095ee6e535bce63333f5148179a1e183e877a4fbcda30c69abf7e7a3a5b8 SHA512 b0544ac5d678324e7672f133c1236dd331f170dc99c73a5a22985c3b83d4c6c139d247cf924c6b6e4e4c4e76675c3c0f83e7c84a4ed9aa9a8afa039895730960
diff --git a/dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild b/dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild
deleted file mode 100644
index 7de702a7f327..000000000000
--- a/dev-haskell/ghc-lib-parser/ghc-lib-parser-8.10.2.20200916.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The GHC API, decoupled from GHC versions"
-HOMEPAGE="https://github.com/digital-asset/ghc-lib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.6.3:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-2.4.0.1
- dev-haskell/happy
-"
diff --git a/dev-haskell/ghc-lib-parser/metadata.xml b/dev-haskell/ghc-lib-parser/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/ghc-lib-parser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
index eeec592a3c0f..b4dcd9cfa548 100644
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1 +1,2 @@
+DIST ghc-paths-0.1.0.12-rev5.cabal 699 BLAKE2B c23c4c781ff3d47a8a01f067803fb1b71e34b954018990bf03ac81c42e6ca6bc434569c66b2d4cdb13b4f651fe3969a3b3323915a30bfd3d682c4522659044ba SHA512 c68d9f16c28bbac47d6831c5f385e4e21ce2b8188e7b04eb0531ca088b79c2f1169a36650fb5588f73a5e4d78307a0fbbb17af241b8bdc46b9c7dcde39b8d096
DIST ghc-paths-0.1.0.12.tar.gz 2565 BLAKE2B 3e4783a854510a4ae6d6a9d5f4d0fefa7fbc03088aa298d8731c7bdf961ab47553b0e46c1b8d2f61193b669c43fc74e8eb6f948abba4419b0110772d56397c1d SHA512 1c66caf459f5783bde38a47ce1292bf5c47fef21e3f69d7f6c052b4eb39f446ed5decd38f0e4143a90d55ba44ebc0891b4497050cc652cbf3fcad636d45690e9
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 7408ec144131..c1b92212a47b 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.2.9999
@@ -15,24 +15,26 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.3
+ >=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.7
"
+# https://github.com/simonmar/ghc-paths/pull/26
+CABAL_CHDEPS=(
+ 'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.7'
+)
+
src_prepare() {
- default
+ haskell-cabal_src_prepare
# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
cabal-mksetup
- cabal_chdeps \
- 'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.3'
-
# and use gentoo's hardcoded one:
# a few things we need to replace, and example values
# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
new file mode 100644
index 000000000000..c2d544493b0d
--- /dev/null
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Knowledge of GHC's installation directories"
+HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-3.11
+"
+
+src_prepare() {
+ haskell-cabal_src_prepare
+
+ # ghc-patch it has awfully unportable (across cabal versions) ghc detection code
+ # but in gentoo we install it to fixed patch, so remove Setup.hs detection code
+ cabal-mksetup
+
+ # and use gentoo's hardcoded one:
+ # a few things we need to replace, and example values
+ # GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+ # GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+ # GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+ # GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+ cat >"${S}/GHC/Paths.hs" <<-EOF
+ module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
+
+ libdir, docdir, ghc, ghc_pkg :: FilePath
+
+ libdir = "$(ghc-libdir)"
+ docdir = "/usr/share/doc/ghc-$(ghc-version)/html"
+
+ ghc = "$(ghc-getghc)"
+ ghc_pkg = "$(ghc-getghcpkg)"
+ EOF
+}
diff --git a/dev-haskell/ghc-paths/metadata.xml b/dev-haskell/ghc-paths/metadata.xml
index c7bb0e775ab0..f6c086c0de21 100644
--- a/dev-haskell/ghc-paths/metadata.xml
+++ b/dev-haskell/ghc-paths/metadata.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">ghc-paths</remote-id>
+ <remote-id type="github">simonmar/ghc-paths</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
deleted file mode 100644
index b58f99afb716..000000000000
--- a/dev-haskell/gio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gio-0.13.8.1.tar.gz 70144 BLAKE2B ba7bea0df82731b92c79c316776eed547885690ccd9a39713a2cb14ecd84cc601dfa2ac09b520584bd48944f2406d9651c7927fad035be46a87c66af62638c4a SHA512 9eaee3c41c0da5ada37881238623677b85a008225f7948c95f87f1f9c7bc66582911d11a31e44109c9f53918e5b4ee73b33162f0cafb68b9da4c9b9566061899
diff --git a/dev-haskell/gio/gio-0.13.8.1.ebuild b/dev-haskell/gio/gio-0.13.8.1.ebuild
deleted file mode 100644
index 59aea8739438..000000000000
--- a/dev-haskell/gio/gio-0.13.8.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/metadata.xml b/dev-haskell/gio/metadata.xml
deleted file mode 100644
index bc39010a1e05..000000000000
--- a/dev-haskell/gio/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- GIO is striving to provide a modern, easy-to-use VFS API that sits at the right level in the library stack.
- The goal is to overcome the shortcomings of GnomeVFS and provide an API that is
- so good that developers prefer it over raw POSIX calls.
- Among other things that means using GObject.
- It also means not cloning the POSIX API, but providing higher-level, document-centric interfaces.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/git-lfs/Manifest b/dev-haskell/git-lfs/Manifest
index 971868f91df7..a4c299b03043 100644
--- a/dev-haskell/git-lfs/Manifest
+++ b/dev-haskell/git-lfs/Manifest
@@ -1 +1 @@
-DIST git-lfs-1.1.0.tar.gz 16488 BLAKE2B 4902cada8c580abe20a3220d8f5eee8627f7f17a2f60cc876309665fde54afa27576b39165b939cb9a31b516db9fc26a01f89333a3cf1add84b595a9e6f303f0 SHA512 c662e7752ba9346b8adec5af225806f95702aaded3ea6b3d8e8871e923db24f8bd49a275fe7477cc44b65b35edab06fb7ab92f0e57d9bdd8af7b209c4adfa5c5
+DIST git-lfs-1.2.0.tar.gz 17277 BLAKE2B 6f9fb460dc7413e5a8a89a560f437a986c6d9cd140d1c4479cb1a8becd2aa478575261d83a3889167d26fe004a59af7b9c9364f3e2a2e15f08e22630b9d004fb SHA512 13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65
diff --git a/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild b/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild
deleted file mode 100644
index d159ef769a51..000000000000
--- a/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="git-lfs protocol"
-HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.6.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
-"
diff --git a/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..70a2acec2e8f
--- /dev/null
+++ b/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="git-lfs protocol"
+HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'aeson >= 1.3 && < 2.1' 'aeson >= 1.3'
+)
+
+RDEPEND="
+ >=dev-haskell/aeson-1.3:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/git-lfs/metadata.xml b/dev-haskell/git-lfs/metadata.xml
index 937381521944..da00322873bd 100644
--- a/dev-haskell/git-lfs/metadata.xml
+++ b/dev-haskell/git-lfs/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">git-lfs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/git/Manifest b/dev-haskell/git/Manifest
deleted file mode 100644
index 2a824293977c..000000000000
--- a/dev-haskell/git/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST git-0.3.0.tar.gz 45846 BLAKE2B 93eb07d136085a0512f51b67e2e3b906fc7bee2c63e1bb621570a6123da0e08e87c829c88f7f17ddaf2a9f3cb3b8d5ddc485f83a14c814da86f2863fe17087f5 SHA512 f50061a6b3bccb063f7af74cbdcad33561b45c353ce35b8071ad03b0dd0b6e0d215381d6145dfeeff8bb66fbcef0379a9d749a8a1c1f8e45857b0c6bc4574f29
diff --git a/dev-haskell/git/files/git-0.3.0-monadfail.patch b/dev-haskell/git/files/git-0.3.0-monadfail.patch
deleted file mode 100644
index ffca3a1534e1..000000000000
--- a/dev-haskell/git/files/git-0.3.0-monadfail.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From ad1e877d8e32bc3f573d92cadf697f0bb67a7da2 Mon Sep 17 00:00:00 2001
-From: Jack Todaro <solpeth@posteo.org>
-Date: Fri, 10 Jul 2020 07:01:08 +1000
-Subject: [PATCH] Data.Git.Monad.hs: port to MonadFail proposal
-
-Signed-off-by: Jack Todaro <solpeth@posteo.org>
----
- Data/Git/Monad.hs | 30 ++++++++++++++++++++++--------
- 1 file changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/Data/Git/Monad.hs b/Data/Git/Monad.hs
-index 480af9f..44a7018 100644
---- a/Data/Git/Monad.hs
-+++ b/Data/Git/Monad.hs
-@@ -17,7 +17,7 @@
- --
- -- You can also easily create a new commit: see 'CommitM' and 'withNewCommit'
- --
--
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE OverloadedStrings #-}
- {-# LANGUAGE Rank2Types #-}
-@@ -74,7 +74,9 @@ module Data.Git.Monad
- , Git.Person(..)
- ) where
-
--
-+#if !MIN_VERSION_base(4,11,0)
-+import qualified Control.Monad.Fail as Fail
-+#endif
- import Data.ByteString (ByteString)
- import qualified Data.ByteString as B
- import qualified Data.ByteString.Lazy as BL
-@@ -240,7 +242,11 @@ instance Applicative GitM where
- instance Monad GitM where
- return = returnGitM
- (>>=) = bindGitM
-- fail = failGitM
-+#if !MIN_VERSION_base(4,11,0)
-+ fail = Fail.fail
-+#endif
-+instance MonadFail GitM where
-+ fail = failGitM
-
- instance GitMonad GitM where
- getGit = getGitM
-@@ -313,7 +319,11 @@ instance Applicative CommitAccessM where
- instance Monad CommitAccessM where
- return = returnCommitAccessM
- (>>=) = bindCommitAccessM
-- fail = failCommitAccessM
-+#if !MIN_VERSION_base(4,11,0)
-+ fail = Fail.fail
-+#endif
-+instance MonadFail CommitAccessM where
-+ fail = failCommitAccessM
-
- instance GitMonad CommitAccessM where
- getGit = getCommitAccessM
-@@ -423,7 +433,7 @@ getDir fp = do
- -- > l <- getDir []
- -- > liftGit $ print l
- --
--withCommit :: (Resolvable ref, GitMonad git)
-+withCommit :: (Resolvable ref, GitMonad git, MonadFail git)
- => ref
- -- ^ the commit revision or reference to open
- -> CommitAccessM a
-@@ -474,7 +484,11 @@ instance Applicative CommitM where
- instance Monad CommitM where
- return = returnCommitM
- (>>=) = bindCommitM
-- fail = failCommitM
-+#if !MIN_VERSION_base(4,11,0)
-+ fail = Fail.fail
-+#endif
-+instance MonadFail CommitM where
-+ fail = failCommitM
-
- instance GitMonad CommitM where
- getGit = getCommitM
-@@ -599,7 +613,7 @@ deleteFile path = do
- -- > setFile ["README.md"] $ readmeContent <> "just add some more description\n"
- -- > branchWrite "master" r
- --
--withNewCommit :: (GitMonad git, Resolvable rev)
-+withNewCommit :: (GitMonad git, MonadFail git, Resolvable rev)
- => Git.Person
- -- ^ by default a commit must have an Author and a Committer.
- --
-@@ -670,7 +684,7 @@ withNewCommit p mPrec m = do
- -- )
- -- @
- --
--withBranch :: GitMonad git
-+withBranch :: (GitMonad git, MonadFail git)
- => Git.Person
- -- ^ the default Author and Committer (see 'withNewCommit')
- -> Git.RefName
---
-2.27.0
-
diff --git a/dev-haskell/git/git-0.3.0.ebuild b/dev-haskell/git/git-0.3.0.ebuild
deleted file mode 100644
index 521fbe6b0456..000000000000
--- a/dev-haskell/git/git-0.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hs-git"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/basement:=[profile?]
- >=dev-haskell/cryptonite-0.22:=[profile?]
- >=dev-haskell/hourglass-0.2:=[profile?]
- >=dev-haskell/memory-0.13:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/system-fileio:=[profile?]
- dev-haskell/system-filepath:=[profile?]
- dev-haskell/unix-compat:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- dev-haskell/vector:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/bytedump-1.0
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck )
-"
-
-PATCHES=( "${FILESDIR}/${P}-monadfail.patch" )
diff --git a/dev-haskell/git/metadata.xml b/dev-haskell/git/metadata.xml
deleted file mode 100644
index ec9c4b301b93..000000000000
--- a/dev-haskell/git/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
-
- A Haskell implementation of git storage operations, allowing users
- to manipulate git repositories (read and write).
-
- This implementation is fully interoperable with the main C implementation.
-
- This is strictly only manipulating the git store (what's inside the .git directory),
- and doesn't do anything with the index or your working directory files.
-
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/githash/Manifest b/dev-haskell/githash/Manifest
deleted file mode 100644
index 08eaa362f74b..000000000000
--- a/dev-haskell/githash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST githash-0.1.3.3.tar.gz 6670 BLAKE2B 5d05a438ae6c17a0db9b2f58d3b7889ca461e12bb97e26d22319e667446be6423b0387465ecf438bb0cb94004aaeb380483d87be718b9077fb7f610a914e9905 SHA512 767f9e57819b0450a3f004e6f7ec333657fa76b4507cf89f16ccee44a8f986c972501a1177a4449dceba68568b744846f70dae9f35bfcbc1537de5cb3cead676
diff --git a/dev-haskell/githash/githash-0.1.3.3.ebuild b/dev-haskell/githash/githash-0.1.3.3.ebuild
deleted file mode 100644
index 3ba2a2a48e8a..000000000000
--- a/dev-haskell/githash/githash-0.1.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/snoyberg/githash#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.2:="
-# The package is a wrapper around 'git'
-RDEPEND+=" dev-vcs/git"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
- test? ( dev-haskell/hspec
- dev-haskell/temporary
- dev-haskell/unliftio )
-"
diff --git a/dev-haskell/githash/metadata.xml b/dev-haskell/githash/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/githash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/gitrev/Manifest b/dev-haskell/gitrev/Manifest
deleted file mode 100644
index 1e32fba3dac6..000000000000
--- a/dev-haskell/gitrev/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gitrev-1.3.1.tar.gz 3756 BLAKE2B 6871cb2c036bba9d6e727749778e0e16939a4ff84cf5ca74caf0c198a998265a8cbeea2019ba12e1e6190413499ed1b82874bd002416d620b70bcfd85bfcce1f SHA512 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd
diff --git a/dev-haskell/gitrev/gitrev-1.3.1.ebuild b/dev-haskell/gitrev/gitrev-1.3.1.ebuild
deleted file mode 100644
index fdc78e3a0dc3..000000000000
--- a/dev-haskell/gitrev/gitrev-1.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/acfoltzer/gitrev"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.6.0:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/gitrev/metadata.xml b/dev-haskell/gitrev/metadata.xml
deleted file mode 100644
index 2ceb8a843de2..000000000000
--- a/dev-haskell/gitrev/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Some handy Template Haskell splices for including the current git hash and branch in the code of your project. Useful for including in panic messages, @--version@ output, or diagnostic info for more informative bug reports.
- </longdescription>
- <upstream>
- <remote-id type="github">acfoltzer/gitrev</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index bd25dd35b885..04856c88978b 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -1 +1 @@
-DIST glib-0.13.8.1.tar.gz 39557 BLAKE2B 791f1708d4232ec064527623fa5bcd6efa4328b79842da02e779cddf746d61e196864e7da8240952a661f9a02adac6d1a4c74e3d4f927fc1bb14312b808d849f SHA512 00558dc9dfbc507d7ac19ac4e1634317a41f465abf8b1bbb2594a96253eb4633b976aa9e1960af1260148f6a64d017acf535fef8b95789a058b762813940b5b7
+DIST glib-0.13.10.0.tar.gz 39410 BLAKE2B 4de054903034e366becd3735c8bf4a6900e39906d0aac526e7994cd0b8dae35765e88cbbc4062b138f88f33d37b96a637980042c310220c4c05ab27e0ed637d6 SHA512 59f85b442140c12338b9fecb0f51cee5aba64793f2c9baef9b50490024f58b27f6d1a525d03cf7bbd37eae49d9a0bbd75861dfc21c95a6e24de4cc991559e402
diff --git a/dev-haskell/glib/glib-0.13.10.0.ebuild b/dev-haskell/glib/glib-0.13.10.0.ebuild
new file mode 100644
index 000000000000..654997a0c298
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+closure-signals"
+
+GHC_BOOTSTRAP_PACKAGES=(
+ gtk2hs-buildtools
+)
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND=">=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+ virtual/pkgconfig
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag closure-signals closure_signals)
+}
diff --git a/dev-haskell/glib/glib-0.13.8.1.ebuild b/dev-haskell/glib/glib-0.13.8.1.ebuild
deleted file mode 100644
index a16bdd87d9e0..000000000000
--- a/dev-haskell/glib/glib-0.13.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag closure-signals closure_signals)
-}
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index 935fea6a266d..53e5649323ab 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -5,13 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The GNU Library is a collection of C data structures and utility
- function for dealing with Unicode. This package only binds as
- much functionality as required to support the packages that
- wrap libraries that are themselves based on GLib.
- </longdescription>
<use>
- <flag name="closure-signals">Use the the GClosure-based signals implementation.</flag>
+ <flag name="closure-signals">Use the the GClosure-based signals
+&#9;&#9;implementation.</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">glib</remote-id>
+ <remote-id type="github">gtk2hs/gtk2hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest
index 6c5b0feaf539..1e723dd0ef1b 100644
--- a/dev-haskell/glob/Manifest
+++ b/dev-haskell/glob/Manifest
@@ -1 +1,2 @@
-DIST Glob-0.10.1.tar.gz 29763 BLAKE2B f0618d9b230037d9f6aa52d24e2d78f7220136b0da4161dc64b7cd777835fcc5a6da963725b935d8c4653704eaf3534d50f6dbdae6e19f1bd095447937de4595 SHA512 b2b2ee93f2cadf01f8a6828b9e742a241601f5fada1f73388dc0044f8e0985c601bd6a42738c60c54eecb619b6289ac1302751d8e2402f6494aaeb2b2a4abb42
+DIST Glob-0.10.2-rev3.cabal 2938 BLAKE2B 52a1600d5eaa09126757fdc00e009708e9c3d8408523535835f8598906e24aa0590114aa75fcc5e57d0ebf6d38a2a387650824b7eb2f8ae7b79fc0f62eba0912 SHA512 8802d8cd4d19a5ffa4dda9fb55d3454de762f2701d9cc720d5a0841848a736b2470e67a9fb19a5756bd69dd89c3fec20b38466fa49d7ceb5af7ba10bf6c165da
+DIST Glob-0.10.2.tar.gz 30226 BLAKE2B b729e1b3e36d2161db185b882dcc2d331f35a284f89cb149a9210c082b1c11a3cbced76f299348a511ce1a32a5df0acdbfd4222145c62ac6e94536030f88ca70 SHA512 cd3c3fb00fad3b3e8d9ae2856a76d0d1688885ecec0b083eed87a4c1cf46111df747e66ff3e8bab2ffaf2a5f776a791442c7e0eefcf58f9d1e15e341b4c35a12
diff --git a/dev-haskell/glob/glob-0.10.1.ebuild b/dev-haskell/glob/glob-0.10.1.ebuild
deleted file mode 100644
index 0f8f8bcf04d3..000000000000
--- a/dev-haskell/glob/glob-0.10.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
- >=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
- >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glob/glob-0.10.2.ebuild b/dev-haskell/glob/glob-0.10.2.ebuild
new file mode 100644
index 000000000000..1945e66ecb33
--- /dev/null
+++ b/dev-haskell/glob/glob-0.10.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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_PN="Glob"
+CABAL_P="${CABAL_PN}-${PV}"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+S="${WORKDIR}/${CABAL_P}"
+CABAL_FILE="${S}/${CABAL_PN}.cabal"
+CABAL_DISTFILE="${CABAL_P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Globbing library"
+HOMEPAGE="https://iki.fi/matti.niemenmaa/glob/"
+SRC_URI="https://hackage.haskell.org/package/${CABAL_P}/${CABAL_P}.tar.gz
+ https://hackage.haskell.org/package/${CABAL_P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/dlist-0.4:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2
+ >=dev-haskell/quickcheck-2
+ >=dev-haskell/test-framework-0.2
+ >=dev-haskell/test-framework-hunit-0.2
+ >=dev-haskell/test-framework-quickcheck2-0.3 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
deleted file mode 100644
index 5d8f4a170aeb..000000000000
--- a/dev-haskell/gluraw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GLURaw-2.0.0.4.tar.gz 10557 BLAKE2B 6e25f2167bf4fd9307a07c1081966cd2072d145317752a53d104a0dcc9ad282f83c9d98ba2a0ccab14d900d2f1ab0b0e0d381aef651baf4f077d830de8ef0803 SHA512 971402ed5fd84e8f0e6abca27fd78bee298750930901e66cc782b53d79d28093085120c3fc373a38d5a1354d55f69e1ec1c5ede5a0b1f9a019cf705f11ffcfcc
diff --git a/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild b/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
deleted file mode 100644
index a8e6b57fa1cc..000000000000
--- a/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- virtual/glu
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/metadata.xml b/dev-haskell/gluraw/metadata.xml
deleted file mode 100644
index e1b077a5bd3b..000000000000
--- a/dev-haskell/gluraw/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is
- basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
- interface.
-
- OpenGL is the industry's most widely used and supported 2D and 3D graphics
- application programming interface (API), incorporating a broad set of
- rendering, texture mapping, special effects, and other powerful visualization
- functions. For more information about OpenGL and its various extensions,
- please see &lt;http://www.opengl.org/&gt;
- and &lt;http://www.opengl.org/registry/&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/glut/Manifest b/dev-haskell/glut/Manifest
deleted file mode 100644
index 788a07b32577..000000000000
--- a/dev-haskell/glut/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GLUT-2.7.0.15.tar.gz 654907 BLAKE2B c955d2942ffa2ac8d8370726cc32a67772dba2e343f2ad0a10e24134ae9bf5762bb108292e17275db3665572379bbaab55f605b79973bf90b066818934501aeb SHA512 d4ee183f7a9600e86ddea7783e3236ab33510217b6c1e815fb46936e95db851ea35c6b504142595779665b74912fcc312cbee8462e4719e78e9d5c99913692de
diff --git a/dev-haskell/glut/glut-2.7.0.15.ebuild b/dev-haskell/glut/glut-2.7.0.15.ebuild
deleted file mode 100644
index 851b09bc73f4..000000000000
--- a/dev-haskell/glut/glut-2.7.0.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
- >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples buildexamples) \
- --flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/metadata.xml b/dev-haskell/glut/metadata.xml
deleted file mode 100644
index 90ab938d8ff5..000000000000
--- a/dev-haskell/glut/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A Haskell binding for the OpenGL Utility Toolkit, a window system independent
- toolkit for writing OpenGL programs. For more information about the C library
- on which this binding is based, please see:
- &lt;http://www.opengl.org/resources/libraries/glut/&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
deleted file mode 100644
index 73d67f4ffc45..000000000000
--- a/dev-haskell/gnuidn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnuidn-0.2.2.tar.gz 17534 BLAKE2B e6f152145bc7626dfa9757477970d6cd6066d47350d7ccb25c99ecc8b33406c54634cbf6829ab08c5d8fc7987277e110429899436c7b99d71aafef0ac496dbb7 SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
deleted file mode 100644
index 93d7582be2c1..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- net-dns/libidn:0=
-"
-DEPEND="${RDEPEND}
- dev-haskell/c2hs
- >=dev-haskell/cabal-1.8
- virtual/pkgconfig
-"
diff --git a/dev-haskell/gnuidn/metadata.xml b/dev-haskell/gnuidn/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/gnuidn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/gnutls/Manifest b/dev-haskell/gnutls/Manifest
deleted file mode 100644
index 3778d2d7dac5..000000000000
--- a/dev-haskell/gnutls/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnutls-0.2.tar.gz 17272 BLAKE2B 2412f9a5f7a74054317f6f4c54c5813a897976da2e48a534a5a12557f04766dad680638e6f61071e9721d84ec1a4ff02b72dbf531ed392b1be6c0b5280919092 SHA512 9b5e3083fae30e4ac8584c825ed1f1c07b24136ca6d30c627f17d1c7793a515a091919784791b3a5bcd05038d8d43419802e036cefe8525efac9ee3f9ebf9e8b
diff --git a/dev-haskell/gnutls/gnutls-0.2.ebuild b/dev-haskell/gnutls/gnutls-0.2.ebuild
deleted file mode 100644
index d685017611ca..000000000000
--- a/dev-haskell/gnutls/gnutls-0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgnutls"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnutls/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- net-libs/gnutls:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- virtual/pkgconfig
-"
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/gnutls/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/graphviz/Manifest b/dev-haskell/graphviz/Manifest
deleted file mode 100644
index 98ad73df5154..000000000000
--- a/dev-haskell/graphviz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST graphviz-2999.20.0.4.tar.gz 222563 BLAKE2B 5c7f57c8c78d9711cca48372aa4832bc8b18656031bd51595aaad9e1428314d04a913ab6c9bce62ada407954c6db47224e26515c04fce1ceed5ce3a91d59dcd5 SHA512 fc0a959e642e245cea254ccec9b1bb36b9eace61da2f8350ea0961f7fdffe6c5d5f42cde068201e6110ed71db0dcaab3c14cced431768ef5ed7ae76b0e5b5e9b
diff --git a/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild b/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
deleted file mode 100644
index 1891e83361c0..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # 30 examples, 3 failures, also known to fail here on previous version
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
- >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
- >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/wl-pprint-text-1.2:=[profile?] <dev-haskell/wl-pprint-text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.14
- test? ( >=dev-haskell/fgl-5.5.0.0
- >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
- >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
- >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.14 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'hspec >= 2.1 && < 2.8' 'hspec >= 2.1' \
- 'polyparse >=1.9 && <1.14' 'polyparse >=1.9'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/metadata.xml b/dev-haskell/graphviz/metadata.xml
deleted file mode 100644
index b53bf0f4331b..000000000000
--- a/dev-haskell/graphviz/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library provides bindings for the Dot language used by the
- Graphviz (&lt;http://graphviz.org/&gt;) suite of programs for visualising
- graphs, as well as functions to call those programs.
-
- Main features of the graphviz library include:
-
- * Almost complete coverage of all Graphviz attributes and syntax.
-
- * Support for specifying clusters.
-
- * The ability to use a custom node type.
-
- * Functions for running a Graphviz layout tool with all specified
- output types.
-
- * The ability to not only generate but also parse Dot code with two
- options: strict and liberal (in terms of ordering of statements).
-
- * Functions to convert FGL graphs and other graph-like data structures
- to Dot code - including support to group them into clusters - with a
- high degree of customisation by specifying which attributes to use
- and limited support for the inverse operation.
-
- * Round-trip support for passing an FGL graph through Graphviz to
- augment node and edge labels with positional information, etc.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gridtables/Manifest b/dev-haskell/gridtables/Manifest
new file mode 100644
index 000000000000..841194af0442
--- /dev/null
+++ b/dev-haskell/gridtables/Manifest
@@ -0,0 +1 @@
+DIST gridtables-0.1.0.0.tar.gz 12279 BLAKE2B 046a97927ec0e0c78db52ab6f05c53bd0c81c08ac85fd6916044dd4f9f12b7e09c3e2b2ab3688bc922f295947a9273d1a83d5a56094642be3cefe1c033dc4b5e SHA512 c83a299b73df7e4bb4cbfe1c74a300f06708e7cbe516c369b77d9d83108da45f90b3cd704d8960071b5dcbf5dbd20abe3fea11c197668b515a71434e2e04943c
diff --git a/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild b/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild
new file mode 100644
index 000000000000..ca7f98a0ef30
--- /dev/null
+++ b/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for reStructuredText-style grid tables"
+HOMEPAGE="https://github.com/tarleb/gridtables"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/doclayout:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/gridtables/metadata.xml b/dev-haskell/gridtables/metadata.xml
new file mode 100644
index 000000000000..abeb39d51c61
--- /dev/null
+++ b/dev-haskell/gridtables/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">gridtables</remote-id>
+ <remote-id type="github">tarleb/gridtables</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest
deleted file mode 100644
index 110d810312af..000000000000
--- a/dev-haskell/groupoids/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST groupoids-4.0.tar.gz 2414 BLAKE2B 0576f3c2eb9b5a097805c6db25889a264205029ed67cf9de8769305e4f89b6880ddd1073ba6126eb5340366762e6820d7e759a21be76c34d74db0abab378a266 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289
diff --git a/dev-haskell/groupoids/groupoids-4.0.ebuild b/dev-haskell/groupoids/groupoids-4.0.ebuild
deleted file mode 100644
index 967646e97878..000000000000
--- a/dev-haskell/groupoids/groupoids-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
-HOMEPAGE="https://github.com/ekmett/groupoids/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/groupoids/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/gsasl/Manifest b/dev-haskell/gsasl/Manifest
deleted file mode 100644
index 870ac7892d97..000000000000
--- a/dev-haskell/gsasl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsasl-0.3.7.tar.gz 20184 BLAKE2B 77822255e11d8662a8b4316fa0456bb057ad250b2c823c28d79987f336872bba19596c8062cb0870a4222d68e0f862395835f53fda2a4db30c36e46f6fe595ff SHA512 7a3eb2919aee0df650cfeec62fb6cafd4cc49a9af59c54878a737816b6369cf6d63db7e8afc701c44c74ae15a46a707a20a762f7f976f8a8c1803f1f9db59ed7
diff --git a/dev-haskell/gsasl/gsasl-0.3.7.ebuild b/dev-haskell/gsasl/gsasl-0.3.7.ebuild
deleted file mode 100644
index 784abcff2d99..000000000000
--- a/dev-haskell/gsasl/gsasl-0.3.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgsasl"
-HOMEPAGE="https://git.sr.ht/~singpolyma/gsasl-haskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-loops-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- virtual/gsasl
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- virtual/pkgconfig
-"
diff --git a/dev-haskell/gsasl/metadata.xml b/dev-haskell/gsasl/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/gsasl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
deleted file mode 100644
index 7228fda1a1e4..000000000000
--- a/dev-haskell/gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtk-0.15.5.tar.gz 678555 BLAKE2B 6110bd1a44d4b276deca20dd69580b8b0442ffca11f84b36fc19c068f4bcc1eb515cba63c98b55bd3bcd5310967d94e053b5466f25729ffb8116dc9e076c3b70 SHA512 3d0a75fd1eebcd0fa7c7bf5a0a2dfd622e28b3ab8f69e0f152e10dee9fb8e13b0f6ce7da3a9f304c3f2233cdf432a6d099afc89b47ce3fb4d1cb96c25d6da26b
diff --git a/dev-haskell/gtk/gtk-0.15.5-r1.ebuild b/dev-haskell/gtk/gtk-0.15.5-r1.ebuild
deleted file mode 100644
index b3b8ef283c19..000000000000
--- a/dev-haskell/gtk/gtk-0.15.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
- >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:2
- gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag deprecated deprecated) \
- $(cabal_flag fmode-binary fmode-binary) \
- $(cabal_flag gio have-gio) \
- --flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk/metadata.xml b/dev-haskell/gtk/metadata.xml
deleted file mode 100644
index d31978ed0c26..000000000000
--- a/dev-haskell/gtk/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is the core library of the Gtk2Hs suite of libraries for Haskell
- based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
- for creating graphical user interfaces.
- </longdescription>
- <use>
- <flag name="deprecated">Include definitions in this library that are considered obsolete.</flag>
- <flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
- <flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index 180fe94efb02..c8fa72a8aac0 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -1 +1 @@
-DIST gtk2hs-buildtools-0.13.8.0.tar.gz 178465 BLAKE2B 73a3bea8e002ba641f08f3104b7c8759dba2649e8b050ac769470c7d67441e86365c4687f2645fed62cb79cbe38947c02c2622224e4568440a8d2745a045b333 SHA512 fa427979f20f10ca8baf38c80c28a5190d18b767046de347950ea799660e1d54939d668c01c469da36d2df6c347f7ba67e2e85f3a7000021f8d37852093e03fd
+DIST gtk2hs-buildtools-0.13.10.0.tar.gz 178586 BLAKE2B 56752492d84d6f884f0aaaed19af165296d8d987a15ba6d050aba234090c72929f14e5389e241a81bae5a64a5c5f3d78675143b820262ea192ed331a34525e27 SHA512 ab82220caf6d8d2499de1560130182628455f57588f7cf83d677443f38b9e5fc2980783b7d9e3e941c16fa2e0dba8882e7a3c939ff05adab5706643dfc62233a
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
deleted file mode 100644
index 123c1359ff1b..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Same fix as https://github.com/visq/language-c/issues/74
-
-"""
-Lexer: allow zeros as line numbers in preprocessed directives
-
-Starting from `gcc-11` initial line numbers not related to
-actual files are marked as zeros. See the "preprocessor:
-Better line info for <builtin> & <command-line>"
-https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9
-
-language-c's grammar did not allow it (by accident)
-
-```
-Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos
-Left <no file>:: [ERROR] >>> Syntax Error !
- Lexical error !
- The character '#' does not fit here.
-```
-
-The change allows '0' in line numbers as well.
-"""
---- a/c2hs/c/CLexer.x
-+++ b/c2hs/c/CLexer.x
-@@ -130,7 +130,7 @@ $white+ ;
- -- * allows further ints after the file name a la GCC; as the GCC CPP docu
- -- doesn't say how many ints there can be, we allow an unbound number
- --
--\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
-+\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
- { \pos len str -> setPos (adjustPos (take len str) pos) >> lexToken }
-
- -- #pragma directive (K&R A12.8)
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild
new file mode 100644
index 000000000000..292c62fa3acc
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+ dev-haskell/hashtables:=[profile?]
+ dev-haskell/random:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/alex-3.0.1
+ >=dev-haskell/cabal-3.0.0.0
+ >=dev-haskell/happy-1.18.9
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag closuresignals closuresignals)
+}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
deleted file mode 100644
index 30ffca890e99..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
- dev-haskell/fail:=[profile?]
- dev-haskell/hashtables:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.18.1.3
- dev-haskell/happy
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.8.0-gcc-11.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml
index f1582cbe816c..5b552520f5a8 100644
--- a/dev-haskell/gtk2hs-buildtools/metadata.xml
+++ b/dev-haskell/gtk2hs-buildtools/metadata.xml
@@ -5,18 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides a set of helper programs necessary to
- build the Gtk2Hs suite of libraries. These tools include
- a modified c2hs binding tool that is used to generate
- FFI declarations, a tool to build a type hierarchy that
- mirrors the C type hierarchy of GObjects found in glib,
- and a generator for signal declarations that are used
- to call back from C to Haskell. These tools are not needed
- to actually run Gtk2Hs programs.
- </longdescription>
<use>
- <flag name="closuresignals">Use the the GClosure-based signals
- implementation.</flag>
+ <flag name="closuresignals">Use the the GClosure-based signals implementation.</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">gtk2hs-buildtools</remote-id>
+ <remote-id type="github">gtk2hs/gtk2hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
deleted file mode 100644
index 9be0518f773e..000000000000
--- a/dev-haskell/gtk3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtk3-0.15.5.tar.gz 677124 BLAKE2B a6a21411fb0af55dd718b2b3b63e303d05c8636ad19ed82935ce9263f29b05f85775ee0b7123ba9b6671dcf798fbdabbdbb9831e0b1e48a2663a8c2bbfd5d5e9 SHA512 937b250f04e797b821d560a768f9eaee448f2d2d98571b6ef401de44177f50861f557e653afc7f055dfa2e15180dca9d82e36469f0fb97dff5a170ebc6c62519
diff --git a/dev-haskell/gtk3/gtk3-0.15.5.ebuild b/dev-haskell/gtk3/gtk3-0.15.5.ebuild
deleted file mode 100644
index 8afd7bb2c283..000000000000
--- a/dev-haskell/gtk3/gtk3-0.15.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: have-gio:gio,build-demos:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
- >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/glib:2
- x11-libs/gtk+:3
- gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag fmode-binary fmode-binary) \
- $(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk3/metadata.xml b/dev-haskell/gtk3/metadata.xml
deleted file mode 100644
index 1ae94681f1f6..000000000000
--- a/dev-haskell/gtk3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is the core library of the Gtk2Hs suite of libraries for Haskell
- based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
- for creating graphical user interfaces.
- </longdescription>
- <use>
- <flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
- <flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index b087e633d8ff..6e22cb418693 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,3 +1,3 @@
-DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
-DIST hackage-security-0.6.0.1-r1.cabal 12313 BLAKE2B 41dbb4a5b175fe49ab65dba01aa1cbd1a43fbf55fc9cd06697dc984f9a3917d3da5c9c3234e336b78372899848b0fa5adf09f0507617ed0835dfad1443eb62ab SHA512 f4a8d2adde837af18587d74cf4191bc12dec22802aaafc4cd86968d893a41bf912d3649be339503063f8c698a4b8a62888ad50e0e58d3836cc55de100ca51e30
-DIST hackage-security-0.6.0.1.tar.gz 86006 BLAKE2B 6d057da569beb4e30f91a630ec37247fd47a3467e6037ebf0c4391ff58d95d5477bea09f7d66ab6d0bbe49a445ea15d53ded884f9ea7922583a03ba7497cdd9a SHA512 b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb
+DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
+DIST hackage-security-0.6.2.3-rev3.cabal 12712 BLAKE2B 329c7ad4039411932fc8cdb6f5f31274de8adb11ab68a6688a03bd9d20043ee7df66e9c063aba33aaf7435470190d3e775f7d121011c5ef4b8dd8dfe2837eeb2 SHA512 cf4545d393745efd29da0882b093299d7a6cf8072c3219d71a3d5d1f754bf8b435e135df686447dd785f18ab190287ca57f2a749bb3b1d59199d6d00225684f5
+DIST hackage-security-0.6.2.3.tar.gz 86611 BLAKE2B 4cc851be655c6b4dc9435f129bcd1bda4b31dc16e0a97181c6e68a91c374d662937d5b629934087b6eb13db4c3b49217e3ed924f98024f2b868dca4eced13750 SHA512 d2bd80a940a2bacdbe6c6f5086ae846eb27548f0013952e0fe95dfbdea7bc4f17631f86f295d62b02a491f3903d8a5ab316bad2d8227fd240f459cbe966b1b84
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
deleted file mode 100644
index 7c30961a4b4d..000000000000
--- a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
---- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs 2018-03-25 19:39:07.000000000 -0400
-+++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs 2019-03-16 08:29:08.347456951 -0400
-@@ -78,7 +78,7 @@
- lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
- lookupM m fp =
- case lookup fp m of
-- Nothing -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
-+ Nothing -> error $ "No entry for " ++ pretty fp ++ " in filemap"
- Just nfo -> return nfo
-
- {-------------------------------------------------------------------------------
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
deleted file mode 100644
index fd83a5113c56..000000000000
--- a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
-index 598e151..f62f1c5 100644
---- a/tests/TestSuite.hs
-+++ b/tests/TestSuite.hs
-@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [
- testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical
- , testProperty "prop_roundtrip_pretty" JSON.prop_roundtrip_pretty
- , testProperty "prop_canonical_pretty" JSON.prop_canonical_pretty
-- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical
-+ -- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical
- ]
- ]
-
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
new file mode 100644
index 000000000000..dc26881ebdbe
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
@@ -0,0 +1,33 @@
+From b228347d62b7c69f16d1983d4c8c70f6601c7351 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 2 Jul 2023 14:33:27 -0600
+Subject: [PATCH] Change dependency on Cabal-syntax
+
+Do not add Cabal-syntax to build-depends when the Cabal-syntax flag is
+off.
+
+This will ensure that Cabal-syntax is ignored/omitted when the flag is
+off which will prevent version conflicts with >=Cabal-syntax-3.8
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ hackage-security.cabal | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/hackage-security.cabal b/hackage-security.cabal
+index 58afd57..f0463f4 100644
+--- a/hackage-security.cabal
++++ b/hackage-security.cabal
+@@ -170,8 +170,7 @@ library
+ else
+ build-depends: Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+- || >= 3.0 && < 3.7,
+- Cabal-syntax < 3.7
++ || >= 3.0 && < 3.7
+
+ hs-source-dirs: src
+ default-language: Haskell2010
+--
+2.39.3
+
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
deleted file mode 100644
index 2c6a4be4ebc2..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage security library"
-HOMEPAGE="https://github.com/haskell/hackage-security"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # QC-2.10 finds counterexamples
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
- >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/cabal-1.14:=[profile?]
- >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
- >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- >=dev-haskell/old-locale-1.0:=[profile?]
- network-uri? ( >=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?] )
- !network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.9
- >=dev-haskell/tasty-1.0
- >=dev-haskell/tasty-hunit-0.10
- >=dev-haskell/tasty-quickcheck-0.10
- >=dev-haskell/temporary-1.2
- !network-uri? ( dev-haskell/network-uri ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.12' 'base >= 4.5' \
- 'tasty == 1.0.*' 'tasty >= 1.0' \
- 'tasty-hunit == 0.10.*' 'tasty-hunit >= 0.10' \
- 'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10' \
- 'QuickCheck == 2.9.*' 'QuickCheck >= 2.9' \
- 'temporary == 1.2.*' 'temporary >= 1.2' \
- 'network >= 2.6 && < 2.7' 'network >= 2.6' \
- 'Cabal >= 1.14 && < 2.4' 'Cabal >= 1.14' \
- 'containers >= 0.4 && < 0.6' 'containers >= 0.4' \
- 'time >= 1.2 && < 1.9' 'time >= 1.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri use-network-uri)
-}
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
deleted file mode 100644
index e10ab6c3c0b5..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-# hackport: flags: -mtl21,+use-network-uri
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage security library"
-HOMEPAGE="https://github.com/haskell/hackage-security"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${P}/revision/4.cabal -> ${PF}.cabal"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+lukko"
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
- >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
- >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.6:=[profile?]
- >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
- >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6
- >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
- >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.4
- >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
- >=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
- >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
- >=dev-haskell/vector-0.12 <dev-haskell/vector-0.13 )
-"
-
-# See upstream issue #247 for more details, https://github.com/haskell/hackage-security/issues/
-PATCHES=( "${FILESDIR}/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch" )
-
-src_prepare() {
- default
-
- cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag lukko lukko) \
- --flag=-mtl21 \
- --flag=use-network-uri
-}
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
new file mode 100644
index 000000000000..ee8cdf8c13a2
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -mtl21,+use-network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+ >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+ >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+ >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ >=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.8:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+ dev-haskell/text
+ >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+ >=dev-haskell/vector-0.12 <dev-haskell/vector-0.13
+ || ( ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.5 )
+ || ( ( >=dev-haskell/aeson-1.5 <dev-haskell/aeson-1.6 )
+ ( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.1 ) ) ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag lukko lukko) \
+ --flag=-mtl21 \
+ --flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
new file mode 100644
index 000000000000..a1f898fad5cb
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -mtl21,+use-network-uri,-Cabal-syntax
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Requires Cabal-3.8 or newer
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.6.2.3-change-cabal-syntax-dep.patch"
+)
+
+CABAL_CHDEPS=(
+ '|| >= 3.0 && < 3.7' '|| >= 3.0'
+)
+
+RDEPEND="
+ >=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+ >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+ >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/network-2.6 <dev-haskell/network-2.9 )
+ ( >=dev-haskell/network-3.0 <dev-haskell/network-3.2 )
+ )
+ dev-haskell/network:=[profile?]
+ lukko? (
+ >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+# test? (
+# >=dev-haskell/cabal-3.7 <dev-haskell/cabal-3.12
+# >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+# >=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+# dev-haskell/text
+# >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+# >=dev-haskell/vector-0.12 <dev-haskell/vector-0.14
+# || (
+# ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6 )
+# ( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.2 )
+# )
+# )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-Cabal-syntax \
+ $(cabal_flag lukko lukko) \
+ --flag=-mtl21 \
+ --flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index b6aa0a6ae2b4..63d1cf7e461f 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -6,26 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
</use>
- <longdescription>
- The hackage security library provides both server and
- client utilities for securing the Hackage package server
- (&lt;http://hackage.haskell.org/&gt;). It is based on The Update
- Framework (&lt;http://theupdateframework.com/&gt;), a set of
- recommendations developed by security researchers at
- various universities in the US as well as developers on the
- Tor project (&lt;https://www.torproject.org/&gt;).
-
- The current implementation supports only index signing,
- thereby enabling untrusted mirrors. It does not yet provide
- facilities for author package signing.
-
- The library has two main entry points:
- "Hackage.Security.Client" is the main entry point for
- clients (the typical example being @cabal@), and
- "Hackage.Security.Server" is the main entry point for
- servers (the typical example being @hackage-server@).
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">hackage-security</remote-id>
+ <remote-id type="github">haskell/hackage-security</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
deleted file mode 100644
index de50c543982e..000000000000
--- a/dev-haskell/haddock-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
-DIST haddock-api-2.24.0.tar.gz 200478 BLAKE2B 5c4f7be45066583e3d3afa0b1866070f2c05d71685526b0d915461f75208f13cf6bbf2b91cc820e1f229df9dbf240cfef150fb3a9929878cfdc02db9dc124c99 SHA512 dfbe5bcfd722dc92ec70aca2dd681da9e122f60ec3da5c9583c188f65b11bade314c64d4af1a3a51cf8f618d8bea943bd4052aa9860ece38ab10717b484ed057
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
deleted file mode 100644
index 84c275fbb348..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From e455bc18e15adf05a1f32bc7c4512eedb7ab889f Mon Sep 17 00:00:00 2001
-From: Alex Biehl <alexbiehl@gmail.com>
-Date: Tue, 8 Dec 2020 19:42:52 +0100
-Subject: [PATCH 1/2] Changes for GHC#17566
-
-See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469
----
- haddock-api/src/Haddock/Backends/LaTeX.hs | 2 +-
- haddock-api/src/Haddock/Backends/Xhtml.hs | 2 +-
- .../src/Haddock/Backends/Xhtml/Decl.hs | 4 ++-
- haddock-api/src/Haddock/GhcUtils.hs | 29 +++++++++++++++++--
- haddock-api/src/Haddock/Types.hs | 1 +
- 5 files changed, 32 insertions(+), 6 deletions(-)
-
-diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs
-index 647812f93..024a6c513 100644
---- a/src/Haddock/Backends/LaTeX.hs
-+++ b/src/Haddock/Backends/LaTeX.hs
-@@ -255,7 +255,7 @@ declNames :: LHsDecl DocNameI
- , [DocName] -- names being declared
- )
- declNames (L _ decl) = case decl of
-- TyClD _ d -> (empty, [tcdName d])
-+ TyClD _ d -> (empty, [tcdNameI d])
- SigD _ (TypeSig _ lnames _ ) -> (empty, map unLoc lnames)
- SigD _ (PatSynSig _ lnames _) -> (text "pattern", map unLoc lnames)
- ForD _ (ForeignImport _ (L _ n) _ _) -> (empty, [n])
-diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
-index f80a9c05f..541f40c4f 100644
---- a/src/Haddock/Backends/Xhtml.hs
-+++ b/src/Haddock/Backends/Xhtml.hs
-@@ -407,7 +407,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode pkg qual_opt ifaces = d
- exportSubs _ = []
-
- exportName :: ExportItem DocNameI -> [IdP DocNameI]
-- exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc expItemDecl)
-+ exportName ExportDecl { expItemDecl } = getMainDeclBinderI (unLoc expItemDecl)
- exportName ExportNoDecl { expItemName } = [expItemName]
- exportName _ = []
-
-diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
-index ef0ba1b67..30b8d43eb 100644
---- a/src/Haddock/Backends/Xhtml/Decl.hs
-+++ b/src/Haddock/Backends/Xhtml/Decl.hs
-@@ -536,6 +536,8 @@ ppClassDecl summary links instances fixities loc d subdocs
- -- Only the fixity relevant to the class header
- fixs = ppFixities [ f | f@(n,_) <- fixities, n == unLoc lname ] qual
-
-+ nm = tcdNameI decl
-+
- hdr = ppClassHdr summary lctxt (unLoc lname) ltyvars lfds
-
- -- Associated types
-@@ -794,7 +796,7 @@ ppDataDecl summary links instances fixities subdocs loc doc dataDecl pats
- | otherwise = header_ +++ docSection curname pkg qual doc +++ constrBit +++ patternBit +++ instancesBit
-
- where
-- docname = tcdName dataDecl
-+ docname = tcdNameI dataDecl
- curname = Just $ getName docname
- cons = dd_cons (tcdDataDefn dataDecl)
- isH98 = case unLoc (head cons) of
-diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
-index 0874e7b4d..43fe3e774 100644
---- a/src/Haddock/GhcUtils.hs
-+++ b/src/Haddock/GhcUtils.hs
-@@ -58,8 +58,7 @@ moduleString = moduleNameString . moduleName
- isNameSym :: Name -> Bool
- isNameSym = isSymOcc . nameOccName
-
--getMainDeclBinder :: (SrcSpanLess (LPat p) ~ Pat p , HasSrcSpan (LPat p)) =>
-- HsDecl p -> [IdP p]
-+getMainDeclBinder :: HsDecl (GhcPass p) -> [IdP (GhcPass p)]
- getMainDeclBinder (TyClD _ d) = [tcdName d]
- getMainDeclBinder (ValD _ d) =
- case collectHsBindBinders d of
-@@ -221,6 +220,31 @@ getGADTConType (ConDeclH98 {}) = panic "getGADTConType"
- -- Should only be called on ConDeclGADT
- getGADTConType (XConDecl nec) = noExtCon nec
-
-+getMainDeclBinderI :: HsDecl DocNameI -> [IdP DocNameI]
-+getMainDeclBinderI (TyClD _ d) = [tcdNameI d]
-+getMainDeclBinderI (ValD _ d) =
-+ case collectHsBindBinders d of
-+ [] -> []
-+ (name:_) -> [name]
-+getMainDeclBinderI (SigD _ d) = sigNameNoLoc d
-+getMainDeclBinderI (ForD _ (ForeignImport _ name _ _)) = [unLoc name]
-+getMainDeclBinderI (ForD _ (ForeignExport _ _ _ _)) = []
-+getMainDeclBinderI _ = []
-+
-+familyDeclLNameI :: FamilyDecl DocNameI -> Located DocName
-+familyDeclLNameI (FamilyDecl { fdLName = n }) = n
-+familyDeclLNameI (XFamilyDecl nec) = noExtCon nec
-+
-+tyClDeclLNameI :: TyClDecl DocNameI -> Located DocName
-+tyClDeclLNameI (FamDecl { tcdFam = fd }) = familyDeclLNameI fd
-+tyClDeclLNameI (SynDecl { tcdLName = ln }) = ln
-+tyClDeclLNameI (DataDecl { tcdLName = ln }) = ln
-+tyClDeclLNameI (ClassDecl { tcdLName = ln }) = ln
-+tyClDeclLNameI (XTyClDecl nec) = noExtCon nec
-+
-+tcdNameI :: TyClDecl DocNameI -> DocName
-+tcdNameI = unLoc . tyClDeclLNameI
-+
- -- -------------------------------------
-
- getGADTConTypeG :: ConDecl (GhcPass p) -> LHsType (GhcPass p)
-@@ -761,4 +785,3 @@ defaultRuntimeRepVars = go emptyVarEnv
-
- go _ ty@(LitTy {}) = ty
- go _ ty@(CoercionTy {}) = ty
--
-diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
-index c2cf08bb2..853f4b1b2 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -789,6 +789,7 @@ type instance XDataDecl DocNameI = NoExtField
- type instance XSynDecl DocNameI = NoExtField
- type instance XFamDecl DocNameI = NoExtField
- type instance XXFamilyDecl DocNameI = NoExtCon
-+type instance XXTyClDecl DocNameI = NoExtCon
-
- type instance XHsIB DocNameI _ = NoExtField
- type instance XHsWC DocNameI _ = NoExtField
-
-From e1fe49e9458a5d5161adc8b5b8bfea6437a9eedf Mon Sep 17 00:00:00 2001
-From: alexbiehl <alexbiehl@gmail.com>
-Date: Tue, 8 Dec 2020 20:03:49 +0100
-Subject: [PATCH 2/2] Import intercalate
-
----
- haddock-api/src/Haddock/Interface/Rename.hs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
-index 78c585814..4d9eadac5 100644
---- a/src/Haddock/Interface/Rename.hs
-+++ b/src/Haddock/Interface/Rename.hs
-@@ -29,6 +29,7 @@ import TysWiredIn (eqTyCon_RDR)
- import Control.Applicative
- import Control.Arrow ( first )
- import Control.Monad hiding (mapM)
-+import Data.List (intercalate)
- import qualified Data.Map as Map hiding ( Map )
- import qualified Data.Set as Set
- import Prelude hiding (mapM)
diff --git a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
deleted file mode 100644
index cd03ee56f66b..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
- >=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?]
- >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
- >=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.0.0.0
- test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
- >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
- >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
deleted file mode 100644
index d17fc17abb38..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib hoogle hscolour profile test-suite" # haddock
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
- >=dev-haskell/haddock-library-1.9.0:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
- >=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.0.0.0
- test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
- >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
- >=dev-haskell/quickcheck-2.11
- )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.10.2.patch )
-
-src_prepare () {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.11 && < 2.14' 'QuickCheck >= 2.11'
-}
diff --git a/dev-haskell/haddock-api/metadata.xml b/dev-haskell/haddock-api/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/haddock-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index d021b2c1e5fc..083c44d13106 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,2 +1,2 @@
-DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
-DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d SHA512 ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5
+DIST haddock-library-1.10.0-rev3.cabal 4178 BLAKE2B 72b7e3424ed6e7974c9549f77d924bbccf6caba55bc91ef2ce13fa0c48a1eee4dd4f3a74286b64cb3b77f60427736fc4674de10b2390bfb28145cba18ec67e2d SHA512 7b9d61d23725920f4a303be38800a5679e317b8633307b028bd8168ddce5a0cc0e42d149b3b595f5e2b6afd062e87a8df877c73cea9182d21fd0292696d1e860
+DIST haddock-library-1.10.0.tar.gz 32427 BLAKE2B 7c1b26edca2a40a43622c376cd8c064c6dd333d85db37e38a26b91ff1d61004f96e1ed330c54987b5891157f560f46a56e88a730a82b2561f430014fc7aed4f0 SHA512 dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1
diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..ca8fdfae207d
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+CABAL_CHDEPS=(
+ 'hspec >= 2.4.4 && < 2.8' 'hspec >=2.4.4'
+ 'hspec-discover:hspec-discover >= 2.4.4 && < 2.8' 'hspec-discover:hspec-discover >=2.4.4'
+ 'optparse-applicative ^>= 0.15' 'optparse-applicative >=0.15'
+ 'tree-diff ^>= 0.1' 'tree-diff >=0.1'
+ 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+ 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+)
+
+RDEPEND="
+ >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/base-compat-0.11.0
+ >=dev-haskell/hspec-2.4.4
+ >=dev-haskell/optparse-applicative-0.15
+ >=dev-haskell/tree-diff-0.1
+ || (
+ ( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.12 )
+ ( >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15 )
+ )
+ )
+"
+BDEPEND="test? (
+ >=dev-haskell/hspec-discover-2.4.4
+)"
diff --git a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
deleted file mode 100644
index 0a9bf5474c7c..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
- >=dev-haskell/optparse-applicative-0.15 <dev-haskell/optparse-applicative-0.16
- >=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
- >=dev-haskell/base-compat-0.9.3 <dev-haskell/base-compat-0.12
- >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
- 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3'
-}
diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
deleted file mode 100644
index 59c2d563d118..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/hspec-2.4.4
- >=dev-haskell/optparse-applicative-0.15
- >=dev-haskell/tree-diff-0.1
- >=dev-haskell/base-compat-0.9.3
- >=dev-haskell/quickcheck-2.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
- 'hspec >= 2.4.4 && < 2.8' 'hspec >= 2.4.4' \
- 'optparse-applicative ^>= 0.15' 'optparse-applicative >= 0.15' \
- 'QuickCheck ^>= 2.11 || ^>= 2.13.2' 'QuickCheck >= 2.11' \
- 'tree-diff ^>= 0.1' 'tree-diff >= 0.1'
-}
diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
index 2abd7bdab3b9..9272627d4f5e 100644
--- a/dev-haskell/haddock-library/metadata.xml
+++ b/dev-haskell/haddock-library/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Haddock is a documentation-generation tool for Haskell
- libraries. These modules expose some functionality of it
- without pulling in the GHC dependency. Please note that the
- API is likely to change so specify upper bounds in your
- project if you can't release often. For interacting with Haddock
- itself, see the <pkg>dev-haskell/haddock</pkg> package.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">haddock-library</remote-id>
+ <remote-id type="github">haskell/haddock</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
deleted file mode 100644
index a900dd75f77f..000000000000
--- a/dev-haskell/haddock/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
-DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036 SHA512 52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003
diff --git a/dev-haskell/haddock/haddock-2.23.1.ebuild b/dev-haskell/haddock/haddock-2.23.1.ebuild
deleted file mode 100644
index 21f858ae97ac..000000000000
--- a/dev-haskell/haddock/haddock-2.23.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="" # test-suite unavailable
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.8.3
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # test suite unavailable
-
-RDEPEND="~dev-haskell/haddock-api-2.23.1:=
- >=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.0.0.0
-" # test? ( ~dev-haskell/haddock-test-0.0.1 )
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/haddock-2.24.0.ebuild b/dev-haskell/haddock/haddock-2.24.0.ebuild
deleted file mode 100644
index 08f165ce877f..000000000000
--- a/dev-haskell/haddock/haddock-2.24.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="" # broken test-suite
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # test suite unavailable on hackage
-
-RDEPEND="~dev-haskell/haddock-api-2.24.0:=
- >=dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.0.0.0"
-# test? ( ~dev-haskell/haddock-test-0.0.1 )
-#"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/metadata.xml b/dev-haskell/haddock/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/haddock/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
deleted file mode 100644
index da24e9ffe3ae..000000000000
--- a/dev-haskell/hakyll/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hakyll-4.14.0.0.tar.gz 109807 BLAKE2B e1e6e541f5783571740744b9eee1bcd9edd79eec69b5556de39ef7a47f86e23fa0284ccb83ff9212ff4b07b7e2519eff67946ebdbf90663421cf98ea9761c529 SHA512 5f3f7a952b085cf1a59a646c15e42f29c89d4ed0a5a96f55156d19b86340c2361da6c19ff7a70bde98122423e237dc7082bfcc84bc5e96ab9421fdaef84a8cce
diff --git a/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild b/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild
deleted file mode 100644
index a9d1b64fa5f2..000000000000
--- a/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A static website compiler library"
-HOMEPAGE="https://jaspervdj.be/hakyll"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
-
-RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.14:=[profile?]
- >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
- >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
- >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
- >=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- >=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
- >=dev-lang/ghc-8.6.3:=
- buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.14:=[profile?] )
- checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
- previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
- >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
- >=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
- >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
- !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
- watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
- usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
- >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- # See upstream commit making this change:
- # https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246
- cabal_chdeps \
- 'pandoc >= 2.11 && < 2.12' 'pandoc >= 2.11' \
- 'pandoc >= 2.11 && < 2.12' 'pandoc >= 2.11'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag buildwebsite buildwebsite) \
- $(cabal_flag checkexternal checkexternal) \
- $(cabal_flag previewserver previewserver) \
- $(cabal_flag usepandoc usepandoc) \
- $(cabal_flag watchserver watchserver)
-}
-
-src_test() {
- # unixFilter test expects 'option' output in error message
- # But it's a localized string that:
- # https://github.com/jaspervdj/hakyll/issues/607
- LANGUAGE=en haskell-cabal_src_test
-}
diff --git a/dev-haskell/hakyll/metadata.xml b/dev-haskell/hakyll/metadata.xml
deleted file mode 100644
index 68225177cd41..000000000000
--- a/dev-haskell/hakyll/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="buildwebsite">Build the hakyll website</flag>
- <flag name="previewserver">Include the preview server</flag>
- <flag name="checkexternal">Include external link checking</flag>
- <flag name="watchserver">wait for filesystem changes and rebuild pages</flag>
- <flag name="usepandoc">Include Pandoc support</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/half/Manifest b/dev-haskell/half/Manifest
deleted file mode 100644
index a2e18e5771de..000000000000
--- a/dev-haskell/half/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST half-0.3.tar.gz 7341 BLAKE2B d37dad7dbc36b894132b4fdd430280be5305acc2fb26b0a88c68e5ca9678f7608d2086154fb174bd453723a466c7b1e4bc2dd055d48aa28b1938d545218bd1df SHA512 576766a8d5ae767da3915541195b68ce9586ff7a4a83473364a9d73d44b147b8fec4ecc09dc071520dd422b092e6291348dd2af25454a779b9c62e02cef0964c
diff --git a/dev-haskell/half/half-0.3-r1.ebuild b/dev-haskell/half/half-0.3-r1.ebuild
deleted file mode 100644
index dc4816532737..000000000000
--- a/dev-haskell/half/half-0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Half-precision floating-point"
-HOMEPAGE="https://github.com/ekmett/half"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/quickcheck-2.9
- >=dev-haskell/hspec-2.4 )
-"
diff --git a/dev-haskell/half/metadata.xml b/dev-haskell/half/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/half/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hamlet/Manifest b/dev-haskell/hamlet/Manifest
deleted file mode 100644
index cf6652ff1556..000000000000
--- a/dev-haskell/hamlet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hamlet-1.2.0.tar.gz 1636 BLAKE2B 21b9b161238d715f5ec2c4e97ba05b87c73276f5acfea11c2bf04eb64c4bf24902def08be45ee4199e7489798e2d6df87aebf934c9a771f070078272d99a9cff SHA512 8bc20f0ddc64b6943f0e85cd7f6babf5bbd6121bf50d420824320241b6ea270876fb58e39e3275d8476b959a815e6a6fee711e3376c18e88f25cccfeb059f99a
diff --git a/dev-haskell/hamlet/hamlet-1.2.0.ebuild b/dev-haskell/hamlet/hamlet-1.2.0.ebuild
deleted file mode 100644
index 3fa8422e6489..000000000000
--- a/dev-haskell/hamlet/hamlet-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haml-like template files that are compile-time checked (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hamlet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
deleted file mode 100644
index 066cbc80ede8..000000000000
--- a/dev-haskell/happstack-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f SHA512 e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e
diff --git a/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
deleted file mode 100644
index fd564869651b..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="http://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- dev-haskell/exceptions:=[profile?]
- dev-haskell/extensible-exceptions:=[profile?]
- >=dev-haskell/hslogger-1.0.2:=[profile?]
- dev-haskell/html:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- dev-haskell/old-locale:=[profile?]
- <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?]
- >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?]
- dev-haskell/syb:=[profile?]
- >=dev-haskell/system-filepath-0.3.1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/threads-0.5:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- dev-haskell/xhtml:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
deleted file mode 100644
index 12beb4b37e38..000000000000
--- a/dev-haskell/happstack-server/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
- </longdescription>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 9258d5307181..aaa3de4cec94 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1 +1,2 @@
DIST happy-1.19.12.tar.gz 183254 BLAKE2B 17b0d30f4aaf194a0e36c06bd6349665c704b5ab61dce16cae47f0ca6bfef0a0e2d4bbf3456f47cebf0f71f1a0b4a59ff6b581cb4ff76a26d82573eb0e7b056a SHA512 20f36b17adf7330852fd4c05335adbf31e6f19907b4ec247c85a40ee1f8496c6dc432055026696906b149cec7f982b88c9a2eeedf14a11d34b1f6f73272e5208
+DIST happy-1.20.1.1.tar.gz 183409 BLAKE2B b9bb9da227b21e6a63a9649454745f32b6f9fb2c33132da60595ab1bbca0e6659a6941ec89ed0705f9c5052dfc1dc076888c0b309d797f699a1d398e04d5913a SHA512 a2ff6a1778884de22f4900a22b8a451ed5dc8a8e66020ce9e186a03068257748a3810c63b56f1efa0b646d99fe637f87178983f387d4c49bc33b82613877ec48
diff --git a/dev-haskell/happy/happy-1.19.12.ebuild b/dev-haskell/happy/happy-1.19.12.ebuild
index c67b77e14afb..b9635469540b 100644
--- a/dev-haskell/happy/happy-1.19.12.ebuild
+++ b/dev-haskell/happy/happy-1.19.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
#hackport: flags: +small_base
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="doc"
RDEPEND=">=dev-haskell/mtl-2.2.1:=
diff --git a/dev-haskell/happy/happy-1.20.1.1.ebuild b/dev-haskell/happy/happy-1.20.1.1.ebuild
new file mode 100644
index 000000000000..de73725aa660
--- /dev/null
+++ b/dev-haskell/happy/happy-1.20.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal autotools
+
+DESCRIPTION="Happy is a parser generator for Haskell"
+HOMEPAGE="https://www.haskell.org/happy/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-haskell/mtl-2.2.1:=
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ doc? ( ~app-text/docbook-xml-dtd-4.2
+ app-text/docbook-xsl-stylesheets )
+"
+
+src_prepare() {
+ default
+
+ if use doc; then
+ cd doc || die
+ eautoconf
+ fi
+}
+
+src_configure() {
+ # '--with-happy=false' allows detecting circular
+ # depends even when 'happy' is installed in system
+ haskell-cabal_src_configure \
+ --with-happy=false\
+ --flag=small_base
+
+ if use doc; then
+ # does not like out-of-source builds
+ cd doc || die
+ econf
+ fi
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+
+ if use doc; then
+ emake -C doc -j1
+ fi
+}
+
+src_install() {
+ haskell-cabal_src_install
+
+ if use doc; then
+ docinto html
+ dodoc -r doc/happy/.
+ doman doc/happy.1
+ fi
+}
diff --git a/dev-haskell/harp/Manifest b/dev-haskell/harp/Manifest
deleted file mode 100644
index f5beec9dc043..000000000000
--- a/dev-haskell/harp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST harp-0.4.3.2.tar.gz 2908 BLAKE2B 70ce7ab8d4ea89700412bf78cced290ae7d4a0b880f4814c2cdae57f64e8e5a8cd3684dd5a8cae19589a520514ee71b75697bd36cb93a03458c31da235ef919b SHA512 912e4a79eea4fa5ee1b989b2b073676874303aa68fdb91dda24e2e87b7445f1fc0db92bc01159021cdfe64a3875477985fcbe5cc6a9b698e6604da978c265020
diff --git a/dev-haskell/harp/harp-0.4.3.2.ebuild b/dev-haskell/harp/harp-0.4.3.2.ebuild
deleted file mode 100644
index 6d0c7ef3f3b6..000000000000
--- a/dev-haskell/harp/harp-0.4.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base < 4.13' 'base'
-}
diff --git a/dev-haskell/harp/metadata.xml b/dev-haskell/harp/metadata.xml
deleted file mode 100644
index 4134cb256d1e..000000000000
--- a/dev-haskell/harp/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription lang="en">
- HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
- normal pattern matching facility with the power of regular expressions. This
- expressive power is highly useful in a wide range of areas, including text
- parsing and XML processing. Regular expression patterns in HaRP work over
- ordinary Haskell lists ([]) of arbitrary type. HaRP is implemented as a
- pre-processor to ordinary Haskell.
- </longdescription>
- <upstream>
- <remote-id type="github">seereason/harp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
deleted file mode 100644
index 8c3a45c1d7eb..000000000000
--- a/dev-haskell/hashable-time/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
deleted file mode 100644
index 72b81da8323a..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="https://hackage.haskell.org/package/hashable-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.7 && <4.13' 'base >=4.7' \
- 'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable-time/metadata.xml b/dev-haskell/hashable-time/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hashable-time/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index b8f7c7c6c831..6349c517f370 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1 +1,3 @@
-DIST hashable-1.2.7.0.tar.gz 30182 BLAKE2B 7dee78e531fb396c51531f7b239f45a316bad3494590684b13814894a606ab8ddf7ef85a2027f26eeddad0a38f2c06a8a16d03b1b67ce009f9e8aed6cc872232 SHA512 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7
+DIST hashable-1.4.0.2.tar.gz 25528 BLAKE2B a9d219ce08db64b2bccf691f26ea5e248785ac3263ce1045eb612d2deaf51baa5f0b14270a9810aa1d32193fe9f52b26c2ca4fccb94b98e2ccdcb0b6ba6e8a56 SHA512 a8cc2b7cafa8f18d9a74490d2dff7edf12901b7c40ca0c1881af579695135c1ca7629347d34d0c7dc662078d7669d5d6234bd889c1f77f344297942243fe7dda
+DIST hashable-1.4.2.0-rev1.cabal 4520 BLAKE2B fa09b82c6df33e80381957593f9e4c9206467f9b81ed4dcca73f7924ffee68ccc78600875ca46709582cb231aebff54fa1328fbdee1c0b8613c0d12726f3fc1f SHA512 a244e2e323faa8e36865b52aafbf3f8a792d1051379b11fc5be5f4257c64d5a6c52e4bdbf3a24790f23de707f13ef645ac13222cbc05b5f1e77e4c05564d9298
+DIST hashable-1.4.2.0.tar.gz 25094 BLAKE2B c398381bd1555b4c3d91656391ac492b036daa2f67cc501af8734d46a891e55028f0e7af4cede1d4ebd57863a2ceb10493ec822a01d29bb0edf07c8dc574e199 SHA512 6e44177b6c00d4b385696348a8f66e6158beeb224aa85726141bc4d58c5e3094dab35dd68ae4ef61845ccb3ffd8836547d988d61e9b39176782b567189381140
diff --git a/dev-haskell/hashable/hashable-1.2.7.0.ebuild b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
deleted file mode 100644
index dbcf2526b0c2..000000000000
--- a/dev-haskell/hashable/hashable-1.2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 examples +gmp"
-
-RESTRICT=test # circular deps: hashable[test]->quickcheck->semigroups->hashable
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.4 && < 4.12' 'base >= 4.4'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples examples) \
- $(cabal_flag gmp integer-gmp) \
- $(cabal_flag cpu_flags_x86_sse2 sse2) \
- $(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild b/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild
new file mode 100644
index 000000000000..94059d396072
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,+integer-gmp,+random-initial-seed
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+RESTRICT=test # circular deps: hashable[test]->quickcheck->semigroups->hashable
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/haskell-unordered-containers/hashable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="random-initial-seed"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( dev-haskell/hunit
+# >=dev-haskell/quickcheck-2.4.0.1
+# >=dev-haskell/random-1.0 <dev-haskell/random-1.3
+# >=dev-haskell/test-framework-0.3.3
+# dev-haskell/test-framework-hunit
+# >=dev-haskell/test-framework-quickcheck2-0.2.9 )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=integer-gmp \
+ $(cabal_flag random-initial-seed random-initial-seed)
+}
diff --git a/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild b/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild
new file mode 100644
index 000000000000..4c505a202cd9
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,+integer-gmp,+random-initial-seed
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/haskell-unordered-containers/hashable"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="random-initial-seed"
+
+RESTRICT=test # fails 1 test consistently on ghc-9.0.2
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.6:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+ >=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.4.0.1
+ >=dev-haskell/random-1.0 <dev-haskell/random-1.3
+ >=dev-haskell/test-framework-0.3.3
+ dev-haskell/test-framework-hunit
+ >=dev-haskell/test-framework-quickcheck2-0.2.9
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=integer-gmp \
+ $(cabal_flag random-initial-seed random-initial-seed)
+}
diff --git a/dev-haskell/hashable/metadata.xml b/dev-haskell/hashable/metadata.xml
index 56c3b878bc95..60a3f5314947 100644
--- a/dev-haskell/hashable/metadata.xml
+++ b/dev-haskell/hashable/metadata.xml
@@ -5,14 +5,15 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package defines a class, 'Hashable', for types that
- can be converted to a hash value. This class
- exists for the benefit of hashing-based data
- structures. The package provides instances for
- basic types and a way to combine hash values.
- </longdescription>
+ <use>
+ <flag name="random-initial-seed">
+ Randomly initialize the seed on every executable invocation. This
+ is not a security feature and is intended only for testing (it
+ can affect legitimate use cases).
+ </flag>
+ </use>
<upstream>
- <remote-id type="github">tibbe/hashable</remote-id>
+ <remote-id type="hackage">hashable</remote-id>
+ <remote-id type="github">haskell-unordered-containers/hashable</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index 1fe7076067dc..0a4264f7732a 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1 +1 @@
-DIST hashtables-1.2.4.1.tar.gz 58425 BLAKE2B 1e7d0e0f80e2e8ef17370f7019f802989c12eb7a7e340cfac44fa4138baa105985846262b0d5eeb1f59ee21d27a5036dce9c45623fecf6ecdf319ed8d4e36bc8 SHA512 e88fb8f9c8a51be31e5d07ca1fef3d1a05a347942878f84a500d8c224b1118a2be97f9a947f17834a8331f296f302eafeef34d1f151360361675ecf5204b38f6
+DIST hashtables-1.3.1.tar.gz 58697 BLAKE2B d543987f667553b0739b414600190127840cb656d1509cb2541274bed00c298d176ff8ae059f79cc1dbf9201f1e76697103c9620a6208e9a9bf744cafea379d5 SHA512 b6430e092cfa9cde3dbea34cd9e2a10869c41e40e88f79e28aa6aabfdcd359dd74fb87020f8b9e004b817a6e9a8825335fcc91c2b88f7eb93b25758c71c77833
diff --git a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild b/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
deleted file mode 100644
index b4558c556890..000000000000
--- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
- >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
- >=dev-haskell/quickcheck-2.3.0.2
- >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3
- >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag bounds-checking bounds-checking) \
- $(cabal_flag debug debug) \
- $(cabal_flag detailed-profiling detailed-profiling) \
- $(cabal_flag portable portable) \
- $(cabal_flag cpu_flags_x86_sse4_2 sse42) \
- $(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/hashtables-1.3.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
new file mode 100644
index 000000000000..13d8df830c14
--- /dev/null
+++ b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: sse42:cpu_flags_x86_sse4_2,+unsafe-tricks,-portable
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mutable hash tables in the ST monad"
+HOMEPAGE="https://github.com/gregorycollins/hashtables"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling"
+
+RDEPEND="
+ =dev-haskell/hashable-1.4*:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+ >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
+ >=dev-haskell/quickcheck-2.3.0.2
+ >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3
+ >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bounds-checking bounds-checking) \
+ $(cabal_flag debug debug) \
+ $(cabal_flag detailed-profiling detailed-profiling) \
+ --flag=-portable \
+ $(cabal_flag cpu_flags_x86_sse4_2 sse42) \
+ --flag=unsafe-tricks
+}
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 86c607e5ac2e..0cf72ece23fa 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -3,107 +3,14 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides a couple of different implementations of mutable hash
- tables in the ST monad, as well as a typeclass abstracting their common
- operations, and a set of wrappers to use the hash tables in the IO monad.
-
- /QUICK START/: documentation for the hash table operations is provided in the
- "Data.HashTable.Class" module, and the IO wrappers (which most users will
- probably prefer) are located in the "Data.HashTable.IO" module.
-
- This package currently contains three hash table implementations:
-
- 1. "Data.HashTable.ST.Basic" contains a basic open-addressing hash table
- using linear probing as the collision strategy. On a pure speed basis it
- should currently be the fastest available Haskell hash table
- implementation for lookups, although it has a higher memory overhead
- than the other tables and can suffer from long delays when the table is
- resized because all of the elements in the table need to be rehashed.
-
- 2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
- hashing\" as introduced by Pagh and Rodler in 2001 (see
- &lt;https://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
- worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
- the table can perform acceptably well even when more than 90% full.
- Randomized testing shows this implementation of cuckoo hashing to be
- slightly faster on insert and slightly slower on lookup than
- "Data.Hashtable.ST.Basic", while being more space efficient by about a
- half-word per key-value mapping. Cuckoo hashing, like the basic hash
- table implementation using linear probing, can suffer from long delays
- when the table is resized.
-
- 3. "Data.HashTable.ST.Linear" contains a linear hash table (see
- &lt;https://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
- and lookup performance for higher space efficiency and much shorter
- delays when expanding the table. In most cases, benchmarks show this
- table to be currently slightly faster than @Data.HashTable@ from the
- Haskell base library.
-
- It is recommended to create a concrete type alias in your code when using this
- package, i.e.:
-
- &gt; import qualified Data.HashTable.IO as H
- &gt;
- &gt; type HashTable k v = H.BasicHashTable k v
- &gt;
- &gt; foo :: IO (HashTable Int Int)
- &gt; foo = do
- &gt; ht &lt;- H.new
- &gt; H.insert ht 1 1
- &gt; return ht
-
- Firstly, this makes it easy to switch to a different hash table implementation,
- and secondly, using a concrete type rather than leaving your functions abstract
- in the HashTable class should allow GHC to optimize away the typeclass
- dictionaries.
-
- This package accepts a couple of different cabal flags:
-
- * @unsafe-tricks@, default /ON/. If this flag is enabled, we use some
- unsafe GHC-specific tricks to save indirections (namely @unsafeCoerce#@
- and @reallyUnsafePtrEquality#@. These techniques rely on assumptions
- about the behaviour of the GHC runtime system and, although they've been
- tested and should be safe under normal conditions, are slightly
- dangerous. Caveat emptor. In particular, these techniques are
- incompatible with HPC code coverage reports.
-
- * @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
- instructions (see &lt;https://en.wikipedia.org/wiki/SSE4&gt;, first available on
- Intel Core 2 processors) to speed up cache-line searches for cuckoo
- hashing.
-
- * @bounds-checking@, default /OFF/. If this flag is enabled, array accesses
- are bounds-checked.
-
- * @debug@, default /OFF/. If turned on, we'll rudely spew debug output to
- stdout.
-
- * @portable@, default /OFF/. If this flag is enabled, we use only pure
- Haskell code and try not to use unportable GHC extensions. Turning this
- flag on forces @unsafe-tricks@ and @sse41@ /OFF/.
-
- This package has been tested with GHC 7.0.3, on:
-
- * a MacBook Pro running Snow Leopard with an Intel Core i5 processor,
- running GHC 7.0.3 in 64-bit mode.
-
- * an Arch Linux desktop with an AMD Phenom II X4 940 quad-core processor.
-
- * a MacBook Pro running Snow Leopard with an Intel Core 2 Duo processor,
- running GHC 6.12.3 in 32-bit mode.
-
- Please send bug reports to
- &lt;https://github.com/gregorycollins/hashtables/issues&gt;.
- </longdescription>
<use>
<flag name="bounds-checking">if on, use bounds-checking array accesses</flag>
<flag name="detailed-profiling">add detailed profiling information to profiled build-depends</flag>
- <flag name="portable">if on, use only pure Haskell code and no GHC extensions.</flag>
- <flag name="unsafe-tricks">turn on unsafe GHC tricks</flag>
</use>
<upstream>
+ <remote-id type="hackage">hashtables</remote-id>
<remote-id type="github">gregorycollins/hashtables</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index bcebc77ebeb4..314ae7a6e71a 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1 +1,2 @@
-DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
+DIST haskeline-0.8.2-rev3.cabal 6005 BLAKE2B 33c5f34d92060bef118fd9685cfe26384a1494e1bfe9eff0ed397fcbb00908a19a070d1c3502dd7bcf538f85ffcc56b986170453c3b59a877584bcf9bfd9e629 SHA512 86461b6b5398c42fd4776c60854b0d251a7762b21ef0a65978182b2f4411400352a55773eaa2fecb7aa1fc309554c8d50ff9bf01254c22352a3d384cde92d4c5
+DIST haskeline-0.8.2.tar.gz 72759 BLAKE2B 389908d07775bd150801c7423f3cdc860e1330c0f13cd754374870b4aea19d5bd01f761aec7aa0f2effe87a80c25dc8e7f4390c095627c4d25ed2976de855a63 SHA512 5e8dccceb2230340a7f07f2e0926a938b52106d8a1638be6c1a031802ecbdf12cb42246096518ac12614d5d48479666a44ad33e5e32ab0ac2043b630a7b53746
diff --git a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
deleted file mode 100644
index 2a793ea65887..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="https://github.com/judah/haskeline"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+terminfo"
-
-RDEPEND=">=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.9 && < 4.13' 'base >=4.9'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag terminfo terminfo)
-}
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
diff --git a/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..e3c2e948c9c5
--- /dev/null
+++ b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -examples
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="A command-line interface for user input, written in Haskell"
+HOMEPAGE="https://github.com/judah/haskeline"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+terminfo"
+
+RESTRICT=test # test requires example executable which does not work correctly
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-examples \
+ $(cabal_flag terminfo terminfo)
+}
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
index 3e0dfe213e4f..0151f4371988 100644
--- a/dev-haskell/haskeline/metadata.xml
+++ b/dev-haskell/haskeline/metadata.xml
@@ -5,18 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Haskeline provides a user interface for line input in command-line
- programs. This library is similar in purpose to readline, but since
- it is written in Haskell it is (hopefully) more easily used in other
- Haskell programs.
-
- Haskeline runs both on POSIX-compatible systems and on Windows.
- </longdescription>
<use>
<flag name="terminfo">Use the terminfo package for POSIX consoles.</flag>
</use>
<upstream>
+ <remote-id type="hackage">haskeline</remote-id>
<remote-id type="github">judah/haskeline</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index 0cabd6c8e6da..3485b5f55373 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1 +1 @@
-DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
+DIST haskell-lexer-1.1.tar.gz 14368 BLAKE2B e06a1399c45511c8f67516fc7abba2eecbdb22a39f6278ec17418ae43a4f2c74bd1e47053f55b06bf45697f9760b2efc3787429674b08554fd2aa51a3203e673 SHA512 7a93d135d8994941ac73feba6b22a82e05b3c124d2aaefeb33851c28d2268714ebf5fac6abea9544097b7afc2cb3945caed600cc08f9867bc819b96fe467b28f
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
deleted file mode 100644
index d4c2c7acfd7f..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="https://github.com/yav/haskell-lexer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
new file mode 100644
index 000000000000..05972606fe05
--- /dev/null
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A fully compliant Haskell 98 lexer"
+HOMEPAGE="https://github.com/yav/haskell-lexer"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/haskell-lexer/metadata.xml b/dev-haskell/haskell-lexer/metadata.xml
index 937381521944..2c08d6790c93 100644
--- a/dev-haskell/haskell-lexer/metadata.xml
+++ b/dev-haskell/haskell-lexer/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">yav/haskell-lexer</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts-util/Manifest b/dev-haskell/haskell-src-exts-util/Manifest
deleted file mode 100644
index 0883a9994e08..000000000000
--- a/dev-haskell/haskell-src-exts-util/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST haskell-src-exts-util-0.2.5.tar.gz 6428 BLAKE2B 42211d72756d97e7761148b8cc0d7b2a548db38b007d506fc1cad3ef2e7003e352c225201e047683c82b4ec8561825170b6976f36a4d824d3595173023f2b76d SHA512 0497d8e2206402cc295289b1893f326c8f5fa7fc00177279b7af389b3351a94a123d7eb754d8a245981bae51d1a978684791d9b111befca2888bc7fe22f07147
diff --git a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
deleted file mode 100644
index ce057531edb5..000000000000
--- a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Helper functions for working with haskell-src-exts trees"
-HOMEPAGE="https://github.com/pepeiborra/haskell-src-exts-util"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default:=[profile?]
- >=dev-haskell/haskell-src-exts-1.20.0:=[profile?]
- dev-haskell/semigroups:=[profile?]
- dev-haskell/uniplate:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/haskell-src-exts-util/metadata.xml b/dev-haskell/haskell-src-exts-util/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/haskell-src-exts-util/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index f86d6143b9f7..4c2cdbcbf8e4 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,2 +1 @@
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
-DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
+DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0 SHA512 c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index cc8b39436970..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- dev-haskell/happy
- test? ( dev-haskell/mtl
- dev-haskell/pretty-show
- >=dev-haskell/smallcheck-1.0
- dev-haskell/syb
- >=dev-haskell/tasty-0.3
- >=dev-haskell/tasty-golden-2.2.2
- dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
deleted file mode 100644
index 9f059879744c..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.21/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.18.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- dev-haskell/happy
- test? ( dev-haskell/mtl
- >=dev-haskell/pretty-show-1.6.16
- >=dev-haskell/smallcheck-1.0
- >=dev-haskell/tasty-0.3
- >=dev-haskell/tasty-golden-2.2.2
- dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=base4
-}
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
new file mode 100644
index 000000000000..11f448db3079
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
+HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ dev-haskell/happy
+ test? ( >=dev-haskell/pretty-show-1.6.16
+ >=dev-haskell/smallcheck-1.0
+ >=dev-haskell/tasty-0.3
+ >=dev-haskell/tasty-golden-2.2.2
+ dev-haskell/tasty-smallcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4
+}
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 1314698031a7..135db545c9df 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,22 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription lang="en">
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
- * Multi-parameter type classes with functional dependencies
- * Empty data declarations
- * GADTs
- * Implicit parameters (ghc and hugs style)
- * Template Haskell (broken for 6.4, needs redoing)
-</longdescription>
- <upstream>
- <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
deleted file mode 100644
index 9fefff683676..000000000000
--- a/dev-haskell/haskell-src-meta/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST haskell-src-meta-0.8.5.tar.gz 24027 BLAKE2B f94f88fa7a5edac23cab13de346056a3b9f6fb30e47de8f98142378211d7d12ad1622317bed04dec3cc322730023b0cce5e571016b6325c05e2503fe9fafa73a SHA512 873a797f53fc30dbb51b719228bc649f47d1c3432380a82b5dca11574b432676ed29d297c7547f1d752bb1c977c8858e55fb5135ffb58146b938d02414fe6723
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
deleted file mode 100644
index 142ba4bdc860..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: fails to build
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests/Splices.hs:69:77: error: Not in scope: data constructor ‘Extension.QuantifiedConstraints’
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src-exts-1.24:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- >=dev-haskell/th-orphans-0.12:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'haskell-src-exts >= 1.18 && < 1.23' 'haskell-src-exts >= 1.18 && < 1.24'
-}
diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
deleted file mode 100644
index 524b5ca5b136..000000000000
--- a/dev-haskell/haskell-src-meta/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The translation from haskell-src-exts abstract syntax
- to template-haskell abstract syntax isn't 100% complete yet.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest
deleted file mode 100644
index cbf48573cb3b..000000000000
--- a/dev-haskell/haskell-src/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5
diff --git a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
deleted file mode 100644
index 84342b0d6847..000000000000
--- a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit bd0a8199252f4cd7f5d93ee862a919646f85a06f
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date: Wed Sep 18 12:36:15 2019 +0100
-
- Build with GHC 8.8
-
-diff --git a/Language/Haskell/ParseMonad.hs b/Language/Haskell/ParseMonad.hs
-index 1ed9b7a..f9bea5e 100644
---- a/Language/Haskell/ParseMonad.hs
-+++ b/Language/Haskell/ParseMonad.hs
-@@ -12,6 +12,8 @@
- --
- -----------------------------------------------------------------------------
-
-+{-# LANGUAGE CPP #-}
-+
- module Language.Haskell.ParseMonad(
- -- * Parsing
- P, ParseResult(..), atSrcLoc, LexContext(..),
-@@ -134,7 +136,9 @@ instance Monad P where
- case m i x y l s mode of
- Failed loc msg -> Failed loc msg
- Ok s' a -> runP (k a) i x y l s' mode
-+#if !(MIN_VERSION_base(4,13,0))
- fail = Fail.fail
-+#endif
-
- -- | @since 1.0.3.0
- instance Fail.MonadFail P where
-@@ -191,7 +195,9 @@ instance Monad (Lex r) where
- return = pure
- Lex v >>= f = Lex $ \k -> v (\a -> runL (f a) k)
- (>>) = (*>)
-+#if !(MIN_VERSION_base(4,13,0))
- fail = Fail.fail
-+#endif
-
- -- | @since 1.0.3.0
- instance Fail.MonadFail (Lex r) where
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
deleted file mode 100644
index 04e987ba642d..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- dev-haskell/happy
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.3.0-ghc-8.8.patch )
diff --git a/dev-haskell/haskell-src/metadata.xml b/dev-haskell/haskell-src/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/haskell-src/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
deleted file mode 100644
index 26608caf28cb..000000000000
--- a/dev-haskell/haxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HaXml-1.25.5.tar.gz 145834 BLAKE2B 4afb4a4ee5b9af2229edd797177550dcc6fc4c917f69d87670bb8bd1232398a0138a2f297222fc8677c1fd1cd50e37ee9e3480ff5d363095263d48e3f06efa6e SHA512 c2aa429198b4ba9b3a32ddf10e10e1213e34d617241e7a2f476f1998b8f24a7ca8462f8cdb52edceeb50f2020c74ff63db4307faebf3ae621afb3b8822398d15
diff --git a/dev-haskell/haxml/haxml-1.25.5-r1.ebuild b/dev-haskell/haxml/haxml-1.25.5-r1.ebuild
deleted file mode 100644
index 17a81e4f1738..000000000000
--- a/dev-haskell/haxml/haxml-1.25.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="http://projects.haskell.org/HaXml/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.12.1:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3.1.0 && < 4.13' 'base >= 4.3.1.0' \
- 'polyparse >= 1.12.1 && <1.13' 'polyparse >= 1.12.1'
-}
diff --git a/dev-haskell/haxml/metadata.xml b/dev-haskell/haxml/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/haxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hcg-minus/Manifest b/dev-haskell/hcg-minus/Manifest
deleted file mode 100644
index 14829d82c2f8..000000000000
--- a/dev-haskell/hcg-minus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hcg-minus-0.15.tar.gz 12997 BLAKE2B 77df853ae1fdf22742e5d4f4ea4e42e78619fdd52c2395ad22850d8471c98fab362bb48aede9faebde6b309db13b7d14f322106a19008c6af6d92252826bebc7 SHA512 875b89656a5340bbd9a303a98004bc13d2b7b37fc58762c9a4f96abbb78ec3e67403a5968f8b9ff59d955aaa3d2031eba45cee85a2ec19c442f31ad0f413da45
diff --git a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild b/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
deleted file mode 100644
index 0dba398d0928..000000000000
--- a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="haskell cg (minus)"
-HOMEPAGE="http://rd.slavepianos.org/t/hcg-minus"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/colour:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hcg-minus/metadata.xml b/dev-haskell/hcg-minus/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hcg-minus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
deleted file mode 100644
index 8433d242b583..000000000000
--- a/dev-haskell/hcodecs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HCodecs-0.5.2.tar.gz 24397 BLAKE2B 267a230f124c7ecb50f918fd5ba293373ac82b9b38d6b3ede715f79f8f7ace3e7a7f3ad2280fbdb6225febd647fec5837b4cb6d2a00c05ec3b9a514fac2e5e7b SHA512 454f499e93c9a99bb0f5b210d84e89ea1edb1714a639826ea012caa49e744de3fe024eab25a9288317135d081cab0cfb19b4fb2537c14a6c27dbb228e70c9a49
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
deleted file mode 100644
index ff997f5b7a61..000000000000
--- a/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HCodecs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
-HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
- >=dev-haskell/quickcheck-2.0:2=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/semigroups:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
deleted file mode 100644
index 230ea50c5b96..000000000000
--- a/dev-haskell/hcodecs/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The library provides functions to read, write and manipulate MIDI, WAVE and
- SoundFont2 multimedia files. It is written entirely in Haskell (without any
- FFI). It uses efficient parsing and building combinators for binary data
- stored in ByteStrings (based on the one in 'binary' package).
-
- Correctness of significant parts of the library has been validated with
- QuickCheck and Haskell Program Coverage (HPC) tool-kits.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
deleted file mode 100644
index 60d7241b1f35..000000000000
--- a/dev-haskell/hdbc-mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7 SHA512 aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
deleted file mode 100644
index 11fe2231d73e..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.7.1.0-cabal-3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Setup.lhs
-+++ b/Setup.lhs
-@@ -35,7 +35,7 @@ mysqlConfigProgram = (simpleProgram "mysql_config") {
-
- mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
- mysqlBuildInfo lbi = do
-- let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi)
-+ let mysqlConfig = getDbProgramOutput verbosity mysqlConfigProgram (withPrograms lbi)
- ws = " \n\r\t"
-
- includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"]
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
deleted file mode 100644
index c0ce27b1585e..000000000000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/ryantm/hdbc-mysql"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- dev-libs/openssl:0=
- sys-libs/zlib
- dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-cabal-3.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug)
-}
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
deleted file mode 100644
index 18b3e18f1302..000000000000
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides a MySQL driver for HDBC, implemented via
- bindings to the C @mysqlclient@ library.
- </longdescription>
- <upstream>
- <remote-id type="github">bos/hdbc-mysql</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
deleted file mode 100644
index b83c15e30100..000000000000
--- a/dev-haskell/hdbc-odbc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HDBC-odbc-2.6.0.0.tar.gz 28537 BLAKE2B a3055d837406cd97586448c921738ae1bf05360fe4dc11d28f931c8020899c53ba83924f377945865c17b787eb32658a881136e19be1bd2a45a51b4766e4faa1 SHA512 300ee4b14a9cf1392d32549d17f3bb46e4dff22c0c5c8fc6a235dd76cb8dae2d722c3094bcd191ca146381c23259678b0735a7fb3a2d6527122d2a7a7e4db0d4
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild
deleted file mode 100644
index d0afebe0c643..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.6.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -buildtests,-buildstresstest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-db/unixODBC
- >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?]
- >=dev-haskell/hdbc-2.1.0:2=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- virtual/libc
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-buildstresstest \
- --flag=-buildtests
-}
diff --git a/dev-haskell/hdbc-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
index 94d3c2bb0ab1..45507d0c9efd 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1 +1,2 @@
DIST HDBC-postgresql-2.5.0.0.tar.gz 24404 BLAKE2B 8fc7ca3b2fa6d379af4f9dd4b801921274a6c352b05e95b836f0208304e2e2a6cc18df765b432767cb6ef9fa3f99ee0488e095b82091c12838f6b3220f114453 SHA512 3a81708b119e156e08265b02f3b27ac764a854b8d79f7ed1bd1c191b897ead10d231854f0edaf1f27d76af18e4330c67b7ced0328830e013bab88ec47f668a4d
+DIST hdbc-postgresql-2.5.0.1.tar.gz 24975 BLAKE2B 2d71b0624bbd5a0ca18bda5060a0fb2aed5528120109631660832ecea11101af2e3a9f545d86659ca67bda44e9eb86f5662158668bb72ddc068770416146ca67 SHA512 0f693fc7bf4f78805f097523203024801b445348441b9cbb5f22a6e55fc0e3409fc4f1c08c7a20299bb96f407286d994c890f8d05a52cb883755be5246bcd4c0
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 829c73553edb..1d9f67c6efaa 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
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +splitbase -buildtests
+#hackport: flags: +splitbase,-buildtests,+minTime15
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -17,13 +17,13 @@ HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-db/postgresql-7:*
dev-haskell/convertible:=[profile?]
- >=dev-haskell/hdbc-2.2.0:2=[profile?]
+ >=dev-haskell/hdbc-2.2.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/old-locale:=[profile?]
dev-haskell/old-time:=[profile?]
@@ -37,15 +37,14 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'Cabal >= 1.8 && < 3.3' 'Cabal >= 1.8'
-}
+CABAL_CHDEPS=(
+ 'Cabal >= 1.8 && < 3.3' 'Cabal >= 1.8'
+ 'time >= 1.5 && < 1.10' 'time >= 1.5'
+)
src_configure() {
haskell-cabal_src_configure \
--flag=-buildtests \
- --flag=splitbase
+ --flag=splitbase \
+ --flag=minTime15
}
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
new file mode 100644
index 000000000000..0072be8a8d5a
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -buildtests,+mintime15,+splitbase
+
+CABAL_PN="HDBC-postgresql"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+# error: Connection.hsc:34:10: fatal error: pg_config.h: No such file or directory
+RESTRICT="test" # Missing files
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-db/postgresql-7:*
+ dev-haskell/convertible:=[profile?]
+ >=dev-haskell/hdbc-2.2.0:=[profile?]
+ dev-haskell/old-time:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-buildtests \
+ --flag=mintime15 \
+ --flag=splitbase
+}
diff --git a/dev-haskell/hdbc-postgresql/metadata.xml b/dev-haskell/hdbc-postgresql/metadata.xml
index 86e6ee48b925..c5d81d92f84e 100644
--- a/dev-haskell/hdbc-postgresql/metadata.xml
+++ b/dev-haskell/hdbc-postgresql/metadata.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">hdbc/hdbc-postgresql</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">HDBC-postgresql</remote-id>
+ <remote-id type="github">hdbc/hdbc-postgresql</remote-id>
+ </upstream>
</pkgmetadata>
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 5cb19571040f..8d237bf11d1c 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: -buildtests
@@ -18,11 +18,11 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+splitbase"
RDEPEND=">=dev-db/sqlite-3.0
- >=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+ >=dev-haskell/hdbc-2.3.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
new file mode 100644
index 000000000000..f4c9fab13d7b
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+splitbase"
+
+RDEPEND=">=dev-db/sqlite-3.0
+ >=dev-haskell/hdbc-2.3.0.0:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-buildtests \
+ $(cabal_flag splitbase splitbase)
+}
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index b22461360e61..9a764c81c830 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1 +1,2 @@
DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a SHA512 394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43
+DIST hdbc-2.4.0.4.tar.gz 23756 BLAKE2B 5711f68c212194915895392139544c401981d46672f969fdc453deb01611826f536fefcc989edb1a723ccf9b385c6934d0f7102ded3d3fba17e494faad341a73 SHA512 16bdd35b8b2491ead171f4920133025ac6bc2cf47f8ea9c0ed684107ad576f757badeabc4e789f976948d96a47dafa638f907d9a534bce7bcd54b1d406fb001a
diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch b/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch
new file mode 100644
index 000000000000..e2b94b459273
--- /dev/null
+++ b/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch
@@ -0,0 +1,127 @@
+From cea6c0ebde0c3c7a0a0976fd9a0e745ccad9dec4 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Mon, 27 Feb 2023 07:54:10 -0700
+Subject: [PATCH] Fix tests
+
+Fix tests for modern 'time' and turn 'runtests' into a proper test
+suite.
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ HDBC.cabal | 40 +++++++++++++++++-----------------------
+ testsrc/TestSqlValue.hs | 16 +++++++++++++++-
+ 2 files changed, 32 insertions(+), 24 deletions(-)
+
+diff --git a/HDBC.cabal b/HDBC.cabal
+index e189f9a..15d0c15 100644
+--- a/HDBC.cabal
++++ b/HDBC.cabal
+@@ -24,9 +24,6 @@ source-repository head
+
+ flag splitBase
+ description: Choose the new smaller, split-up base package.
+-flag buildtests
+- description: Build the executable to run unit tests
+- default: False
+ flag minTime15
+ description: Use time 1.5 or higher.
+ default: True
+@@ -59,28 +56,25 @@ library
+ FlexibleInstances, DeriveDataTypeable
+ Default-Language: Haskell2010
+
+-Executable runtests
+- if flag(buildtests)
+- Buildable: True
+- Build-Depends: HUnit, QuickCheck >= 2.0
++Test-Suite runtests
++ Build-Depends: HUnit, QuickCheck >= 2.0
+
+- if flag(splitBase)
+- Build-Depends: base>=3 && <5, old-time, bytestring, containers
+- if flag(minTime15)
+- Build-Depends: time >= 1.5 && < 1.14
+- CPP-Options: -DMIN_TIME_15
+- else
+- Build-Depends: time >= 1.2 && < 1.5, old-locale
+- else
+- Build-Depends: base<3
+- Build-Depends: mtl, convertible >= 1.1.0.0, utf8-string, text
+-
+- -- Hack for cabal-install weirdness. cabal-install forces base 3,
+- -- though it works fine for Setup.lhs manually. Fix.
+- if impl(ghc >= 6.9)
+- build-depends: base >= 4
++ if flag(splitBase)
++ Build-Depends: base>=3 && <5, old-time, bytestring, containers
++ if flag(minTime15)
++ Build-Depends: time >= 1.5 && < 1.14
++ CPP-Options: -DMIN_TIME_15
++ else
++ Build-Depends: time >= 1.2 && < 1.5, old-locale
+ else
+- Buildable: False
++ Build-Depends: base<3
++ Build-Depends: mtl, convertible >= 1.1.0.0, utf8-string, text
++
++ -- Hack for cabal-install weirdness. cabal-install forces base 3,
++ -- though it works fine for Setup.lhs manually. Fix.
++ if impl(ghc >= 6.9)
++ build-depends: base >= 4
++ Type: exitcode-stdio-1.0
+ Main-Is: runtests.hs
+ Other-Modules: TestSqlValue
+ Hs-Source-Dirs: ., testsrc
+diff --git a/testsrc/TestSqlValue.hs b/testsrc/TestSqlValue.hs
+index 7d29453..e6161e8 100644
+--- a/testsrc/TestSqlValue.hs
++++ b/testsrc/TestSqlValue.hs
+@@ -6,12 +6,18 @@ All rights reserved.
+ For license and copyright information, see the file COPYRIGHT
+ -}
+
++{-# LANGUAGE CPP #-}
++
+ module TestSqlValue where
+ import Test.QuickCheck hiding (Result)
+ import Test.QuickCheck.Property (Result)
+ import qualified Test.HUnit as HU
+ import Database.HDBC
++#if MIN_VERSION_time(0,10,0)
++import Data.Time.Format (parseTimeM)
++#else
+ import Data.Time.Format (parseTime)
++#endif
+ import Data.Time.LocalTime
+ import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat, oldIso8601DateFormat)
+ import Data.Maybe
+@@ -29,17 +35,25 @@ fromSql_Int x =
+
+ testZonedTimeStr = "1989-08-01 15:33:01 -0500"
+ testZonedTime :: ZonedTime
+-testZonedTime = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T %z"))
++testZonedTime = fromJust $ parseTimeM False defaultTimeLocale (iso8601DateFormat (Just "%T %z"))
+ testZonedTimeStr
+
+ testZonedTimeFracStr = "1989-08-01 15:33:01.536 -0500"
+ testZonedTimeFrac :: ZonedTime
++#if MIN_VERSION_time(0,10,0)
++testZonedTimeFrac = fromJust $ parseTimeM False defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z"))
++#else
+ testZonedTimeFrac = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z"))
++#endif
+ testZonedTimeFracStr
+
+ testZonedTimeTwoDigitYearStr = "89-08-01 15:33:01 -0500"
+ testZonedTimeTwoDigitYear :: ZonedTime
++#if MIN_VERSION_time(0,10,0)
++testZonedTimeTwoDigitYear = fromJust $ parseTimeM False defaultTimeLocale (oldIso8601DateFormat (Just "%T %z"))
++#else
+ testZonedTimeTwoDigitYear = fromJust $ parseTime defaultTimeLocale (oldIso8601DateFormat (Just "%T %z"))
++#endif
+ testZonedTimeTwoDigitYearStr
+
+ ztparsenf =
+--
+2.39.2
+
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 90831462697a..f2d24771a8d8 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
#hackport: flags: buildtests:test
@@ -17,12 +17,16 @@ HOMEPAGE="https://github.com/hdbc/hdbc"
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT="test" # Requires unmaintaned dev-haskell/testpack
+CABAL_CHDEPS=(
+ 'time >= 1.5 && < 1.10' 'time >= 1.5'
+)
+
RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/old-locale:=[profile?]
@@ -36,3 +40,13 @@ DEPEND="${RDEPEND}
"
S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ config_flags=(
+ --flag=-buildtests
+ --flag=splitBase
+ --flag=minTime15
+ )
+
+ haskell-cabal_src_configure ${config_flags[@]}
+}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
new file mode 100644
index 000000000000..3ef978f673de
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: +minTime15,+splitBase
+
+CABAL_PN="HDBC"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell Database Connectivity"
+HOMEPAGE="https://github.com/hdbc/hdbc"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.0.4-fix-tests.patch"
+)
+
+RDEPEND="
+ >=dev-haskell/convertible-1.1.0.0:=[profile?]
+ dev-haskell/old-time:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.0
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=minTime15 \
+ --flag=splitBase
+}
diff --git a/dev-haskell/hdbc/metadata.xml b/dev-haskell/hdbc/metadata.xml
index 5e241a22ffbf..4c4bed34630e 100644
--- a/dev-haskell/hdbc/metadata.xml
+++ b/dev-haskell/hdbc/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- HDBC provides an abstraction layer between Haskell programs and SQL
- relational databases. This lets you write database code once, in
- Haskell, and have it work with any number of backend SQL databases
- (MySQL, Oracle, PostgreSQL, ODBC-compliant databases, etc.)
- </longdescription>
<upstream>
+ <remote-id type="hackage">HDBC</remote-id>
<remote-id type="github">hdbc/hdbc</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/heaps/Manifest b/dev-haskell/heaps/Manifest
deleted file mode 100644
index 13915bc9d3bf..000000000000
--- a/dev-haskell/heaps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heaps-0.3.6.1.tar.gz 12440 BLAKE2B 560a605d91b1481ec9e69510d1634e45bad2dfe589ba2fa6d3eb5391837904a9bb41fa7bfc8a6472862ae163905bc178fd71d6e60fb92c6ab8c630d3bb2ac7d1 SHA512 7c3cfb4ca95538a51b418ab2d42171883c9c51860f63e6836d42845a43cead825016fce74ed5e866decf0a6812433c3ecd6989161f2303939bbcad8ef4aab0ef
diff --git a/dev-haskell/heaps/heaps-0.3.6.1.ebuild b/dev-haskell/heaps/heaps-0.3.6.1.ebuild
deleted file mode 100644
index 7535de78d815..000000000000
--- a/dev-haskell/heaps/heaps-0.3.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Asymptotically optimal Brodal/Okasaki heaps"
-HOMEPAGE="https://github.com/ekmett/heaps/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/heaps/metadata.xml b/dev-haskell/heaps/metadata.xml
deleted file mode 100644
index 73d163ed25b3..000000000000
--- a/dev-haskell/heaps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Asymptotically optimal Brodal/Okasaki bootstrapped skew-binomial heaps from the paper \"Optimal Purely Functional Priority Queues\", extended with a Foldable interface.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
index 7f9623bf8eb2..1fc4946becd1 100644
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1 +1,3 @@
-DIST hedgehog-1.0.4.tar.gz 68959 BLAKE2B db9b5d2202d1a27fd27703f45083ac3b1e6c26505e4ead2c26bc79f5bd42f9523f2c11299cfa42b095467e289a5c80d2b75cf628828af4b702ad22195f2b1457 SHA512 71eb946550c0189e598d2a4205547c007cc4fd101e1cfab38f79535e7c158dfa3b43dec6dde2331d5fe9cb5b0d4c6212f51b820ec146e47ecd9823a99f0f8133
+DIST hedgehog-1.0.5-rev1.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2
+DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98
+DIST hedgehog-1.4.tar.gz 77762 BLAKE2B 44b8cc3db1f9cb2b833fa71cbcdb9398456a82a66682985be304bcae0f8def5e1f2587abbd27e708fc15d38117e237fef797014294491272503ef018b566acf6 SHA512 2c91d0bab1f06996ea68e2823d7e2105da616329ba3bb967b230fe018e113ee40a40996a60641084c8f5390743fc002a36670620cfa7068ff594bdd28e4b1a9a
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild
deleted file mode 100644
index 2b09e994ae4d..000000000000
--- a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Release with confidence"
-HOMEPAGE="https://hedgehog.qa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
- >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
- >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
- >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
- >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
- >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
- >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
- >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
- >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
new file mode 100644
index 000000000000..5c505c139823
--- /dev/null
+++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Release with confidence"
+HOMEPAGE="https://hedgehog.qa"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'template-haskell >= 2.10 && < 2.18' 'template-haskell >=2.10'
+)
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
+ >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
+ >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
+ >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
+ >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+ >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hedgehog/hedgehog-1.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.4.ebuild
new file mode 100644
index 000000000000..bc16f40c282f
--- /dev/null
+++ b/dev-haskell/hedgehog/hedgehog-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Release with confidence"
+HOMEPAGE="https://hedgehog.qa"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+ >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/barbies-1.0:=[profile?] <dev-haskell/barbies-2.1:=[profile?]
+ >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
+ >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
+ >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
+ >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+ >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ >=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+ >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/hedgehog/metadata.xml b/dev-haskell/hedgehog/metadata.xml
index 7ca4c2d1397c..a1012330d499 100644
--- a/dev-haskell/hedgehog/metadata.xml
+++ b/dev-haskell/hedgehog/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Hedgehog is a modern property-based testing system, in the spirit of
- QuickCheck. Hedgehog uses integrated shrinking, so shrinks obey the
- invariants of generated values by construction.
-
- To get started quickly, see the examples:
- &lt;https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example&gt;
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">hedgehog</remote-id>
+ <remote-id type="github">hedgehogqa/haskell-hedgehog</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hex/Manifest b/dev-haskell/hex/Manifest
deleted file mode 100644
index 6df1afb899a1..000000000000
--- a/dev-haskell/hex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hex-0.1.2.tar.gz 1956 BLAKE2B e0552b6278e2be4e8985e9d1e17f653f9fa401a6324dc252c4fc0e6c200564c972541bc9ac37321bff41fa9c52555ff95679a9dc1fdea3e836d88d6016c7a6e0 SHA512 30608035819260b94759d644644b92a7145defa000685de53323ab4e765250ead410010e4ab96e99b97af647e97394c86edaf92cb811aa5df8228669b8ff9b4d
diff --git a/dev-haskell/hex/files/hex-0.1.2-monadfail.patch b/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
deleted file mode 100644
index 27caaf0774f2..000000000000
--- a/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- hex-0.1.2/Data/Hex.hs 2011-10-11 05:44:11.000000000 +1100
-+++ Data/Hex.hs 2020-08-01 12:28:49.166983032 +1000
-@@ -22,7 +22,7 @@
- -- | Convert string into hexadecimal.
- hex :: t -> t
- -- | Convert from hexadecimal and fail on invalid input.
-- unhex :: Monad m => t -> m t
-+ unhex :: (Monad m, MonadFail m) => t -> m t
-
-
- instance Hex String where
-@@ -37,7 +37,7 @@
- unhex [_] = fail "Non-even length"
-
-
--c :: Monad m => Char -> m Int
-+c :: (Monad m, MonadFail m) => Char -> m Int
- c '0' = return 0
- c '1' = return 1
- c '2' = return 2
diff --git a/dev-haskell/hex/hex-0.1.2.ebuild b/dev-haskell/hex/hex-0.1.2.ebuild
deleted file mode 100644
index f158291c77d8..000000000000
--- a/dev-haskell/hex/hex-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Convert strings into hexadecimal and back"
-HOMEPAGE="https://hackage.haskell.org/package/hex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/cabal
-"
-
-PATCHES=( "${FILESDIR}"/${P}-monadfail.patch )
diff --git a/dev-haskell/hex/metadata.xml b/dev-haskell/hex/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
deleted file mode 100644
index eabe54f64c0a..000000000000
--- a/dev-haskell/hexpat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hexpat-0.20.13.tar.gz 143733 BLAKE2B 73cb82a98454f7dda6425d1366e3746741e73290dc6eb2d10510caa3a3d749a074f1592766a03a45bd820d6f44d6cbd9215eddb35bc4005b2bf273501a889695 SHA512 900abcb599bd66856c822b791222a814cc6293d655f45c4295e991ba74f750a80fd1c3993a0dfd943de6a83e90a5905711a7ce9c599471b043b10f661ca5a598
diff --git a/dev-haskell/hexpat/hexpat-0.20.13.ebuild b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
deleted file mode 100644
index 6bdd54151798..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -bundle
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="https://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
- >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- dev-libs/expat
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bundle
-}
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hexpat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hi-file-parser/Manifest b/dev-haskell/hi-file-parser/Manifest
deleted file mode 100644
index 39e834a4ea0c..000000000000
--- a/dev-haskell/hi-file-parser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hi-file-parser-0.1.0.0.tar.gz 9344 BLAKE2B 4fc453a2a14c43b59ca060cfe69464693fbb3e2368919a1ccb7a01e3853d8706ae86c4d674fa28b66ef454af1092b303f1e57d774992aeee3519014d1a100a9f SHA512 e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f
diff --git a/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild b/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
deleted file mode 100644
index 86a7e0ea8fcd..000000000000
--- a/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for GHC's hi files"
-HOMEPAGE="https://github.com/commercialhaskell/stack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/rio-0.1.9.2:=[profile?]
- >=dev-haskell/vector-0.12.0.1:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( >=dev-haskell/hspec-2.4.8 )
-"
diff --git a/dev-haskell/hi-file-parser/metadata.xml b/dev-haskell/hi-file-parser/metadata.xml
deleted file mode 100644
index 602fe7ff6efe..000000000000
--- a/dev-haskell/hi-file-parser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Please see the README on Github at &lt;https://github.com/commercialhaskell/stack/blob/master/subs/hi-file-parser/README.md&gt;
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/highlighting-kate/Manifest b/dev-haskell/highlighting-kate/Manifest
deleted file mode 100644
index 28a6f69f21c9..000000000000
--- a/dev-haskell/highlighting-kate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST highlighting-kate-0.6.4.tar.gz 913575 BLAKE2B d38ec3618e6703dddd5e6f568942d72749e93b56ea92bf64eabf3159c2d1b8b17f5607bcb0acda6fbe7918bf4a785207a422d74db7d3e392de3fb3b8a5924c62 SHA512 19b0c81f2465c499f3fed6a7124382ee01820bcd2f4073a374b92ae3f7e5ab5f247d8d676183e0eda2c8bb7edffde3561e19bb8a395c230658c93146e8f0d544
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
deleted file mode 100644
index c98a94a32450..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
- !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/diff )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- $(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/metadata.xml b/dev-haskell/highlighting-kate/metadata.xml
deleted file mode 100644
index dae51161efeb..000000000000
--- a/dev-haskell/highlighting-kate/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- highlighting-kate is a syntax highlighting library
- with support for nearly one hundred languages. The syntax
- parsers are automatically generated from Kate
- syntax descriptions (&lt;http://kate-editor.org/&gt;),
- so any syntax supported by Kate can be added.
- An (optional) command-line program is provided, along
- with a utility for generating new parsers from Kate
- XML syntax descriptions.
- </longdescription>
- <use>
- <flag name="executable">Build the Highlight executable.</flag>
- <flag name="pcre-light">Use the pcre-light library instead of regex-pcre-builtin.</flag>
- </use>
- <upstream>
- <remote-id type="github">jgm/highlighting-kate</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest
index af641d63a29d..95a2682af8f0 100644
--- a/dev-haskell/hinotify/Manifest
+++ b/dev-haskell/hinotify/Manifest
@@ -1 +1,2 @@
DIST hinotify-0.3.10.tar.gz 9193 BLAKE2B 877f98091412732656913f7af9e29e34088d240ac88214afd237e2994730f119a80db3960f27ad3a024026dcd8bb232853412aa314f416555e27886f87fda64a SHA512 d22f40bb055e14fd4be6669122a11b36fd7c5a989489d1b8c1e4117672b9f1700197a827f23242c91504b8236c349a4494adf724827001a77a1abdc11a9d6b8b
+DIST hinotify-0.4.1.tar.gz 9173 BLAKE2B c9baafdb64167f1d4ceb82bb072ee56fd0d9d893b321a8f50c3f125ee2756dddbe7372dbf1eeb8f44ce98e07adaf47e531b07ee0df7332fa141d825d11e4e12d SHA512 2f4627a3604ac6ec5d745ba6f4fd11e39a094ad54a5ab4d5040fe6c7c2a8823e42be575b9be95dc6848db99b421bac70798f8eb5f9ba6841f06f6156afe8797b
diff --git a/dev-haskell/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
index f66c4ab16b10..b95364639d11 100644
--- a/dev-haskell/hinotify/hinotify-0.3.10.ebuild
+++ b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Haskell binding to inotify"
-HOMEPAGE="https://github.com/kolmodin/hinotify.git"
+HOMEPAGE="https://github.com/kolmodin/hinotify"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/hinotify/hinotify-0.4.1.ebuild b/dev-haskell/hinotify/hinotify-0.4.1.ebuild
new file mode 100644
index 000000000000..60b1686af667
--- /dev/null
+++ b/dev-haskell/hinotify/hinotify-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell binding to inotify"
+HOMEPAGE="https://github.com/kolmodin/hinotify"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/async-2:=[profile?] <dev-haskell/async-3:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml
index a6d15f03263f..2b3b0f1989b1 100644
--- a/dev-haskell/hinotify/metadata.xml
+++ b/dev-haskell/hinotify/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">kolmodin/hinotify.git</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kolmodin/hinotify</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
deleted file mode 100644
index 46c6f5f1d37e..000000000000
--- a/dev-haskell/hit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hit-0.7.0.tar.gz 4919 BLAKE2B ff48cdc9421da4d2ef122a93859d82748c951f445f02d91cb1b320646a1cc68251380bfb6dfbe358ddf009e3664f258c1b7fe1e0f4dc402b2223ccc1bb929fe2 SHA512 d900c768bd60533092cf01627021b5b09804a0f29e3188bf4b9c6c2c79c709afb1c461a8d49459d5434d0d4d1241f5863a242e38ac9e28ddfaa02ef7565b9270
diff --git a/dev-haskell/hit/hit-0.7.0.ebuild b/dev-haskell/hit/hit-0.7.0.ebuild
deleted file mode 100644
index f5754a04b7a8..000000000000
--- a/dev-haskell/hit/hit-0.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/git-0.3.0:=
- >=dev-haskell/hashable-1.2:=
- dev-haskell/hashtables:=
- dev-haskell/hourglass:=
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug)
-}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
deleted file mode 100644
index 410bc17ff884..000000000000
--- a/dev-haskell/hit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- An haskell implementation of git storage operations, allowing users
- to manipulate git repositories (read and write).
-
- This implementation is fully interoperable with the main C implementation.
-
- This is stricly only manipulating the git store (what's inside the .git directory),
- and doesn't do anything with the index or your working directory files.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index feb053f4b3dd..0f0f75ea03d4 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1 +1,2 @@
DIST hjsmin-0.2.0.4.tar.gz 5233 BLAKE2B 839cc956a7dad0b958a12f9e9ca45dfeb2c64ef35f6e746747a01d1bba771edc229b9822c9274a67c1fa483da64f94e500644b77b9d90283e1feb56975d0badb SHA512 11534fd3f351cb1b73e9f166ee42737eb31c10f8f49b2b8d593f9a5a07d08d6b070f71204ec41257d02f38b0dc1172f48bd95d59b553b9f602b90018a795b07c
+DIST hjsmin-0.2.1.tar.gz 5197 BLAKE2B 88bca64c36728370f11635499d0ff240db43a495e8c2871bb706096995a0ceeb4c0553dd9a95cffde4b97c22a9f63704fc65a12c52a30dde211b056abdb6ca29 SHA512 ccc7ac765c99986e15e35f7e7ceef96b4551dbcccef2a62ad8625a8e4ab51edd0afe87368d6066062dd3749e827dd84af1a1ba1d272934481a77763f1d4d793e
diff --git a/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
new file mode 100644
index 000000000000..ce994c7588f1
--- /dev/null
+++ b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
@@ -0,0 +1,29 @@
+From 9605b913e6aed7fa3d40aa9925975b506d3a0eb0 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Wed, 1 Mar 2023 14:13:58 -0700
+Subject: [PATCH] Fix tests
+
+Tests assume a 'dist-newstyle' directory (e.g. cabal-v2) when we
+actually have a 'dist' directory.
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ test/test-cli.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-cli.hs b/test/test-cli.hs
+index a97e1b7..7691587 100644
+--- a/test/test-cli.hs
++++ b/test/test-cli.hs
+@@ -18,7 +18,7 @@ main = do
+ IO.hSetBuffering IO.stderr LineBuffering
+
+ cwd <- getCurrentDirectory
+- topdir <- canonicalizePath $ cwd </> "dist-newstyle"
++ topdir <- canonicalizePath $ cwd </> "dist"
+
+ -- Set an environment variable for all the exectuables we want to test.
+ setExecutableEnvVar "HJSMIN" topdir "hjsmin"
+--
+2.39.2
+
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index e74f3c315fb3..85827564b153 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,11 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # Requires network access?
+CABAL_CHDEPS=(
+ 'bytestring == 0.10.*' 'bytestring >= 0.10'
+)
+
RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?]
>=dev-haskell/optparse-applicative-0.7:=[profile?]
>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
new file mode 100644
index 000000000000..d34c0a0ac0e8
--- /dev/null
+++ b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of a javascript minifier"
+HOMEPAGE="https://github.com/erikd/hjsmin"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.0.4-fix-tests.patch"
+)
+
+CABAL_CHDEPS=(
+ 'text >= 2' 'text >= 1.2.5.0'
+)
+
+RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?]
+ >=dev-haskell/optparse-applicative-0.7:=[profile?]
+ >=dev-haskell/text-1.2.5.0:=[profile?]
+ >=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.6.3.0
+ test? ( dev-haskell/extra )
+"
+
+src_prepare() {
+ # Tests need exec permissions on these files
+ local files=(
+ "test/cli/minimal-input/run"
+ "test/cli/empty-input/run"
+ )
+ chmod -v +x "${files[@]}"
+
+ haskell-cabal_src_prepare
+}
diff --git a/dev-haskell/hjsmin/metadata.xml b/dev-haskell/hjsmin/metadata.xml
index f9a7be27c0e1..3ae810a2ce4b 100644
--- a/dev-haskell/hjsmin/metadata.xml
+++ b/dev-haskell/hjsmin/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Reduces size of javascript files by stripping out extraneous whitespace and
- other syntactic elements, without changing the semantics.
- </longdescription>
<upstream>
- <remote-id type="github">alanz/hjsmin</remote-id>
+ <remote-id type="hackage">hjsmin</remote-id>
+ <remote-id type="github">erikd/hjsmin</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
deleted file mode 100644
index 53e6e9ccf33e..000000000000
--- a/dev-haskell/hlint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hlint-3.2.7.tar.gz 159088 BLAKE2B 5fde93d35093aff4c56dd2b39f2f2318872b6d85cfa1d8ee21aaa7c970ecbd013eb5cac3b9d8742139fe3fa1e5c251364ea479facbc54338adcec5717e31dfaa SHA512 5db66f671d18279d5f4da8b158c9947e95804eff97b2efe1b53a2e3f0f5e23d7560c8085a253031e57d20bb77da0c266f2143b3b03899bfaa1a311d3ace2985b
diff --git a/dev-haskell/hlint/hlint-3.2.7.ebuild b/dev-haskell/hlint/hlint-3.2.7.ebuild
deleted file mode 100644
index a66d70328900..000000000000
--- a/dev-haskell/hlint/hlint-3.2.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -ghc-lib
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gpl hsyaml +threaded test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?]
- >=dev-haskell/ansi-terminal-0.8.1:=[profile?]
- >=dev-haskell/cmdargs-0.10:=[profile?]
- >=dev-haskell/cpphs-1.20.1:=[profile?]
- >=dev-haskell/data-default-0.3:=[profile?]
- >=dev-haskell/extra-1.7.3:=[profile?]
- dev-haskell/file-embed:=[profile?]
- >=dev-haskell/filepattern-0.1.1:=[profile?]
- >=dev-haskell/ghc-lib-parser-8.10:=[profile?] <dev-haskell/ghc-lib-parser-8.11:=[profile?]
- >=dev-haskell/ghc-lib-parser-ex-8.10.0.17:=[profile?] <dev-haskell/ghc-lib-parser-ex-8.10.1:=[profile?]
- >=dev-haskell/refact-0.3:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/uniplate-1.5:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
- hsyaml? ( >=dev-haskell/hsyaml-0.2:=[profile?]
- >=dev-haskell/hsyaml-aeson-0.2:=[profile?] )
- !hsyaml? ( >=dev-haskell/yaml-0.5.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-ghc-lib \
- $(cabal_flag gpl gpl) \
- $(cabal_flag hsyaml hsyaml) \
- $(cabal_flag threaded threaded)
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}:${LD_LIBRARY_PATH}"
- "${S}"/dist/build/hlint/hlint --datadir="${S}"/data --test || die
-}
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
deleted file mode 100644
index 071458df58dc..000000000000
--- a/dev-haskell/hlint/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="gpl">Use GPL libraries, specifically hscolour</flag>
- <flag name="hsyaml">Use HsYAML instead of yaml</flag>
- <flag name="threaded">Build with support for multithreaded execution</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
deleted file mode 100644
index 3cd522a8ac5e..000000000000
--- a/dev-haskell/hoauth2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hoauth2-1.16.0.tar.gz 18479 BLAKE2B ca9aa0d35d3bfb9ee3a9cbe62c2ecb1a0efd109c89600642a062fbcbe62cefae53f4810b38eb55b81c29c72e4b80aca8f746966ccbaf17ecc83883e2f6fc3528 SHA512 fe42759c2ccaf035bfa15d9276a7c8bf6608a7b74732c6950c2081616196296a73c34474989c1eda5fcfc15066626e1facf2f58b6977d5e00520290948731cb6
diff --git a/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild b/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
deleted file mode 100644
index ebe4fd23f0ae..000000000000
--- a/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/binary-0.8.3:=[profile?]
- >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
- >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5:=[profile?]
- >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
- >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-test
-}
diff --git a/dev-haskell/hoauth2/metadata.xml b/dev-haskell/hoauth2/metadata.xml
deleted file mode 100644
index 2b959805f759..000000000000
--- a/dev-haskell/hoauth2/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Haskell OAuth2 authentication.
-
- Tested following services
-
- * google web oauth: &lt;https://developers.google.com/accounts/docs/OAuth2WebServer&gt;
-
- * weibo oauth2: &lt;http://open.weibo.com/wiki/Oauth2&gt;
-
- * github oauth: &lt;https://developer.github.com/v3/oauth/&gt;
- </longdescription>
- <upstream>
- <remote-id type="github">freizl/hoauth2</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hostname/hostname-1.0-r1.ebuild b/dev-haskell/hostname/hostname-1.0-r1.ebuild
index 076f4847b05e..382f6315397e 100644
--- a/dev-haskell/hostname/hostname-1.0-r1.ebuild
+++ b/dev-haskell/hostname/hostname-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
new file mode 100644
index 000000000000..f9a62ed78904
--- /dev/null
+++ b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
@@ -0,0 +1,30 @@
+From 803fc360e3aa7a772ee7fd5bd7a81c8a21f99c38 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Mon, 27 Feb 2023 13:44:09 -0700
+Subject: [PATCH] Fix tests for >=time-1.10
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ tests/Tests.hs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/Tests.hs b/tests/Tests.hs
+index d400032..309eb84 100644
+--- a/tests/Tests.hs
++++ b/tests/Tests.hs
+@@ -210,7 +210,12 @@ tests knowns = testGroup "hourglass"
+ [ testProperty "iso8601 date" $ \(e :: Elapsed) ->
+ let fmt = calTimeFormatTimeISO8601 (elapsedToPosixTime e)
+ ed1 = localTimeParseE ISO8601_Date fmt
++#if MIN_VERSION_time(0,10,0)
++ md2 = T.parseTimeM False T.defaultTimeLocale fmt "%F"
++#else
+ md2 = T.parseTime T.defaultTimeLocale fmt "%F"
++#endif
++
+ in case (ed1,md2) of
+ (Left err, Nothing) -> error ("both cannot parse: " ++ show fmt ++ " hourglass-err=" ++ show err)
+ (Left err, Just _) -> error ("error parsing string: " ++ show err)
+--
+2.39.2
+
diff --git a/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
new file mode 100644
index 000000000000..c75f291fc8b9
--- /dev/null
+++ b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="simple performant time related library"
+HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.12-time-1_10-fix.patch"
+)
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/old-locale
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
index 60cfa4cc7cfe..0e63606ac731 100644
--- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
diff --git a/dev-haskell/hourglass/metadata.xml b/dev-haskell/hourglass/metadata.xml
index fe5e8c16ea92..0a81fcfb89e9 100644
--- a/dev-haskell/hourglass/metadata.xml
+++ b/dev-haskell/hourglass/metadata.xml
@@ -5,15 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Simple time library focusing on simple but powerful and performant API
-
- The backbone of the library are the Timeable and Time type classes.
-
- Each Timeable instances can be converted to type that has a Time instances,
- and thus are different representations of current time.
- </longdescription>
<upstream>
+ <remote-id type="hackage">hourglass</remote-id>
<remote-id type="github">vincenthz/hs-hourglass</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
deleted file mode 100644
index 052dde252cfe..000000000000
--- a/dev-haskell/hpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b
diff --git a/dev-haskell/hpack/hpack-0.33.0.ebuild b/dev-haskell/hpack/hpack-0.33.0.ebuild
deleted file mode 100644
index da9f5c70e109..000000000000
--- a/dev-haskell/hpack/hpack-0.33.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An alternative format for Haskell packages"
-HOMEPAGE="https://github.com/sol/hpack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.4.3.0:=[profile?]
- dev-haskell/bifunctors:=[profile?]
- >=dev-haskell/cabal-2.2:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- >=dev-haskell/glob-0.9.0:=[profile?]
- dev-haskell/http-client:=[profile?]
- dev-haskell/http-client-tls:=[profile?]
- dev-haskell/http-types:=[profile?]
- >=dev-haskell/infer-license-0.2.0:=[profile?] <dev-haskell/infer-license-0.3:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-haskell/yaml-0.10.0:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
- >=dev-haskell/hunit-1.6.0.0
- dev-haskell/interpolate
- >=dev-haskell/mockery-0.3
- dev-haskell/quickcheck
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hpack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hps/Manifest b/dev-haskell/hps/Manifest
deleted file mode 100644
index 5ee8b81b7b5e..000000000000
--- a/dev-haskell/hps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hps-0.15.tar.gz 12111 BLAKE2B 24dc23e3315f69bab6975b4b091c026c91a478b6d9c4cf220d4cea527a72522b0ef17dceeab5d7907c9f598268d2e1e7dfcd4849740615bdfa0667fe936c9738 SHA512 19b86161b46d523357863acbbdc8b7311e9f6b286429dbf1f56e044ced578d7c7026315d02b50ef831b3bce412ca623082956039181e832fb766e30729ea27c6
diff --git a/dev-haskell/hps/files/hps-0.15-ghc84.patch b/dev-haskell/hps/files/hps-0.15-ghc84.patch
deleted file mode 100644
index cbc67705459a..000000000000
--- a/dev-haskell/hps/files/hps-0.15-ghc84.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Graphics/PS/PS.hs
-+++ b/Graphics/PS/PS.hs
-@@ -14,2 +14,3 @@ import qualified Graphics.PS.Paper as P
- import qualified Graphics.PS.Image as I
-+import qualified Data.Semigroup as S
-
-@@ -248,2 +249,6 @@ newtype MonadMonoid m = MonadMonoid {appMonadMonoid :: m ()}
-
-+instance Monad m => S.Semigroup (MonadMonoid m) where
-+ (<>) (MonadMonoid a) (MonadMonoid b) =
-+ MonadMonoid (a >> b)
-+
- instance Monad m => Monoid (MonadMonoid m) where
---- a/Graphics/PS/Statistics.hs
-+++ b/Graphics/PS/Statistics.hs
-@@ -6,2 +6,3 @@ import Graphics.PS.Image
- import Graphics.PS.Path
-+import qualified Data.Semigroup as S
-
-@@ -16,2 +17,8 @@ data Statistics = Statistics {nMoveTo :: Integer
-
-+instance S.Semigroup Statistics where
-+ (<>) p q =
-+ let (Statistics m1 l1 c1 f1 g1 t1) = p
-+ (Statistics m2 l2 c2 f2 g2 t2) = q
-+ in Statistics (m1+m2) (l1+l2) (c1+c2) (f1+f2) (g1+g2) (t1+t2)
-+
- instance Monoid Statistics where
diff --git a/dev-haskell/hps/hps-0.15.ebuild b/dev-haskell/hps/hps-0.15.ebuild
deleted file mode 100644
index 94746a07a995..000000000000
--- a/dev-haskell/hps/hps-0.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Postscript"
-HOMEPAGE="https://hackage.haskell.org/package/hps"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-exec"
-
-RDEPEND=">=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- build-exec? ( dev-haskell/random:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
-)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag build-exec build-exec)
-}
diff --git a/dev-haskell/hps/metadata.xml b/dev-haskell/hps/metadata.xml
deleted file mode 100644
index 4b009fca0b67..000000000000
--- a/dev-haskell/hps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="build-exec">Build the `hps-fractals' executable</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/hs-bibutils/Manifest b/dev-haskell/hs-bibutils/Manifest
deleted file mode 100644
index af3c1535c130..000000000000
--- a/dev-haskell/hs-bibutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hs-bibutils-6.8.0.0.tar.gz 751679 BLAKE2B 8e229e6e15ccfe576cc9cf4a8fb44eaaa10bddc5d3e6f13d0fae9f5934eea0817504a1b96d8c131c65502a49e8f4050382d520b8a874a95b1b834dd376a59f6a SHA512 2e19f570e962b6a76ceb08a34eee8ad2533dee06cc2de0860a0b8d4ad02601dc00679ab2292e63a612cd6f0dd939d18c7c80a1493f0e24e05c992cc23c93e27d
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
deleted file mode 100644
index a545227c809c..000000000000
--- a/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to bibutils, the bibliography conversion utilities"
-HOMEPAGE="https://github.com/wilx/hs-bibutils"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16
-"
diff --git a/dev-haskell/hs-bibutils/metadata.xml b/dev-haskell/hs-bibutils/metadata.xml
deleted file mode 100644
index 3a7dd29ae4b3..000000000000
--- a/dev-haskell/hs-bibutils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Haskell bindings to Chris Putnam's bibutils, a
- library that interconverts between various
- bibliography formats using a common MODS-format
- XML intermediate.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
deleted file mode 100644
index 19135755b956..000000000000
--- a/dev-haskell/hs3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hS3-0.5.9.tar.gz 19981 BLAKE2B 085c09739c666b658f0fcf2e82cd7bd7c1fd033d29490a7a6754c43ecaaf495ce914a2c987d2fd852b95b2714cabbf9d6106cd9a3b9c92daceb9b70f46832191 SHA512 30a3393f28a6ddd930cda1b866527ead9be59d376c2a6c3123eab3278a996602307612f3eaf126b36ef4a09c65784b842442ff09caafbf605474b42b6582c79d
diff --git a/dev-haskell/hs3/hs3-0.5.9.ebuild b/dev-haskell/hs3/hs3-0.5.9.ebuild
deleted file mode 100644
index c1f77d69f0bf..000000000000
--- a/dev-haskell/hs3/hs3-0.5.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="hS3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Interface to Amazon's Simple Storage Service (S3)"
-HOMEPAGE="http://gregheartsfield.com/hS3/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/crypto-4.1.0:=[profile?]
- dev-haskell/dataenc:=[profile?]
- >=dev-haskell/http-4000.0.0:=[profile?]
- >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?]
- >=dev-haskell/missingh-0.18.6:=[profile?]
- dev-haskell/old-locale:=[profile?]
- dev-haskell/old-time:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/regex-compat:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?]
- <dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
deleted file mode 100644
index 1800537be43d..000000000000
--- a/dev-haskell/hs3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package</flag>
- </use>
- <longdescription>
- This is the Haskell S3 library. It provides an
- interface to Amazon's Simple Storage Service (S3), allowing Haskell
- developers to reliably store and retrieve arbitrary amounts of
- data from anywhere on the Internet.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsb2hs/Manifest b/dev-haskell/hsb2hs/Manifest
deleted file mode 100644
index 1f66a4c463d6..000000000000
--- a/dev-haskell/hsb2hs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsb2hs-0.3.1.tar.gz 2387 BLAKE2B 747ad23761939c543d067a031869528b55149bc7c01bb417d107d4be2c61726d286798b174805469f176dfd74c003534feec92ee0aba27aee9ce4e5a9bf55900 SHA512 3be89ccfee5b10e604434943ba22476c4cba2e9f4c57e169fd3674d4a46250c8d4c35edcb46ff5509ccfca80ec7d45a594008791970d15256864abfdf29381e1
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
deleted file mode 100644
index c0b8224ccab6..000000000000
--- a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
-HOMEPAGE="https://hackage.haskell.org/package/hsb2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/preprocessor-tools-1.0:=
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hsb2hs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 1bc3dc7944b6..756c65f19d51 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1 +1,2 @@
DIST hscolour-1.24.4.tar.gz 28729 BLAKE2B fdda7f784e35ff165981de53df5535b3294f5dbd5d1f484bcd34a20bfde014ddc9a916f20fae639420eca8cd4577f683d0e799459e846aabcc7cb4290b7035d2 SHA512 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
+DIST hscolour-1.25.tar.gz 28695 BLAKE2B c413533a6adac73a94d837aac9d1294e339e138a972e31bc3feb47b1ef3c1f96d7d09a46f72e336a112c91986b6a783c59f9066ec8454355780a52615f77f338 SHA512 00a9b679ae0fa13f3ad873991a1d1af953fb84cc2127387a014eaa8697265dc672c3c286b24a75e07c47b6c96a829aede6ef0e0d5f5939117821654319dc6c6c
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
index 6d3897e87d2e..cb3a73c25842 100644
--- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.5.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hscolour/hscolour-1.25.ebuild b/dev-haskell/hscolour/hscolour-1.25.ebuild
new file mode 100644
index 000000000000..7ab96d0275bd
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.25.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle"
+# avoid Cabal dependency as it's a dependency of most packages
+# including cabal depends.
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="https://code.haskell.org/~malcolm/hscolour/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+"
+
+src_configure() {
+ # llvm-general-pure passes rtsopts
+ haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+ cabal_src_install
+ if use doc; then
+ docinto html
+ dodoc hscolour.css
+ fi
+}
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
index 9aae77a1da19..1194f4d00e90 100644
--- a/dev-haskell/hscolour/metadata.xml
+++ b/dev-haskell/hscolour/metadata.xml
@@ -5,15 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- hscolour is a small Haskell script to colourise Haskell code. It currently
- has six output formats:
- ANSI terminal codes (optionally XTerm-256colour codes),
- HTML 3.2 with &lt;font&gt; tags,
- HTML 4.01 with CSS,
- HTML 4.01 with CSS and mouseover annotations,
- XHTML 1.0 with inline CSS styling,
- LaTeX,
- and mIRC chat codes.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">hscolour</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index 74027e0de418..14d8586dd9eb 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1 +1,2 @@
+DIST hslogger-1.3.1.0-rev7.cabal 2978 BLAKE2B 6886f8313f486b6dfe978ea2e6e12567e85c58e7eb74fc0a221136fc31dbe3b923d5fbb6eb617e95b71b354a367343d556be9db4713d48139cc658ca76f9277e SHA512 22de818ce0c2c9ecdff3a2415ff98b7b3f49dec5b8d16a613357f69ef5d7468441ef2f57428f79a9189f96558a0c27610994aceb6998417f6c62a4256290aa3e
DIST hslogger-1.3.1.0.tar.gz 37468 BLAKE2B 24bb750c356f071ee35cc84e01b2483f612b6e7403fe8fe60b8af148dba43107660a36a0e30305666fb76af1939ff00f6817dff98720ab7eef321192e6e87976 SHA512 a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
deleted file mode 100644
index b91fd077bbf5..000000000000
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -test,-buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="https://github.com/hvr/hslogger/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
-
-RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
- !network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 )
- ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-buildtests \
- $(cabal_flag network-3 network--gt-3_0_0) \
- --flag=-test
-}
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
new file mode 100644
index 000000000000..abf50952cace
--- /dev/null
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -test,-buildtests,+network--gt-3_0_0
+
+CABAL_HACKAGE_REVISION=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Versatile logging framework"
+HOMEPAGE="https://github.com/haskell-hvr/hslogger/wiki"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND="
+ >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2
+ >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9
+ =dev-haskell/old-locale-1.0*:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ || (
+ ( =dev-haskell/hunit-1.3* )
+ ( =dev-haskell/hunit-1.6* )
+ )
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-buildtests \
+ --flag=network--gt-3_0_0 \
+ --flag=-test
+}
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 7ea7e95faf7c..13cea5a1ec27 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -5,19 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="network-3">Use network-3</flag>
- </use>
- <longdescription>
- hslogger is a logging framework for Haskell, roughly similar to
- Python's logging module.
-
- hslogger lets each log message have a priority and source be associated
- with it. The programmer can then define global handlers that route
- or filter messages based on the priority and source. hslogger also
- has a syslog handler built in.
- </longdescription>
<upstream>
- <remote-id type="github">jgoerzen/hslogger</remote-id>
+ <remote-id type="hackage">hslogger</remote-id>
+ <remote-id type="github">haskell-hvr/hslogger</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hslua-aeson/Manifest b/dev-haskell/hslua-aeson/Manifest
new file mode 100644
index 000000000000..3ee1acd921ac
--- /dev/null
+++ b/dev-haskell/hslua-aeson/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-aeson-2.2.0.tar.gz 5881 BLAKE2B 00d630f676c32dd55bf66d43c01075412f453d76731d96baf1c894fff7fb122795039e46e4a8180ef1335c3a42b1a7a2e3a17766b697dfea7a5dcd6df2cd38ee SHA512 c11a94d29ba89ebcc403f41935a5338a7e77893a659beb7ce6c34644baf8d0ed03bb5651c99e873a240047673e20e3ec759b190b7419de4706796c014517d66e
+DIST hslua-aeson-2.3.0.1.tar.gz 7182 BLAKE2B 652ea54204a2e6270db1d6b371abcca260f0b8314a4ed5cf4bfb6f63a67c7a9dcc5d0db8b076826c13cba2fe1be3c0b41c37a00a6f0459189fea56e7c7e41fdc SHA512 0934ba51a554f8f889340d6f28739028c07ac26e935bd68cea85d6221b0092531f41a0c28bb99d47c0725b4947dcf4742c25f42fe3cc4ef7553158f92a7e06a5
diff --git a/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
new file mode 100644
index 000000000000..3599f023e784
--- /dev/null
+++ b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 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="Allow aeson data types to be used with Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild b/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild
new file mode 100644
index 000000000000..659aa951d90a
--- /dev/null
+++ b/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Allow aeson data types to be used with Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+ >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.10
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-aeson/metadata.xml b/dev-haskell/hslua-aeson/metadata.xml
new file mode 100644
index 000000000000..88d90360b9fb
--- /dev/null
+++ b/dev-haskell/hslua-aeson/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-aeson</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-classes/Manifest b/dev-haskell/hslua-classes/Manifest
new file mode 100644
index 000000000000..619f5a842fa4
--- /dev/null
+++ b/dev-haskell/hslua-classes/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-classes-2.2.0.tar.gz 11614 BLAKE2B 4fddbdd4c130562e961c627ae6a0201362036df846f18b03293d237a9b658157d8e607b5cf840ad793724dfde308e240c299a3633d185e75a40b9e9dbedf0852 SHA512 21d9da7fca86123cf1f6ac339b2453393bd97c052eb9b5ab75bf06a56fc0ff81593e30c88082aab5eb767816c479e975622b01f78e3df13ed476710d424f48c7
+DIST hslua-classes-2.3.0.tar.gz 11579 BLAKE2B b8b61a058b160060438f1d39f8024d98cdac934d7e2107ff71d8b9cea3a0945c6c8556a9c2ccd4a6c1e863a280be52a7a6454ecee58eedf34cbbc4f1717d4302 SHA512 07daa9b31bf4d3c8ec24bff67219cdcaf58ec56d45ac4c1b000aceccbbd90a79748f6786497c3a79e7c2670442859e1f31b200455cf2b26eb0dc4d699f9345ba
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
new file mode 100644
index 000000000000..d41aa9607953
--- /dev/null
+++ b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="Type classes for HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hslua-1.0
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild
new file mode 100644
index 000000000000..91609b23db75
--- /dev/null
+++ b/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type classes for HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hslua-1.0
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-classes/metadata.xml b/dev-haskell/hslua-classes/metadata.xml
new file mode 100644
index 000000000000..b71394be1af6
--- /dev/null
+++ b/dev-haskell/hslua-classes/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-classes</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-cli/Manifest b/dev-haskell/hslua-cli/Manifest
new file mode 100644
index 000000000000..f3ccb8b9f597
--- /dev/null
+++ b/dev-haskell/hslua-cli/Manifest
@@ -0,0 +1 @@
+DIST hslua-cli-1.4.1.tar.gz 5856 BLAKE2B 80f949f9f4146bda9d391d9fe959b817c4cb79c5c75dc9bdee00548d36f14789b78fb7b7022bc9120e249de693cedf72e2acff7a85f3a2fe35d46c2a05b79f36 SHA512 799715a478bd3ee2f5b5c4aa1d5daa2126bacf7d4315855800ce5c4c189bcb340836af614fe22dabbb88f53d0fb509d7f71636ff079c8fce007d6d12032e1639
diff --git a/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild b/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild
new file mode 100644
index 000000000000..605153581f9c
--- /dev/null
+++ b/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command-line interface for Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-repl-0.1:=[profile?] <dev-haskell/hslua-repl-0.2:=[profile?]
+ >=dev-haskell/lua-2.3:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/hslua-cli/metadata.xml b/dev-haskell/hslua-cli/metadata.xml
new file mode 100644
index 000000000000..06ebc2e67d14
--- /dev/null
+++ b/dev-haskell/hslua-cli/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="executable">Compile `hslua` standalone executable.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">hslua-cli</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-core/Manifest b/dev-haskell/hslua-core/Manifest
new file mode 100644
index 000000000000..9dffd7138958
--- /dev/null
+++ b/dev-haskell/hslua-core/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-core-2.2.0.tar.gz 36808 BLAKE2B 02cbb94ea562fbaac9c2eb9445150f6f79a345ab15b2062aa7900d18c671ad0104a0ad3abe6603a38ddb40a9fa59cd13f4892d73c7dba4baff5727a9211fa503 SHA512 cb2f8b76b44432698624aac3d425be7a0c068bec1d41cd8a13b75854ed15fc614de5a0aee46c1092ef22b0e6b706a931188879d97354c01c37aa47a334baf5f3
+DIST hslua-core-2.3.1.tar.gz 39580 BLAKE2B db54e9ba24ae17762ce153af9db9e7838579264c90457df15f3dc39cf7942cb6c617dee9bf2c94cada5433fc85107ba7650c10a162c4ee06b40fd478c08ae60f SHA512 840ab7f7a17c34ec00c84b3b7ae80a9c0842ac117d61f938fb8900c0685a41d91006d154898b04e69eb9cd79d08e0e1d8f53e464e6038f08fe15b9570bbad947
diff --git a/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
new file mode 100644
index 000000000000..2e32e5bd91df
--- /dev/null
+++ b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild b/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild
new file mode 100644
index 000000000000..418a570aa0d6
--- /dev/null
+++ b/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/lua-2.3.1:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-core/metadata.xml b/dev-haskell/hslua-core/metadata.xml
new file mode 100644
index 000000000000..2b850d9e5612
--- /dev/null
+++ b/dev-haskell/hslua-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-core</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-list/Manifest b/dev-haskell/hslua-list/Manifest
new file mode 100644
index 000000000000..e99a2da9c3d4
--- /dev/null
+++ b/dev-haskell/hslua-list/Manifest
@@ -0,0 +1 @@
+DIST hslua-list-1.1.1.tar.gz 8004 BLAKE2B 8936a36fe6d0dd173fd432e4bd38318ef86d020667f32f211c1204327a76b96ce60140e897c27049fac554b474a07bc0fbbfd6760147fdf18913fb9c63c900b1 SHA512 1b9cc115503239fda71e290e05a42cb0d475b88d59767f67e89775dc4a47ad63245b632e0facc21fb275b4a6098e09d402b0497d1107db01c63579d9a4f0f43a
diff --git a/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild b/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild
new file mode 100644
index 000000000000..025ec711d706
--- /dev/null
+++ b/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Opinionated, but extensible Lua list type"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-lua-1.0 )
+"
diff --git a/dev-haskell/hslua-list/metadata.xml b/dev-haskell/hslua-list/metadata.xml
new file mode 100644
index 000000000000..d45dfd379164
--- /dev/null
+++ b/dev-haskell/hslua-list/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-list</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-marshalling/Manifest b/dev-haskell/hslua-marshalling/Manifest
new file mode 100644
index 000000000000..d562173d702a
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-marshalling-2.2.0.tar.gz 16488 BLAKE2B f5aa47ecb431c5ea2308e16f0e4568fe7ba979e4f08901fd85c1c4c7e516c9b1a59e42f58a93db6dc113646e4ab826c13ed0e669972ea8980aabe9ad41828244 SHA512 80436b67fa73a970bcbcf4b8684187ec81590030c0cd38b4feb28e9a719c32f2b0f3cd1288b03f19b130112037e47ccb9585015d7f806ce6dcfe3b12abb7bd51
+DIST hslua-marshalling-2.3.0.tar.gz 17214 BLAKE2B 08d4828bf1ac9dbefa48b1e04cdcacbdcbfc0e847a0de62f0fc327aa746121cdd33b4fac55fb5a83a5e84db5d5b22d9d89a04a7df37798ebed93c921a02d29fe SHA512 b5ebc33f4f4e5b5dd60de60a9bf73cf97b040674a0c0c5a0815f5dada18745061559abf7bfc1cfe5034d0f27ee967eadc9dc287c064d8ff593e3cedb01b771fd
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
new file mode 100644
index 000000000000..3da02cd1b7bc
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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="Marshalling of values between Haskell and Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild
new file mode 100644
index 000000000000..b3ebed5a4d8a
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Marshalling of values between Haskell and Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-marshalling/metadata.xml b/dev-haskell/hslua-marshalling/metadata.xml
new file mode 100644
index 000000000000..0f7290f0f208
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-marshalling</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-doclayout/Manifest b/dev-haskell/hslua-module-doclayout/Manifest
new file mode 100644
index 000000000000..c408f8b838b2
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-module-doclayout-1.0.4.tar.gz 10184 BLAKE2B 232b48b77ade823c53f3f46db7e227506d7a175bb1393a84cfed1af799d2761ec0742a26a5746ef03c7bb7b81347f34b34de657b84868cbd07d119f47b39bf52 SHA512 2a72e3bf2ccc407ac3208e256216cff4d8b6c80f1378c859c2361e5d932f5e513283a234902221f295db3cdb73cadecd164e59cc7a06d493b3227372b218d0da
+DIST hslua-module-doclayout-1.1.0.tar.gz 10294 BLAKE2B 63f1f8372d8e7a4175422bd67273800951b41f2e5c1cb6d653fcb2dcf4a148fdd3d9eff211061e14229936985c428d0318260323b334807f50a67db75fbb4fe3 SHA512 f9fd8120492b5c2a9d62140bb1e9fed586611b3cc994616732d6ff22975f44771969cae272a02b99608dc46b50e336f4e6c10f4c80862b9cb5b04446f9dfab4f
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
new file mode 100644
index 000000000000..59819de34573
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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="Lua module wrapping Text.DocLayout"
+HOMEPAGE="https://github.com/hslua/hslua-module-doclayout"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild
new file mode 100644
index 000000000000..ed5a168aaa95
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapping Text.DocLayout"
+HOMEPAGE="https://github.com/hslua/hslua-module-doclayout"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/doclayout-0.2:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/hslua-2.3:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.1 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-doclayout/metadata.xml b/dev-haskell/hslua-module-doclayout/metadata.xml
new file mode 100644
index 000000000000..567263939b8b
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-module-doclayout</remote-id>
+ <remote-id type="github">hslua/hslua-module-doclayout</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-path/Manifest b/dev-haskell/hslua-module-path/Manifest
index a41c7cad9c52..c4a40d1ce0d5 100644
--- a/dev-haskell/hslua-module-path/Manifest
+++ b/dev-haskell/hslua-module-path/Manifest
@@ -1 +1,2 @@
-DIST hslua-module-path-0.1.0.1.tar.gz 8144 BLAKE2B d86eb43e1bc5805c60971bf1d9c9f0824118b06879c5e74d820324451ead467fc08a8272dcb37a698ca35c46103456efa2333002c2627679b1f5952693af0a37 SHA512 b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb
+DIST hslua-module-path-1.0.2.tar.gz 7991 BLAKE2B 4cb4ce417cca440185099c003f83c7baf402fb90e00d044bae4b395465083f6f04102c40f06d4e20e581fb3ddf965bb90ef551087d3aeaa12806b43e1266a2ad SHA512 57387757b5adbc52f39d3a9d6eb2bc5f0d59ef054b88a4c61541a38bd07793635c7b54212ef4e720dc5d1604054242175fc28b332bd20480461eb274c8a23b76
+DIST hslua-module-path-1.1.0.tar.gz 8040 BLAKE2B d8f24d0c80e98986563a521bcaeadb0a1ccc55e81b7f7571ef2e2a1164bfeb8b568c6322fd0f6b496afd8fcda33705016155a5308a32c6564874586f58b8da2a SHA512 0cef760dc73fd1a84cb79a6efbbd1e17c677fd6bae86cb410d324d1a6fbb63c876c59508a2da0ac02e888faf4bc28dcad661e058c928d2e572fa4d9a4edbddc0
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
deleted file mode 100644
index bebeecf74cf6..000000000000
--- a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module to work with file paths"
-HOMEPAGE="https://github.com/hslua/hslua-module-path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
-"
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
new file mode 100644
index 000000000000..1c59f8123c62
--- /dev/null
+++ b/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="Lua module to work with file paths"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild
new file mode 100644
index 000000000000..66366c77d6bc
--- /dev/null
+++ b/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file paths"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-path/metadata.xml b/dev-haskell/hslua-module-path/metadata.xml
index 937381521944..54c3028e99ca 100644
--- a/dev-haskell/hslua-module-path/metadata.xml
+++ b/dev-haskell/hslua-module-path/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-module-path</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
index f09220e8bfdb..bf2e979d5723 100644
--- a/dev-haskell/hslua-module-system/Manifest
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -1 +1,2 @@
-DIST hslua-module-system-0.2.2.1.tar.gz 6962 BLAKE2B bedc569bb969c0529a70b82fc1ddf14cc013c1954f97cb518cc5ea3495392812c2635b214c6a31d9f39107ea8e3ba68f4380fd1d9dd082b195a21ab697ef4e32 SHA512 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b
+DIST hslua-module-system-1.0.2.tar.gz 8488 BLAKE2B 433f7aefcdcc3ad6ea04192718d0a8891d4a845e6e1585da7b15b98299574b6e53391b4b5e44dc2e8ca28a5c46486ea067d390df664ea237fe1675282a4b057a SHA512 921c5098f5f5ea4483ed787de68824cd316c5c202a7387bfdc23969f7b6fa30782cc946f34137d44870e921c2d9c7aebbf67ff3cfbf158585a42e2ba38ac5963
+DIST hslua-module-system-1.1.0.1.tar.gz 8930 BLAKE2B 51baa74a331185ed02435a51e8e91cd35bb55799d7db7571a3276f78b333f701b1ef7dc264a9ef12a05428427cfa89f299cc64d833a1fafacb94e6d91ee5917b SHA512 1406a59187a98c3947fc51cc76fb38db04beb15765db51ff3a2662c57a34c77df2f0e27844c825ff1aca6eff261cf42b7db9f7a87fbba4648434d6502bb36931
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
deleted file mode 100644
index 85a0d5fd8f2f..000000000000
--- a/dev-haskell/hslua-module-system/hslua-module-system-0.2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module wrapper around Haskell's System module"
-HOMEPAGE="https://github.com/hslua/hslua-module-system"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- >=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
- dev-haskell/text )
-"
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
new file mode 100644
index 000000000000..fcf23439b04f
--- /dev/null
+++ b/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="Lua module wrapper around Haskell's System module"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+ >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+ >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild
new file mode 100644
index 000000000000..1badffe3bfbc
--- /dev/null
+++ b/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapper around Haskell's System module"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-system/metadata.xml b/dev-haskell/hslua-module-system/metadata.xml
index f218327f3045..0d3a6e7e1d20 100644
--- a/dev-haskell/hslua-module-system/metadata.xml
+++ b/dev-haskell/hslua-module-system/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides access to system information and functionality
- to Lua scripts via Haskell's `System` module.
-
- Intended usage for this package is to preload it by adding
- the loader function to `package.preload`. Note that the
- Lua `package` library must have already been loaded before
- the loader can be added.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">hslua-module-system</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hslua-module-text/Manifest b/dev-haskell/hslua-module-text/Manifest
index c8bddbb19252..0433511913a9 100644
--- a/dev-haskell/hslua-module-text/Manifest
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -1,2 +1,2 @@
-DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
-DIST hslua-module-text-0.3.0.1.tar.gz 4617 BLAKE2B 682650493a2757b6d40a75aee5995f39bbca649d072eefad4f5d5394efd152088304379fa5d1e605111f9329e4eb5ddf98228006f90f8c5a2566c9b3bc684bc6 SHA512 15ba5e97261e9fa0bb4053575a0dd368048141a401200c32bb53a969cc741d2bd2d04890fef5c488fb6f476438d28e4d5ab9fea4a62aecdee285e8f1a1adecc4
+DIST hslua-module-text-1.0.2.tar.gz 4650 BLAKE2B 94e6a2ff8682acfe29b556e6f3b5a789d7c6f2c8864e4e5d91872c637ed864af4743ca45c64f3c7ce6462c25dbc52308e7fa935b9dac214666ae177ee2ab835f SHA512 1678630a5ae7ac66946598691901a2dcb2f62723e9f7bda50d8c3711384437f4280d280363b04e2794487a541a9b5ee70bbf52a94fa042128650a9c576108e0d
+DIST hslua-module-text-1.1.0.1.tar.gz 6216 BLAKE2B 6f3ca45eefbc65d59f97d9107ad9bfa27229057015e6ec6fdf6b7310638da10740bfd88246fc923e3769caa5051d6e9cb777351e8a9a417456c7a85dd3d41286 SHA512 7f2ecc5efd0eb5b3cef42f570407df4bcea04d7e3b3b96d80823f7c33301cafd5da8f0b99216f4ddd955dcdf9c21a1b2b02891216694b877eb2371d5cd5602fb
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
deleted file mode 100644
index f0377f866dbc..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
deleted file mode 100644
index 12af58705fdb..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 )
-"
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
new file mode 100644
index 000000000000..d865771f4c7e
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild
new file mode 100644
index 000000000000..aa34b09bda6c
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-text/metadata.xml b/dev-haskell/hslua-module-text/metadata.xml
index 937381521944..67f7f39fcf4e 100644
--- a/dev-haskell/hslua-module-text/metadata.xml
+++ b/dev-haskell/hslua-module-text/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-module-text</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hslua-module-version/Manifest b/dev-haskell/hslua-module-version/Manifest
new file mode 100644
index 000000000000..4b0598470e93
--- /dev/null
+++ b/dev-haskell/hslua-module-version/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-module-version-1.0.2.tar.gz 5821 BLAKE2B 50e777e8656a1e6213a5aea7a35d61432611eca2f56a12c48b8b33659abf63c4f69696bab4f3e68d9dd0e7b727480bb4ba3ba976b3c9a6c09ef5c2a93d7911b8 SHA512 9c9c392206a5700d46e8481ce56eb3f52827b7017d64937263960db3b4dd05d379d14cdf3a6d1a5680e33706c4baca95b7cc6f60a5a7a7b6221e385a3746b6fd
+DIST hslua-module-version-1.1.0.tar.gz 6110 BLAKE2B 62e7b8a7c6bc61d54c812ea5c860c2e270690be92585de68e6bec10c09e19c8e7761584768ab67adf2b4eba89e7e6650eff3c61f37e3dbf233db8712ebe6e873 SHA512 b1856d103fa7ab114176a25fcf2610fa834fcb1fc7ad8af6b9bcc306576da10583ab0f6ec45141bb4bc7a827e5287d3500ce4f4175157dcc8135c8a83a667ec4
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
new file mode 100644
index 000000000000..dd6a9ffab7b5
--- /dev/null
+++ b/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="Lua module to work with version specifiers"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild b/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild
new file mode 100644
index 000000000000..1470cbbcac88
--- /dev/null
+++ b/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with version specifiers"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-version/metadata.xml b/dev-haskell/hslua-module-version/metadata.xml
new file mode 100644
index 000000000000..49e6f6e03816
--- /dev/null
+++ b/dev-haskell/hslua-module-version/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-module-version</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-zip/Manifest b/dev-haskell/hslua-module-zip/Manifest
new file mode 100644
index 000000000000..620717e589e8
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/Manifest
@@ -0,0 +1 @@
+DIST hslua-module-zip-1.1.0.tar.gz 7603 BLAKE2B 3f09ffa5c6e641271f9a358b62d2e8c5bf3719afa22e9674bba8bc8103f0c91ac031b461d5a320540dd17f60e509467f96fa2ef160ee123fe349751a6765db8d SHA512 ed68b34bd8f964732d2be120d2ec2372a435fd50d6494ab147351e9a882f0fb289ee33a1009ebac49ff146c70ae2b9c42104f361ba7cc862560981125eea7542
diff --git a/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild b/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild
new file mode 100644
index 000000000000..9002513566b4
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file zips"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-list-1.1:=[profile?] <dev-haskell/hslua-list-1.2:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/zip-archive-0.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/hslua-module-system
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-zip/metadata.xml b/dev-haskell/hslua-module-zip/metadata.xml
new file mode 100644
index 000000000000..1299eac80ffc
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-module-zip</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-objectorientation/Manifest b/dev-haskell/hslua-objectorientation/Manifest
new file mode 100644
index 000000000000..b8caecdf626f
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-objectorientation-2.2.0.tar.gz 15240 BLAKE2B 741298dd4d47b5b0bc4da565f9bae1004f13fccb4cb617ad1603821df884604a12f481626af9314f84f781a48bff836367d7fb71ce0ca5e2d3d8058c5899b394 SHA512 c40f0526264db229093f39deb9e77a44e575e6ebf97f257ff063b61279cd47aeecda4204db2ebc686b3e8ac467e2a0f4887608a54386f4afca2d47b469ee6107
+DIST hslua-objectorientation-2.3.0.tar.gz 16615 BLAKE2B 7760d09d30631bdac2255c33a12a005b134b7643d71092076d7a8142c78bb9ae9b54cb0f727746df837cf5a2661c1442edc97560a0fe839e1bd25fe0214ac413 SHA512 648dd92b7b51d8edfc8fcf455e3ae87afc828aeb4f5e54cb7d4f23d0e12173369ecac6ac44a79ddb474e723d1b007615492018d375aa7a4d58abbd13752a84e3
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
new file mode 100644
index 000000000000..380a7df3bd7a
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="Object orientation tools for HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hslua-1.0
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild
new file mode 100644
index 000000000000..6c61223c4187
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Object orientation tools for HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hslua-1.0
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-objectorientation/metadata.xml b/dev-haskell/hslua-objectorientation/metadata.xml
new file mode 100644
index 000000000000..c43dd0fe0783
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-objectorientation</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-packaging/Manifest b/dev-haskell/hslua-packaging/Manifest
new file mode 100644
index 000000000000..de44d9b8d86a
--- /dev/null
+++ b/dev-haskell/hslua-packaging/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-packaging-2.2.0.tar.gz 15932 BLAKE2B 724a28d8c7414766555968bca08cd6007e6637f8c4183da9524699b70b198a82f8cb4a6430af9ac6a0d26d1cf5abe25bee5153e8e8e09d058153f17a93298035 SHA512 f2dedc0674dd569f76e753edb3f20fe395fd6af082162b648d36ecb2eb0f5adaf5ab7354b809fa995c25cd17f30b7035d40c0ed9b0fb4fc78332f430cd152685
+DIST hslua-packaging-2.3.0.tar.gz 16903 BLAKE2B 8d1c0b10e80013cbe4018c7a9ae8a1b7a06227d9c2aa496ca9d3642f4622c49deedc8e37a5e877dbff568a4ca4a6e35f755a9629d4c69d0fa87665a913ec07dc SHA512 6b5b8f4bfda3798467bae4a7433f3c0ecbaaa9d3392d2fe51cc06d8b3d8ac05b1c9d32b3606ce6347bcbd43b39c583f640e7921befc095c4779db396450f5b4f
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
new file mode 100644
index 000000000000..8db96786de75
--- /dev/null
+++ b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 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="Utilities to build Lua modules"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild
new file mode 100644
index 000000000000..92d50c5953a3
--- /dev/null
+++ b/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities to build Lua modules"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-objectorientation-2.3:=[profile?] <dev-haskell/hslua-objectorientation-2.4:=[profile?]
+ >=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/hslua-packaging/metadata.xml b/dev-haskell/hslua-packaging/metadata.xml
new file mode 100644
index 000000000000..13301f339d83
--- /dev/null
+++ b/dev-haskell/hslua-packaging/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-packaging</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-repl/Manifest b/dev-haskell/hslua-repl/Manifest
new file mode 100644
index 000000000000..7df0ea685b8e
--- /dev/null
+++ b/dev-haskell/hslua-repl/Manifest
@@ -0,0 +1 @@
+DIST hslua-repl-0.1.1.tar.gz 4052 BLAKE2B cd7ca9277340a4708798144d6bd9da54e3b113a35f0896bdc8d08149677892f5fb1d5db0ed4f4ff2d2b29444be10ca737bcb1d18ec853f50284c07a7bb35b56d SHA512 c54c6bb7455d8f0cfd29812afc80d9617d0a100e94d4c3cd279b7579bf3be1fa3c1935785cb9eb4c664af345f1556e16a178049f3bd41823fdea56083d81bfdd
diff --git a/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild b/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild
new file mode 100644
index 000000000000..25501539d61c
--- /dev/null
+++ b/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Isocline-based Lua REPL"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/isocline-1.0:=[profile?] <dev-haskell/isocline-1.1:=[profile?]
+ >=dev-haskell/lua-2.3:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/hslua-repl/metadata.xml b/dev-haskell/hslua-repl/metadata.xml
new file mode 100644
index 000000000000..aad2a20db55b
--- /dev/null
+++ b/dev-haskell/hslua-repl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="executable">Compile `luarepl` standalone executable.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">hslua-repl</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-typing/Manifest b/dev-haskell/hslua-typing/Manifest
new file mode 100644
index 000000000000..56e376438547
--- /dev/null
+++ b/dev-haskell/hslua-typing/Manifest
@@ -0,0 +1 @@
+DIST hslua-typing-0.1.0.tar.gz 6420 BLAKE2B 06571d510baf0654199a91dd98bf4188ab3007bc1f6aa1ce6c1085a593d778e41fb65d549e75c3625c6d6e8083086dc414052e689d2331e61299336298efc271 SHA512 caca4003fab2fab4920e43491dc56cd137198f4a312d654f9489ea841b5e18b1b528a46e493692d027500a2fc5201d6f39b49b8bf0af8c199dbe357b95ccfb1f
diff --git a/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild b/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild
new file mode 100644
index 000000000000..2d60654a9256
--- /dev/null
+++ b/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type specifiers for Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/lua-arbitrary-1.0 <dev-haskell/lua-arbitrary-1.1
+ dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.10
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-typing/metadata.xml b/dev-haskell/hslua-typing/metadata.xml
new file mode 100644
index 000000000000..339631ae3125
--- /dev/null
+++ b/dev-haskell/hslua-typing/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hslua-typing</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index 86588d66e9f7..12918e9307d4 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,3 +1,2 @@
-DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
-DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
-DIST hslua-1.3.0.1.tar.gz 253503 BLAKE2B 381a0281d7bfd6713b1e8ec4023ff4a42e9b9248d20c958daa1ff75b0a52f9ed381bf3dda6ee87d51c130b31d6627f20f66dd9ff918bb5047ad98475b72a3304 SHA512 6c270cfd3abd81c3b06dc2005796909ea96e14ecc2ff4689f18164ac38fe13f99ff0e5cd25ed1aa020ad422c7e52d2d40001e1c7298436c10e04f3670aa08e98
+DIST hslua-2.2.0.tar.gz 17278 BLAKE2B eda496aa4a2bd89fd0be2fcefa0b1554a931c7876f5b2e456fb315a72d304050f8d9b2ad5ee583c15f4b31dc26f1a87370c526626d8dbed1e2fc5660ee66667e SHA512 cdd4ff872557ba014bb6f64a592702820e9274456c35b9f9c42fccbd279b2157b3087a5040be2bad03890934bf682c7f4d066232480e8243d5259f871514346a
+DIST hslua-2.3.0.tar.gz 17387 BLAKE2B 298ca26eed54c508621596efd90b0c8c7f0151ff9ab5a4d61d8e10fe57b2b61a865b39fcf7b6f12087a6fe913a0f6fb1e01b37aa2ae7c7e4aab58f434aafcac7 SHA512 a3e4bd970d0a55465aafff91f6b03d29443599d819a48dc9f3296bcac5807c9cb2920cb5c6c5e3bda854403a5bea219b9a626305d932f8c452ff9cc09572d060
diff --git a/dev-haskell/hslua/hslua-1.0.3.1.ebuild b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
deleted file mode 100644
index 14a16b75700b..000000000000
--- a/dev-haskell/hslua/hslua-1.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="" # system-lua disabled since it requires lua-5.3, which is masked
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-system-lua \
- --flag=-pkg-config
-}
diff --git a/dev-haskell/hslua/hslua-1.1.2.ebuild b/dev-haskell/hslua/hslua-1.1.2.ebuild
deleted file mode 100644
index 829469faf3e7..000000000000
--- a/dev-haskell/hslua/hslua-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-pkg-config \
- --flag=-system-lua
-}
diff --git a/dev-haskell/hslua/hslua-1.3.0.1.ebuild b/dev-haskell/hslua/hslua-1.3.0.1.ebuild
deleted file mode 100644
index 7a67259435cd..000000000000
--- a/dev-haskell/hslua/hslua-1.3.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-pkg-config \
- --flag=-system-lua
-}
diff --git a/dev-haskell/hslua/hslua-2.2.0.ebuild b/dev-haskell/hslua/hslua-2.2.0.ebuild
new file mode 100644
index 000000000000..e0b517abae08
--- /dev/null
+++ b/dev-haskell/hslua/hslua-2.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+ >=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?]
+ >=dev-haskell/hslua-packaging-2.2:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-2.0
+ >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ --flag=-lua501 \
+ --flag=-lua502 \
+ --flag=-lua_32bits \
+ --flag=-pkg-config \
+ --flag=-system-lua
+}
diff --git a/dev-haskell/hslua/hslua-2.3.0.ebuild b/dev-haskell/hslua/hslua-2.3.0.ebuild
new file mode 100644
index 000000000000..0e681552783c
--- /dev/null
+++ b/dev-haskell/hslua/hslua-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-aeson-2.3:=[profile?] <dev-haskell/hslua-aeson-2.4:=[profile?]
+ >=dev-haskell/hslua-classes-2.2:=[profile?] <dev-haskell/hslua-classes-2.4:=[profile?]
+ >=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/hslua-objectorientation-2.3:=[profile?] <dev-haskell/hslua-objectorientation-2.4:=[profile?]
+ >=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+ >=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/lua-2.0
+ >=dev-haskell/lua-arbitrary-1.0
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ dev-haskell/tasty-hslua
+ >=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ --flag=-lua501 \
+ --flag=-lua502 \
+ --flag=-lua_32bits \
+ --flag=-pkg-config \
+ --flag=-system-lua
+}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index dd3f14edb59f..3b4e9a667d84 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -5,7 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="hardcode-reg-keys">Don't use CAPI to determine the names of certain registry key names but Use hard coded values for instead. This flag is required when compiling against Lua 5.3.3 or earlier, as those do not expose the necessary information in the @lauxlib.h@ header file.</flag>
- </use>
+ <upstream>
+ <remote-id type="hackage">hslua</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
deleted file mode 100644
index 61f575eda5cf..000000000000
--- a/dev-haskell/hsopenssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HsOpenSSL-0.11.4.17.tar.gz 80235 BLAKE2B c8229b96e5d079a46255010dd44ca9caed292c974dfe5d815130696d798263c493bc8825be9ff1e360a2e0c86919842883d9125f26166184d002c619fab03649 SHA512 fe7be85a6e9690f4c7a5d79c0bab56efd42e183415c5b92b589c5bd380f2646877e0d4b1208f5583d3223a602118c9a3d74688e02f9d24a1ea20aea64a625eb6
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
deleted file mode 100644
index 7e8c53796aee..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -homebrew-openssl,-macports-openssl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/vshabanov/HsOpenSSL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="fast-bignum"
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/openssl:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag fast-bignum fast-bignum) \
- --flag=-homebrew-openssl \
- --flag=-macports-openssl
-}
diff --git a/dev-haskell/hsopenssl/metadata.xml b/dev-haskell/hsopenssl/metadata.xml
deleted file mode 100644
index a89a19102712..000000000000
--- a/dev-haskell/hsopenssl/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="fast-bignum">Enable fast moving of bignums between OpenSSL and GMP (GHC Only)</flag>
- </use>
- <longdescription>
-
- HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA
- and DSA keys, read and write PEM files, generate message digests,
- sign and verify messages, encrypt and decrypt messages. It has
- also some capabilities of creating SSL clients and servers.
-
- Please note that this project has started at the time when there
- were no pure-Haskell implementations of TLS. Now there is tls
- package (&lt;http://hackage.haskell.org/package/tls&gt;), which looks
- pretty saner than HsOpenSSL especially for initialisation and
- error handlings. So PHO (the initial author of HsOpenSSL) highly
- encourages you to use and improve the tls package instead as long
- as possible.
-
- </longdescription>
- <upstream>
- <remote-id type="github">phonohawk/HsOpenSSL</remote-id>
- </upstream>
-</pkgmetadata>
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 1ca03547f198..b98ca284f5c9 100644
--- a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
+++ b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # test-suite fails to build
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
index 1601ec771bb8..03f9707c9277 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -1 +1,2 @@
-DIST hspec-core-2.7.1.tar.gz 58835 BLAKE2B b6fa09a26c6adaf25f99d6fc3b1df80ea5407f6e8963c16473b4c98ccff694457131a9c7c35e5250beee47a03fb1c695d74f33be335623340a2d729b6221cdff SHA512 5ab0925566c3b6f05480bd4e464ca32e0a212b4b4ff439d02b3df5b75b23b45ca0c63bab8398ebeeedce0ba30bb653b1ea85df2b7e6e3a058cb4413dc1c53ee2
+DIST hspec-core-2.10.6.tar.gz 90413 BLAKE2B 9f219404602a93db9f6cc143ed7176eb6237402463772374951578c80261e982faae69c1430496c4ab58fb4cc2de4e74336902057d6fc5312eef07cbaff623dc SHA512 ae1dfc4819706511483646c61663ccabc39f0e17128d496bbc65a26c558f5d446ea2e0edcbd9cbd6b61710e522b581e5a412f7ef4fdb17daeebe187d24616126
+DIST hspec-core-2.9.4.tar.gz 79521 BLAKE2B c403787898de2296506cd2906641c2d91f3a4cee4cdab69e7e63e2ebab26a5729b37e938001992cccc76930ad5d4e39c0f204064ea542a2ca979b58acce77fdd SHA512 55859f3a6db6ca855a560b7b16f001784a81f6a70061374d58841fe0d6bdb99e98b522df03677ea132222ad6c96b3fed8d87aedb96dfde5326b7e6fde238e387
diff --git a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
new file mode 100644
index 000000000000..1b54214140c1
--- /dev/null
+++ b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+ >=dev-haskell/call-stack-0.2.0:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+ >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
+ >=dev-haskell/quickcheck-2.13.1:=[profile?]
+ >=dev-haskell/quickcheck-io-0.2.0:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/setenv:=[profile?]
+ >=dev-haskell/stm-2.2:=[profile?]
+ dev-haskell/tf-random:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/base-orphans
+ ~dev-haskell/hspec-meta-2.10.5
+ >=dev-haskell/quickcheck-2.14
+ >=dev-haskell/silently-1.2.4
+ dev-haskell/temporary
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
deleted file mode 100644
index d93f992ae506..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
- dev-haskell/call-stack:=[profile?]
- >=dev-haskell/clock-0.7.1:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
- >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
- >=dev-haskell/quickcheck-2.13.1:2=[profile?]
- >=dev-haskell/quickcheck-io-0.2.0:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/setenv:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?]
- dev-haskell/tf-random:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-meta-2.3.2
- >=dev-haskell/silently-1.2.4
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
new file mode 100644
index 000000000000..47e557342c1c
--- /dev/null
+++ b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+ dev-haskell/call-stack:=[profile?]
+ >=dev-haskell/clock-0.7.1:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+ >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
+ >=dev-haskell/quickcheck-2.13.1:=[profile?]
+ >=dev-haskell/quickcheck-io-0.2.0:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/setenv:=[profile?]
+ >=dev-haskell/stm-2.2:=[profile?]
+ dev-haskell/tf-random:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( dev-haskell/base-orphans
+# ~dev-haskell/hspec-meta-2.9.3
+# >=dev-haskell/quickcheck-2.14
+# >=dev-haskell/silently-1.2.4
+# dev-haskell/temporary )
diff --git a/dev-haskell/hspec-core/metadata.xml b/dev-haskell/hspec-core/metadata.xml
index 937381521944..3b3621d13184 100644
--- a/dev-haskell/hspec-core/metadata.xml
+++ b/dev-haskell/hspec-core/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">hspec-core</remote-id>
+ <remote-id type="github">hspec/hspec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
index 36b7c9f2d35b..f92632fc89c7 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -1 +1,2 @@
-DIST hspec-discover-2.7.1.tar.gz 6755 BLAKE2B 009f49090de3d79c7776e8b9b22eb975f276081c39980b49e157dfd50c97f3253140b2d66c8f392f53f83976d01d4302d78afc1ec95df45cb0a61d4c7a741234 SHA512 b07e7be5bd81f2e116b63f27e307ac628b6d678cc24dfb519bed7dcc1c27f772ff5d4a18c801474a425d4450337e809b9563b4ee1ca397830dfc7f9a92d7359f
+DIST hspec-discover-2.10.6.tar.gz 6843 BLAKE2B bd9f6feaa3a3aabec31ee0513821b79c439377bbb865fef50af5a63ba61c126fdddf26436a7768bbcfc415ab5f3179c794f770caee24a80d719608d099a1de18 SHA512 a6fad93f31b264b3f80b2775b5420ea983014d88296f404f7b9126d6a97d290313a1e9c59ba92957fe68789cc9b5d49c30fdfa8558e2f8d853fa93aa673f64e3
+DIST hspec-discover-2.9.4.tar.gz 6829 BLAKE2B c0f3a762db63f6d50edf2af0d240c5a9ccff7092ba0f440a342c809b4cc7c7c7e9fee95ca92d426baa6956f4e459ea8da04f2d7bb2545d4ca948395d38c75cff SHA512 0c76cfbe56ee67ab14040c7252a2f1ccecf8230868435d64c9015c472c85557921f1ca30e12df6f3097866b5b791e86d06026ef5fa5e998c354f3fa26c95e5ea
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild
new file mode 100644
index 000000000000..2981c9f0918b
--- /dev/null
+++ b/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatically discover and run Hspec tests"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ ~dev-haskell/hspec-meta-2.10.5
+ >=dev-haskell/mockery-0.3.5
+ >=dev-haskell/quickcheck-2.7
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
deleted file mode 100644
index f1dbd5de681f..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( >=dev-haskell/hspec-meta-2.3.2
- >=dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
new file mode 100644
index 000000000000..087b9912e6e0
--- /dev/null
+++ b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Automatically discover and run Hspec tests"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( ~dev-haskell/hspec-meta-2.9.3
+# >=dev-haskell/mockery-0.3.5
+# >=dev-haskell/quickcheck-2.7 )
diff --git a/dev-haskell/hspec-discover/metadata.xml b/dev-haskell/hspec-discover/metadata.xml
index 937381521944..21b829b0d806 100644
--- a/dev-haskell/hspec-discover/metadata.xml
+++ b/dev-haskell/hspec-discover/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">hspec-discover</remote-id>
+ <remote-id type="github">hspec/hspec</remote-id>
+ </upstream>
</pkgmetadata>
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 cca181884d05..753401c3486b 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/hspec-expectations/metadata.xml b/dev-haskell/hspec-expectations/metadata.xml
index 532e2bdd54ae..c99ed02a022a 100644
--- a/dev-haskell/hspec-expectations/metadata.xml
+++ b/dev-haskell/hspec-expectations/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">sol/hspec-expectations#readme</remote-id>
+ <remote-id type="github">hspec/hspec-expectations#readme</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hspec-megaparsec/Manifest b/dev-haskell/hspec-megaparsec/Manifest
new file mode 100644
index 000000000000..5f4ffb75b8d2
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/Manifest
@@ -0,0 +1 @@
+DIST hspec-megaparsec-2.2.0.tar.gz 5298 BLAKE2B fe18c95325a7b17c214635d8e57477dcd55b10b9a8dad20ccbf7c3d8bdd9027b49da394397493276b1b5aceb5a8337f51688c409fbb1ea1ddf86e96502e19c8e SHA512 347e1d5275fbd52bc0a51a1106aab8de123034ec34d5f0a113af76136009bc16d2c570aa747e903e050899cf3d53a091e765af5aa67dd7eb3ee7aef6e62054a4
diff --git a/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
new file mode 100644
index 000000000000..61ab9e695e89
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utility functions for testing Megaparsec parsers with Hspec"
+HOMEPAGE="https://github.com/mrkkrp/hspec-megaparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
+ >=dev-haskell/megaparsec-9.0:=[profile?] <dev-haskell/megaparsec-10.0:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev
+}
diff --git a/dev-haskell/hspec-megaparsec/metadata.xml b/dev-haskell/hspec-megaparsec/metadata.xml
new file mode 100644
index 000000000000..8559a2fdcf9d
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hspec-megaparsec</remote-id>
+ <remote-id type="github">mrkkrp/hspec-megaparsec</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index 7d6e8e8f2cfb..b9cabe57899f 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -1 +1,2 @@
-DIST hspec-meta-2.6.0.tar.gz 49275 BLAKE2B 1c79dea90807e4cec62fcec6f894fe57639e1f8f46e360d9a668bde1cc04c9c172075dfc2b605d7d3b6399a8905920ecfe2cbd82412b8f0224e059717d19013d SHA512 c35d09f84c093ab5fe7ae31cf004d485cf6d15a06ee7c98270d3f5c471da6e0c9a71c8ec6ca0aa87e7454c9470b218c24538270711677003dc63d316fb23dce9
+DIST hspec-meta-2.10.5.tar.gz 74024 BLAKE2B 971e2bda452e0d155754cd6ea02e06d8ab2ed492eea428b8f5c21b354e14b573eabb90182926e2004e88ea3c5e3ed30613fffa10c923dd9d91b53a991b85287d SHA512 2c9b9a0a91f8596de423d8409a734642520a317659d93888685a6049971b9fb29806904da48ec6d73f269baa8c39d34da1881d107795212a3c0564eb702797b5
+DIST hspec-meta-2.9.3.tar.gz 69002 BLAKE2B 2ed9b44eeb9b5b3335a4e7a695a199cda1bd405c9e041e251ac1f33cf9ade99be84853cbd32bb6204ec879ad342b55841425b0f76399c0a5d588f8769a7a6dea SHA512 d6205a4aead9c8824a89b18f41d2513a0115c76f9130b7100e349f2b8c91dfef34c704ba169f5b103895d0144a8fdf79eaf46abf1c7447da7d634eb3b7c8e80b
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
new file mode 100644
index 000000000000..0162ff534d11
--- /dev/null
+++ b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/ansi-terminal:=[profile?]
+ dev-haskell/call-stack:=[profile?]
+ dev-haskell/clock:=[profile?]
+ >=dev-haskell/quickcheck-2.12:=[profile?]
+ dev-haskell/quickcheck-io:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/setenv:=[profile?]
+ >=dev-haskell/stm-2.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
deleted file mode 100644
index 9b5b1040a23d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
- dev-haskell/call-stack:=[profile?]
- dev-haskell/clock:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
- dev-haskell/hunit:=[profile?]
- >=dev-haskell/quickcheck-2.12:2=[profile?]
- dev-haskell/quickcheck-io:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/setenv:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
new file mode 100644
index 000000000000..ae4955444518
--- /dev/null
+++ b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/ansi-terminal:=[profile?]
+ dev-haskell/call-stack:=[profile?]
+ dev-haskell/clock:=[profile?]
+ >=dev-haskell/quickcheck-2.12:=[profile?]
+ dev-haskell/quickcheck-io:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/setenv:=[profile?]
+ >=dev-haskell/stm-2.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec-meta/metadata.xml b/dev-haskell/hspec-meta/metadata.xml
index 937381521944..cbe0038a21d2 100644
--- a/dev-haskell/hspec-meta/metadata.xml
+++ b/dev-haskell/hspec-meta/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">hspec-meta</remote-id>
+ <remote-id type="github">hspec/hspec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hspec-smallcheck/Manifest b/dev-haskell/hspec-smallcheck/Manifest
deleted file mode 100644
index 4953f5ea01bb..000000000000
--- a/dev-haskell/hspec-smallcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hspec-smallcheck-0.5.2.tar.gz 4432 BLAKE2B 2eb26ca677a7665f65911193047ccbcf798f2620ce30959e6a667e3b6560d1f7eef68928f39f97b93a7e1abd39c891b6a6f823c227d39a892e42309d6055e2ee SHA512 2fd27126285e7d308f277480dcadcb6b047f67a82389edaf7d4761504f88ffedd8831db5b6b4f178c429cf3e8009e8aee8c6b05040dd960e7d2813e50908bd05
diff --git a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild b/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild
deleted file mode 100644
index 37e83ca7bc2b..000000000000
--- a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Hspec testing framework"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
- >=dev-haskell/hspec-core-2.5.0:=[profile?]
- dev-haskell/hunit:=[profile?]
- >=dev-haskell/smallcheck-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/base-orphans
- dev-haskell/hspec
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/hspec-smallcheck/metadata.xml b/dev-haskell/hspec-smallcheck/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hspec-smallcheck/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-wai/Manifest b/dev-haskell/hspec-wai/Manifest
new file mode 100644
index 000000000000..d418ef5839bc
--- /dev/null
+++ b/dev-haskell/hspec-wai/Manifest
@@ -0,0 +1,2 @@
+DIST hspec-wai-0.10.1.tar.gz 7979 BLAKE2B 5972f55595efa643b3ff0c2a3aafc213c23a9bb26841b8c0beebe9a853311edc22337d4496641829f6c0856e079ff8fe9e5685aa1b4fb65570618aa2683d0163 SHA512 9a599411e79ef056a915494f7bb247e61f94a5243cd7fde3f6651f09e2b6fc28e99554f1721717ee45f06b7029502620d6fdf1624e280442333224147320508d
+DIST hspec-wai-0.11.1.tar.gz 7899 BLAKE2B ac21a945bcca7c1c42a2e507b66306e648f85e90df8f4d8210f187b10124a12bfbd5e7e13c61631d82f8bb657c6887540e5e605ed9962216823ab56502591be5 SHA512 c5c72dee572f6fd7bd80f3beb4e668697d58f3bb045dabb321e65098f4fc3b1d577aa32e5fe607cab3e18433627538582b6c7acc7bb4728a99daeb20afe41b0a
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
new file mode 100644
index 000000000000..2113672f6249
--- /dev/null
+++ b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Experimental Hspec support for testing WAI applications"
+HOMEPAGE="https://github.com/hspec/hspec-wai#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.0:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/quickcheck:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/wai-3:=[profile?]
+ >=dev-haskell/wai-extra-3:=[profile?]
+ >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
new file mode 100644
index 000000000000..2dffe8d9ac75
--- /dev/null
+++ b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Experimental Hspec support for testing WAI applications"
+HOMEPAGE="https://github.com/hspec/hspec-wai#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.0:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/quickcheck:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/wai-3:=[profile?]
+ >=dev-haskell/wai-extra-3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/hspec
+ >=dev-haskell/wai-3.2.2
+ )
+"
diff --git a/dev-haskell/hspec-wai/metadata.xml b/dev-haskell/hspec-wai/metadata.xml
new file mode 100644
index 000000000000..0e880184b7ff
--- /dev/null
+++ b/dev-haskell/hspec-wai/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">hspec-wai</remote-id>
+ <remote-id type="github">hspec/hspec-wai</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index e8bf1d25f624..ecfc7b1b7400 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -1 +1,2 @@
-DIST hspec-2.7.1.tar.gz 9270 BLAKE2B b4cd1433c0e5eb0075c1560c244767cba9b0d34591fbede96c6ccc4f3ccc55f414fcdbcc943a21b7e42254ed091b4f2d496af5b42999ec8802468d9bd3c83965 SHA512 64e69444d447072ec501b745c7c8913f38bb6b540db4867ed4cbe4752e9d147e8a7e75538c15be7d8c65f9f8e7b48654e8fc2b53ae733a28236074fbafe9a6c6
+DIST hspec-2.10.6.tar.gz 10847 BLAKE2B 3ed8df690cbf77319aa6cf449df462f3bd5bbeefff31f220a9d4ed4af51fb30d63e0589559718dbbdde07708dd5d3e668a5986575b8397182b946f2641196b15 SHA512 bb20b02b22b8b6dd2cf64141a0738ee786278514fadd9e81712e5aa9e3d25d63b1cfdc89199df34b29c749b3f958f26a660116ffc10bbf6d0db0e7ee97aedddf
+DIST hspec-2.9.4.tar.gz 10117 BLAKE2B fbe881a560fc015ab4b3b3d81710d9fa758e65fe6740aeea5273e02588d373cd83b64cc7bba870bcf943787614681ad9a139912c3cbe04e9e822b8cb24788e5c SHA512 648fd812f22613616c1f81206e8bd0ee3bbfe52a4e367344887a832b56317615711aa401c1ac6dfab46f84404885e01065d91e154b9136bde041cf5e419b01a0
diff --git a/dev-haskell/hspec/hspec-2.10.6.ebuild b/dev-haskell/hspec/hspec-2.10.6.ebuild
new file mode 100644
index 000000000000..f8f9cbab5453
--- /dev/null
+++ b/dev-haskell/hspec/hspec-2.10.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="~dev-haskell/hspec-core-2.10.6:=[profile?]
+ ~dev-haskell/hspec-discover-2.10.6:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+ >=dev-haskell/quickcheck-2.12:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec/hspec-2.7.1.ebuild b/dev-haskell/hspec/hspec-2.7.1.ebuild
deleted file mode 100644
index 4634717e59ab..000000000000
--- a/dev-haskell/hspec/hspec-2.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.7.1:=[profile?]
- ~dev-haskell/hspec-discover-2.7.1:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
- >=dev-haskell/quickcheck-2.12:2=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/hspec/hspec-2.9.4.ebuild b/dev-haskell/hspec/hspec-2.9.4.ebuild
new file mode 100644
index 000000000000..2f38a5db8ae6
--- /dev/null
+++ b/dev-haskell/hspec/hspec-2.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="~dev-haskell/hspec-core-2.9.4:=[profile?]
+ ~dev-haskell/hspec-discover-2.9.4:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+ >=dev-haskell/quickcheck-2.12:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec/metadata.xml b/dev-haskell/hspec/metadata.xml
index 55d39a4696ef..2ad3a3322f59 100644
--- a/dev-haskell/hspec/metadata.xml
+++ b/dev-haskell/hspec/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Behavior Driven Development for Haskell
-
- Hspec is roughly based on the Ruby library RSpec. However, Hspec is just a framework for running HUnit and QuickCheck tests. Compared to other options, it provides a much nicer syntax that makes tests very easy to read.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">hspec</remote-id>
+ <remote-id type="github">hspec/hspec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/hsql-mysql/Manifest b/dev-haskell/hsql-mysql/Manifest
deleted file mode 100644
index cc5e6c2f085f..000000000000
--- a/dev-haskell/hsql-mysql/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hsql-mysql-1.8.2.tar.gz 4659 BLAKE2B 342f9baf9deb2596d2276e8050c202bbf476f56c5eb654f71b52959b8d5fba31ad4cfaf4c2b9ac47cc862e4d97468dbe5c312a73c2f8496f561183b1d226b46d SHA512 8476cfe746085f75a50aa2d24ecfd87abb8e5809f6292e3f5ebab184d96672178dc23a2d6f749b99d916932e19894ed022138eb192e4e90de94097625374941b
-DIST hsql-mysql-1.8.3.tar.gz 4366 BLAKE2B af5fcd66b15d7ac4d9fb3cf72688fcd47e262cc9fdbf77b93fef5d13d8242806c433dac98ae52948639a48d8318db3736c3bba03ced3c9463a0d49bf699d0980 SHA512 8004ad313774ecb628e9d1a8876c90efba854d2e36c5918d378269e6e1c3d09eb1c2ad0250f1455879d5097a75ec33a18a379228ea250a69af261c6e7846577e
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
deleted file mode 100644
index 40d0c3b3a3f5..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
- >=dev-haskell/hsql-1.8.2[profile?]
- >=dev-lang/ghc-6.10.1
- dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
deleted file mode 100644
index 14cd7791ca82..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="" # buggy, has no headers
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
- >=dev-haskell/hsql-1.8.2[profile?]
- >=dev-lang/ghc-6.10.1
- dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/metadata.xml b/dev-haskell/hsql-mysql/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hsql-mysql/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-odbc/Manifest b/dev-haskell/hsql-odbc/Manifest
deleted file mode 100644
index d82c157c4c42..000000000000
--- a/dev-haskell/hsql-odbc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-odbc-1.8.2.tar.gz 8041 BLAKE2B 80b3881297218b7dadfc7826acdb19e9f61d41124f5ca2d5a589ceabdfb03a6b64020432b43579e9fc9af82956e64147354b35ac5fb08b8e6eccd13e0f10afd1 SHA512 78f91ee63007e02820eefd1bd9ae08b9659667aa70f545ef83ff6d83d592c7f542339db129bb6c3ad14f4cdde320b3a4e1251c25267db716dbd88cbb5931a6d5
diff --git a/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
deleted file mode 100644
index 1c6c599b9cd7..000000000000
--- a/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Setup.lhs
-+++ b/Setup.lhs
-@@ -3,5 +3,10 @@
- \begin{code}
-+{-# LANGUAGE CPP #-}
- import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf)
- import Distribution.Simple.Setup(ConfigFlags)
-+#if MIN_VERSION_Cabal(2,2,0)
-+import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
-+#else
- import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
-+#endif
- import Distribution.PackageDescription
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
deleted file mode 100644
index 6e24f9b6c977..000000000000
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell Interface to ODBC"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-odbc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?]
- >=dev-lang/ghc-6.10.1:=
- >=dev-db/unixODBC-2.2"
-DEPEND="${RDEPEND}
- dev-haskell/cabal"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cabal22.patch
-)
diff --git a/dev-haskell/hsql-odbc/metadata.xml b/dev-haskell/hsql-odbc/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hsql-odbc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-sqlite3/Manifest b/dev-haskell/hsql-sqlite3/Manifest
deleted file mode 100644
index 8e0dd92c1380..000000000000
--- a/dev-haskell/hsql-sqlite3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-sqlite3-1.8.2.tar.gz 4752 BLAKE2B 84a77f8bc835b4337d99cdd974f7cd5960f7b52faeb4c06e2572d31887bdae3d2cdf6bf00d4c44eae7a4f98b116a134e950353932ef9cb43d557b11b85ffff96 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e
diff --git a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
deleted file mode 100644
index b421fbb9362a..000000000000
--- a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Setup.lhs
-+++ b/Setup.lhs
-@@ -3,2 +3,3 @@
- \begin{code}
-+{-# LANGUAGE CPP #-}
- import Control.Monad(when)
-@@ -13,3 +14,7 @@ import Distribution.PackageDescription
- ,emptyBuildInfo)
-+#if MIN_VERSION_Cabal(2,2,0)
-+import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
-+#else
- import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
-+#endif
- import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks
diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
deleted file mode 100644
index 4a8275cd65d0..000000000000
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SQLite3 driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-sqlite3"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.0
- >=dev-haskell/hsql-1.8.2:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-0"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cabal22.patch
-)
diff --git a/dev-haskell/hsql-sqlite3/metadata.xml b/dev-haskell/hsql-sqlite3/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hsql-sqlite3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
deleted file mode 100644
index 649048b12620..000000000000
--- a/dev-haskell/hsql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-1.8.2.tar.gz 10568 BLAKE2B 9890847e6ec5c78feb414e247098a108bf0d6135f8795e9efeb4934fb1b5ad76ab3fb8e78f14016007932b2c51bdda635551078c391db5ccb758b1ddd25632b1 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6
diff --git a/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
deleted file mode 100644
index 8f90d43393e2..000000000000
--- a/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/DB/HSQL/Core.hs
-+++ b/DB/HSQL/Core.hs
-@@ -7,3 +7,3 @@ import Control.Exception(Exception,throw,catch,handle)
- import Control.Concurrent.MVar(MVar,withMVar,modifyMVar_)
--import Data.Dynamic(cast)
-+import Data.Typeable(cast)
-
---- a/DB/HSQL/Error.hs
-+++ b/DB/HSQL/Error.hs
-@@ -7,3 +7,3 @@ module DB.HSQL.Error(SqlError(..)) where
- import Control.Exception(Exception(..),SomeException(..))
--import Data.Dynamic(Typeable,TyCon,mkTyCon3,cast)
-+import Data.Typeable(Typeable, cast)
- import DB.HSQL.Type(SqlType)
-@@ -32,14 +32,3 @@ data SqlError
- | SqlClosedHandle -- ^ referenced handle is already closed
--#ifdef __GLASGOW_HASKELL__
- deriving (Eq,Ord,Typeable)
--#else
-- deriving (Eq,Ord)
--
--instance Typeable SqlError where
-- typeOf _ = mkAppTy sqlErrorTc []
--#endif
--
---- | The `TyCon' of `SqlError'.
--sqlErrorTc :: TyCon
--sqlErrorTc = mkTyCon3 "DB.HSQL" "Error" "SqlError"
-
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
deleted file mode 100644
index ec20d50fd460..000000000000
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Database access from Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/hsql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
-)
-
-pkg_postinst() {
- haskell-cabal_pkg_postinst
-
- elog "You will probably want to emerge one or more HSQL backend."
- elog "These backends are available:"
- elog " hsql-postgresql"
- elog " hsql-mysql"
- elog " hsql-sqlite"
- elog " hsql-odbc"
-}
diff --git a/dev-haskell/hsql/metadata.xml b/dev-haskell/hsql/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hsql/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hstringtemplate/Manifest b/dev-haskell/hstringtemplate/Manifest
deleted file mode 100644
index 4fc7a41bd5ec..000000000000
--- a/dev-haskell/hstringtemplate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HStringTemplate-0.8.7.tar.gz 15903 BLAKE2B c030b287893e908e2e8b70f8b8f06750978d2109daa86a26c8c08abe2e00112f7fdbb8c8da1c45c689803e7bfc2027fda87c44b24d6d3f31c129b0803c42f324 SHA512 a00552a104231aa44e06c558f200a36430774351de2e7c55b0f25fd064d29aa25e62e48185d79184d916fe7440ad2a6d20dd54a5b4ad4bb635e58fc259185e5b
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
deleted file mode 100644
index fb6fc92d09b3..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/old-locale:=[profile?]
- <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?]
- dev-haskell/syb:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/void:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'time >= 1.4.2 && < 1.9' 'time >= 1.4.2'
-}
diff --git a/dev-haskell/hstringtemplate/metadata.xml b/dev-haskell/hstringtemplate/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hstringtemplate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hsyaml-aeson/Manifest b/dev-haskell/hsyaml-aeson/Manifest
deleted file mode 100644
index 7b09584c0b17..000000000000
--- a/dev-haskell/hsyaml-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HsYAML-aeson-0.2.0.0.tar.gz 11095 BLAKE2B b168c5d676718c99567835aaaa53321ccecc7b089e15850676a0b600f6ea2280facd4cf22e0212807c6c952287b125d52974ed19240390c0bc22d54c7047a641 SHA512 09da59c38e9fead3b11bbb6752cef803ae2d60392b710ea3958091d6256ff267f0b0f9b27293bbbc96a9d3af08464e463feafcba4a7caab6fd78286127f91527
diff --git a/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild b/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
deleted file mode 100644
index 4e02c6072d88..000000000000
--- a/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HsYAML-aeson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="JSON to YAML Adapter"
-HOMEPAGE="https://hackage.haskell.org/package/HsYAML-aeson"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/hsyaml-0.2.0:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5' \
- 'containers >=0.4.2 && <0.7' 'containers >=0.4.2' \
- 'aeson ^>= 1.4.0.0' 'aeson >= 1.4.0.0'
-}
diff --git a/dev-haskell/hsyaml-aeson/metadata.xml b/dev-haskell/hsyaml-aeson/metadata.xml
deleted file mode 100644
index fc966d5e30f0..000000000000
--- a/dev-haskell/hsyaml-aeson/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The [YAML 1.2](https://yaml.org/spec/1.2/spec.html) format provides
- a much richer data-model and feature-set
- than the [JavaScript Object Notation (JSON)](https://tools.ietf.org/html/rfc7159) format.
- However, sometimes it's desirable to ignore the extra capabilities
- and treat YAML as if it was merely a more convenient markup format
- for humans to write JSON data. To this end this module provides a
- compatibility layer atop [HsYAML](https://hackage.haskell.org/package/HsYAML)
- which allows decoding YAML documents in the more limited JSON data-model while also providing
- convenience by reusing [aeson](https://hackage.haskell.org/package/aeson)'s
- 'FromJSON' instances for decoding the YAML data into native Haskell data
- types.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest
index 68e65ca3a7fd..611ac0253b3a 100644
--- a/dev-haskell/hsyaml/Manifest
+++ b/dev-haskell/hsyaml/Manifest
@@ -1 +1,3 @@
-DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+DIST hsyaml-0.2.1.0-rev4.cabal 5397 BLAKE2B 66c3351dd9d89684d17c48aa7efbf6d49e422ce20f5537712fc13ea454f675cd70aca8657695075de8b75bfed1f27de6fb351abc35854535fb1972f54d2fe31e SHA512 abbcd42b604b11ad1758f85f6de732b65fc21f1d08d5855569cce6d52b7ca26c88431bcec640031b7209c768bd5902d401039f52ffd31b857616298000697ffc
+DIST hsyaml-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+DIST hsyaml-0.2.1.2.tar.gz 84263 BLAKE2B 1fb534a31cdcc41536e3f0114f27b4f140142293aca052d72d5d5993ff5ff686fea30a893e30efe34c2969ad9237228a43960f8adac201470568628d60464237 SHA512 4ade814924422a0985096be48ce0305f8491df03985511b408fefcf68a044f9ec4a0d29d978c2bb72b36315c49ee3faea69d8336cd5d88ca3d2d86077f46d003
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
index 756bb6481b97..12061ee0f047 100644
--- a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+CABAL_PN="HsYAML"
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-MY_PN="HsYAML"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure Haskell YAML 1.2 parser"
+DESCRIPTION="Pure Haskell YAML 1.2 processor"
HOMEPAGE="https://github.com/hvr/HsYAML"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
@@ -27,20 +27,11 @@ RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14
- test? ( >=dev-haskell/quickcheck-2.13:2=
+ test? ( >=dev-haskell/quickcheck-2.13:=
>=dev-haskell/tasty-1.2:=
>=dev-haskell/tasty-quickcheck-0.10:= )
"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.5 && <4.14' 'base >=4.5' \
- 'containers >=0.4.2 && <0.7' 'containers >=0.4.2' \
- 'QuickCheck == 2.13.*' 'QuickCheck >= 2.13' \
- 'tasty == 1.2.*' 'tasty >= 1.2' \
- 'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10'
+src_configure() {
+ haskell-cabal_src_configure --flag=-exe
}
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild
new file mode 100644
index 000000000000..162f34b60644
--- /dev/null
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_PN="HsYAML"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell YAML 1.2 processor"
+HOMEPAGE="https://github.com/haskell-hvr/HsYAML"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="exe"
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-2.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ exe? ( >=dev-haskell/megaparsec-7.0:=[profile?] <dev-haskell/megaparsec-10:=[profile?]
+ >=dev-haskell/microaeson-0.1:=[profile?] <dev-haskell/microaeson-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.6
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag exe exe)
+}
diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml
index 298c3553c5d9..a72f234e538f 100644
--- a/dev-haskell/hsyaml/metadata.xml
+++ b/dev-haskell/hsyaml/metadata.xml
@@ -5,17 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- @HsYAML@ is a [YAML 1.2](http://yaml.org/spec/1.2/spec.html) parser implementation for Haskell.
-
- Features of @HsYAML@ include:
-
- * Pure Haskell implementation with small dependency footprint and emphasis on strict compliance with the [YAML 1.2 specification](http://yaml.org/spec/1.2/spec.html).
- * Direct decoding to native Haskell types via (@aeson@-inspired) typeclass-based API (see "Data.YAML").
- * Support for constructing custom YAML node graph representation (including support for cyclic YAML data structures).
- * Support for the standard (untyped) /Failsafe/, (strict) /JSON/, and (flexible) /Core/ \"schemas\" providing implicit typing rules as defined in the YAML 1.2 specification (including support for user-defined custom schemas).
- * Event-based API resembling LibYAML's Event-based API (see "Data.YAML.Event").
- * Low-level API access to lexical token-based scanner (see "Data.YAML.Token").
-
- </longdescription>
+ <use>
+ <flag name="exe">Enable @exe:yaml-test@ component</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">HsYAML</remote-id>
+ <remote-id type="github">hvr/HsYAML</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
deleted file mode 100644
index 8a008c788f2d..000000000000
--- a/dev-haskell/htf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HTF-0.14.0.3.tar.gz 80795 BLAKE2B 8933c2bc9480ff7d29cf86cf5d7718ebd179aad55a7836b2f19cf1b93ba6acd48eba89410fe4040bb073111686ae736360554a598456b7a25c77e52ed05c4335 SHA512 cf839a3fa67aec998b1f035a9b5ddb326f57c859c13767f3681deb2f8041ac283c3bcf36d0c37b08ef7878fc8ada5623af60c72a548adf8c272d2d38f8609784
diff --git a/dev-haskell/htf/htf-0.14.0.3.ebuild b/dev-haskell/htf/htf-0.14.0.3.ebuild
deleted file mode 100644
index 25806e6a0ae1..000000000000
--- a/dev-haskell/htf/htf-0.14.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib haddock hoogle hscolour" # test-suite: needs htfpp already installed, profile crashes cpp
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs stack, needs htfpp already installed
-
-RDEPEND=">=dev-haskell/aeson-0.11:=
- dev-haskell/base64-bytestring:=
- >=dev-haskell/cpphs-1.19:=
- >=dev-haskell/diff-0.3:=
- dev-haskell/haskell-src:=
- >=dev-haskell/hunit-1.2.5:=
- >=dev-haskell/lifted-base-0.1:=
- >=dev-haskell/monad-control-0.3:=
- >=dev-haskell/mtl-1.1:=
- >=dev-haskell/old-time-1.0:=
- >=dev-haskell/quickcheck-2.3:2=
- >=dev-haskell/random-1.0:=
- >=dev-haskell/regex-compat-0.92:=
- >=dev-haskell/text-0.11:=
- dev-haskell/vector:=
- >=dev-haskell/xmlgen-0.6:=
- >=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- >=dev-haskell/cpphs-1.19
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/htf/metadata.xml b/dev-haskell/htf/metadata.xml
deleted file mode 100644
index a50cd071c80f..000000000000
--- a/dev-haskell/htf/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The Haskell Test Framework (/HTF/ for short) lets you define unit
- tests (&lt;http://hunit.sourceforge.net&gt;), QuickCheck properties
- (&lt;http://www.cs.chalmers.se/~rjmh/QuickCheck/&gt;), and black box
- tests in an easy and convenient way. The HTF uses a custom
- preprocessor that collects test definitions automatically.
- Furthermore, the preprocessor allows the HTF to report failing
- test cases with exact file name and line number information.
-
- The documentation of the "Test.Framework.Tutorial" module
- provides a tutorial for the HTF.
- </longdescription>
- <upstream>
- <remote-id type="github">skogsbaer/HTF</remote-id>
- </upstream>
-</pkgmetadata>
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 eb613fbe946e..a9f5265be7cc 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 47616a4c9b8c..86f01034f9c6 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+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/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index 7f6025c4946c..044643a2ab47 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1 +1,3 @@
-DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
+DIST http-api-data-0.4.3.cabal 3845 BLAKE2B fdde464e0c378bd60b135fd325bd2263df2eef42f797c1aa7b04e9382027b58498c80414a75dd83278d3bdf5676041c3ed2493b918d87eda3140ccddecc410b8 SHA512 cbf03caa0a026cad8c327b9fdf04dcc447dab3879c9cacf8fe7cf118665b9466983660937684fe8d14b7c50a29d7fa8a5f8f2eb2e8febc9d8217f3d30888e5d5
+DIST http-api-data-0.4.3.tar.gz 20827 BLAKE2B 04e7f0a9e5edebc230b47640c6a86dc76d271942cc70d0aa109d289fe2b1139e4c8103ba0799990b4c7ea0a37f3dd46ac4a72e9a5e4a39029d856e134ebfe8fb SHA512 625367d8f524eff07c69620df17c87a4365c01b9bc8bdd6bab5b8abe1b47cc429a050d63f48e50cb08fcac55aef95dfea532a5d52c87b6fa2d3e58b06aa8f4b0
+DIST http-api-data-0.5.1.tar.gz 21114 BLAKE2B 4653d97f57a8740da75e2d573d43d8ed988499d05c5d235572a2b6983fb22e2be06cdb347b179d23aca9337b7dfc75cfa2a21709ffb233da7d42ac2bee1b7b9b SHA512 04518851593fa8a081ca4ba706a7a21a693c0645968720f734df25fe884b5176a12c32f29ca9595c5de501e071b1e73bc1c45b1ae9dab5f7712ac4ac160a06db
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
deleted file mode 100644
index f64232f9c25c..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
- >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
- >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
- >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
- >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
- >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8
- >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
- >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.7 && < 4.14' 'base >= 4.7'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-use-text-show
-}
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
new file mode 100644
index 000000000000..a0df91b08980
--- /dev/null
+++ b/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
+HOMEPAGE="https://github.com/fizruk/https-api-data"
+HACKAGE_REV="6"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="text-show"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/attoparsec-iso8601-1.0.2.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+ >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/time-compat-1.9.5:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ text-show? ( >=dev-haskell/text-show-3.8.2:=[profile?] <dev-haskell/text-show-3.10:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.10
+ >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.25.2 <dev-haskell/quickcheck-instances-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag text-show use-text-show)
+}
diff --git a/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild
new file mode 100644
index 000000000000..033308af399f
--- /dev/null
+++ b/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
+HOMEPAGE="https://github.com/fizruk/https-api-data"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="text-show"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/attoparsec-iso8601-1.1.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.2:=[profile?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+ >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/time-compat-1.9.5:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ text-show? ( >=dev-haskell/text-show-3.8.2:=[profile?] <dev-haskell/text-show-3.11:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.11
+ >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.25.2 <dev-haskell/quickcheck-instances-0.4
+ dev-haskell/text )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag text-show use-text-show)
+}
diff --git a/dev-haskell/http-api-data/metadata.xml b/dev-haskell/http-api-data/metadata.xml
index 145f1adbf832..baafe048b8e7 100644
--- a/dev-haskell/http-api-data/metadata.xml
+++ b/dev-haskell/http-api-data/metadata.xml
@@ -5,7 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <use>
+ <flag name="text-show">Use text-show library for efficient ToHttpApiData implementations.</flag>
+ </use>
<upstream>
+ <remote-id type="hackage">http-api-data</remote-id>
<remote-id type="github">fizruk/http-api-data</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/http-attoparsec/Manifest b/dev-haskell/http-attoparsec/Manifest
deleted file mode 100644
index d0ecc3a24b09..000000000000
--- a/dev-haskell/http-attoparsec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-attoparsec-0.1.1.tar.gz 2501 BLAKE2B ffd8cfdcd7bf8b5916348633d519531a3a50426a03d9aef2818ebc3577c30f54e2e3c9ff1a4e7cfa7ea8cbe48a08c97262a796fead873128eb70d3074807a994 SHA512 7be64a4f8df874b392b3d75ecb16bb4e4f689e2c9e65eb406c7287bd637eced2c2580d27be3cfa164aac9cdfdd89cb8aaa8d9ab708e44542a478ec76a9b5955d
diff --git a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch b/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
deleted file mode 100644
index 2de100c5deb5..000000000000
--- a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Network/HTTP/Attoparsec.hs b/Network/HTTP/Attoparsec.hs
-index ec464d0..37f9983 100644
---- a/Network/HTTP/Attoparsec.hs
-+++ b/Network/HTTP/Attoparsec.hs
-@@ -7,3 +7,3 @@ module Network.HTTP.Attoparsec
- where
--import Network.HTTP.Types.Header
-+import Network.HTTP.Types.Header hiding (parseByteRanges)
-
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
deleted file mode 100644
index cb6d745f57bf..000000000000
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attoparsec parsers for http-types"
-HOMEPAGE="https://github.com/tlaitinen/http-attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
- >=dev-haskell/http-types-0.8.0:=[profile?]
- >=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8.0.2
-"
-
-PATCHES=("${FILESDIR}"/${P}-http.patch)
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0' \
- 'http-types >= 0.8.0 && < 0.9' 'http-types >= 0.8.0'
-}
diff --git a/dev-haskell/http-attoparsec/metadata.xml b/dev-haskell/http-attoparsec/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/http-attoparsec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-conduit/Manifest b/dev-haskell/http-client-conduit/Manifest
deleted file mode 100644
index 49af944211f2..000000000000
--- a/dev-haskell/http-client-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-client-conduit-0.3.0.tar.gz 1176 BLAKE2B 29a8da8e051c31b24c710db783d330eb25316f500968df8b546cf085ca179526b26f1709d2e05cfb4d32703cf1233a8b9e9d0e0b04bc66b15fb38bbf6ce1ae7b SHA512 c6d3a2ee7d2b3efca346835d226421bf18443d7248d743b0467b32a9697d845697267a5fa9ee5a7bdf2c6918c60f4f6897f3df109b9337ab3967b3b9ef2528fe
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
deleted file mode 100644
index 0a4612da0fe7..000000000000
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Frontend support for using http-client with conduit (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-conduit/metadata.xml b/dev-haskell/http-client-conduit/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/http-client-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-multipart/Manifest b/dev-haskell/http-client-multipart/Manifest
deleted file mode 100644
index fb5b1ae79bb8..000000000000
--- a/dev-haskell/http-client-multipart/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-client-multipart-0.3.0.0.tar.gz 1130 BLAKE2B 016468d0509055776615ba0e23f234f24868557c0b0c8e366e7ef7157028461e8fd5f0af73d84db68179c68c52624a8251c41195342798234c93801e7f7ed0b9 SHA512 4d0985d6cbc5e6ec4fe79b5037a4e378afd4b14382f2b26d62870ac091de661cf80be827851a8a8de014d6cd846867ea54ac7722deb6f97ecd70bee61fc1caeb
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
deleted file mode 100644
index 97cdaf3071b9..000000000000
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate multipart uploads for http-client. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-multipart/metadata.xml b/dev-haskell/http-client-multipart/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/http-client-multipart/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-restricted/Manifest b/dev-haskell/http-client-restricted/Manifest
index ab2bc2debefc..d5b8732a61d7 100644
--- a/dev-haskell/http-client-restricted/Manifest
+++ b/dev-haskell/http-client-restricted/Manifest
@@ -1 +1,2 @@
-DIST http-client-restricted-0.0.3.tar.gz 5178 BLAKE2B 3fd0a0d1218f1a5ef0d87ac43cd3b3ddc37cf78ca3a8c6841409048d3de4cc44773539b17f0c60ec75dc5e120497e6226edad5556024623a09544a0d78ea9e4c SHA512 6734f674b6a026f1cbba495b892cd98892584817db69bc36db07f4179e6ae4841055afa37a4841edff7c30270f9977b5700ecd9640ca812d213c575fb4ffbf86
+DIST http-client-restricted-0.0.5.tar.gz 5389 BLAKE2B 83ec4694c6d99858b85c9751ed915b1d2ebf1df901c62fe59521dda18ced697ec9af71519785df16d06a795c18e496f8b90f6253845b88e810bf4caf0c02704d SHA512 d5876c02c1c6989f1da4741e191f18554efd448339e83bb9b267edec0e414141221c4f770d9f8e48c9d5f4a8fac9d58295e5f57e8c877710c95a71419e53cf3d
+DIST http-client-restricted-0.1.0.tar.gz 5462 BLAKE2B e25116e70172373c198187a4596da6f7d4f77c67b574dd02838ff31e96697386232dcdb887c26aad9ef2eafdbdd61065560a826138454210e7e26e6287456723 SHA512 c2f1f3476b01bc0c16512a1db037948d6a1365d9367d7058dee9862e328c59fb9cfbde679904ef66c8353a8422256e64fde443b7fcae2a389495f496fcc3a5ac
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
deleted file mode 100644
index 22410e693dcc..000000000000
--- a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="restricting the servers that http-client will use"
-HOMEPAGE="https://hackage.haskell.org/package/http-client-restricted"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
- >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/network-3.0.0.0:=[profile?]
- dev-haskell/network-bsd:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
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
new file mode 100644
index 000000000000..ab5551d23ecb
--- /dev/null
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="restricting the servers that http-client will use"
+HOMEPAGE="https://hackage.haskell.org/package/http-client-restricted"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ >=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/network-3.0.0.0:=[profile?]
+ dev-haskell/network-bsd:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild
new file mode 100644
index 000000000000..54490aa6b5cc
--- /dev/null
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="restricting the servers that http-client will use"
+HOMEPAGE="https://hackage.haskell.org/package/http-client-restricted"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/crypton-connection-0.3.1:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ >=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/network-3.0.0.0:=[profile?]
+ dev-haskell/network-bsd:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/http-client-restricted/metadata.xml b/dev-haskell/http-client-restricted/metadata.xml
index 937381521944..0654b24d0ab8 100644
--- a/dev-haskell/http-client-restricted/metadata.xml
+++ b/dev-haskell/http-client-restricted/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">http-client-restricted</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
index e02c5b810093..5a2453db63b0 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1 +1,2 @@
-DIST http-client-tls-0.3.5.3.tar.gz 7679 BLAKE2B 490fb9af14ba814528560bab7cbf37bf348db38078d08d6be07934e52754741bc3b0ed91e614598ab8b26e19a67d7c6121f52a59b0b9ee47481e5c9bdf3cd36d SHA512 df4fff9fbd6736a52d54bf04669107b24e3d31c22b0f7882310204ca4ef1a895e9f79cea289423341aa575759a2667ff9ca86b889567605ad3daec266a1bbb14
+DIST http-client-tls-0.3.6.1.tar.gz 7850 BLAKE2B c2ef4e8981f2141d496d2d3e0720a29a536cd4937a95e4a59c8db356ac4390c2d419bf61b2eae6fcb4b5e98a73cd945981c9d8535353b3e444b603f9237bab3e SHA512 81b6e9ad3956f237bec83173ab8ac153ea3e9b555f0a84dc6ec0a13f6ad96dfc104d61125b66fc8733c8d8c3b7f8fc5e89cfcb885a7352f3af2e2b5473732294
+DIST http-client-tls-0.3.6.3.tar.gz 7935 BLAKE2B df9ffb0ea6dc0984faabaf4269c6cc62241b603465fdbd65af8cdf434e63f2e222ffbb73e51b404f77ef8eeee13ad0e6289e8ba27230935c4c1f9e318d46644c SHA512 2b4475a9fdcfed07512f19af989289d8b8eacc8568392c03839a806327d5b1cd6dfcbc5afe29a0dd3f63d9c93a7043c4fea594b73c46b43db94518dd7a39325f
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
deleted file mode 100644
index 047a658d1d09..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/connection-0.2.5:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/http-client-0.5.0:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- dev-haskell/network:=[profile?]
- dev-haskell/network-uri:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/tls-1.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec )
-"
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
new file mode 100644
index 000000000000..b87d9d1812ca
--- /dev/null
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 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="http-client backend using the connection package and tls library"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/connection-0.2.5:=[profile?]
+ dev-haskell/cryptonite:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/http-client-0.7.11:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/memory:=[profile?]
+ dev-haskell/network:=[profile?]
+ dev-haskell/network-uri:=[profile?]
+ >=dev-haskell/tls-1.2:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild
new file mode 100644
index 000000000000..4f1e2fc62318
--- /dev/null
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="http-client backend using the connection package and tls library"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+ dev-haskell/crypton:=[profile?]
+ dev-haskell/crypton-connection:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/http-client-0.7.11:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/memory:=[profile?]
+ dev-haskell/network:=[profile?]
+ dev-haskell/network-uri:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/tls-1.2:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/http-client-tls/metadata.xml b/dev-haskell/http-client-tls/metadata.xml
index 895e9366e8a6..fd46ff83d375 100644
--- a/dev-haskell/http-client-tls/metadata.xml
+++ b/dev-haskell/http-client-tls/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">http-client-tls</remote-id>
<remote-id type="github">snoyberg/http-client</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index 006592b30475..eda78e7fddff 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -1 +1,2 @@
-DIST http-client-0.6.4.1.tar.gz 89702 BLAKE2B 845488745e7429b833c92521be7abb6e03ae90fa81f819995d9fead467fce1f3c43ece8c4f5da1f8242d79086556b0f86eeea3da931a0a613eb49966ca9cd60d SHA512 b9595ebf3cb48c5ed288934976b78270a3092a35ae083853684c848301ee88a18e0e41534180033df071ab87dc9f9cbab99da37cbc74d538472409c13dcfce7d
+DIST http-client-0.7.11.tar.gz 94548 BLAKE2B 5e630b5ec1861301a8a503238c111091b9b099d181b17a1d9c5fd22dac1dc60952faa7ec1da597dd909fe5f23408d728964461d77314a30a747e5edaa1757889 SHA512 0c01961e66c71636ff2628851151a788aaf941155d50a9f20b01a2e065ca7a8218ab4867b24e7cfb434aaa9b9178f727d950017870540e0bce91fffdcc374852
+DIST http-client-0.7.14.tar.gz 95406 BLAKE2B 9cb48fb44d529bc271ce969e72ff374c3d3afe1d983193e7ae7c55ea4dc8625df02e0a1ffd3597ef7882772a3f997057f88c37f356b088a8f9c2eeb9dcf90c7c SHA512 7668bb4b53c9d60aec3bb5a9342bb7c87502820d467dbf40943828136c52e99a619f0be6e8ec96fa6dcf79d8265b55fd3d681d5ce81f0e8540392534b26a3354
diff --git a/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch b/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch
new file mode 100644
index 000000000000..0cc6e4f40dc2
--- /dev/null
+++ b/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch
@@ -0,0 +1,16 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Disable tests that depend on network access
+
+diff -urN http-client-0.7.10/http-client.cabal http-client-0.7.10-r1/http-client.cabal
+--- http-client-0.7.10/http-client.cabal 2022-01-20 19:39:19.388814780 -0700
++++ http-client-0.7.10-r1/http-client.cabal 2022-01-20 19:39:58.298814799 -0700
+@@ -104,6 +104,7 @@
+ , zlib
+ , async
+ , streaming-commons >= 0.1.1
++ buildable: False
+
+
+ test-suite spec-nonet
diff --git a/dev-haskell/http-client/http-client-0.6.4.1.ebuild b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
deleted file mode 100644
index 023cfce84a64..000000000000
--- a/dev-haskell/http-client/http-client-0.6.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
- >=dev-haskell/case-insensitive-1.0:=[profile?]
- dev-haskell/cookie:=[profile?]
- >=dev-haskell/exceptions-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?]
- >=dev-haskell/memory-0.7:=[profile?]
- dev-haskell/mime-types:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/stm-2.3:=[profile?]
- >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-lang/ghc-8.2.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/async
- dev-haskell/hspec
- dev-haskell/monad-control
- >=dev-haskell/streaming-commons-0.1.1
- dev-haskell/zlib
- !network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.7.11.ebuild b/dev-haskell/http-client/http-client-0.7.11.ebuild
new file mode 100644
index 000000000000..043f4db8f9ee
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.7.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/async:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?]
+ >=dev-haskell/blaze-builder-0.3:=[profile?]
+ >=dev-haskell/case-insensitive-1.0:=[profile?]
+ dev-haskell/cookie:=[profile?]
+ >=dev-haskell/http-types-0.8:=[profile?]
+ >=dev-haskell/iproute-1.7.5:=[profile?]
+ dev-haskell/mime-types:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+ dev-haskell/random:=[profile?]
+ >=dev-haskell/stm-2.3:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec
+ dev-haskell/monad-control
+ >=dev-haskell/streaming-commons-0.1.1
+ dev-haskell/zlib )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.10-disable-net-tests.patch" )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=network-uri
+}
diff --git a/dev-haskell/http-client/http-client-0.7.14.ebuild b/dev-haskell/http-client/http-client-0.7.14.ebuild
new file mode 100644
index 000000000000..624051696f80
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.7.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.10-disable-net-tests.patch"
+)
+
+RDEPEND=">=dev-haskell/async-2.0:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?]
+ >=dev-haskell/blaze-builder-0.3:=[profile?]
+ >=dev-haskell/case-insensitive-1.0:=[profile?]
+ dev-haskell/cookie:=[profile?]
+ >=dev-haskell/http-types-0.8:=[profile?]
+ >=dev-haskell/iproute-1.7.5:=[profile?]
+ dev-haskell/mime-types:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+ dev-haskell/random:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec
+ dev-haskell/monad-control
+ >=dev-haskell/streaming-commons-0.1.1
+ dev-haskell/zlib )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=network-uri
+}
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
index 7ade654e2560..50f1751001a7 100644
--- a/dev-haskell/http-client/metadata.xml
+++ b/dev-haskell/http-client/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- </use>
<upstream>
+ <remote-id type="hackage">http-client</remote-id>
<remote-id type="github">snoyberg/http-client</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
deleted file mode 100644
index b851c99853a5..000000000000
--- a/dev-haskell/http-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-common-0.8.2.1.tar.gz 9413 BLAKE2B 0e79e29f277902ac188ff2ba962f9bd3ad99d21f70a9f9f9e6ad5951d9af353110dd1a7519f77d0fb593aa965cdfd08be8abc01b27ce9fcc82e37a696dc790ca SHA512 da165d118575f1958c300c2b389b28cd4e0d720be79e776b5e72444b30b7b0369f336d44283d8b71c7758c1405e64a13e5591971da2e6b29cf7786233f2e04dc
diff --git a/dev-haskell/http-common/http-common-0.8.2.1.ebuild b/dev-haskell/http-common/http-common-0.8.2.1.ebuild
deleted file mode 100644
index e0fe46eedcb0..000000000000
--- a/dev-haskell/http-common/http-common-0.8.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://github.com/istathar/http-common"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/network:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24
-"
diff --git a/dev-haskell/http-common/metadata.xml b/dev-haskell/http-common/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/http-common/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-conduit/Manifest b/dev-haskell/http-conduit/Manifest
index 353b6fd9f301..d970512b6c09 100644
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@@ -1 +1 @@
-DIST http-conduit-2.3.7.3.tar.gz 28227 BLAKE2B 9cc2583809410bf7e52244140eda9152d4021699a287a8f99cf5501f854965893b03f661a8f0d266239978e48518be386ec3f3ed5bdf44030638b94b9a95d26c SHA512 0b3733ce031299ee3b93ca44d45a913e384dbfcd43efe5c65076efb5ff8266058ecb07e90f699ebb54d2d37f4a299be79717c3988e72cce631d417ba21ed4d08
+DIST http-conduit-2.3.8.tar.gz 28858 BLAKE2B a89a858eb0c11b66046d9292d95a2df1c257ce6130ed5f3c2f4b25b6841bacdb3f2cd8b9fca2ff213a48df76910476e53d150a678d6d69accbe419f64a1ed299 SHA512 44c337f1a0a0ec74a5d6e4e28a3aa5a32609c3a4da9424e99aedc2a8db67fc4684ef10cf82d6bda0761c7ffba4f0222e683946ab6dd8de1ab8225a40cc14cf66
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
deleted file mode 100644
index d9ea0f35a75c..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- >=dev-haskell/conduit-1.2:=[profile?]
- >=dev-haskell/conduit-extra-1.1:=[profile?]
- >=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
- >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- >=dev-haskell/void-0.5.5:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/blaze-builder
- dev-haskell/case-insensitive
- >=dev-haskell/connection-0.2
- dev-haskell/cookie
- dev-haskell/data-default-class
- >=dev-haskell/hspec-1.3
- dev-haskell/hunit
- dev-haskell/network
- dev-haskell/streaming-commons
- dev-haskell/temporary
- dev-haskell/text
- dev-haskell/unliftio
- dev-haskell/utf8-string
- >=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
- dev-haskell/wai-conduit
- >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.4
- dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
new file mode 100644
index 000000000000..4278d2e134ea
--- /dev/null
+++ b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +aeson
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # needs a port
+inherit haskell-cabal
+
+DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
+HOMEPAGE="https://www.yesodweb.com/book/https-conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT=test # needs network
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ >=dev-haskell/conduit-1.2:=[profile?]
+ >=dev-haskell/conduit-extra-1.1:=[profile?]
+ >=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ >=dev-haskell/aeson-0.8:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=+aeson
+}
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
index 98f0133adaa0..0ff226550df7 100644
--- a/dev-haskell/http-date/Manifest
+++ b/dev-haskell/http-date/Manifest
@@ -1 +1,2 @@
+DIST http-date-0.0.11.tar.gz 5351 BLAKE2B e9f9ff3323895ea90fd98625af7fb5213d52303e2b39a661617d7635db294ec256470d6b4dc6d6c38fc2dc7f349eb3a9d4018358e7fef43b966539229ef779fe SHA512 dec4f4fc5f765887fb884a0309648dd3336e2591c05ac89150c7ebe935d1167f3c5996a12c5371f3fab3525b95ca8e46873b6bafc1b937b1b5367c256358a62d
DIST http-date-0.0.8.tar.gz 5322 BLAKE2B a88ee8ff31e5356aefa095d5c700e77554657a1102ab12091debbe173dc8b8886b3468795117b81ac745c08511b5b856ee49f6754db265226bd375926a68413c SHA512 7ad48dc20c62fea21aad0d15251cca333b56a59ca13c45be61fd9fcd938e28f5cb82701b7a394c256e1487679d0bbfcf994de90d7c8b57888e3bac8809e97114
diff --git a/dev-haskell/http-date/http-date-0.0.11.ebuild b/dev-haskell/http-date/http-date-0.0.11.ebuild
new file mode 100644
index 000000000000..bd0d30401b3e
--- /dev/null
+++ b/dev-haskell/http-date/http-date-0.0.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP Date parser/formatter"
+HOMEPAGE="https://hackage.haskell.org/package/http-date"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
+
+RDEPEND="dev-haskell/attoparsec:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/doctest-0.8
+ dev-haskell/hspec
+ dev-haskell/old-locale )
+"
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 45fdcf4f136e..7ffa278155d0 100644
--- a/dev-haskell/http-date/http-date-0.0.8.ebuild
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,13 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
RDEPEND="dev-haskell/attoparsec:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/http-download/Manifest b/dev-haskell/http-download/Manifest
deleted file mode 100644
index 46f594e22d27..000000000000
--- a/dev-haskell/http-download/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-download-0.2.0.0.tar.gz 8946 BLAKE2B f8b52744605ac8bd9bc922e23a5ffa02d0d7c10af7109594e0273cd46fec8afd0e20e2cbffed04ac206234d3635b2c53f6adfc8e11467e05f1b3544f02c7a271 SHA512 b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae
diff --git a/dev-haskell/http-download/http-download-0.2.0.0.ebuild b/dev-haskell/http-download/http-download-0.2.0.0.ebuild
deleted file mode 100644
index 5123c9182820..000000000000
--- a/dev-haskell/http-download/http-download-0.2.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Verified downloads with retries"
-HOMEPAGE="https://github.com/commercialhaskell/http-download#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #requires network access
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
- dev-haskell/conduit:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/cryptonite-conduit:=[profile?]
- dev-haskell/exceptions:=[profile?]
- dev-haskell/http-client:=[profile?]
- dev-haskell/http-conduit:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- dev-haskell/path:=[profile?]
- dev-haskell/path-io:=[profile?]
- dev-haskell/retry:=[profile?]
- dev-haskell/rio:=[profile?]
- dev-haskell/rio-prettyprint:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/hspec
- dev-haskell/hspec-discover )
-"
diff --git a/dev-haskell/http-download/metadata.xml b/dev-haskell/http-download/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/http-download/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-media/Manifest b/dev-haskell/http-media/Manifest
new file mode 100644
index 000000000000..23a0d95e094d
--- /dev/null
+++ b/dev-haskell/http-media/Manifest
@@ -0,0 +1 @@
+DIST http-media-0.8.0.0.tar.gz 18895 BLAKE2B 3a6db500f6433c6f0bc23f6b51aa5f35b3340a4258b4b5d637bdeafd5161c28af8c2630a013f06a8204a2d37242d5bc880d5c75d32adbf92fb664417872806a2 SHA512 549fa1892c81224e79bad4268993e0cfa324d9d0c9daa0d800ac7cc4eee307405155989672c49adb0e124ca29c2d83cc565ba3c935fd3be4ab4ef0594b012bb5
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
new file mode 100644
index 000000000000..691350b0f193
--- /dev/null
+++ b/dev-haskell/http-media/http-media-0.8.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Processing HTTP Content-Type and Accept headers"
+HOMEPAGE="https://github.com/zmthy/http-media"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-1.0:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( >=dev-haskell/quickcheck-2.8
+ >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+# https://hackage.haskell.org/package/http-media-0.8.0.0/revisions/
+CABAL_CHDEPS=(
+ 'base >= 4.7 && < 4.13' 'base >= 4.8'
+ 'bytestring >= 0.10 && < 0.11' ' bytestring >= 0.10'
+ 'base >= 4.7 && < 4.13' 'base >= 4.7'
+ 'bytestring >= 0.10 && < 0.11' 'bytestring >= 0.10'
+ 'QuickCheck >= 2.8 && < 2.14' 'QuickCheck >= 2.8'
+)
diff --git a/dev-haskell/http-media/metadata.xml b/dev-haskell/http-media/metadata.xml
new file mode 100644
index 000000000000..fee7d2838ce4
--- /dev/null
+++ b/dev-haskell/http-media/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <longdescription>
+ This library is intended to be a comprehensive solution to parsing and
+ selecting quality-indexed values in HTTP headers. It is capable of parsing
+ both media types and language parameters from the Accept and Content header
+ families, and can be extended to match against other accept headers as well.
+ Selecting the appropriate header value is achieved by comparing a list of
+ server options against the quality-indexed values supplied by the client.
+
+ In the following example, the Accept header is parsed and then matched against
+ a list of server options to serve the appropriate media using
+ 'mapAcceptMedia':
+
+ &gt; getHeader &gt;&gt;= maybe send406Error sendResourceWith . mapAcceptMedia
+ &gt; [ ("text/html", asHtml)
+ &gt; , ("application/json", asJson)
+ &gt; ]
+
+ Similarly, the Content-Type header can be used to produce a parser for request
+ bodies based on the given content type with 'mapContentMedia':
+
+ &gt; getContentType &gt;&gt;= maybe send415Error readRequestBodyWith . mapContentMedia
+ &gt; [ ("application/json", parseJson)
+ &gt; , ("text/plain", parseText)
+ &gt; ]
+
+ The API is agnostic to your choice of server.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">zmthy/http-media</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/http-reverse-proxy/Manifest b/dev-haskell/http-reverse-proxy/Manifest
deleted file mode 100644
index e7c42a48dbaa..000000000000
--- a/dev-haskell/http-reverse-proxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-reverse-proxy-0.6.0.tar.gz 10538 BLAKE2B 39fb4e7ed1ce3e413f44926b875152a01cd062d7f7435712075c190f16547f370f6f52e1ec93c35d942fb2a1c55d262a8573fca4a40f39c6e9b27c3ccecc15b1 SHA512 4b294ab670abf922392aeed372c948d52a5ea8c8faafbcb16fb7ee2fda740fe01c25addefffbe7848c06e4117b8c159e7dbfcc9bff2857088cf15b3a73e57d28
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.6.0.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.6.0.ebuild
deleted file mode 100644
index 9d3e00694bd5..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- >=dev-haskell/blaze-builder-0.3:=[profile?]
- >=dev-haskell/case-insensitive-0.4:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- >=dev-haskell/http-client-0.3:=[profile?]
- dev-haskell/network:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/streaming-commons:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/unliftio-0.2:=[profile?]
- >=dev-haskell/wai-3.0:=[profile?]
- dev-haskell/wai-logger:=[profile?]
- >=dev-haskell/word8-0.0:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/blaze-builder
- >=dev-haskell/conduit-1.1
- dev-haskell/conduit-extra
- >=dev-haskell/hspec-1.3
- >=dev-haskell/http-conduit-2.3
- dev-haskell/http-types
- dev-haskell/network
- dev-haskell/resourcet
- dev-haskell/streaming-commons
- dev-haskell/transformers
- dev-haskell/unliftio
- dev-haskell/wai
- >=dev-haskell/warp-2.1 )
-"
diff --git a/dev-haskell/http-reverse-proxy/metadata.xml b/dev-haskell/http-reverse-proxy/metadata.xml
deleted file mode 100644
index ebbb0ff2c0fe..000000000000
--- a/dev-haskell/http-reverse-proxy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Provides a simple means of reverse-proxying HTTP requests. The raw approach uses the same technique as leveraged by keter, whereas the WAI approach performs full request/response parsing via WAI and http-conduit.
- </longdescription>
- <upstream>
- <remote-id type="github">fpco/http-reverse-proxy</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
deleted file mode 100644
index f0d58e860f1b..000000000000
--- a/dev-haskell/http-streams/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-streams-0.8.7.2.tar.gz 35163 BLAKE2B 80b5a12bd95379009993efe1eb3f484c54e143d2d132a9b7a4faa64fd59fcacdade0b388138de7357692c49bffbdf508ccf05dc2e919e56c59e52191bf1b7f8c SHA512 1028e7a102fc189ddd20d353492306d506f24f0408a234e0ec2b01c11737bc9ffec76a5609e18e355ef838663ec412ce3b358d8223deea7dd4c35ada5223f3ea
diff --git a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild b/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
deleted file mode 100644
index e2e1e9367992..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop 'test-suite' to avoid circular depend
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/blaze-builder-0.4:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/hsopenssl-0.11.2:=[profile?]
- >=dev-haskell/http-common-0.8.2:=[profile?]
- >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?]
- <dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/metadata.xml b/dev-haskell/http-streams/metadata.xml
deleted file mode 100644
index 72f0ed5fab0e..000000000000
--- a/dev-haskell/http-streams/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- /Overview/
-
- An HTTP client, using the Snap Framework's 'io-streams' library to
- hande the streaming IO. The API is optimized for ease of use for the
- rather common case of code needing to query web services and deal with
- the result.
-
- The library is exported in a single module; see "Network.Http.Client"
- for full documentation.
- </longdescription>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- </use>
-</pkgmetadata>
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 91be0dd4f5f2..a4122c117bae 100644
--- a/dev-haskell/http-types/http-types-0.12.3.ebuild
+++ b/dev-haskell/http-types/http-types-0.12.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/http/Manifest
index 773b7c36d1ff..04d7dc0b45e9 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1 +1,2 @@
-DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
+DIST http-4000.4.1-rev2.cabal 5862 BLAKE2B bd161e438c968d6bf20efc5bce869b5bae297b59a01332711176e34cd99f03d449f3ca8da178b5147703c2ecebe5c67f5405d98122d59fd796c8d6b23c2113f2 SHA512 03798e5436f1da1a6ecb66879f610b3b2a34d18f90c77b0724167c5931cb25b8e711316d413b7d2688c4eb2809bc957e9af2d10ad827986d026c71b2bed40a86
+DIST http-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
deleted file mode 100644
index c2e843e563e2..000000000000
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-uri? ( >=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?] )
- !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
- >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
- >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
- >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
- >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3.0.0 && < 4.14' 'base >= 4.3.0.0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag conduit10 conduit10) \
- --flag=-mtl1 \
- $(cabal_flag network-uri network-uri) \
- --flag=-network23 \
- --flag=-old-base \
- --flag=-warn-as-error \
- --flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.4.1-r1.ebuild b/dev-haskell/http/http-4000.4.1-r1.ebuild
new file mode 100644
index 000000000000..bf07dbb5578e
--- /dev/null
+++ b/dev-haskell/http/http-4000.4.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
+
+CABAL_HACKAGE_REVISION=2
+CABAL_PN="HTTP"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
+ >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
+ >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
+ >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
+ >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-conduit10 \
+ --flag=-mtl1 \
+ --flag=network-uri \
+ --flag=-network23 \
+ --flag=-old-base \
+ --flag=-warn-as-error \
+ --flag=-warp-tests
+}
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
index b45d3251d695..39f332301d58 100644
--- a/dev-haskell/http/metadata.xml
+++ b/dev-haskell/http/metadata.xml
@@ -5,44 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The HTTP package supports client-side web programming in Haskell. It lets you set up
- HTTP connections, transmitting requests and processing the responses coming back, all
- from within the comforts of Haskell. It's dependent on the network package to operate,
- but other than that, the implementation is all written in Haskell.
-
- A basic API for issuing single HTTP requests + receiving responses is provided. On top
- of that, a session-level abstraction is also on offer (the @BrowserAction@ monad);
- it taking care of handling the management of persistent connections, proxies,
- state (cookies) and authentication credentials required to handle multi-step
- interactions with a web server.
-
- The representation of the bytes flowing across is extensible via the use of a type class,
- letting you pick the representation of requests and responses that best fits your use.
- Some pre-packaged, common instances are provided for you (@ByteString@, @String@.)
-
- Here's an example use:
-
- &gt;
- &gt; do
- &gt; rsp &lt;- Network.HTTP.simpleHTTP (getRequest "http://www.haskell.org/")
- &gt; -- fetch document and return it (as a 'String'.)
- &gt; fmap (take 100) (getResponseBody rsp)
- &gt;
- &gt; do
- &gt; rsp &lt;- Network.Browser.browse $ do
- &gt; setAllowRedirects True -- handle HTTP redirects
- &gt; request $ getRequest "https://google.com/"
- &gt; fmap (take 100) (getResponseBody rsp)
- &gt;
-
- Git repository available at &lt;https://github.com/haskell/HTTP.git&gt;
- </longdescription>
- <use>
- <flag name="conduit10">Use version 1.0.x or below of the conduit package (for the test suite).</flag>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- </use>
<upstream>
+ <remote-id type="hackage">HTTP</remote-id>
<remote-id type="github">haskell/HTTP</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
index 4a2fae055607..4c18f5b4a652 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -1 +1,2 @@
-DIST http2-2.0.3.tar.gz 5211934 BLAKE2B cc1fad663650eaa1514e5f94737966ac86a92c2cc15f47db06c057a78873ca7d745aa77280cf451e11a9c2e328cad2a89d965bb7502d6b2e0b9b808b88570a8d SHA512 ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20
+DIST http2-3.0.1.tar.gz 5556373 BLAKE2B 40daf73f0460ce649d6bed41b9df961b7388f7ac2e67a11aae56be2f31209183e68cef558b7880b87d1a752f96f989779e5ecbf1a86df5bd4ac8443cd476c41b SHA512 aaa32209fb9945cc33c557866acb053df403bbe37c2bd024ac52e7fc6a3e816d0249e48b83e8846017fe0df0998327cf3498f1bc96b57b0fa81ce9c4d35589c6
+DIST http2-4.1.2.tar.gz 5496723 BLAKE2B 1939a137ce0ef3fad476721fe9059963de7b96e9e09c49735d33de3bb4382ec5536c17965677df3482edb09b93e83edee485503d989b07bff8cf7d0c76f48b3e SHA512 85fb0025854c059d186dd4cefffb1065f0c87d494740afba6a3f785c7d579bc11e2ba881eeeae8f682e55902e70a8ba8bc571f84aa27fcaf341110fb70e1b43d
diff --git a/dev-haskell/http2/http2-2.0.3.ebuild b/dev-haskell/http2/http2-2.0.3.ebuild
deleted file mode 100644
index 6d153aeb24cb..000000000000
--- a/dev-haskell/http2/http2-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="https://github.com/kazu-yamamoto/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/network:=[profile?]
- >=dev-haskell/network-byte-order-0.1.1:=[profile?]
- dev-haskell/psqueues:=[profile?]
- dev-haskell/stm:=[profile?]
- dev-haskell/time-manager:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/aeson
- dev-haskell/aeson-pretty
- dev-haskell/base16-bytestring
- >=dev-haskell/doctest-0.9.3
- >=dev-haskell/glob-0.9
- >=dev-haskell/hspec-1.3
- dev-haskell/text
- dev-haskell/unordered-containers
- dev-haskell/vector )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-devel
-}
diff --git a/dev-haskell/http2/http2-3.0.1.ebuild b/dev-haskell/http2/http2-3.0.1.ebuild
new file mode 100644
index 000000000000..26de4836f1dd
--- /dev/null
+++ b/dev-haskell/http2/http2-3.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -devel,-doc,-h2spec
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="HTTP/2 library"
+HOMEPAGE="https://github.com/kazu-yamamoto/http2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # test suite requires too new dependencies
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/network:=[profile?]
+ >=dev-haskell/network-byte-order-0.1.5:=[profile?]
+ dev-haskell/psqueues:=[profile?]
+ dev-haskell/stm:=[profile?]
+ dev-haskell/time-manager:=[profile?]
+ dev-haskell/unix-time:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( dev-haskell/aeson
+# dev-haskell/aeson-pretty
+# dev-haskell/async
+# >=dev-haskell/base16-bytestring-1.0
+# dev-haskell/cryptonite
+# >=dev-haskell/glob-0.9
+# >=dev-haskell/hspec-1.3
+# >=dev-haskell/network-run-0.1.0
+# dev-haskell/text
+# dev-haskell/typed-process
+# dev-haskell/unordered-containers
+# dev-haskell/vector )
+# "
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-devel \
+ --flag=-doc \
+ --flag=-h2spec
+}
diff --git a/dev-haskell/http2/http2-4.1.2.ebuild b/dev-haskell/http2/http2-4.1.2.ebuild
new file mode 100644
index 000000000000..3c47800475b9
--- /dev/null
+++ b/dev-haskell/http2/http2-4.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -devel,-doc,-h2spec
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP/2 library"
+HOMEPAGE="https://github.com/kazu-yamamoto/http2"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network to run one of the test suites
+
+RDEPEND="dev-haskell/async:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/network:=[profile?]
+ >=dev-haskell/network-byte-order-0.1.5:=[profile?]
+ dev-haskell/psqueues:=[profile?]
+ dev-haskell/time-manager:=[profile?]
+ dev-haskell/unix-time:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/aeson-2
+ dev-haskell/aeson-pretty
+ >=dev-haskell/base16-bytestring-1.0
+ dev-haskell/cryptonite
+ >=dev-haskell/glob-0.9
+ >=dev-haskell/hspec-1.3
+ >=dev-haskell/network-run-0.1.0
+ dev-haskell/text
+ dev-haskell/typed-process
+ dev-haskell/unordered-containers
+ dev-haskell/vector )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-devel \
+ --flag=-doc \
+ --flag=-h2spec
+}
diff --git a/dev-haskell/http2/metadata.xml b/dev-haskell/http2/metadata.xml
index 937381521944..baab2d1900ab 100644
--- a/dev-haskell/http2/metadata.xml
+++ b/dev-haskell/http2/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">http2</remote-id>
+ <remote-id type="github">kazu-yamamoto/http2</remote-id>
+ </upstream>
</pkgmetadata>
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
new file mode 100644
index 000000000000..a04f32d17dd5
--- /dev/null
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +network-uri,+network-bsd
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple web-server with an interact style API"
+HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="buildexamples"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+ >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag buildexamples buildexamples) \
+ --flag=network-bsd \
+ --flag=network-uri
+}
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
deleted file mode 100644
index 887a309bcd6a..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildexamples +network-bsd +network-uri"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
- >=dev-haskell/network-2.7:=[profile?] )
- !network-bsd? ( <dev-haskell/network-2.7:=[profile?] )
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?]
- >=dev-haskell/network-2.6:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?]
- <dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag buildexamples buildexamples) \
- $(cabal_flag network-bsd network-bsd) \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index 7a2c9f5d6382..e8d6b06231be 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -12,7 +12,5 @@
</longdescription>
<use>
<flag name="buildexamples">Build example executables.</flag>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- <flag name="network-bsd">Get Network.BSD from the network-bsd package.</flag>
</use>
</pkgmetadata>
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 8aea6aa8513d..49751e7f2dff 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,3 +1,2 @@
-DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
-DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
DIST HUnit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
+DIST hunit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
diff --git a/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch b/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch
new file mode 100644
index 000000000000..42d1027aba22
--- /dev/null
+++ b/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch
@@ -0,0 +1,20 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+When dependencies change (for instance switching from USE=-test to USE=test)
+the ABI hash for the package changes, causing reverse-dependencies to break.
+This keeps the dependencies the same whether tests are enabled or not.
+
+diff -urN HUnit-1.6.2.0/HUnit.cabal HUnit-1.6.2.0-r1/HUnit.cabal
+--- HUnit-1.6.2.0/HUnit.cabal 2022-08-28 14:11:57.178837140 -0600
++++ HUnit-1.6.2.0-r1/HUnit.cabal 2022-08-28 14:12:38.558837160 -0600
+@@ -32,7 +32,8 @@
+ build-depends:
+ base ==4.*,
+ call-stack >=0.3.0,
+- deepseq
++ deepseq,
++ filepath
+ exposed-modules:
+ Test.HUnit.Base
+ Test.HUnit.Lang
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
deleted file mode 100644
index e5dd40bab7be..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.0.0.ebuild b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
deleted file mode 100644
index 23d2fdc9578c..000000000000
--- a/dev-haskell/hunit/hunit-1.6.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="https://github.com/hspec/HUnit#readme"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild b/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild
new file mode 100644
index 000000000000..69a8f58dcad5
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_PN="HUnit"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="https://github.com/hspec/HUnit#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.6.2.0-prevent-abi-change.patch"
+)
+
+RDEPEND=">=dev-haskell/call-stack-0.3.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hunit/hunit-1.6.2.0.ebuild b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
index cbb1890d931d..bd88e63271d2 100644
--- a/dev-haskell/hunit/hunit-1.6.2.0.ebuild
+++ b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/call-stack-0.3.0:=[profile?]
diff --git a/dev-haskell/hunit/metadata.xml b/dev-haskell/hunit/metadata.xml
index c659a3510515..f49a11c4e034 100644
--- a/dev-haskell/hunit/metadata.xml
+++ b/dev-haskell/hunit/metadata.xml
@@ -5,11 +5,9 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- HUnit is a unit testing framework for Haskell, inspired by the
- JUnit tool for Java, see: &lt;http://www.junit.org&gt;.
- </longdescription>
<upstream>
+ <remote-id type="hackage">HUnit</remote-id>
+ <remote-id type="github">hspec/HUnit</remote-id>
<remote-id type="sourceforge">hunit</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
deleted file mode 100644
index 23172b87c71e..000000000000
--- a/dev-haskell/hxt-charproperties/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hxt-charproperties-9.4.0.0.tar.gz 317043 BLAKE2B e8ea482090b0496a1064720e81cab04fa64be51486dedae6b418ea2386b5dc91d0b08af3d57a5c1b52206c6c76ff0b23c380dd03aa0bdfc1e84a80fb2317411b SHA512 8885ceb06e402f2e2e31d616eb605ddf380bec771edf4112fdf6875cbbf03cf1a88b5466e4b74270c7ccf0e1c04e335a3ded6867133a951e1070b7635976fba6
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
deleted file mode 100644
index 1cf7512f4d2c..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -profile
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Character properties and classes for XML and Unicode"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-profile
-}
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
deleted file mode 100644
index 987a8e91e635..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hxt-regex-xmlschema-9.2.0.3.tar.gz 35781 BLAKE2B 0ab5c2042acf032e2709e6781457ec28f2bda3b9778947b08dafd7075c9422e0375574104fd06089f19192bebce3f3f3da5e1b515c8eb62bb7ce5c06c3e8680c SHA512 707ad7a4b5c32785fd89131279dd89a871f134a26ce1f98fd4ac8fec196c8960c2d39d18674967379b40508748fca3a34b9289500173075c54c1d6726191bbd8
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
deleted file mode 100644
index 51b331e5ebfa..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile"
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
- >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/text-0.10:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag profile profile)
-}
diff --git a/dev-haskell/hxt-regex-xmlschema/metadata.xml b/dev-haskell/hxt-regex-xmlschema/metadata.xml
deleted file mode 100644
index a977bed04c46..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library supports full W3C XML Schema regular expressions
- inclusive all Unicode character sets and blocks.
- The complete grammar can be found under &lt;http://www.w3.org/TR/xmlschema11-2/#regexs&gt;.
- It is implemented by the technique of derivations of regular expressions.
- The W3C syntax is extended to support not only union of regular sets,
- but also intersection, set difference, exor.
- Matching of subexpressions is also supported.
- The library can be used for constricting lightweight scanners and tokenizers.
- It is a standalone library, no external regex libraries are used.
- This package is a substitute for the old regex-xmlschema package.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
deleted file mode 100644
index 42d562370c61..000000000000
--- a/dev-haskell/hxt-unicode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hxt-unicode-9.0.2.4.tar.gz 14010 BLAKE2B cdec42564a1107f1a1d322cb22a1f5b74d2bed6e3aaa04ca2973ccc0d6b02b98c18faa86ce92881ad9229b60d2f29055e4cdaa2a2e7002fdb7b9e25133f35dc3 SHA512 4daab9c754e05e15bb0f32bce4ccc0c581c6d8dd4ca4d4868ca7b756a6e40cc9ae8890fc3c925b63bb419db0354229ca6e61fa96bec048f0c61b3ebb43d212bb
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
deleted file mode 100644
index 59bc1eeb8078..000000000000
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
deleted file mode 100644
index 05ad4875acbb..000000000000
--- a/dev-haskell/hxt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.18.ebuild
deleted file mode 100644
index 2a562ce245da..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
- >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
- >=dev-haskell/hxt-unicode-9.0.1:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-haskell/network-uri-2.6:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=network-uri
-}
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
deleted file mode 100644
index 0245ce787d55..000000000000
--- a/dev-haskell/hxt/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
- but introduces a more general approach for processing XML with Haskell.
- The Haskell XML Toolbox uses a generic data model for representing XML documents,
- including the DTD subset and the document subset, in Haskell.
- It contains a validating XML parser, a HTML parser, namespace support,
- an XPath expression evaluator, an XSLT library, a RelaxNG schema validator
- and funtions for serialization and deserialization of user defined data.
- The library makes extensive use of the arrow approach for processing XML.
- Since version 9 the toolbox is partitioned into various (sub-)packages.
- This package contains the core functionality,
- hxt-curl, hxt-tagsoup, hxt-relaxng, hxt-xpath, hxt-xslt, hxt-regex-xmlschema contain the extensions.
- hxt-unicode contains encoding and decoding functions,
- hxt-charproperties char properties for unicode and XML.
- </longdescription>
- <upstream>
- <remote-id type="github">UweSchmidt/hxt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/icalendar/Manifest b/dev-haskell/icalendar/Manifest
deleted file mode 100644
index 6d4396513406..000000000000
--- a/dev-haskell/icalendar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iCalendar-0.4.0.5.tar.gz 29978 BLAKE2B 36a442f83eabec17629ffb38b160e5d17c3d76f4ed54855427d6fa475c0d8d3e0201a08d8b9ed87eaafb37e30625c2d513da8f3dd234c6b8c66264ae64335e48 SHA512 31c58c275d4a4c74adba790a4f32ce368c0dc4a96ac7728111dd4ef71dbc29152786d23d8b25dc3abe064da931a0e11029c0090bf71cf90d22bb5e7a3451e093
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
deleted file mode 100644
index 16848e1417b2..000000000000
--- a/dev-haskell/icalendar/icalendar-0.4.0.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +network-uri
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="iCalendar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="iCalendar data types, parser, and printer"
-HOMEPAGE="https://github.com/chrra/iCalendar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/case-insensitive-0.4:=[profile?]
- >=dev-haskell/data-default-0.3:=[profile?]
- >=dev-haskell/mime-0.4.0.2:=[profile?]
- >=dev-haskell/mtl-2.1.0:=[profile?]
- >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?]
- dev-haskell/old-locale:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'containers >= 0.5 && < 0.6' 'containers >= 0.5' \
- 'network >= 2.6 && < 2.7' 'network >= 2.6'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=network-uri
-}
diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/icalendar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/iconv/Manifest b/dev-haskell/iconv/Manifest
deleted file mode 100644
index 9c953d0b58cc..000000000000
--- a/dev-haskell/iconv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iconv-0.4.1.3.tar.gz 12706 BLAKE2B 569b61bc426115feaf321cb52230460d1cc66472e2fa18678a16e5486a80b5df698e2fece746371268d7031d82268bee98f15ae1713b9589b42f54b4e9cdd0e5 SHA512 b5541bbf477572f7546fa804a33243f5d126c6eb57d0fc12abd85fb9fb19dbb10a79cca60054c585845c3b755d2d5d021413d9aca4db63f5b0eaa52bba87d588
diff --git a/dev-haskell/iconv/iconv-0.4.1.3.ebuild b/dev-haskell/iconv/iconv-0.4.1.3.ebuild
deleted file mode 100644
index 7b64368b5d70..000000000000
--- a/dev-haskell/iconv/iconv-0.4.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="String encoding conversion"
-HOMEPAGE="https://hackage.haskell.org/package/iconv"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/iconv/metadata.xml b/dev-haskell/iconv/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/iconv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/idiii/Manifest b/dev-haskell/idiii/Manifest
deleted file mode 100644
index 26db451dc090..000000000000
--- a/dev-haskell/idiii/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST idiii-0.1.3.3.tar.gz 103560 BLAKE2B cc0f89cbdc2eee4d2b50f48cd1c259af57a7846e38ad80214e8ca57d5ef6e8af1c0f4aac435a8092b4c2c21584c2dd9cc33d0afc5558494c76c93af6e5782ef7 SHA512 31d993aad1891d1d673bf4cebaf639cf20c4cbf9835eb808a5d241e9933a8b2e64a33465d8a77950d9aa2afe4ae6985e4d62d890b7a52701792e3f5c7bf70547
diff --git a/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch b/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch
deleted file mode 100644
index 0bd0469e53af..000000000000
--- a/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/ID3/Type/Tag.hs
-+++ b/src/ID3/Type/Tag.hs
-@@ -89,3 +89,3 @@ getActualSize t = (footerSize t) + (framesSize (t^.frames)) + (extHSize t)
- framesSize :: Map FrameID ID3Frame -> FrameSize
--framesSize fs = Map.fold (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs
-+framesSize fs = Map.foldr (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs
- footerSize :: ID3Tag -> Integer
diff --git a/dev-haskell/idiii/idiii-0.1.3.3.ebuild b/dev-haskell/idiii/idiii-0.1.3.3.ebuild
deleted file mode 100644
index 5125917fdc3c..000000000000
--- a/dev-haskell/idiii/idiii-0.1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing files
-inherit haskell-cabal
-
-DESCRIPTION="ID3v2 (tagging standard for MP3 files) library"
-HOMEPAGE="https://hackage.haskell.org/package/idiii"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #missing files
-
-RDEPEND="dev-haskell/data-accessor:=[profile?]
- dev-haskell/missingh:=[profile?]
- dev-haskell/polyparse:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-PATCHES=("${FILESDIR}"/${P}-fold.patch)
diff --git a/dev-haskell/idiii/metadata.xml b/dev-haskell/idiii/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/idiii/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/idna/Manifest b/dev-haskell/idna/Manifest
deleted file mode 100644
index c0ec4f77d1e1..000000000000
--- a/dev-haskell/idna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST idna-0.3.0.tar.gz 2352 BLAKE2B d4b0441c22b14d5e87438d3e39594e44943aaccc70ee4c66eab70146067e7a1a0c358e94cd68251517fcdbbb2b14f896441a6ebfccd764b31c342d82b8e79b8f SHA512 c18bd9e4157abfde7fa30a16d0df432745f04ee784a2d2be3852750d989964a77bcfc8cc34ab8629a0bb25686adacc07f510150f9696a926559964e6a724f98f
diff --git a/dev-haskell/idna/idna-0.3.0.ebuild b/dev-haskell/idna/idna-0.3.0.ebuild
deleted file mode 100644
index 6f9e096fad03..000000000000
--- a/dev-haskell/idna/idna-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements IDNA (RFC 3490)"
-HOMEPAGE="https://hackage.haskell.org/package/idna"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
- >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?]
- >=dev-haskell/text-0.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/idna/metadata.xml b/dev-haskell/idna/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/idna/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index ee7c4e8a0207..5f21c1727c97 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -1 +1,2 @@
DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a307419d903db6f4cb4108f3556d5475805f997e31212f580ed859c45e3019c55c0fd1ce8ec3bbf0d1892b04fc091 SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866
+DIST ieee754-0.8.0.tar.gz 17564 BLAKE2B 7dcbfc3fcff5fb840bdba9e6fb6e964adf519ad3b6e21e40bbf05c9a4e571f196b9946b8f4bc3b66b1d38720ad9e44bf23c301fbee39c0da7a2766930e0a7262 SHA512 d75b619f0c0b9ac496a68997b6d79b3d7504221f1583e7c35ecc035b6e2b11559e402264f36827153aa89d9eabb27d9383413eb5fd157385b3f41c4f0050a43b
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index a2ba2fb33338..e8e44dc73401 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ieee754/ieee754-0.8.0.ebuild b/dev-haskell/ieee754/ieee754-0.8.0.ebuild
new file mode 100644
index 000000000000..0e9230f0a20b
--- /dev/null
+++ b/dev-haskell/ieee754/ieee754-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities for dealing with IEEE floating point numbers"
+HOMEPAGE="https://github.com/patperry/hs-ieee754"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2.0
+"
diff --git a/dev-haskell/ieee754/metadata.xml b/dev-haskell/ieee754/metadata.xml
index fccae010a714..70603691e494 100644
--- a/dev-haskell/ieee754/metadata.xml
+++ b/dev-haskell/ieee754/metadata.xml
@@ -5,10 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Utilities for dealing with IEEE floating point numbers, ported from the Tangoi
- math library; approximate and exact equality comparisons for general types.
- </longdescription>
<upstream>
<remote-id type="github">patperry/hs-ieee754</remote-id>
</upstream>
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index c1d6dc73bdc1..7b6731de862f 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/indexed-traversable-instances/Manifest
new file mode 100644
index 000000000000..aa4424fe5e72
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/Manifest
@@ -0,0 +1,3 @@
+DIST indexed-traversable-instances-0.1.1.2-rev1.cabal 2536 BLAKE2B 31012e89159e2957839f38047c5b6f7806dc69b14aedcd99c5851584368b9e44948e22f9ae6e483ca72865bdcf75e99eee099ff00a81b01a9c9444a21a549267 SHA512 097d27918d2589f9b08ebc0d39d47b49ad67c3f594bdbbf668ae5514d0921c458d2386211f0c81753d5694523ea5221d89a73402706d1b79100c7f617fa922f5
+DIST indexed-traversable-instances-0.1.1.2.tar.gz 3769 BLAKE2B c45df13fc334e928df402c3bdc76376b27bfbe5bc3ac0a279499e27a9d592d2fd4fc2e8a8f42e2b8bc0d5ed822f5db4ae1a9b4960f0718ab5d093d506ac8a9e6 SHA512 8e4e53054105155e2bc6637348f91548e49c422c87de659193aa917a1ca69e5b157c30f5bfb213661112d28185f87bb9cc453a57e5960042c82b5654d444ba1f
+DIST indexed-traversable-instances-0.1.tar.gz 4235 BLAKE2B e6ae68acc5c6424fd7b9bb045bcafe2d5eb158bb10bc2bd2c677bdd4471dd679a90d8d79628d278a1ade1f0a5940a0e17720fce7c123b89b0c79640497fcadf7 SHA512 ff27968b32c6f0925dc8959dd1b185d75811d2bdb0946818e4f7062e22fd71051c627f2abf943b05b40c85610653098b1f9780145a6369231635993fbedd29a2
diff --git a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild
new file mode 100644
index 000000000000..e7dbb672e045
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable-instances"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.29 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.10.1.1 <dev-haskell/tasty-quickcheck-0.11
+ )
+"
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
new file mode 100644
index 000000000000..ce00ab299a4d
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'base >=4.5 && <4.16' 'base >=4.5'
+)
+
+RDEPEND=">=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.25.1 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.10.1.1 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/indexed-traversable-instances/metadata.xml b/dev-haskell/indexed-traversable-instances/metadata.xml
new file mode 100644
index 000000000000..27f813d261e3
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">indexed-traversable-instances</remote-id>
+ <remote-id type="github">haskellari/indexed-traversable</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
index 8228ee7d30fa..7b589a1c7def 100644
--- a/dev-haskell/indexed-traversable/Manifest
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -1,2 +1,2 @@
-DIST indexed-traversable-0.1.1.tar.gz 8424 BLAKE2B ae6465c62dbd850350433e9a465fcc54d7e25ab80da8b86180bb9aba9ffb7010df5704931a0137737129143e984a6d4ec367ee06d8ed4fda9336410397c4ea9a SHA512 63d6c305f33d97f34c4efaeaede0e5c06c5ff95df9c45307e849de54693c0f93ec017d0e163c64e14bbb498bb2b02a3d54d1cd6a4e75992c8f96609bb73c8dbc
-DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
+DIST indexed-traversable-0.1.2.1.tar.gz 8905 BLAKE2B 48abecc7b8e4b494fc8fde5786ac4d92d8a3463351199daf49b46a1dbcbb95e782ef860a9ac976157967e68dbbaba0e36689d2720830877c34987532047cc507 SHA512 22960e94b6cf3c661ae9db7cb8e0ad7d0931bf4bd01ee692c1c026453c6f176fe36acdbe12e8a8552011b3792c2a493d4e17e0996fad0aaa23140d39b1b6d253
+DIST indexed-traversable-0.1.2.tar.gz 8685 BLAKE2B e136715ed18919f614b1c977f27556447f3bfdf745f6e47e7cd2aeb3038d7afaae31a34f4e9f299494cc034d34ba4e75e7e8481b8b81ba421a1afb1a8408c619 SHA512 38d2dfc0e45e3eafa1e8827c7f27a64e296902f0193cb61939af74ad6845be067024ac32278a6b5bca1976a2d3ada5820a7a6879d7bf9000730450714a5df9c4
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
deleted file mode 100644
index 865aa49f6371..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild
new file mode 100644
index 000000000000..3f0590469484
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
new file mode 100644
index 000000000000..da621553099c
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
deleted file mode 100644
index 5c2c92466fbe..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/indexed-traversable/metadata.xml b/dev-haskell/indexed-traversable/metadata.xml
index 937381521944..df84db65042b 100644
--- a/dev-haskell/indexed-traversable/metadata.xml
+++ b/dev-haskell/indexed-traversable/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">indexed-traversable</remote-id>
+ <remote-id type="github">haskellari/indexed-traversable</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/infer-license/Manifest b/dev-haskell/infer-license/Manifest
deleted file mode 100644
index 34ad5dc76572..000000000000
--- a/dev-haskell/infer-license/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST infer-license-0.2.0.tar.gz 48173 BLAKE2B 27b7adb74c897c03d6e8795d580d165d41ffd527ea4d6b6bed4c730a46d23177babeb57fc6e33ec379a285a76a89727bc10557f925bcc81f4bcb6c50f10bd989 SHA512 266651d9890ccbd9281ef3f9cd16df10f9c6fa8449990b63e956bd13559b1ef773c9dee92ad80de5b9d03599ac6a09766a1f4f3425884007982ab14d01697d45
diff --git a/dev-haskell/infer-license/infer-license-0.2.0.ebuild b/dev-haskell/infer-license/infer-license-0.2.0.ebuild
deleted file mode 100644
index 680469304774..000000000000
--- a/dev-haskell/infer-license/infer-license-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Infer software license from a given license file"
-HOMEPAGE="https://hackage.haskell.org/package/infer-license"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-haskell/text-metrics-0.3.0:=[profile?] <dev-haskell/text-metrics-0.4:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/infer-license/metadata.xml b/dev-haskell/infer-license/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/infer-license/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/inspection-testing/Manifest b/dev-haskell/inspection-testing/Manifest
deleted file mode 100644
index a3e6a9a7782b..000000000000
--- a/dev-haskell/inspection-testing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST inspection-testing-0.4.2.4.tar.gz 20946 BLAKE2B 20547c5a231083391c886fcef8b3dc153fde8498d9268a297013691a055c65dc93deb31b5988a8cdf1e32d465344802153448850a89b819744551dc13712a1a2 SHA512 16ebfcd20e4ee3a9117670ad9e0d683002262a2f3c52dcfdb7c7123f256db4f133780e759a80469a14c786a4158ef9ba4e7d534e728e8d44188b11765a1e8745
diff --git a/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild b/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild
deleted file mode 100644
index 92e6cb057df0..000000000000
--- a/dev-haskell/inspection-testing/inspection-testing-0.4.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -more-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: compiler-dependent
-inherit haskell-cabal
-
-DESCRIPTION="GHC plugin to do inspection testing"
-HOMEPAGE="https://github.com/nomeata/inspection-testing"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # examples/Fusion.hs:22:1: sumUp1 === sumUp2 failed
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-more-tests
-}
diff --git a/dev-haskell/inspection-testing/metadata.xml b/dev-haskell/inspection-testing/metadata.xml
deleted file mode 100644
index f0b744b0f0f0..000000000000
--- a/dev-haskell/inspection-testing/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Some carefully crafted libraries make promises to their
- users beyond functionality and performance.
-
- Examples are: Fusion libraries promise intermediate data
- structures to be eliminated. Generic programming libraries promise
- that the generic implementation is identical to the
- hand-written one. Some libraries may promise allocation-free
- or branch-free code.
-
- Conventionally, the modus operandi in all these cases is
- that the library author manually inspects the (intermediate or
- final) code produced by the compiler. This is not only
- tedious, but makes it very likely that some change, either
- in the library itself or the surrounding eco-system,
- breaks the library's promised without anyone noticing.
-
- This package provides a disciplined way of specifying such
- properties, and have them checked by the compiler. This way,
- this checking can be part of the ususal development cycle
- and regressions caught early.
-
- See the documentation in "Test.Inspection" or the project
- webpage for more examples and more information.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index f75dfc862437..b50896cee19d 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1 +1,2 @@
+DIST integer-logarithms-1.0.3.1-rev4.cabal 3262 BLAKE2B 7f75cecf3dc90bc6e50f55990c2b1be832cb0b94fbd0c0b6d8d985ecd21aee1a6f078b74af72676ce303261f1e71d5e3b177985baa8b005f52020d0b84159a93 SHA512 217c0fd597f2519879adba16c8e10ee562928102f7c9786a604e7ec12ea683c751d28902296d1153d30a752f566ea6c8cb83c86c990e3cdbb358807b3de71d9b
DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild
new file mode 100644
index 000000000000..286e3937405a
--- /dev/null
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -check-bounds,+integer-gmp
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integer logarithms"
+HOMEPAGE="https://github.com/haskellari/integer-logarithms"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
+ >=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-check-bounds \
+ --flag=integer-gmp
+}
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
deleted file mode 100644
index 2951f7036eb2..000000000000
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integer logarithms"
-HOMEPAGE="https://github.com/haskellari/integer-logarithms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1"
-# test? ( >=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
-# >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
-# >=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.4
-# >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-# >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
-# >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-# "
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-check-bounds
-}
diff --git a/dev-haskell/integer-logarithms/metadata.xml b/dev-haskell/integer-logarithms/metadata.xml
index 937381521944..b5ed47e1ed50 100644
--- a/dev-haskell/integer-logarithms/metadata.xml
+++ b/dev-haskell/integer-logarithms/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">integer-logarithms</remote-id>
+ <remote-id type="github">haskellari/integer-logarithms</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/integer-roots/Manifest b/dev-haskell/integer-roots/Manifest
deleted file mode 100644
index b3463ce3555a..000000000000
--- a/dev-haskell/integer-roots/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST integer-roots-1.0.tar.gz 54399 BLAKE2B 72584c0beb74546e87867efbf54259ad236a7fde5fd239e8389e4ea4d15b292abac926319e96c04072a8fb123e0347bee986c1887ebfd642e7192fdb5163a08c SHA512 62f78ef6dbf55fe2e0487dcade557d345ae13e6b2432fc50ecd2c4998bafa0b0c033d58c6c7f4b7999f552da13a55a7a128ff4cc42859ea55da06e34440fa4f0
diff --git a/dev-haskell/integer-roots/integer-roots-1.0.ebuild b/dev-haskell/integer-roots/integer-roots-1.0.ebuild
deleted file mode 100644
index f8425642c990..000000000000
--- a/dev-haskell/integer-roots/integer-roots-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integer roots and perfect powers"
-HOMEPAGE="https://github.com/Bodigrim/integer-roots"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires porting to smallcheck-1.2
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=[gmp]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-" # test? ( >=dev-haskell/smallcheck-1.1.3 <dev-haskell/smallcheck-1.2
-# >=dev-haskell/tasty-0.10
-# >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-# >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11
-# >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-# "
diff --git a/dev-haskell/integer-roots/metadata.xml b/dev-haskell/integer-roots/metadata.xml
deleted file mode 100644
index 723dae1b4c58..000000000000
--- a/dev-haskell/integer-roots/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Calculating integer roots and testing perfect powers of arbitrary precision. Originally part of &lt;https://hackage.haskell.org/package/arithmoi arithmoi&gt; package.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/interpolate/Manifest b/dev-haskell/interpolate/Manifest
deleted file mode 100644
index e80004582f51..000000000000
--- a/dev-haskell/interpolate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST interpolate-0.2.0.tar.gz 6889 BLAKE2B 548418c34af569e4ed0f4bfe5189f4d2957e99a7e11d70dea18f6584cb497a89b3ca458d933301798fdff29e98ba90ae75fc45aa454599f1709bab5f7f1319c9 SHA512 adc90d7da696c4aea0935c5f85dbf37a1738c89ff3b940804cd7bb4f888e28a445c51db9e0f2e1e66f98646f60964c10d135cef30c13efaaaffee3c65b93c89a
diff --git a/dev-haskell/interpolate/interpolate-0.2.0.ebuild b/dev-haskell/interpolate/interpolate-0.2.0.ebuild
deleted file mode 100644
index 3a468706674b..000000000000
--- a/dev-haskell/interpolate/interpolate-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="String interpolation done right"
-HOMEPAGE="https://github.com/sol/interpolate#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-meta-0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/base-compat
- >=dev-haskell/hspec-1.5
- dev-haskell/quickcheck
- dev-haskell/quickcheck-instances
- dev-haskell/text )
-"
diff --git a/dev-haskell/interpolate/metadata.xml b/dev-haskell/interpolate/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/interpolate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/invariant/Manifest b/dev-haskell/invariant/Manifest
index 1e2f56cd99fb..6bb9860284e6 100644
--- a/dev-haskell/invariant/Manifest
+++ b/dev-haskell/invariant/Manifest
@@ -1 +1,2 @@
-DIST invariant-0.5.3.tar.gz 24394 BLAKE2B 5946f6419c74a0697f6017b1178f6a5a99d62b26e7bbf08e9a08430ae22f4e15fae032a5257d9c5589767125d1a5f53ce9c16e1d6c15c90081b355ca102c8149 SHA512 0a488a800b0eec85e865b100e3944d5e9dd45e6c12a411f67b4ba7f40de6fe0b8e37900f72c83ec7b92033a3d15e754dc11d991ecafe18d8f257afdaf67ca9be
+DIST invariant-0.5.5.tar.gz 27181 BLAKE2B d2a6bfb24bfcc28a4e06524e15fbf0b61412d65f9a8a8bf89f77e2ea854b4c10c5a6c30a47c2720c0e772ad20cae0459f1907bcb85b44a64d72d50712933b4af SHA512 da572f725bb1d93e6c2d07f1c8e770a8acbebd4fa3f192cc4459720f440da26f07ac66dcd44c021f82c3e351e1de53db8dd229dd4000d1b917613c6df1d65fa5
+DIST invariant-0.6.2.tar.gz 28199 BLAKE2B e9acc24e0ef05fe4664ba52e23232206b7b01e8c1d6c310eba991876032a351213f07148f59dbb18f9a4bcf1cc29f054efeebe0f8091f0f680cb39f1e679d01c SHA512 a66d21cebbcef1c247ae329e4d607573308060056c22efaedf6f16fb658b6f71d0dade7deb073bf4fd0f9b595e524d190f94b23695ad98cd40a0f141988fa2ee
diff --git a/dev-haskell/invariant/invariant-0.5.3.ebuild b/dev-haskell/invariant/invariant-0.5.3.ebuild
deleted file mode 100644
index 8708070bba60..000000000000
--- a/dev-haskell/invariant/invariant-0.5.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 invariant functors"
-HOMEPAGE="https://github.com/nfrisby/invariant-functors"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
- >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/th-abstraction-0.2.2:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.8
- >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell >= 2.4 && < 2.16' 'template-haskell >= 2.4' \
- 'template-haskell >= 2.4 && < 2.16' 'template-haskell >= 2.4'
-}
diff --git a/dev-haskell/invariant/invariant-0.5.5.ebuild b/dev-haskell/invariant/invariant-0.5.5.ebuild
new file mode 100644
index 000000000000..b16e860c3f98
--- /dev/null
+++ b/dev-haskell/invariant/invariant-0.5.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 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="Haskell98 invariant functors"
+HOMEPAGE="https://github.com/nfrisby/invariant-functors"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
+ >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
+ >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
+"
diff --git a/dev-haskell/invariant/invariant-0.6.2.ebuild b/dev-haskell/invariant/invariant-0.6.2.ebuild
new file mode 100644
index 000000000000..719a1d450ef1
--- /dev/null
+++ b/dev-haskell/invariant/invariant-0.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 invariant functors"
+HOMEPAGE="https://github.com/nfrisby/invariant-functors"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
+ >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
+"
diff --git a/dev-haskell/invariant/metadata.xml b/dev-haskell/invariant/metadata.xml
index 937381521944..4e2cf6833ac7 100644
--- a/dev-haskell/invariant/metadata.xml
+++ b/dev-haskell/invariant/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">invariant</remote-id>
+ <remote-id type="github">nfrisby/invariant-functors</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/io-streams-haproxy/Manifest b/dev-haskell/io-streams-haproxy/Manifest
deleted file mode 100644
index 9683ccaf0c4b..000000000000
--- a/dev-haskell/io-streams-haproxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST io-streams-haproxy-1.0.1.0.tar.gz 10348 BLAKE2B 6c2268cacdfbe73561b8f753594fa39a4027ddf5d22696c7487e8b4c74c330627feec748789389f9f942c14412ecd030c80e779ef0031905d2fe681d7a1bff66 SHA512 6d9f2da6b014a9f2ee894237af56376b94616af1c1795681adac4bfd10edfb851cbe1a37295025c6ebf7e77fe7b5d2abba3557ac1a9ed594deabaee05151572a
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
deleted file mode 100644
index 8dbbfe09f058..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # two tests require network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
- >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.13' 'base >= 4.5' \
- 'network >= 2.3 && < 3.1' 'network >= 2.3 && < 3.2'
-}
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
deleted file mode 100644
index 297f2aa02cbf..000000000000
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- HAProxy protocol version 1.5 support (see
- &lt;http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt&gt;) for applications
- using io-streams. The proxy protocol allows information about a networked
- peer (like remote address and port) to be propagated through a forwarding
- proxy that is configured to speak this protocol.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
deleted file mode 100644
index 1c6f233e10ac..000000000000
--- a/dev-haskell/io-streams/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
diff --git a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild b/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
deleted file mode 100644
index 0d44d531e46d..000000000000
--- a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +nointeractivetests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
-HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network +zlib"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
- zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/mtl-2 <dev-haskell/mtl-3
- >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
- >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
- zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network network) \
- --flag=nointeractivetests \
- $(cabal_flag zlib zlib)
-}
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
deleted file mode 100644
index 310f0593f2cf..000000000000
--- a/dev-haskell/io-streams/metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="network">Include network support</flag>
- <flag name="zlib">Include zlib support</flag>
- </use>
- <longdescription>
- /Overview/
-
- The io-streams library contains simple and easy-to-use primitives for I/O
- using streams. Most users will want to import the top-level convenience
- module "System.IO.Streams", which re-exports most of the library:
-
- @
- import System.IO.Streams (InputStream, OutputStream)
- import qualified System.IO.Streams as Streams
- @
-
- For first-time users, @io-streams@ comes with an included tutorial, which can
- be found in the "System.IO.Streams.Tutorial" module.
-
- /Features/
-
- The @io-streams@ user API has two basic types: @InputStream a@ and
- @OutputStream a@, and three fundamental I/O primitives:
-
- @
- \-\- read an item from an input stream
- Streams.read :: InputStream a -&gt; IO (Maybe a)
-
- \-\- push an item back to an input stream
- Streams.unRead :: a -&gt; InputStream a -&gt; IO ()
-
- \-\- write to an output stream
- Streams.write :: Maybe a -&gt; OutputStream a -&gt; IO ()
- @
-
- Streams can be transformed by composition and hooked together with provided combinators:
-
- @
- ghci&gt; Streams.fromList [1,2,3::Int] &gt;&gt;= Streams.map (*10) &gt;&gt;= Streams.toList
- [10,20,30]
- @
-
- Stream composition leaves the original stream accessible:
-
- @
- ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
- ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
- ghci&gt; Streams.read wrapped
- Just \"long\"
- ghci&gt; Streams.read wrapped
- Nothing
- ghci&gt; Streams.read input
- Just \" string\"
- @
-
- Simple types and operations in the IO monad mean straightforward and simple
- exception handling and resource cleanup using Haskell standard library
- facilities like 'Control.Exception.bracket'.
-
- @io-streams@ comes with:
-
- * functions to use files, handles, concurrent channels, sockets, lists,
- vectors, and more as streams.
-
- * a variety of combinators for wrapping and transforming streams, including
- compression and decompression using zlib, controlling precisely how many
- bytes are read from or written to a stream, buffering output using
- bytestring builders, folds, maps, filters, zips, etc.
-
- * support for parsing from streams using @attoparsec@.
-
- * support for spawning processes and communicating with them using streams.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/iproute/Manifest b/dev-haskell/iproute/Manifest
index 1c138c30e702..834c1a541f79 100644
--- a/dev-haskell/iproute/Manifest
+++ b/dev-haskell/iproute/Manifest
@@ -1 +1,2 @@
+DIST iproute-1.7.12.tar.gz 17864 BLAKE2B ac69d90c43415602f52d69de69d3c044cf1908eeadb60266ccc629f8589e53a6cae27a32ad990595f65055f97fd597ca81eda83d34f909d8a0ee1f151edf6d0b SHA512 45d60e98e0a18929472d3de8850a257e21a638b3052fc31afc960c0ea755092bf44e44a1b0fae175582c1bcbda6029af028e84ba1498fe6491d925173cf310b7
DIST iproute-1.7.8.tar.gz 13309 BLAKE2B 8d6bef341643e4f096399fcba595e339d63b056aca086434fdbb906688c5720fb556ac17cbaf0c0ff851bd44133e97643a03f35db837065268f0d791222616fa SHA512 ee1bd24a560ee73757ca71eda70a610d5c8e01101c22835bbef23ec7a2217ed66a37b49d5fc3042f3df0e943aaeda2a050e75316ff2ac11602b745cbf7d7ca6a
diff --git a/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
new file mode 100644
index 000000000000..f7f88a6cedd4
--- /dev/null
+++ b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
@@ -0,0 +1,20 @@
+diff -urN iproute-1.7.12/Data/IP/Addr.hs iproute-1.7.12-r1/Data/IP/Addr.hs
+--- iproute-1.7.12/Data/IP/Addr.hs 2001-09-08 19:46:40.000000000 -0600
++++ iproute-1.7.12-r1/Data/IP/Addr.hs 2022-01-15 10:13:21.758588845 -0700
+@@ -1,6 +1,7 @@
+ {-# LANGUAGE BangPatterns #-}
+ {-# LANGUAGE DeriveDataTypeable #-}
+ {-# LANGUAGE DeriveGeneric #-}
++{-# LANGUAGE PackageImports #-}
+
+ module Data.IP.Addr where
+
+@@ -14,7 +15,7 @@
+ import Data.Word
+ import Network.Socket
+ import Numeric (showHex, showInt)
+-import System.ByteOrder
++import "byteorder" System.ByteOrder
+ import Text.Appar.String
+ import GHC.Enum (succError,predError)
+ import GHC.Generics
diff --git a/dev-haskell/iproute/iproute-1.7.12.ebuild b/dev-haskell/iproute/iproute-1.7.12.ebuild
new file mode 100644
index 000000000000..9d3683101441
--- /dev/null
+++ b/dev-haskell/iproute/iproute-1.7.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="IP Routing Table"
+HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.12-package-imports.patch" )
+
+RDEPEND="dev-haskell/appar:=[profile?]
+ dev-haskell/byteorder:=[profile?]
+ dev-haskell/network:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/doctest-0.9.3
+ dev-haskell/hspec
+ dev-haskell/quickcheck
+ dev-haskell/safe )
+"
diff --git a/dev-haskell/iproute/iproute-1.7.8.ebuild b/dev-haskell/iproute/iproute-1.7.8.ebuild
index 493de60c762f..316f54e8548a 100644
--- a/dev-haskell/iproute/iproute-1.7.8.ebuild
+++ b/dev-haskell/iproute/iproute-1.7.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.3
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/iproute/metadata.xml b/dev-haskell/iproute/metadata.xml
index 429df5ba18d3..937381521944 100644
--- a/dev-haskell/iproute/metadata.xml
+++ b/dev-haskell/iproute/metadata.xml
@@ -5,11 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- IP Routing Table is a tree of IP ranges
- to search one of them on the longest
- match base. It is a kind of TRIE with one
- way branching removed. Both IPv4 and IPv6
- are supported.
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
index ec2ece3b5096..96edd0471f39 100644
--- a/dev-haskell/ipynb/Manifest
+++ b/dev-haskell/ipynb/Manifest
@@ -1 +1 @@
-DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
+DIST ipynb-0.2.tar.gz 632962 BLAKE2B bdd85dd21e9e34e9e60157bb3d7447afa96a5ff83aa00fcf9662ce388617e974e81058d6588d5b41d55a38c32fe2e05458987e5ea37c53bf0852bd6c7b60b2b3 SHA512 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea
diff --git a/dev-haskell/ipynb/ipynb-0.1.ebuild b/dev-haskell/ipynb/ipynb-0.1.ebuild
deleted file mode 100644
index 06638f5e9ff0..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="https://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/aeson-diff
- dev-haskell/microlens
- dev-haskell/microlens-aeson
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/vector )
-"
diff --git a/dev-haskell/ipynb/ipynb-0.2.ebuild b/dev-haskell/ipynb/ipynb-0.2.ebuild
new file mode 100644
index 000000000000..a8db88eb040f
--- /dev/null
+++ b/dev-haskell/ipynb/ipynb-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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="Data structure for working with Jupyter notebooks (ipynb)"
+HOMEPAGE="https://hackage.haskell.org/package/ipynb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5.2.0:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/microlens
+ dev-haskell/microlens-aeson
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/isocline/Manifest b/dev-haskell/isocline/Manifest
new file mode 100644
index 000000000000..5f5081d1b6be
--- /dev/null
+++ b/dev-haskell/isocline/Manifest
@@ -0,0 +1 @@
+DIST isocline-1.0.9.tar.gz 101834 BLAKE2B b01a6c097bc4d3623dc2f1082ed79be1907827d133d713df3ed2a007a70e1fb4957553c9bdc17aca02eba7b4833fc2ec0789253e3327bd35dc505ae1f2db72cb SHA512 0bc1a4b2ad217e1e3b270eeab51b18b4d0f5534fb8759daed4b699f2a56628f4a18d909862abed5c949f671ed746855a6de508ee23f3d93ffbff5a8525db1a47
diff --git a/dev-haskell/isocline/isocline-1.0.9.ebuild b/dev-haskell/isocline/isocline-1.0.9.ebuild
new file mode 100644
index 000000000000..c75b7f1f6808
--- /dev/null
+++ b/dev-haskell/isocline/isocline-1.0.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A portable alternative to GNU Readline"
+HOMEPAGE="https://github.com/daanx/isocline#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/isocline/metadata.xml b/dev-haskell/isocline/metadata.xml
new file mode 100644
index 000000000000..04164fed4a5f
--- /dev/null
+++ b/dev-haskell/isocline/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">isocline</remote-id>
+ <remote-id type="github">daanx/isocline</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/iwlib/Manifest b/dev-haskell/iwlib/Manifest
deleted file mode 100644
index 6281c72cc9b7..000000000000
--- a/dev-haskell/iwlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iwlib-0.1.0.tar.gz 3393 BLAKE2B 32df17beb4b9df6dedb12b729249883846ca8975d41d34dda047264d5b8544ab646877705d0c02fa8478ecaad735d67dbbf3d1bb86ca463d3f811e5179c1e80c SHA512 a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93
diff --git a/dev-haskell/iwlib/iwlib-0.1.0.ebuild b/dev-haskell/iwlib/iwlib-0.1.0.ebuild
deleted file mode 100644
index ae2d4e33491a..000000000000
--- a/dev-haskell/iwlib/iwlib-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for the iw C library"
-HOMEPAGE="https://github.com/jaor/iwlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- net-wireless/wireless-tools
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/iwlib/metadata.xml b/dev-haskell/iwlib/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/iwlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index a463a37c3057..0b23e6ca4c6d 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1,2 +1,2 @@
-DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
-DIST jira-wiki-markup-1.3.4.tar.gz 23759 BLAKE2B 0492ceb9cbd2d4b7d579446ce3379dec5596c89b1617f113d2d455ef3c8a9bc4f9cb41905f6ca61229e67433c2ebe4e04927cb3b8261c0570a27063bcfdd8186 SHA512 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481
+DIST jira-wiki-markup-1.4.0.tar.gz 24883 BLAKE2B 565c0ddca8361848683ee453e4eaa0020b74d52d847930fd8ae0da43e435c325cf42a1ca1547ad92f10607ba07137ba6a596e90b97f599d0ef055922023cf6ca SHA512 f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750
+DIST jira-wiki-markup-1.5.1.tar.gz 25459 BLAKE2B 6055bab5a28538e357069e5c7b3ed64bfe64edf2fac045b4a8b3401cd0370e2d8d3e86f928b9c63a7e86568694fbe52a2c1fe208cb645eeacd0f9704e6624f3a SHA512 d72eca3fcf82fb9569eba39cd2446396b3f16bb08c805e4f8f570397001541ca921cadb642acf17af773fc486054bb0533240516a417a21a74ec1642e7b3b517
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
deleted file mode 100644
index 3bd4d3067c1a..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
deleted file mode 100644
index 08606428538b..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Handle Jira wiki markup"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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?]
- >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
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
new file mode 100644
index 000000000000..83908a8cbf14
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Handle Jira wiki markup"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild
new file mode 100644
index 000000000000..f92cc66782c7
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Handle Jira wiki markup"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/jira-wiki-markup/metadata.xml b/dev-haskell/jira-wiki-markup/metadata.xml
index 937381521944..b5e7e1d74e03 100644
--- a/dev-haskell/jira-wiki-markup/metadata.xml
+++ b/dev-haskell/jira-wiki-markup/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">jira-wiki-markup</remote-id>
+ <remote-id type="github">tarleb/jira-wiki-markup</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/js-chart/Manifest b/dev-haskell/js-chart/Manifest
new file mode 100644
index 000000000000..baf4227296a7
--- /dev/null
+++ b/dev-haskell/js-chart/Manifest
@@ -0,0 +1 @@
+DIST js-chart-2.9.4.1.tar.gz 501058 BLAKE2B 364aff9566b5fcb18cdef88af38ce7832cbe9347dd7aea0a2ef24aee80901d3802b26f6eb81b58894d94e138903b1dfb7381f8e6511294090da6f656ad63e04e SHA512 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
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
new file mode 100644
index 000000000000..114bee27d6bd
--- /dev/null
+++ b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Obtain minified chart.js code"
+HOMEPAGE="https://github.com/jonascarpay/js-chart#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/js-chart/metadata.xml b/dev-haskell/js-chart/metadata.xml
new file mode 100644
index 000000000000..3d7fb8281ca6
--- /dev/null
+++ b/dev-haskell/js-chart/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jonascarpay/js-chart</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/js-flot/Manifest b/dev-haskell/js-flot/Manifest
deleted file mode 100644
index 0674e3965795..000000000000
--- a/dev-haskell/js-flot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST js-flot-0.8.3.tar.gz 662691 BLAKE2B d7a8abca7eb8a45fa28da783139f6e672f5557dfc75c1a2b1f41254a3b0e09500f0f1c179b41f76fed456485d4c1db716e51306260c84c090a8779f23b86b791 SHA512 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
deleted file mode 100644
index 147b2a8bfabe..000000000000
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified flot code"
-HOMEPAGE="https://github.com/ndmitchell/js-flot#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-flot/metadata.xml b/dev-haskell/js-flot/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/js-flot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
deleted file mode 100644
index 8920abb9cfff..000000000000
--- a/dev-haskell/js-jquery/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
deleted file mode 100644
index 9487166647fc..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/metadata.xml b/dev-haskell/js-jquery/metadata.xml
deleted file mode 100644
index ba7fbea8d848..000000000000
--- a/dev-haskell/js-jquery/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package bundles the minified &lt;http://jquery.com/ jQuery&gt; code into a Haskell package,
- so it can be depended upon by Cabal packages. The first three components of
- the version number match the upstream jQuery version. The package is designed
- to meet the redistribution requirements of downstream users (e.g. Debian).
- </longdescription>
- <upstream>
- <remote-id type="github">ndmitchell/js-jquery</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
deleted file mode 100644
index efb003978680..000000000000
--- a/dev-haskell/json/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST json-0.10.tar.gz 22622 BLAKE2B 4ee854a80738b6d12e027ca8562ac365bc6192532682d9b8997a8887b70d2e19553535fec6c7ab6ecf119262d6f7d229dc4217ac867dcac8dd3158c80606c727 SHA512 4015693c363810701114a222207083ab9610ebd1196d24f0eb8dcad35af54e9067259ca412b131eaa986b8dbfbf0ce62058ca4c31aeeff29fdf21f17e8d86e90
diff --git a/dev-haskell/json/json-0.10.ebuild b/dev-haskell/json/json-0.10.ebuild
deleted file mode 100644
index 55a5773eba27..000000000000
--- a/dev-haskell/json/json-0.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for serialising Haskell to and from JSON"
-HOMEPAGE="https://hackage.haskell.org/package/json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mapdict +parsec +pretty"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-haskell/syb-0.3.3:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- parsec? ( dev-haskell/parsec:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag mapdict mapdict) \
- $(cabal_flag parsec parsec) \
- $(cabal_flag pretty pretty)
-}
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
deleted file mode 100644
index e86ac7f7a4ef..000000000000
--- a/dev-haskell/json/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- JSON (JavaScript Object Notation) is a lightweight data-interchange
- format. It is easy for humans to read and write. It is easy for
- machines to parse and generate. It is based on a subset of the
- JavaScript Programming Language, Standard ECMA-262 3rd Edition -
- December 1999.
-
- This library provides a parser and pretty printer for converting
- between Haskell values and JSON.
- </longdescription>
- <use>
- <flag name="mapdict">Encode Haskell maps as JSON dicts</flag>
- <flag name="parsec">Add support for parsing with Parsec</flag>
- <flag name="pretty">Add support for using pretty printing combinators</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
index 9cfa62d570d3..5c7732637649 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1 +1,2 @@
DIST JuicyPixels-3.3.5.tar.gz 131914 BLAKE2B a541f8052952e9a757fecb7168a74b9cb6aef152a1913aad36ac47d4ea2dbdeec9c644a0d2edf340986bd179ba4e925d3d284fbe73725e149e2b87866a8a5865 SHA512 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed
+DIST juicypixels-3.3.7.tar.gz 132469 BLAKE2B 06b58a9969b084eeb4bea2b4e88691d92d77ebdb30fdde944c90bd4b77f780d52dd3fa1f44e0415e71bfed29c5259ec65c434f04075f02935fe052236ac1f4b2 SHA512 adb3ccae12524ddb6f2736d65d14d997e1d672960b2fcc02739742fe18d748497324c9aeecb0b0b5e7662b218c5db55b2e8f5639e6438e0b8a45960c9c0e7da1
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
index 7a2fbfdee5af..730b4ec64d54 100644
--- a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -17,9 +17,13 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="mmap"
+CABAL_CHDEPS=(
+ 'bytestring >= 0.9 && < 0.11' 'bytestring >=0.9'
+)
+
RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
>=dev-haskell/primitive-0.4:=[profile?]
>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.7.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.7.ebuild
new file mode 100644
index 000000000000..217a2ad292c8
--- /dev/null
+++ b/dev-haskell/juicypixels/juicypixels-3.3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_PN="JuicyPixels"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
+HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="mmap"
+
+RDEPEND=">=dev-haskell/primitive-0.4:=[profile?]
+ <dev-haskell/vector-0.13:=[profile?]
+ >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+ 'mtl >= 1.1 && < 2.3' 'mtl >= 1.1'
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag mmap mmap)
+}
diff --git a/dev-haskell/juicypixels/metadata.xml b/dev-haskell/juicypixels/metadata.xml
index a1ef9357fe85..9bb364346e80 100644
--- a/dev-haskell/juicypixels/metadata.xml
+++ b/dev-haskell/juicypixels/metadata.xml
@@ -5,13 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- &lt;&lt;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==&gt;&gt;
-
- This library can load and store images in PNG,Bitmap, Jpeg, Radiance and
- read Gif images.
- </longdescription>
+ <use>
+ <flag name="mmap">Enable the file loading via mmap (memory map)</flag>
+ </use>
<upstream>
+ <remote-id type="hackage">JuicyPixels</remote-id>
<remote-id type="github">Twinside/Juicy.Pixels</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index 3b2574ad4e7f..0644a39def31 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1 +1 @@
-DIST kan-extensions-5.2.tar.gz 24151 BLAKE2B c36692fc89f4bd378a1e2a12368cc0b34548b40a56ac72cc744dbf37a6832ae8970549adda42b3b5286db98f9cb8474ebeee2754503a52caeb223ce216e7874a SHA512 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e
+DIST kan-extensions-5.2.5.tar.gz 22205 BLAKE2B 372b83ed6d024e97ed76fa1a7cbee08d0ef8a2871d8d103a5c114c8616d6281e494503900e1f51d6c828f272be826e5ab3e6087e0de0b6c5119960f06a7c326e SHA512 70303f23e4935ca662f5e094a0ab9c18997c5ff2896bbbe1c8f7d994002f75176457757ad8d4647699ea1cc28701c75cb10cb4fcbe81d8c2f3c71cf28244ca9c
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
new file mode 100644
index 000000000000..dc371d8a1789
--- /dev/null
+++ b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"
+HOMEPAGE="https://github.com/ekmett/kan-extensions/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+ >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
+ >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+ >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
deleted file mode 100644
index b42a508ccf77..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
- >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
- >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
deleted file mode 100644
index ffe7a207ec83..000000000000
--- a/dev-haskell/keys/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST keys-3.12.3.tar.gz 14378 BLAKE2B 0c2c4599dfa9234e9170a285206ad94f988246a9d56440ea5a89680e17cabd488372ec7b444fd997deb27f6315f9d843494dfbbdd4d2a09ef0525829e7340ed6 SHA512 e0bab964eb38388dfb2fe7dcb4999da0263a2162f171f7ed629a2e1de33eb1cb99dc37a6fe32045f136466cebb5aed69e533417256877316c81a02abc700c28d
diff --git a/dev-haskell/keys/keys-3.12.3.ebuild b/dev-haskell/keys/keys-3.12.3.ebuild
deleted file mode 100644
index 5d1ecad351ff..000000000000
--- a/dev-haskell/keys/keys-3.12.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
- >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
deleted file mode 100644
index 845daf0c0a9e..000000000000
--- a/dev-haskell/keys/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ekmett/keys</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-bash/Manifest b/dev-haskell/language-bash/Manifest
deleted file mode 100644
index 1b3e0f244077..000000000000
--- a/dev-haskell/language-bash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-bash-0.9.0.tar.gz 23660 BLAKE2B de074d6c397200514357838c621157c28c4610c7f5eab0920f99dd9c2bb1648420829822e589cde66774b8a3467fb66fe6bb1363994182d4a219ca8119ca1391 SHA512 cf14e6353b1afa487515a85b99f5cc2d93d614f3e6d653bacf55328921f5966ce5083fe19f51c0e952513c539101541c14664858315288d96b23d12d6b587fc8
diff --git a/dev-haskell/language-bash/language-bash-0.9.0.ebuild b/dev-haskell/language-bash/language-bash-0.9.0.ebuild
deleted file mode 100644
index 442f6094633e..000000000000
--- a/dev-haskell/language-bash/language-bash-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
-HOMEPAGE="https://github.com/knrafto/language-bash/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails, "getDirectoryContents:openDirStream: does not exist"
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
- >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-expected-failure
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/language-bash/metadata.xml b/dev-haskell/language-bash/metadata.xml
deleted file mode 100644
index eaece55a1edc..000000000000
--- a/dev-haskell/language-bash/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">knrafto/language-bash</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index 49a3aea8bdc6..4d89e33f9a4a 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,3 +1,2 @@
-DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
-DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
+DIST language-c-0.9.2.tar.gz 125202 BLAKE2B 56b9254002757158308968b75ac42745710d426c8ba92900a9e0c5e391e6654d8cca3ffc4ae194598d3e07b860bd9ff5634270cd27911b4f7f1ff99bd8980657 SHA512 eaa1a0befbc6ccb5ed53a200a03ea7fa51c2d820fb501476576cc4268d8c8816080f942a5044a769e88a1ec58b0f3f5ca55512c70b797a6c3555186e842de701
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
deleted file mode 100644
index f1d684f79539..000000000000
--- a/dev-haskell/language-c/language-c-0.4.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +separatesyb,+usebytestrings,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.6
- dev-haskell/happy
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=separatesyb \
- --flag=splitbase \
- --flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.7.1.ebuild b/dev-haskell/language-c/language-c-0.7.1.ebuild
deleted file mode 100644
index edfde92bc028..000000000000
--- a/dev-haskell/language-c/language-c-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-#hackport: flags: -allwarnings,+usebytestrings
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.8
- dev-haskell/happy
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allwarnings \
- --flag=usebytestrings
-}
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 795d688b3cde..dd8f5c0f1f78 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/language-c/language-c-0.9.2.ebuild b/dev-haskell/language-c/language-c-0.9.2.ebuild
new file mode 100644
index 000000000000..46747b88aee0
--- /dev/null
+++ b/dev-haskell/language-c/language-c-0.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Analysis and generation of C code"
+HOMEPAGE="https://visq.github.io/language-c/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ || ( dev-lang/ghc dev-haskell/process[profile?] )
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ dev-haskell/alex
+ >=dev-haskell/cabal-2.2.0.1
+ dev-haskell/happy
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allwarnings \
+ --flag=iecfpextension \
+ --flag=separatesyb \
+ --flag=splitbase \
+ --flag=usebytestrings
+}
diff --git a/dev-haskell/language-c/metadata.xml b/dev-haskell/language-c/metadata.xml
index c7bb0e775ab0..e2e11e0dbe7c 100644
--- a/dev-haskell/language-c/metadata.xml
+++ b/dev-haskell/language-c/metadata.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">language-c</remote-id>
+ <remote-id type="github">visq/language-c</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/language-css/Manifest b/dev-haskell/language-css/Manifest
deleted file mode 100644
index 19a90596245b..000000000000
--- a/dev-haskell/language-css/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-css-0.0.3.tar.gz 18953 BLAKE2B 388373ca490ab1bad5a5bec0316ae77dc36562b8348ea3765fee67381cbb223a1538c51235b31013aba8ee6a18880978a8520ce8a801e472bd699140b8d15ea1 SHA512 49e6223763f61892342b300b14ee372d27fb7fa4036965f026ca13f290ab6b949e1e2aa1fd679b479d004614a25d38da9bddd5b1f14af9e9c8e2211504880858
diff --git a/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch b/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
deleted file mode 100644
index 43acce4e7314..000000000000
--- a/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/Language/Css/Pretty.hs
-+++ b/src/Language/Css/Pretty.hs
-@@ -6,3 +6,3 @@ import Text.PrettyPrint
- import Language.Css.Syntax
--
-+import Prelude hiding ((<>))
-
diff --git a/dev-haskell/language-css/language-css-0.0.3.ebuild b/dev-haskell/language-css/language-css-0.0.3.ebuild
deleted file mode 100644
index d593144cbf60..000000000000
--- a/dev-haskell/language-css/language-css-0.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="CSS 2.1 syntax"
-HOMEPAGE="https://hackage.haskell.org/package/language-css"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/language-css/metadata.xml b/dev-haskell/language-css/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/language-css/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/language-dot/Manifest b/dev-haskell/language-dot/Manifest
deleted file mode 100644
index 627ac765d985..000000000000
--- a/dev-haskell/language-dot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-dot-0.1.1.tar.gz 8076 BLAKE2B 02d1ea0cf861d8052846961d0ad8792e83f252711f6ff64443a237f5e5aedaa8a93d3e6c32f9fd2d916fede3e6927e69fc6986311e1b367133dde8cc9de002d4 SHA512 a9a3abe5ee617614bce73952384be4e5d53942f0c011817b6a92fd6452dce8c37ba39e05ff4733be404315ef95c2de9c0d4134e7aab4e875e7f414dcdb5bfcd9
diff --git a/dev-haskell/language-dot/language-dot-0.1.1.ebuild b/dev-haskell/language-dot/language-dot-0.1.1.ebuild
deleted file mode 100644
index b5b75724d1fd..000000000000
--- a/dev-haskell/language-dot/language-dot-0.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
-HOMEPAGE="https://hackage.haskell.org/package/language-dot"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+executable"
-
-RDEPEND=">=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable)
-}
diff --git a/dev-haskell/language-dot/metadata.xml b/dev-haskell/language-dot/metadata.xml
deleted file mode 100644
index aa6fd72ca46c..000000000000
--- a/dev-haskell/language-dot/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="executable">Build the `ppdot' executable</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
deleted file mode 100644
index 104a5f3943f3..000000000000
--- a/dev-haskell/language-ecmascript/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-ecmascript-0.19.1.0.tar.gz 56091 BLAKE2B f7f84703aaf6962164b8bfda5fc5ac624cd27e325b77db45cef058bcdb447fa54aa3462eb1ec6ef8318c6663418cfe5459880f31ba97fb89ecc0be97d6757e86 SHA512 07a562af8dcdb72f86466c2cd066252e289bfc253cefdec756dd68cfc4db867b9951ffde4d0edae492cd78feae426796273667a8fcdbf182489aaed415abb2b2
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
deleted file mode 100644
index 7d0cfedf528d..000000000000
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JavaScript parser and pretty-printer library"
-HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-1:=[profile?]
- >=dev-haskell/charset-0.3:=[profile?]
- >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
- >=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?]
- >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
- >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
- >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4
- >=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4 && < 4.15' 'base >= 4' \
- 'base >= 4 && < 4.14' 'base >= 4'
-}
diff --git a/dev-haskell/language-ecmascript/metadata.xml b/dev-haskell/language-ecmascript/metadata.xml
deleted file mode 100644
index cea0c7ac5c5b..000000000000
--- a/dev-haskell/language-ecmascript/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Some tools for working with ECMAScript 3 (popularly known as JavaScript).
- Includes a parser, pretty-printer, and basic building blocks for more
- sophisticated tools.
- This package used to be called WebBits.
- </longdescription>
- <upstream>
- <remote-id type="github">jswebtools/language-ecmascript</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-glsl/Manifest b/dev-haskell/language-glsl/Manifest
deleted file mode 100644
index ebb6bf8510c7..000000000000
--- a/dev-haskell/language-glsl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-glsl-0.3.0.tar.gz 16622 BLAKE2B b30fc8372174a8d6204f94b23f60259580456358e80e2101c3a94a437e2ce26e31fc9802c708b328c205fa08cb527e94533b74d8b81aa64f9db191b1689e8461 SHA512 cdd004906d927654164bb6cb562457ee4d7010dea3a35c3408ebb345abc2698777c5748d1dfb27ed8d43dc7189f5299c05ac6b53eb9b400a25750f47cad62f9b
diff --git a/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild b/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild
deleted file mode 100644
index 9b94910cb63c..000000000000
--- a/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GLSL abstract syntax tree, parser, and pretty-printer"
-HOMEPAGE="https://hackage.haskell.org/package/language-glsl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
- dev-haskell/prettyclass:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/language-glsl/metadata.xml b/dev-haskell/language-glsl/metadata.xml
deleted file mode 100644
index df988fab349c..000000000000
--- a/dev-haskell/language-glsl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The package language-glsl is a Haskell library for the
- representation, the parsing, and the pretty-printing of
- GLSL 1.50 code.
- </longdescription>
-</pkgmetadata>
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 b34e2e9f9aea..84c586cbeeb3 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.3.2.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/regex-posix:=[profile?]
@@ -22,4 +22,4 @@ RDEPEND="dev-haskell/regex-posix:=[profile?]
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
-PATCHES=( ${FILESDIR}/${P}-ghc-8.10.patch )
+PATCHES=( "${FILESDIR}"/${P}-ghc-8.10.patch )
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index 3f60b671450a..53c831352a2e 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -1 +1,2 @@
DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
+DIST language-javascript-0.7.1.0.tar.gz 76438 BLAKE2B c0e893ba9547a1104afd0397ed3b9439ba78947e6650317d98eeb929c140fbedb1b13d2e2425a71326b795a1b22efddbf93325591313dba9ade2b70acef12909 SHA512 35f935f121cb8aad1a28be50ba8d571ee60bd2c6721eaf9bc7f897cbc4a33b17213e89d84bf9525ddbf555030efd5fbe6b11157c113900354430a7193223516f
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 f06f2a718c6c..79daaa409b53 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
diff --git a/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild b/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild
new file mode 100644
index 000000000000..ea7d040d8936
--- /dev/null
+++ b/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for JavaScript"
+HOMEPAGE="https://github.com/erikd/language-javascript"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
+ >=dev-haskell/mtl-1.1:=[profile?]
+ >=dev-haskell/semigroups-0.16.1:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ dev-haskell/alex
+ >=dev-haskell/cabal-1.9.2
+ dev-haskell/happy
+ test? ( dev-haskell/hspec
+ >=dev-haskell/quickcheck-2
+ >=dev-haskell/utf8-light-0.4 )
+"
diff --git a/dev-haskell/language-javascript/metadata.xml b/dev-haskell/language-javascript/metadata.xml
index 6945e6d21338..2f963f44eea3 100644
--- a/dev-haskell/language-javascript/metadata.xml
+++ b/dev-haskell/language-javascript/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">alanz/language-javascript</remote-id>
+ <remote-id type="github">erikd/language-javascript</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/language-lua/Manifest b/dev-haskell/language-lua/Manifest
deleted file mode 100644
index 10341777d380..000000000000
--- a/dev-haskell/language-lua/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-lua-0.11.0.1.tar.gz 122831 BLAKE2B 20b1ae06f2b22e5f75b50c04b7fe9edbb81b8897ec015d8b5c6a8ea97fa8dba49901ff101103a4f728189be6c18f76191506cda8a28583f3783d6f4af66a6b4b SHA512 59b3d64f7a920b7aee55965e2a0c847d7eeb4e7c5a33668ee4a796b403b98a11a37ed8d6d1efe8244aba6e56cba01841cd7cf00d706544d65949ac019b5fd11a
diff --git a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild b/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
deleted file mode 100644
index aec8100c4652..000000000000
--- a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua parser and pretty-printer"
-HOMEPAGE="https://github.com/glguy/language-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[profile?]
- >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.16.0
- dev-haskell/happy
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5'
-}
diff --git a/dev-haskell/language-lua/metadata.xml b/dev-haskell/language-lua/metadata.xml
deleted file mode 100644
index 0e28f55c31de..000000000000
--- a/dev-haskell/language-lua/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">glguy/language-lua</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-python/Manifest b/dev-haskell/language-python/Manifest
deleted file mode 100644
index 35fc9662204c..000000000000
--- a/dev-haskell/language-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-python-0.5.8.tar.gz 60171 BLAKE2B 1ea4e12bb9d8efe209d126c8787d80e616c34393cbb7017b7a55711b407f19150e688f3e8f45eb8a6f6a5c3c0a080539674134c8b253586ddd7da006fd0a4733 SHA512 fa2d9c1a20460e38dcc370be60157090e7279386a4ebc0f4c4bac56fb3a8f65541c41fa789d2df31e385eeea3c05e2f84c44f77917379194eb4e29372ab4c20d
diff --git a/dev-haskell/language-python/language-python-0.5.8.ebuild b/dev-haskell/language-python/language-python-0.5.8.ebuild
deleted file mode 100644
index 5aa8e0d13874..000000000000
--- a/dev-haskell/language-python/language-python-0.5.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty printing of Python code"
-HOMEPAGE="https://github.com/bjpop/language-python "
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
- >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.18.1.3
- dev-haskell/happy
-"
diff --git a/dev-haskell/language-python/metadata.xml b/dev-haskell/language-python/metadata.xml
deleted file mode 100644
index 6c804705807d..000000000000
--- a/dev-haskell/language-python/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- language-python is a Haskell library for lexical analysis, parsing
- and pretty printing Python code. It supports versions 2.x and 3.x of Python.
- </longdescription>
- <upstream>
- <remote-id type="github">bjpop/language-python</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lazysmallcheck/Manifest b/dev-haskell/lazysmallcheck/Manifest
deleted file mode 100644
index f32bcd2e8720..000000000000
--- a/dev-haskell/lazysmallcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lazysmallcheck-0.6.tar.gz 16862 BLAKE2B 8099de24e51e19106da50d30e370ea71fea42da2d25641b7887d06e57a341ae10f5b440b7431ab50beffba97f9fc22cc517f7a1e8f12be4341769559ead19348 SHA512 cd9e7d53686587828b5be892bacbd902b4e916d01e65c56d7634717c00353f9d0b81f92fcae9fab5008361dc7257da50a1429568f8265136883d4cca942f954d
diff --git a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild
deleted file mode 100644
index 2495ff0d6e00..000000000000
--- a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for demand-driven testing of Haskell programs"
-HOMEPAGE="http://www.cs.york.ac.uk/~mfn/lazysmallcheck/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/cabal
-"
diff --git a/dev-haskell/lazysmallcheck/metadata.xml b/dev-haskell/lazysmallcheck/metadata.xml
deleted file mode 100644
index 2c208c5ea386..000000000000
--- a/dev-haskell/lazysmallcheck/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Lazy SmallCheck is a library for exhaustive, demand-driven testing of
- Haskell programs. It is based on the idea that if a property holds
- for a partially-defined input then it must also hold for all
- fully-defined refinements of the that input. Compared to ``eager''
- input generation as in SmallCheck, Lazy SmallCheck may require
- significantly fewer test-cases to verify a property for all inputs up
- to a given depth.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lcs/Manifest b/dev-haskell/lcs/Manifest
deleted file mode 100644
index 298af2d9b699..000000000000
--- a/dev-haskell/lcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lcs-0.2.tar.gz 11638 BLAKE2B e90201a50746416391156fadb05c67a4432d063294b751b8c48a71541e7567aaad8cc8cdad59c9a58633d8ab72fd917990cab14ef044f2ecb0f9012354add709 SHA512 ac5ac6d9a151be46054f2f56a5927182fe6942e518a04a8c484b02c8caec0506ddaf846f51f5575f1f30d6f0fca9b7b26f16e32675b322d014f8b68db76d5f5e
diff --git a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch b/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
deleted file mode 100644
index 24165ffb9104..000000000000
--- a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/Data/List/LCS/HuntSzymanski.hs b/Data/List/LCS/HuntSzymanski.hs
-index 306368f..e9df4ef 100644
---- a/Data/List/LCS/HuntSzymanski.hs
-+++ b/Data/List/LCS/HuntSzymanski.hs
-@@ -1,2 +1,2 @@
--
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
diff --git a/dev-haskell/lcs/lcs-0.2-r1.ebuild b/dev-haskell/lcs/lcs-0.2-r1.ebuild
deleted file mode 100644
index 245d4794375c..000000000000
--- a/dev-haskell/lcs/lcs-0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Find longest common sublist of two lists"
-HOMEPAGE="http://urchin.earth.li/~ian/cabal/lcs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.0
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.10.patch)
diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/lcs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/leancheck/Manifest b/dev-haskell/leancheck/Manifest
index 0370c79f149e..b1a4364fc7a1 100644
--- a/dev-haskell/leancheck/Manifest
+++ b/dev-haskell/leancheck/Manifest
@@ -1 +1,2 @@
+DIST leancheck-0.9.10.tar.gz 129134 BLAKE2B d9b6d4cf63eae2e54b327783f6f396d112e2b7e59bacd4dd600ad145640a959439ffdf787c57876e8b29023da2ab3e4931803c7ef6d27ebb96fd2196e970211a SHA512 4b27366fd0128332988db1cf31fbe6654110235de45e56d8f0e2bc483567b8e6bdbd33e021d47989df20100f3eb431fa6cf82c957a541ca3cf7b9bf1de72dbbe
DIST leancheck-0.9.3.tar.gz 125801 BLAKE2B 4825d66ddc745a1ba6e20a28c7397ca33bab79e84899d5ed0f28d88f526f8415aad8b707b2e61de25ce482673d47f4771bc2cb1e402b846fff7552df49689837 SHA512 a5591e8f23318ae6097494a62998f1553fe975058827058f4d7400f723e601bcd92060c26fd5d9c60f1c1da51f97d74de0cf380ae5652c8c0721fabc2b4f5027
diff --git a/dev-haskell/leancheck/leancheck-0.9.10.ebuild b/dev-haskell/leancheck/leancheck-0.9.10.ebuild
new file mode 100644
index 000000000000..9306a501545e
--- /dev/null
+++ b/dev-haskell/leancheck/leancheck-0.9.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Enumerative property-based testing"
+HOMEPAGE="https://github.com/rudymatela/leancheck#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/leancheck/leancheck-0.9.3.ebuild b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
index fcd2411fb37c..a1b78d5c2f29 100644
--- a/dev-haskell/leancheck/leancheck-0.9.3.ebuild
+++ b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/leancheck/metadata.xml b/dev-haskell/leancheck/metadata.xml
index 937381521944..3289bf01f4a6 100644
--- a/dev-haskell/leancheck/metadata.xml
+++ b/dev-haskell/leancheck/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">rudymatela/leancheck</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/lens-aeson/Manifest b/dev-haskell/lens-aeson/Manifest
deleted file mode 100644
index c47e46f49b7f..000000000000
--- a/dev-haskell/lens-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-aeson-1.1.tar.gz 11022 BLAKE2B 4291d060db6e6da1eac5f9ac11dc700effb3df8bdf91c4a0ae34c443cbe4655944f210bd13de78c9185465d9bf814111a649e98a7863cc1cf40fc737ffa66961 SHA512 a5e1b98cc50342ddbaf36a9c6f7a87cdfd8e8abb66852777ef8fc3362a3cb7bac473c3dfd7a4ad2f57f3318c5dca6ec7a07e2a4eae05bdcc34308d188d791460
diff --git a/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild b/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
deleted file mode 100644
index 6d0862a5b3d2..000000000000
--- a/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -lib-werror,+test-doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Law-abiding lenses for aeson"
-HOMEPAGE="https://github.com/lens/lens-aeson/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # doctest fails: warnings of "is ambiguous"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/lens-4.4:=[profile?] <dev-haskell/lens-5:=[profile?]
- >=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/text-0.11.1.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
- dev-haskell/generic-deriving
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-lib-werror \
- --flag=test-doctests
-}
diff --git a/dev-haskell/lens-aeson/metadata.xml b/dev-haskell/lens-aeson/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/lens-aeson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family-core/Manifest b/dev-haskell/lens-family-core/Manifest
deleted file mode 100644
index 7ec481b3f6c9..000000000000
--- a/dev-haskell/lens-family-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-family-core-1.2.3.tar.gz 12182 BLAKE2B 196296afe6c1b1a805cff072e67157d9e835a3c24bc71e61a0135d5136797d4ad4039d0bb31d1d6deb8a2c49253d97c49a4f1d82171aaddc8423153f53cf5999 SHA512 d4cc32e302fbd7574464dc036398b4b4f0ba765de8f8749f9f5f09ce0ab74eba1143cecb383eace4140d6b1644e7f6d189edaa1a4b48c69c8b35ae862cbe4a71
diff --git a/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild b/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild
deleted file mode 100644
index 1fb312ec9e8b..000000000000
--- a/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Lens Families"
-HOMEPAGE="https://hackage.haskell.org/package/lens-family-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/lens-family-core/metadata.xml b/dev-haskell/lens-family-core/metadata.xml
deleted file mode 100644
index 1d417d8161d5..000000000000
--- a/dev-haskell/lens-family-core/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides first class( ) functional references.
- In addition to the usual operations of getting, setting and composition, plus integration with the state monad, lens families provide some unique features:
-
- * Polymorphic updating
-
- * Traversals
-
- * Cast projection functions to read-only lenses
-
- * Cast \"toList\" functions to read-only traversals
-
- * Cast semantic editor combinators to modify-only traversals.
-
- ( ) For optimal first-class support use the @lens-family@ package with rank 2 / rank N polymorphism.
- "Lens.Family.Clone" allows for first-class support of lenses and traversals for those who require Haskell 98.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
deleted file mode 100644
index d12154e54673..000000000000
--- a/dev-haskell/lens-family-th/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-family-th-0.5.1.0.tar.gz 5724 BLAKE2B eec0a853e47fd4283a809c97d11d5b12fc5eda26d6d7fc136db230a518b8c99b9eeda40cbafad9ae5ba7916ef77d1d73b509324c407d96df6a8b5819f18703fa SHA512 0b38de8c6270478e7b8933def57288c8d938ba359f880b8e002f0871b56de4cac887b37d0a99c8ccc62ccc0e51416a7d4d3cea1d110477b7ade4ee0e9f799077
diff --git a/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild b/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
deleted file mode 100644
index f8d4fb0e7583..000000000000
--- a/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generate lens-family style lenses"
-HOMEPAGE="https://github.com/DanBurton/lens-family-th#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/lens-family-th/metadata.xml b/dev-haskell/lens-family-th/metadata.xml
deleted file mode 100644
index dddaaa16e6f6..000000000000
--- a/dev-haskell/lens-family-th/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Due to a cabal/hackage defect, curly braces cannot be
- adequately displayed here. Please see
- &lt;https://github.com/DanBurton/lens-family-th#readme&gt;
- for a proper description of this package.
-
- (See &lt;https://github.com/haskell/cabal/issues/968&gt;
- for the ticket I created regarding the defect.)
- </longdescription>
- <upstream>
- <remote-id type="github">DanBurton/lens-family-th</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family/Manifest b/dev-haskell/lens-family/Manifest
deleted file mode 100644
index 7f86aeb55736..000000000000
--- a/dev-haskell/lens-family/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-family-1.2.3.tar.gz 8525 BLAKE2B 769d26b7deeb392718f200ac99b6af757131a56e7725c1b90e9c40d6c352f4d812095a3863e56b48d8b17a9f84348986301c2b7fb10ff88962563449e1379547 SHA512 a8925f6596b396e65f4c5015badfd48056e3dafe372019690204fa44502fd512ebd78dcff709b1fe5d1c1648fc2f3da49d657109c495a281d998c6be67bf3201
diff --git a/dev-haskell/lens-family/lens-family-1.2.3.ebuild b/dev-haskell/lens-family/lens-family-1.2.3.ebuild
deleted file mode 100644
index df0216b7ef61..000000000000
--- a/dev-haskell/lens-family/lens-family-1.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lens Families"
-HOMEPAGE="https://hackage.haskell.org/package/lens-family"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/lens-family/metadata.xml b/dev-haskell/lens-family/metadata.xml
deleted file mode 100644
index 5816abc3bb16..000000000000
--- a/dev-haskell/lens-family/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides first class functional references.
- In addition to the usual operations of getting, setting and composition, plus integration with monad state, lens families provide some unique features:
-
- * Polymorphic updating
-
- * Traversals
-
- * Cast projection functions to read-only lenses
-
- * Cast \"toList\" functions to read-only traversals
-
- * Cast semantic editor combinators to modify-only traversals.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-simple/Manifest b/dev-haskell/lens-simple/Manifest
deleted file mode 100644
index 72fcb472ecf6..000000000000
--- a/dev-haskell/lens-simple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-simple-0.1.0.9.tar.gz 4541 BLAKE2B d3967769ff693b5e1fd370a96753753e2bac502fce326e6266627f28c5ddfc3e29ec0d646c1dcda2ceeaf7ea88f6acd5fb031aaf976c42338a1e9c3190f578f6 SHA512 3bf1079f4525b534bca70f83073ebb8abbc84cd9320ef97a1fb137914fcb614f8d7c8ea7065a4484539dc6240ab1aa393ee22ed3b9e20bc421d25ce7adadbd0c
diff --git a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild b/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
deleted file mode 100644
index 54db5993e44b..000000000000
--- a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="simplified import of elementary lens-family combinators"
-HOMEPAGE="https://github.com/michaelt/lens-simple"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?]
- >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
- <dev-haskell/lens-family-th-0.6:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/lens-simple/metadata.xml b/dev-haskell/lens-simple/metadata.xml
deleted file mode 100644
index 3f1d56fb58af..000000000000
--- a/dev-haskell/lens-simple/metadata.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This module, &lt;http://hackage.haskell.org/package/lens-simple/docs/Lens-Simple.html Lens.Simple&gt;,
- just re-exports the main modules from Russell O\'Connor's
- &lt;http://hackage.haskell.org/package/lens-family lens-family&gt; package, the
- original van Laarhoven-O'Connor lens library.
- @lens-family@ is particularly remarkable for its minute number of dependencies:
- (apart from &lt;http://hackage.haskell.org/package/mtl mtl&gt;
- they are all ghc \'boot\' libraries); but more importantly for its
- extreme conceptual simplicity and theoretical soundness. Much of
- the material it contains is well-explained, from a tutorial point of view, by
- &lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt; It is independent,
- self-standing and readily intelligible apart from any darker
- more general system of combinators that might attempt to extend it. Much
- of it ought to be in the Prelude.
-
- Convenient import of the elementary combinators from @lens-family@,
- however, a little complicated. The idea of this trivial module, then, is just to make a sort of
- low-powered, minimal-dependency, @lens-family@ equivalent of
- the 800 lb gorilla of lens library imports:
-
- &gt; import Control.Lens
-
- namely, the light-weight and elegant:
-
- &gt; import Lens.Simple
-
- Check it out, it's even one character shorter!
-
- The material in &lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt;
- will work fine if you make this substitution in the underlying
- &lt;http://hackage.haskell.org/package/lens-tutorial-1.0.0/docs/src/Control-Lens-Tutorial.html source&gt;
- and follow along as prompted.
-
- As another illustration of the simplicity of the
- fundamental van Laarhoven-O'Connor lens combinators - and their homogeneity with
- @Control.Lens@ - note that the gloss
- &lt;https://github.com/michaelt/lens-family-simple/blob/master/examples/Pong.hs pong example&gt;
- from the @lens@ library examples directory - which continues to be
- among the best introductory lens tutorials precisely by saying nothing -
- requires only this abbreviating change of imports.
-
- If you make that program more complicated,
- you might of course end up needing
- the more sophisticated material in @Control.Lens@ and
- its immense mass of dependencies. On the other hand,
- you might just need some of the additional material
- present in the similarly demystifying
- &lt;http://hackage.haskell.org/package/microlens microlens&gt;
- or &lt;http://hackage.haskell.org/package/microlens-th microlens-th&gt; and
- the associated modules.
-
- This module was originally intended to simplify the use of packages that
- follow the original promise of the van Laarhoven-O'Connor lenses.
- /Correct practice is to export lenses without depending on a lens-library, where possible./
- In basic cases these just use familiar @Prelude@ types, after all.
- Examples of best practices in this respect are e.g. &lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt; which
- doesn't depend on @lens-family@ despite its name and pipes-related packages like
- &lt;http://hackage.haskell.org/package/pipes-bytestring pipes-bytestring&gt;
- and &lt;http://hackage.haskell.org/package/pipes-group pipes-group&gt;.
-
- @Lens.Simple@ also re-exports @makeLenses@ and
- other convenient TH incantations from Dan Burton's associated
- &lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt;.
-
- </longdescription>
- <upstream>
- <remote-id type="github">michaelt/lens-simple</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index 0ef8594ffd71..97d0431ce993 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -1,2 +1,2 @@
-DIST lens-4.19.2-r2.cabal 16053 BLAKE2B 66e0c6048fea41a029780e481e102e1881e0fa381eecbdfb3de01295669abf2ffb91c9c116cfaa9439d027ac4340ff86a37d18333a4ae03f9996be7129b8327d SHA512 6c2a535af6e73026884e925abcb7bca556ebef9cdfd8d340e0d03226b5c4347a9b3dc1b641b4e3386355a4e3e02694b72d076fd7dfabdf995297a2d0dfbb9cd5
-DIST lens-4.19.2.tar.gz 705314 BLAKE2B 02de2b8515225c07b039774da06e848c4c1332cb1fc28fe6f782502e8d8b34d09b40bb2272af006157940513b4ce97d192edc45529dd497686cee32a90bfe80d SHA512 f1627c950457c38b0363a71717b76c0c84eafdcebaf14904da632ea295195dee1fd11db07ca524988729254b0e018da4417e40c0cb4f8ff086fbe412ce89f4c6
+DIST lens-5.1.1.tar.gz 697888 BLAKE2B 707a7986a561abaa33abed08b170ba23945dc97ac98af0f72ce675ecd551903eb9eaaa9c8c1e22b841ab174409f1f1e8256cb17c87230b3733f0424b2bc3b6e4 SHA512 2d64cf710b7835e63a6e5af4a3075968354e01cbcd03b1ce4f7bbc56662d029b7dc399b2d8918692715f6e94f5885a63b811704b9016284dc54d9950d9142a78
+DIST lens-5.2.2.tar.gz 700966 BLAKE2B a8c4114931cea0e6566ed3b67c22ed8e056b4d1d825665f355bae05254616034306c4cfe354841b207ba82f0e4db2c9050ab3d7c38f47883bd6987c1a7961257 SHA512 f98c0a6d86470f76d990868a8a3da8680facce982b6aaf3e5870f0e79836de664df9bc831ba7eb96765e1dde29af704d8063e5fd978f5e1726389dbc755fc494
diff --git a/dev-haskell/lens/lens-4.19.2-r2.ebuild b/dev-haskell/lens/lens-4.19.2-r2.ebuild
deleted file mode 100644
index e11ba5a2e8a7..000000000000
--- a/dev-haskell/lens/lens-4.19.2-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -lib-werror,test-hunit:test,test-properties:test,test-templates:test,test-doctests:test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${P}/revision/3.cabal -> ${PF}.cabal"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j safe +trustworthy"
-
-RESTRICT=test # Ambiguous occurrence 'foldmap': Vector.foldMap or Foldable.foldMap
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.4:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
- >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
- >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
- >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
- >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-quickcheck2-0.2
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1
- >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.18 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'Cabal >= 1.10 && <3.3' 'Cabal >= 1.10'
-}
-
-src_prepare() {
- default
-
- cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- --flag=-lib-werror \
- $(cabal_flag safe safe) \
- $(cabal_flag test test-doctests) \
- $(cabal_flag test test-hunit) \
- $(cabal_flag test test-properties) \
- $(cabal_flag test test-templates) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-5.1.1.ebuild b/dev-haskell/lens/lens-5.1.1.ebuild
new file mode 100644
index 000000000000..8931646585a7
--- /dev/null
+++ b/dev-haskell/lens/lens-5.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -lib-werror,+test-hunit,+test-properties,-benchmark-uniplate,-dump-splices,+inlining,-j,+test-templates,+trustworthy
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lenses, Folds and Traversals"
+HOMEPAGE="https://github.com/ekmett/lens/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/bifunctors-5.5.7:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+ >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.5:=[profile?]
+ >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/contravariant-1.4:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/free-5.1.5:=[profile?] <dev-haskell/free-6:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+ >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
+ >=dev-haskell/parallel-3.2.1.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+ >=dev-haskell/profunctors-5.5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
+ >=dev-haskell/semigroupoids-5.0.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hunit-1.2
+ >=dev-haskell/quickcheck-2.4
+ >=dev-haskell/simple-reflect-0.3.1
+ >=dev-haskell/test-framework-0.6
+ >=dev-haskell/test-framework-hunit-0.2
+ >=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-benchmark-uniplate \
+ --flag=-dump-splices \
+ --flag=inlining \
+ --flag=-j \
+ --flag=-lib-werror \
+ --flag=test-hunit \
+ --flag=test-properties \
+ --flag=test-templates \
+ --flag=trustworthy
+}
diff --git a/dev-haskell/lens/lens-5.2.2.ebuild b/dev-haskell/lens/lens-5.2.2.ebuild
new file mode 100644
index 000000000000..ba3ceb4e3504
--- /dev/null
+++ b/dev-haskell/lens/lens-5.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -lib-werror,+test-hunit,+test-properties,-benchmark-uniplate,-dump-splices,+inlining,-j,+test-templates,+trustworthy
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lenses, Folds and Traversals"
+HOMEPAGE="https://github.com/ekmett/lens/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/assoc-1.0.2:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+ >=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+ >=dev-haskell/bifunctors-5.5.7:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+ >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.5:=[profile?]
+ >=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/contravariant-1.4:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/free-5.1.5:=[profile?] <dev-haskell/free-6:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+ >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
+ >=dev-haskell/parallel-3.2.1.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+ >=dev-haskell/profunctors-5.5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
+ >=dev-haskell/semigroupoids-5.0.1:=[profile?] <dev-haskell/semigroupoids-7:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.10:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hunit-1.2
+ >=dev-haskell/quickcheck-2.4
+ >=dev-haskell/simple-reflect-0.3.1
+ >=dev-haskell/test-framework-0.6
+ >=dev-haskell/test-framework-hunit-0.2
+ >=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-benchmark-uniplate \
+ --flag=-dump-splices \
+ --flag=inlining \
+ --flag=-j \
+ --flag=-lib-werror \
+ --flag=test-hunit \
+ --flag=test-properties \
+ --flag=test-templates \
+ --flag=trustworthy
+}
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index 746157c47d78..db61bc69ecd0 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -5,25 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="benchmark-uniplate">
- Enable benchmarking against Neil Mitchell's
- uniplate library for comparative performance analysis. Defaults to being
- turned off to avoid the extra dependency.
- </flag>
- <flag name="inlining">
- Generate inline pragmas when using
- template-haskell. This defaults to enabled, but you can
- to shut it off to benchmark the relative performance impact,
- or as last ditch effort to address compile errors resulting
- from the myriad versions of template-haskell that all purport to be 2.8.
- </flag>
- <flag name="safe">Disallow unsafeCoerce</flag>
- <flag name="dump-splices">Build and run the doctests test-suite.</flag>
- <flag name="j">Attempt a parallel build with GHC 7.8.</flag>
- <flag name="trustworthy">Assert that we are trustworthy when we can</flag>
- </use>
<upstream>
+ <remote-id type="hackage">lens</remote-id>
<remote-id type="github">ekmett/lens</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
deleted file mode 100644
index 7ffefecd0932..000000000000
--- a/dev-haskell/lhs2tex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lhs2tex-1.24.tar.gz 775885 BLAKE2B 106d2677655f4e36412083b98051eb33d1912039e0db91556b12b442d95dc7e8d4b1167d45606a8ac69b0b32a4457d86a871b0a5032d8e758fefa3536af28b0d SHA512 1491368ba8d34c42d32ad4f77b6a803e8a3b885d336e4bd718f2398aaebc59fa2692e667a6c6a99b6e8839e4f627892c128f1feaf8557313ed144619f21c1876
diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
deleted file mode 100644
index 285fbd7d23fe..000000000000
--- a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Setup.hs.orig 2014-11-03 00:57:44.033467328 +0530
-+++ b/Setup.hs 2014-11-03 00:58:05.775218672 +0530
-@@ -205,7 +205,7 @@
- else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
- let manDir = if isWindows
- then dataPref `joinFileName` "Documentation"
-- else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
-+ else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
- createDirectoryIfMissing True docDir
- installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
- when (not isWindows) $
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
deleted file mode 100644
index 969c65b57289..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="https://github.com/kosmikus/lhs2tex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation. dev-texlive/texlive-latexextra provides polytable
-RDEPEND=">=dev-haskell/mtl-2.2.1:=
- dev-haskell/regex-compat:=
- >=dev-lang/ghc-7.4.1:=
- dev-texlive/texlive-mathscience:=
- dev-texlive/texlive-latexextra:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=(
- "${FILESDIR}/${PN}-1.18.1-mandir.patch"
-)
diff --git a/dev-haskell/lhs2tex/metadata.xml b/dev-haskell/lhs2tex/metadata.xml
deleted file mode 100644
index d7c5ad4e3cbc..000000000000
--- a/dev-haskell/lhs2tex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index 94026d83b685..84cb8fd7d085 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -1 +1,2 @@
+DIST libmpd-0.10.0.0.tar.gz 43455 BLAKE2B 1afacbecf7c36f5135b4d4811d38a45841143a87224a7701a1f426b7ec624251e4314645179b19c5743ab6a50d8ad04dfa5c393ac5c6a3c10e20f0baecfc28d2 SHA512 33b2af4cbbcc2c6bb2f05ada685d8870ca5132559f8f0505da39f0deb290f1e15028d783c9b28fc51f785ed86878fbf40bb0be0487612cc2b600eaf619114c11
DIST libmpd-0.9.2.0.tar.gz 41824 BLAKE2B 1788acb7e4152a9612a8cd503ac9751a5165a80044f1470bb4b6b055e9a52b538c9bf9cd5f0d2796e08f11e1c7a80e2739cbedf6869e1929a2f27fda08ec32ae SHA512 44b09e239a757308e59434eec80382465b684c9a00803c917194268a5b5b548b9da8e33ead8582c2a797badd0edb38846267009848a4f2300098adda4004aa18
diff --git a/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild b/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild
new file mode 100644
index 000000000000..499b2215af76
--- /dev/null
+++ b/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An MPD client library"
+HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'text >= 0.11 && < 2' 'text >= 0.11'
+)
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+ >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
+ >=dev-haskell/network-2.6.3.5:=[profile?]
+ >=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+ >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4
+ test? ( >=dev-haskell/hspec-2
+ >=dev-haskell/quickcheck-2.10 )
+"
diff --git a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
index dab573197d1d..562e8233c931 100644
--- a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
@@ -25,7 +25,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=
>=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.0.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
index 937381521944..d15c9225ef07 100644
--- a/dev-haskell/libmpd/metadata.xml
+++ b/dev-haskell/libmpd/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">libmpd</remote-id>
+ <remote-id type="github">vimus/libmpd-haskell</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/libxml-sax/Manifest b/dev-haskell/libxml-sax/Manifest
deleted file mode 100644
index e5392fb8a1aa..000000000000
--- a/dev-haskell/libxml-sax/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxml-sax-0.7.5.tar.gz 8916 BLAKE2B d6d08951825a154e1d983097bb85f2007ed68d25a5fd2dfbe545f0db6f99d3fc8a7721599fee43a9b4f94327f8546d4ff3466be21ab1933bc5658e525d9586cc SHA512 8a7345610de1fa7fdbe0c251c5e3675f980731f3c4212e87243aec606457a152ef36d78c777428a8b879aa8662f75b6cd878fd5a9e48d283def24c853be43c28
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
deleted file mode 100644
index 4ab2c3a7fcfa..000000000000
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for the libXML2 SAX interface"
-HOMEPAGE="https://john-millikin.com/software/haskell-libxml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
- >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
- virtual/pkgconfig
-"
diff --git a/dev-haskell/libxml-sax/metadata.xml b/dev-haskell/libxml-sax/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/libxml-sax/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/libxml/Manifest b/dev-haskell/libxml/Manifest
deleted file mode 100644
index 489a0f20f30a..000000000000
--- a/dev-haskell/libxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxml-0.1.1.tar.gz 3959 BLAKE2B 938bf1b309696574e47b4128dba8824ed9b756416980fa367269730051ff319c68ea8e49b9f4e63ab2da358f9a2ed9adc2f5a1f12cf729fbdd3b3ea48beedd10 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
deleted file mode 100644
index 61c3adf00c84..000000000000
--- a/dev-haskell/libxml/libxml-0.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to libxml2"
-HOMEPAGE="https://hackage.haskell.org/package/libxml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-6.10.4:=
- dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- sed -e 's@includes: libxml/xmlIO.h libxml/xmlmemory.h@pkgconfig-depends: libxml-2.0@' \
- -i "${S}/${PN}.cabal" \
- || die "Could not patch libxml2 configuration in ${PN}.cabal"
-}
diff --git a/dev-haskell/libxml/metadata.xml b/dev-haskell/libxml/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/libxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/libyaml/libyaml-0.1.2.ebuild b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
index be4c94e648a6..62db191a52ba 100644
--- a/dev-haskell/libyaml/libyaml-0.1.2.ebuild
+++ b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,8 +14,8 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-unicode system-libyaml"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+unicode system-libyaml"
RDEPEND=">=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
"
src_configure() {
+ local unicode_flag="no-unicode"
+ use unicode && unicode_flag="-no-unicode"
+
haskell-cabal_src_configure \
- $(cabal_flag no-unicode no-unicode) \
+ --flag="${unicode_flag}" \
$(cabal_flag system-libyaml system-libyaml)
}
diff --git a/dev-haskell/libyaml/metadata.xml b/dev-haskell/libyaml/metadata.xml
index 97319385e94a..8958352628bb 100644
--- a/dev-haskell/libyaml/metadata.xml
+++ b/dev-haskell/libyaml/metadata.xml
@@ -6,7 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
+ <flag name="unicode">Enable unicode output. Otherwise, unicode characters will be escaped.</flag>
<flag name="system-libyaml">Use the system-wide libyaml instead of the bundled copy</flag>
</use>
+ <upstream>
+ <remote-id type="github">snoyberg/yaml</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/lift-type/Manifest b/dev-haskell/lift-type/Manifest
new file mode 100644
index 000000000000..9be6c71c7b6e
--- /dev/null
+++ b/dev-haskell/lift-type/Manifest
@@ -0,0 +1 @@
+DIST lift-type-0.1.0.1.tar.gz 3133 BLAKE2B 64e27c549960e2a02a1f01431f602d4dc34ac3ad8db430c0e8f473c70a412ebebf31b7da5ea4e6024b3e59df654dbccfc3b9f980b32516d9419476941417c41f SHA512 3555cfc79a317849921306f8766d031dbdf247aa9bec604e20b47c31c4d001c7392b2f47a3463a9699b33826fec4a5d092fbad82c3d6a75f3c3151afa033b372
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
new file mode 100644
index 000000000000..d898c66d798b
--- /dev/null
+++ b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift a type from a Typeable constraint to a Template Haskell type"
+HOMEPAGE="https://github.com/parsonsmatt/lift-type#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/lift-type/metadata.xml b/dev-haskell/lift-type/metadata.xml
new file mode 100644
index 000000000000..30704d31ed6e
--- /dev/null
+++ b/dev-haskell/lift-type/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">parsonsmatt/lift-type</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index fd1acdee98df..dc5a10c53020 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1 +1,3 @@
-DIST lifted-async-0.10.0.6.tar.gz 10308 BLAKE2B f9718ed3d97d4cb17b87d49efb594a7b61f11b6be9819b44bd8382a87bb247b754328db07417699f5140f6168d42c3d51fceaaaf33da748f9aba8683101cd6ec SHA512 9e5ae5d906df2577453c9b86f196f4bb4ec4d7766c5d9bcb7d2fa66be62daa44c033ed1475bdc004e1540da81f645a4d39db35142d32d09b33cfe9c01412f1ce
+DIST lifted-async-0.10.2-rev1.cabal 2808 BLAKE2B 62913bfee810304bbd37548ec130dce6b21412497efc055043aaa49ea5d1c2736fb393583783a8c56888e86a2da346165f6352082f7f69b967e08fcb5cd92c73 SHA512 bc9d4310dc1655eb048c68f6a445644ca5a495627bd733b1af4eecabb751ac60598ee68360281464c46c56bd94a6e3ade2abbc18966b11d7bde9135ab4c06136
+DIST lifted-async-0.10.2.3.tar.gz 10685 BLAKE2B 86699670329fe040f1dab3eef317ba717fdfb7c6e69a444190a270280c90e5a59f54378f61d77c63175b06f41bb63100e98e5034d8d4a7df92c4af17fac37293 SHA512 b21ab3ccf04de748d3b0bf0ca8ae2c490fdfad4bcc5b9053a196da424923866d58bb735bc208ca600ae2d4d1d66545adc52e0826ba6bb63a7089d4946493e59a
+DIST lifted-async-0.10.2.tar.gz 10607 BLAKE2B 79ef9e4f11e5d41d3886473f2443a7345a1b52fd0aaf50a96a338f3958fdfef0a00846adf04cf8d310935c130a583544829685ad895c238544fd3ca5558973cd SHA512 eb2b33693ab1617fdeca934c6ede73c530e578425049804c3a0322a63b5262411453f80cb730dabd338590fc6b3093cd13872b9922f5cda4806741fc74ea63ee
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
deleted file mode 100644
index fd66768fffd0..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#beware: hackport not reading `constraints` upper bound correctly
-
-RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
- >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?]
- >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
- >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/mtl
- dev-haskell/tasty
- <dev-haskell/tasty-expected-failure-0.12
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild
new file mode 100644
index 000000000000..42c5ecac4aa8
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/maoe/lifted-async"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/tasty
+ <dev-haskell/tasty-expected-failure-0.13
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ dev-haskell/tasty-th )
+"
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
new file mode 100644
index 000000000000..f90e56840529
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/maoe/lifted-async"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'base >= 4.5 && < 4.16' 'base >= 4.5'
+)
+
+RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
+ >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.4.1.0
+ test? ( dev-haskell/hunit
+ dev-haskell/tasty
+ <dev-haskell/tasty-expected-failure-0.13
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ dev-haskell/tasty-th )
+"
diff --git a/dev-haskell/lifted-async/metadata.xml b/dev-haskell/lifted-async/metadata.xml
index 50b995cb320b..159a65915cec 100644
--- a/dev-haskell/lifted-async/metadata.xml
+++ b/dev-haskell/lifted-async/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides IO operations from @async@ package lifted to any
- instance of 'MonadBase' or 'MonadBaseControl'.
- </longdescription>
<upstream>
+ <remote-id type="hackage">lifted-async</remote-id>
<remote-id type="github">maoe/lifted-async</remote-id>
</upstream>
</pkgmetadata>
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 ec41d67a0930..c0a90695c5bd 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/linear/Manifest b/dev-haskell/linear/Manifest
deleted file mode 100644
index 16d5d945a8e3..000000000000
--- a/dev-haskell/linear/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST linear-1.21.3.tar.gz 54001 BLAKE2B debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b SHA512 0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02
-DIST linear-1.21.5.tar.gz 51148 BLAKE2B 4ef1bd13d732d14fca2f699f354b158a30926279b15bce606949b715077112085600b66120a20d25ac2d76ccc263ae8cc54d906078246bf259f2160a227f2f50 SHA512 544bffe2252158e368e7d5d93e90c15d571b8545ddf20b01c8d50563c9e940dc4298ed7a1c10e0365758407442bcb66d00d0deb099debe4dee992ef0fec8e270
diff --git a/dev-haskell/linear/linear-1.21.3.ebuild b/dev-haskell/linear/linear-1.21.3.ebuild
deleted file mode 100644
index 033a163d5e5a..000000000000
--- a/dev-haskell/linear/linear-1.21.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
- >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
- >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
- >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18
- >=dev-haskell/hunit-1.2.5
- >=dev-haskell/simple-reflect-0.3.1
- >=dev-haskell/test-framework-0.8
- >=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-herbie \
- $(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/linear-1.21.5.ebuild b/dev-haskell/linear/linear-1.21.5.ebuild
deleted file mode 100644
index 9ede3e1ad189..000000000000
--- a/dev-haskell/linear/linear-1.21.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +template-haskell,-herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
- >=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
- >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
- >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
- >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-6:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
- >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/hunit-1.2.5
- >=dev-haskell/simple-reflect-0.3.1
- >=dev-haskell/test-framework-0.8
- >=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-herbie \
- --flag=template-haskell
-}
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
deleted file mode 100644
index 2fe2fec7c8e0..000000000000
--- a/dev-haskell/linear/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="template-haskell">
- You can disable the use of the
- `template-haskell` package using `-f-template-haskell`. Disabling this is an
- unsupported configuration, but it may be useful for accelerating builds in
- sandboxes for expert users.
- </flag>
- </use>
- <upstream>
- <remote-id type="github">ekmett/linear</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/list/Manifest b/dev-haskell/list/Manifest
deleted file mode 100644
index 925e18815559..000000000000
--- a/dev-haskell/list/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST List-0.6.2.tar.gz 7128 BLAKE2B 8ca05ea3994555afd7b1466b104ed8dc5ea8e88fc5f2c994abe504033b5776976f0b68a7a7d2c752466f470e0a2580995e5ddc409c8a6368f2c5212b05839d15 SHA512 c4bde8c31831c8364e3da9db2aa6520de7dc01504ce8619afe012c3f27d3c7453610ad8b86450fe2b0be6276b09570aeb030094ce49e2d6e17e3259749ed4c4a
diff --git a/dev-haskell/list/list-0.6.2.ebuild b/dev-haskell/list/list-0.6.2.ebuild
deleted file mode 100644
index 6376dffb41db..000000000000
--- a/dev-haskell/list/list-0.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="List"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="List monad transformer and class"
-HOMEPAGE="https://github.com/yairchu/generator"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/list/metadata.xml b/dev-haskell/list/metadata.xml
deleted file mode 100644
index 32b431e14bc3..000000000000
--- a/dev-haskell/list/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">yairchu/generator</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/listlike/Manifest b/dev-haskell/listlike/Manifest
deleted file mode 100644
index 56c3a8bf6f6d..000000000000
--- a/dev-haskell/listlike/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ListLike-4.6.3.tar.gz 30538 BLAKE2B e43f67bd5838eca31b4169b36dc33f872c21396e01e15ccd61db26f5deefbcd7e9a1ff596b95425a92edc1740b51c7a8dbf728f4801298d848fa79419008b447 SHA512 9a5eac3543e62d33b433b809f119b0394d71dfee7f6442ab9e436144367e5745438d6806263a8e8658a28dafa11290d5ed50f2aa9cb5528e1762c23efe3cb705
diff --git a/dev-haskell/listlike/listlike-4.6.3.ebuild b/dev-haskell/listlike/listlike-4.6.3.ebuild
deleted file mode 100644
index 9f80458f817d..000000000000
--- a/dev-haskell/listlike/listlike-4.6.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="https://github.com/ddssff/listlike"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
- >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
- >=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/listlike/metadata.xml b/dev-haskell/listlike/metadata.xml
deleted file mode 100644
index 6244d44812f7..000000000000
--- a/dev-haskell/listlike/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Generic support for list-like structures in Haskell.
-
- The ListLike module provides a common interface to the various Haskell
- types that are list-like. Predefined interfaces include standard
- Haskell lists, Arrays, ByteStrings, and lazy ByteStrings. Custom
- types can easily be made ListLike instances as well.
-
- ListLike also provides for String-like types, such as String and
- ByteString, for types that support input and output, and for types that can handle
- infinite lists.
- </longdescription>
-</pkgmetadata>
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 5e45df95d673..32a64b07d9dc 100644
--- a/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
+++ b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/logging-facade/metadata.xml b/dev-haskell/logging-facade/metadata.xml
index 937381521944..b65d66b23236 100644
--- a/dev-haskell/logging-facade/metadata.xml
+++ b/dev-haskell/logging-facade/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">sol/logging-facade</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
deleted file mode 100644
index fdc114280533..000000000000
--- a/dev-haskell/logict-state/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
diff --git a/dev-haskell/logict-state/files/logict-state-0.1.0.5-monadfail-compat.patch b/dev-haskell/logict-state/files/logict-state-0.1.0.5-monadfail-compat.patch
deleted file mode 100644
index 3da6f26e0dd4..000000000000
--- a/dev-haskell/logict-state/files/logict-state-0.1.0.5-monadfail-compat.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/src/Control/Monad/LogicState.hs b/src/Control/Monad/LogicState.hs
-index 93be8aa..613a77c 100644
---- a/src/Control/Monad/LogicState.hs
-+++ b/src/Control/Monad/LogicState.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE UndecidableInstances, Rank2Types, FlexibleInstances, FlexibleContexts, GADTs, ScopedTypeVariables, FunctionalDependencies #-}
-+{-# LANGUAGE UndecidableInstances, Rank2Types, FlexibleInstances, FlexibleContexts, GADTs, ScopedTypeVariables, FunctionalDependencies, CPP #-}
-
- -------------------------------------------------------------------------
- -- |
-@@ -39,6 +39,9 @@ import Control.Applicative
-
- import Control.Monad
- import Control.Monad.Identity
-+#if !MIN_VERSION_base(4,11,0)
-+import qualified Control.Monad.Fail as Fail
-+#endif
- import Control.Monad.Trans
-
- import Control.Monad.State
-@@ -83,7 +86,12 @@ instance Applicative (LogicStateT gs bs f) where
- instance Monad (LogicStateT gs bs m) where
- return a = LogicStateT ($ a)
- m >>= f = LogicStateT $ \sk -> unLogicStateT m (\a -> unLogicStateT (f a) sk)
-- fail _ = LogicStateT $ flip const
-+#if !MIN_VERSION_base(4,11,0)
-+ fail = Fail.fail
-+#endif
-+
-+instance MonadFail (LogicStateT gs bs m) where
-+ fail _ = LogicStateT $ flip const
-
- instance Alternative (LogicStateT gs bs f) where
- empty = LogicStateT $ flip const
-diff --git a/src/Control/Monad/TransLogicState/Class.hs b/src/Control/Monad/TransLogicState/Class.hs
-index 4fa61c4..267704a 100644
---- a/src/Control/Monad/TransLogicState/Class.hs
-+++ b/src/Control/Monad/TransLogicState/Class.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables #-}
-+{-# LANGUAGE ScopedTypeVariables, CPP #-}
-
- module Control.Monad.TransLogicState.Class
- ( TransLogicState(..)
-@@ -15,12 +15,19 @@ import Control.Arrow
- import Control.Monad.Identity
- -- import Control.Monad.Trans
-
-+instance MonadFail Identity where
-+ fail msg = runIdentity $ fail msg
-+
- -- | Additions to MonadTrans specifically useful for LogicState
- class {- MonadTrans t => -} TransLogicState s t where
- -------------------------------------------------------------------------
- -- | Extracts the first result from a 't m' computation,
- -- failing otherwise.
-+#if !MIN_VERSION_base(4,13,0)
- observeT :: (Monad m) => s -> t m a -> m a
-+#else
-+ observeT :: (MonadFail m) => s -> t m a -> m a
-+#endif
- observeT e m = fmap head $ observeManyT e 1 m
-
- -------------------------------------------------------------------------
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
deleted file mode 100644
index 519433782076..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for logic programming based on haskell package logict"
-HOMEPAGE="https://github.com/atzedijkstra/logict-state"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-monadfail-compat.patch )
diff --git a/dev-haskell/logict-state/metadata.xml b/dev-haskell/logict-state/metadata.xml
deleted file mode 100644
index 2ccb8fdaf1f1..000000000000
--- a/dev-haskell/logict-state/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Logic programming built on top of part of logict library, in particular for dealing with backtrackable state
- </longdescription>
- <upstream>
- <remote-id type="github">atzedijkstra/logict-state</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index c59eda725001..100ee4bab151 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1 +1,2 @@
DIST logict-0.7.0.3.tar.gz 5924 BLAKE2B 1d5fe5a78ff0448e70b68c063f3e1a4d632208e4b5bc35c51c17d12bf0ae5175db31b5c8854776ae41d7ca1fe450f8767a9f5db113c85e60ffc26bb949f1406e SHA512 0d845daffb841efea93b59e48ee86daeb0dbacbe4fc7fa417ff71d1dcda3a5551901f589097416441736007d256197932b83de76a2f630a5f7835909cd758e79
+DIST logict-0.8.1.0.tar.gz 18721 BLAKE2B 733be00e92c6ff47b302c444228335bfbbdbbace75c0076ed29b4f2c65730eafcebdecb5bfa6a20ceceaf4df2d1a0e807c9052b48d614a71c00bff08b1a7f319 SHA512 9202d53252b38f9cab39ca95f74a56e3f858cc05ff6ab27f827fcad9a484416ff743195f528636d18a11dccb1e8566314287e8265c98d856fe374f8748de2739
diff --git a/dev-haskell/logict/logict-0.7.0.3.ebuild b/dev-haskell/logict/logict-0.7.0.3.ebuild
index 9215ee27620a..fb111886043b 100644
--- a/dev-haskell/logict/logict-0.7.0.3.ebuild
+++ b/dev-haskell/logict/logict-0.7.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/fail:=[profile?]
diff --git a/dev-haskell/logict/logict-0.8.1.0.ebuild b/dev-haskell/logict/logict-0.8.1.0.ebuild
new file mode 100644
index 000000000000..b1a55d511be6
--- /dev/null
+++ b/dev-haskell/logict/logict-0.8.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A backtracking logic-programming monad"
+HOMEPAGE="https://github.com/Bodigrim/logict#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/async-2.0 <dev-haskell/async-2.3
+ <dev-haskell/tasty-1.5
+ <dev-haskell/tasty-hunit-0.11 )
+"
diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
index 165b9bf095c2..f00a63d92b3a 100644
--- a/dev-haskell/logict/metadata.xml
+++ b/dev-haskell/logict/metadata.xml
@@ -5,14 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A continuation-based, backtracking, logic programming monad.
- An adaptation of the two-continuation implementation found
- in the paper "Backtracking, Interleaving, and Terminating
- Monad Transformers" available here:
- &lt;http://okmij.org/ftp/papers/LogicT.pdf&gt;
- </longdescription>
<upstream>
+ <remote-id type="hackage">logict</remote-id>
<remote-id type="github">Bodigrim/logict</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/lpeg/Manifest b/dev-haskell/lpeg/Manifest
new file mode 100644
index 000000000000..e8375ee4a088
--- /dev/null
+++ b/dev-haskell/lpeg/Manifest
@@ -0,0 +1,2 @@
+DIST lpeg-1.0.3.tar.gz 40092 BLAKE2B fa7abf62be859a15b66aacefb8b170488a59a48cf8d209653bb274327af5ad145a047a0e654b37819045eb594389d405813dbe2c9956f91461bf29e4f3ad99d1 SHA512 636a983054576487af8663d627ea16b57894eca18c92a5994abcdeec11acaa1b5d7bb0da1eae0a1a175c75fad44c93a78c5a5e6e7ce25ddac67f5b376559fbdc
+DIST lpeg-1.0.4.tar.gz 40132 BLAKE2B 03b1edc225b21d09a69da62157564b504115428843dec4f49575f701f4153b12f5f35005bcb7b5738d299910fddbc58851963800f28bed5584ab73efdaa4fcea SHA512 683af7bc2b695a4058f757de7b45759bbaea790d893109256fb9ee13607f15e765e36aa7df7fff6215d93e4aee480b4e0097a52d261673603e7ae6f632d476c0
diff --git a/dev-haskell/lpeg/lpeg-1.0.3.ebuild b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
new file mode 100644
index 000000000000..d7bf73d17e18
--- /dev/null
+++ b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="LPeg - Parsing Expression Grammars For Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag rely-on-shared-lpeg-library rely-on-shared-lpeg-library)
+}
diff --git a/dev-haskell/lpeg/lpeg-1.0.4.ebuild b/dev-haskell/lpeg/lpeg-1.0.4.ebuild
new file mode 100644
index 000000000000..1d47374670a2
--- /dev/null
+++ b/dev-haskell/lpeg/lpeg-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="LPeg – Parsing Expression Grammars For Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="rely-on-shared-lpeg-library"
+
+RDEPEND=">=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag rely-on-shared-lpeg-library rely-on-shared-lpeg-library)
+}
diff --git a/dev-haskell/lpeg/metadata.xml b/dev-haskell/lpeg/metadata.xml
new file mode 100644
index 000000000000..571add0e90e2
--- /dev/null
+++ b/dev-haskell/lpeg/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="rely-on-shared-lpeg-library">Do not build lpeg from source, but trust that lpeg is
+made available in other ways, e.g., through a
+system-wide installation. The loader will be replaced
+with a placeholder function that only emits a message.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">lpeg</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lrucache/Manifest b/dev-haskell/lrucache/Manifest
deleted file mode 100644
index 0a5230e75708..000000000000
--- a/dev-haskell/lrucache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lrucache-1.2.0.1.tar.gz 9224 BLAKE2B d29cfee3d21fcf66318f272011551a1a04e17ccac5ba58da0a80591502488ab7446a5b2137c57c91ded80b2486d95c28f5449c5417c88a99f2e121dd17841eea SHA512 fae5c8a10bb7ee781ed84ccf9c342bd583e112eb840d07aa72803affe3fa7dd394b3d6b73212e45005ec9155a409539902c4893ce20dc0a2a0e3f4a44b2c715b
diff --git a/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild b/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
deleted file mode 100644
index 48b8f20f6e50..000000000000
--- a/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a simple, pure LRU cache"
-HOMEPAGE="https://github.com/chowells79/lrucache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lrucache/metadata.xml b/dev-haskell/lrucache/metadata.xml
deleted file mode 100644
index 0320e74f68da..000000000000
--- a/dev-haskell/lrucache/metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package contains a simple, pure LRU cache, implemented in
- terms of "Data.Map".
-
- It also contains a mutable IO wrapper providing atomic updates to
- an LRU cache.
-
- Version History:
-
- 1.1.1 - Add an additional modification function for AtomicLRUCache.
-
- 1.1.0.1 - Update containers constraint to allow containers from ghc-7
-
- 1.1 - Add a Functor instance for LRUCache.
- Add a generic modification function for AtomicLRUCache.
-
- 1.0 - Breaking API changes:
- 1) The newLRU smart constructor now makes the maximum
- size optional.
- 2) The delete function now returns the value removed, if
- one was.
- Additionally, a function was added to remove the least-recently
- used element in the LRU.
-
- 0.3 - Added a Show instance for LRU. (Requested by Ben Lee)
-
- 0.2.0.1 - Increase strictness slightly.
- Remove cabal target for test executable.
- (Just include test sources instead.)
-
- 0.2 - Added an Eq instance for LRU.
- Added strictness to eliminate space leaks in common use patterns.
-
- 0.1.1 - Add the Data.Cache.LRU.IO.Internal module.
- Clean up build warnings on GHC 6.12.1.
-
- 0.1.0.1 - Minor refactoring
-
- 0.1 - First release
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lua-arbitrary/Manifest b/dev-haskell/lua-arbitrary/Manifest
new file mode 100644
index 000000000000..8e7dbd4add11
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/Manifest
@@ -0,0 +1,2 @@
+DIST lua-arbitrary-1.0.1.1.tar.gz 2487 BLAKE2B 978fb3f94715211cdbb22e89d05abc9fbc92b713237e5d87984f7bfc27b56f547c754d62aaf1b23604de0769382d3d6e52bfcb63ad2af2e900257b8e139c1cde SHA512 135c4e16dae746aa06b7c6f217f7beb99f6e70ffc7f20ada5ee09654827d104a9e653317dd10cb615b404419bd76574b7a3f75f518a4ee560d2fcc9bae26113a
+DIST lua-arbitrary-1.0.1.tar.gz 2479 BLAKE2B e61c8eb60bfd2fa17f253baced7aba296ff79fa8ac930ec3616f7a8db818ab76f0287e99089d61abad1eaf573e522e4456c71e8c7ffc38b675c0dcf7cae3e95f SHA512 09de72fa62600e1b1ddc7de8f51bd6a429bff9a51347c36c2c9d67f0bb25eb9d6105ff7d08717f3b823a63f6fe60c8e4c9620ad3645f285e38126ec10ff5b402
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
new file mode 100644
index 000000000000..9dd27d589e9e
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Arbitrary instances for Lua types"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/lua-2.0:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-haskell/quickcheck-2.7:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
new file mode 100644
index 000000000000..0451a2963615
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="Arbitrary instances for Lua types"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/lua-2.0:=[profile?] <dev-haskell/lua-2.3:=[profile?]
+ >=dev-haskell/quickcheck-2.7:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/lua-arbitrary/metadata.xml b/dev-haskell/lua-arbitrary/metadata.xml
new file mode 100644
index 000000000000..a36ef1983206
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">lua-arbitrary</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lua/Manifest b/dev-haskell/lua/Manifest
new file mode 100644
index 000000000000..93981a094680
--- /dev/null
+++ b/dev-haskell/lua/Manifest
@@ -0,0 +1,2 @@
+DIST lua-2.2.0.tar.gz 260005 BLAKE2B ec79108a72a6060fc82b94aac1e61c51aea0d570bac37add749654d903fec5b62c5caa82932606e9778431c80c68fceb11b5eba9d6c45c183a8f249934d26c55 SHA512 d19f54c9424773557f7ef7929be84dfcb7624d8a617d3383a771fe1ba7d6d5cd724c8fcd40475cde443e02e0cf3164a8869c0d67c90cf04b3b09ef6d876aa727
+DIST lua-2.3.1.tar.gz 262809 BLAKE2B f12e2566008e713e89a87b02edd216bda1f8e9865faf1dcee2e4909b4759990836c3fa4a78d5864812a975ba46f8a6266b45568dc9abd4f752cd765407bcc69f SHA512 3fd5c4d55fdb7480ffc629e7dfd9fb31b7376ca4245e9db098fce7dc4dbdf1a576f521f55902bdf484ad9b4bbfab4a565de4e1528a1cb4296682508ccb977686
diff --git a/dev-haskell/lua/lua-2.2.0.ebuild b/dev-haskell/lua/lua-2.2.0.ebuild
new file mode 100644
index 000000000000..df40677a9ebe
--- /dev/null
+++ b/dev-haskell/lua/lua-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua_32bits,pkg-config:system-lua
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="system-lua"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ system-lua? ( dev-lang/lua:5.4 )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9 )
+ system-lua? ( virtual/pkgconfig )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ --flag=-lua_32bits \
+ $(cabal_flag system-lua pkg-config)
+}
diff --git a/dev-haskell/lua/lua-2.3.1.ebuild b/dev-haskell/lua/lua-2.3.1.ebuild
new file mode 100644
index 000000000000..d79cf4d78381
--- /dev/null
+++ b/dev-haskell/lua/lua-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua_32bits,pkg-config:system-lua
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="system-lua"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ system-lua? ( dev-lang/lua:5.4 )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9 )
+"
+BDEPEND="system-lua? ( virtual/pkgconfig )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ --flag=-lua_32bits \
+ $(cabal_flag system-lua pkg-config)
+}
diff --git a/dev-haskell/lua/metadata.xml b/dev-haskell/lua/metadata.xml
new file mode 100644
index 000000000000..e48f482bf8de
--- /dev/null
+++ b/dev-haskell/lua/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="system-lua">Use @pkg-config@ to discover library and include paths.
+Setting this flag implies `pkg-config`.</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
index 4bd93cb9427f..7ae64b144fc0 100644
--- a/dev-haskell/lukko/Manifest
+++ b/dev-haskell/lukko/Manifest
@@ -1 +1,2 @@
-DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
+DIST lukko-0.1.1.3-rev4.cabal 4584 BLAKE2B f940efd241489c7a078f0c13edf2cd1cce1a6e99109cd423fedefd94ffe73a3a83b021b49c54a760e554f9c6f254261ed16f533feb262543acc5f40a8eba72b8 SHA512 5cde0f7dc7037037a42b73675e1d0c597f77190b5878f6246bc8c71f57fca6de8bb4fb87297fd6dfd145109354341bac55d822ee6c399edbd968f81be2b26a7b
+DIST lukko-0.1.1.3.tar.gz 28575 BLAKE2B 9f0006d05ba1db03de6fda88265e8949797201124f71ca6690113431f398eb59f19ec67363eb6b2834cac136e985b84882d45dfeb71c67e1147dd000c06cd243 SHA512 8bed8b88a101883f642bb9d9d41512436f5c80db5ea1ad0cddb069c6d09257d21b56a60e0f70b57453e91126065fbfdeeb721064763e64de1975dcb51b1a484a
diff --git a/dev-haskell/lukko/lukko-0.1.1.2.ebuild b/dev-haskell/lukko/lukko-0.1.1.2.ebuild
deleted file mode 100644
index 6dcaf99f3e07..000000000000
--- a/dev-haskell/lukko/lukko-0.1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="File locking"
-HOMEPAGE="https://hackage.haskell.org/package/lukko"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ofd-locking"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
- >=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
- >=dev-haskell/tagged-0.8.5 <dev-haskell/tagged-0.9
- >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12
- >=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag ofd-locking ofd-locking)
-}
diff --git a/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild b/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild
new file mode 100644
index 000000000000..b89bdca78478
--- /dev/null
+++ b/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +ofd-locking
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="File locking"
+HOMEPAGE="https://hackage.haskell.org/package/lukko"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+ >=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
+ >=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+ || (
+ ( >=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12 )
+ ( >=dev-haskell/tasty-expected-failure-0.12.2 <dev-haskell/tasty-expected-failure-0.13 )
+ )
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=ofd-locking
+}
diff --git a/dev-haskell/lukko/metadata.xml b/dev-haskell/lukko/metadata.xml
index 813bd62764bc..a6129181f6be 100644
--- a/dev-haskell/lukko/metadata.xml
+++ b/dev-haskell/lukko/metadata.xml
@@ -5,43 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="ofd-locking">Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014).</flag>
- </use>
- <longdescription>
- This package provides access to platform dependent file locking APIs:
-
- * Open file descriptor locking on Linux ("Lukko.OFD")
- * @flock@ locking on unix platforms ("Lukko.FLock")
- * Windows locking @LockFileEx@ ("Lukko.Windows")
- * No-op locking, which throws exceptions ("Lukko.NoOp")
- * "Lukko" module exports the best option for the target platform with uniform API.
-
- There are alternative file locking packages:
-
- * "GHC.IO.Handle.Lock" in @base &gt;= 4.10@ is good enough for most use cases.
- However, uses only 'Handle's so these locks cannot be used for intra-process locking.
- (You should use e.g. 'MVar' in addition).
-
- * &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn't support OFD locking.
-
- /Lukko/ means lock in Finnish.
-
- Submodules "Lukko.OFD", "Lukko.Windows" etc are available based on following conditions.
-
- @
- if os(windows)
- \ cpp-options: -DHAS_WINDOWS_LOCK
-
- elif (os(linux) &amp;&amp; flag(ofd-locking))
- \ cpp-options: -DHAS_OFD_LOCKING
- \ cpp-options: -DHAS_FLOCK
-
- elif !(os(solaris) || os(aix))
- \ cpp-options: -DHAS_FLOCK
- @
-
- "Lukko.FLock" is available on not (Windows or Solaris or AIX).
- "Lukko.NoOp" is always available.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">lukko</remote-id>
+ <remote-id type="github">haskellari/lukko</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/maccatcher/Manifest b/dev-haskell/maccatcher/Manifest
deleted file mode 100644
index 89d50514aca9..000000000000
--- a/dev-haskell/maccatcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maccatcher-2.1.5.tar.gz 4947 BLAKE2B 96a1a7a888e0340c3a69aae24aea102bc5cd361db6e35b2c5ee47902caa82c3910955739fe71c1dcfdea9e4c23b69f93238001a5c8a3a4fe1446fc93718c638a SHA512 a74c5c2e45168ded3319696e59f3f0ba6a5aec4a5316e02b4b1f8d012d8122faf564a059ef1f249d5a6e5f01f922d8e7fe05844b808e3b7673490494ed84adf4
diff --git a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild b/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
deleted file mode 100644
index dbf6532eaad1..000000000000
--- a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +split-base,+cli
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain the host MAC address on *NIX and Windows"
-HOMEPAGE="https://hackage.haskell.org/package/maccatcher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
- dev-haskell/parsec:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=cli \
- --flag=split-base
-}
diff --git a/dev-haskell/maccatcher/metadata.xml b/dev-haskell/maccatcher/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/maccatcher/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
index 6e247ba72615..5e7a36997fa1 100644
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ b/dev-haskell/magic/magic-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/markdown-unlit/Manifest b/dev-haskell/markdown-unlit/Manifest
index 6790b5298bb4..422e7476ad38 100644
--- a/dev-haskell/markdown-unlit/Manifest
+++ b/dev-haskell/markdown-unlit/Manifest
@@ -1 +1,2 @@
DIST markdown-unlit-0.5.0.tar.gz 4681 BLAKE2B cde0d867185c714e0c5d3c76e0baed4b1f7df4f0b85170e3d69476149caa5dd06f7de181e750eee357543ebc2d8e4178d711bee903bd41a5085c75057c9374c8 SHA512 580b4e4a4fcccf845c3e618b2ebc425dd8dba024c1c8bbae8db00a3e4b768353fe6738195dad80ae2afb1a46fcfad46cbed6d98bea1017ef098366fa7a2633ea
+DIST markdown-unlit-0.6.0.tar.gz 5201 BLAKE2B fe5e50cd6df156b1db92859099681f2c6796cc2557144b771819ca215cc171dc5f6dd4d11a15fe24da9ac18e92e925b5e2199e6b85b7d789e4167812028e1c0f SHA512 a1d7179ee82635c5fc07a39fd47b8ec288b260844ac3a90038ea97c7a22c170f2e9db0c72ad538242cbe1ae23b75fd27319650142d0f5bf47793954c3b45639a
diff --git a/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch b/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch
new file mode 100644
index 000000000000..3a40c845652e
--- /dev/null
+++ b/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch
@@ -0,0 +1,23 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Add new USE flag: executable
+This toggles building the executable. Since this seems to be the primary
+purpose of the package, it is enabled by default.
+
+--- markdown-unlit-0.5.1/markdown-unlit.cabal.bak 2021-08-28 01:55:59.160717350 -0600
++++ markdown-unlit-0.5.1/markdown-unlit.cabal 2021-08-28 01:58:49.820717433 -0600
+@@ -35,7 +35,13 @@
+ Paths_markdown_unlit
+ default-language: Haskell2010
+
++flag executable
++ description: Build executable
++ default: True
++
+ executable markdown-unlit
++ if !flag(executable)
++ buildable: False
+ main-is: Main.hs
+ other-modules:
+ Paths_markdown_unlit
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 fbffd43af9e1..be0a1fa55749 100644
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild
new file mode 100644
index 000000000000..f26205873cf5
--- /dev/null
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Literate Haskell support for Markdown"
+HOMEPAGE="https://github.com/sol/markdown-unlit#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+executable"
+
+RDEPEND="
+ dev-haskell/base-compat:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ =dev-haskell/hspec-2*
+ dev-haskell/quickcheck
+ dev-haskell/silently
+ dev-haskell/stringbuilder
+ dev-haskell/temporary
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.1-add-executable-flag.patch" )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/markdown-unlit/metadata.xml b/dev-haskell/markdown-unlit/metadata.xml
index 937381521944..ff003871f22c 100644
--- a/dev-haskell/markdown-unlit/metadata.xml
+++ b/dev-haskell/markdown-unlit/metadata.xml
@@ -5,4 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <use>
+ <flag name="executable">Build executable</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">markdown-unlit</remote-id>
+ <remote-id type="github">sol/markdown-unlit</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/math-functions/Manifest b/dev-haskell/math-functions/Manifest
index e9316477817f..17ed2533d34e 100644
--- a/dev-haskell/math-functions/Manifest
+++ b/dev-haskell/math-functions/Manifest
@@ -1 +1,2 @@
DIST math-functions-0.3.3.0.tar.gz 424169 BLAKE2B 8b53c657fb5eba8d3ab54d5ba29f7d316e8c2f4803d0587a1071fd9b6c0cf0d8a17c4dadc903280faf028622207ab84db5fb628c8826af0e615524ef45b625c5 SHA512 f6ac6f9fb604207c11d7888fa375a52b544732dd8e811c3b9bf74237bbc0dc83839eb83c11c5ef0dd88666cff4919d4e06236e14d84da7065b4dc75717ceafad
+DIST math-functions-0.3.4.2.tar.gz 429223 BLAKE2B 63d305c524c6ab40c415828375a8c2491911693fdf7a1462b9e4d9055a26e1570fb4e80eee8dd617852c96dfc802b6e6a8e2d7bc822d9bf62c00241e5cf43dd7 SHA512 cb29901294463edbba37e97445bb9ed039bdc43815c9bbd9b9bb92b87393e6e891f5840d337c6c06c7e30d26107d32a59c39ac51436be43dba00d0e2411a9053
diff --git a/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch b/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch
new file mode 100644
index 000000000000..5dd2d9c622f7
--- /dev/null
+++ b/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch
@@ -0,0 +1,118 @@
+From 7e5deed1cb3fafdd6eb035b3713ae2f46b67014a Mon Sep 17 00:00:00 2001
+From: Alexey Khudyakov <alexey.skladnoy@gmail.com>
+Date: Thu, 8 Jun 2023 13:26:11 +0300
+Bug: https://github.com/haskell/math-functions/pull/75
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Subject: [PATCH] Fix test suite
+
+QC as of 2.14.3. became much better at generating test cases and started
+reliably failing Kahan summation
+
+This was fixed by tweaking badvec to be just very bad. Not outrageously
+bad.
+---
+ tests/Tests/Sum.hs | 72 +++++++++++++++++++++++++++-------------------
+ 1 file changed, 43 insertions(+), 29 deletions(-)
+
+diff --git a/tests/Tests/Sum.hs b/tests/Tests/Sum.hs
+index 08eaf1e..1fcb2e9 100644
+--- a/tests/Tests/Sum.hs
++++ b/tests/Tests/Sum.hs
+@@ -4,54 +4,68 @@ module Tests.Sum (tests) where
+
+ import Control.Applicative ((<$>))
+ import Numeric.Sum as Sum
++import Numeric.MathFunctions.Comparison
+ import Prelude hiding (sum)
+ import Test.Tasty (TestTree, testGroup)
+-import Test.Tasty.QuickCheck (testProperty)
++import Test.Tasty.QuickCheck
+ import Test.QuickCheck (Arbitrary(..))
+ import qualified Prelude
+
+-t_sum :: ([Double] -> Double) -> [Double] -> Bool
+-t_sum f xs = f xs == trueSum xs
+-
+-t_sum_error :: ([Double] -> Double) -> [Double] -> Bool
+-t_sum_error f xs = abs (ts - f xs) <= abs (ts - Prelude.sum xs)
+- where ts = trueSum xs
+-
+-t_sum_shifted :: ([Double] -> Double) -> [Double] -> Bool
++-- Test that summation result is same as exact sum. That should pass
++-- if we're effectively working with quad precision
++t_sum :: ([Double] -> Double) -> [Double] -> Property
++t_sum f xs
++ = counterexample ("APPROX = " ++ show approx)
++ $ counterexample ("EXACT = " ++ show exact)
++ $ counterexample ("DELTA = " ++ show (approx - exact))
++ $ counterexample ("ULPS = " ++ show (ulpDistance approx exact))
++ $ approx == exact
++ where
++ approx = f xs
++ exact = trueSum xs
++
++-- Test that summation has smaller error than naive summation or no
++-- worse than given number of ulps. If we're close enough to exact
++-- answer naive may get ahead
++t_sum_error :: ([Double] -> Double) -> [Double] -> Property
++t_sum_error f xs
++ = counterexample ("APPROX = " ++ show approx)
++ $ counterexample ("NAIVE = " ++ show naive)
++ $ counterexample ("EXACT = " ++ show exact)
++ $ counterexample ("A-EXACT = " ++ show (approx - exact))
++ $ counterexample ("N-EXACT = " ++ show (naive - exact))
++ $ counterexample ("ULPS[A] = " ++ show (ulpDistance approx exact))
++ $ counterexample ("ULPS[N] = " ++ show (ulpDistance naive exact))
++ $ abs (exact - approx) <= abs (exact - naive)
++ where
++ naive = Prelude.sum xs
++ approx = f xs
++ exact = trueSum xs
++
++t_sum_shifted :: ([Double] -> Double) -> [Double] -> Property
+ t_sum_shifted f = t_sum_error f . zipWith (+) badvec
+
+ trueSum :: (Fractional b, Real a) => [a] -> b
+ trueSum xs = fromRational . Prelude.sum . map toRational $ xs
+
+ badvec :: [Double]
+-badvec = cycle [1,1e16,-1e16]
++badvec = cycle [1, 1e14, -1e14]
+
+ tests :: TestTree
+-tests = testGroup "Summation" [
+- testGroup "ID" [
+- -- plain summation loses precision quickly
+- -- testProperty "t_sum" $ t_sum (sum id)
+-
+- -- tautological tests:
+- -- testProperty "t_sum_error" $ t_sum_error (sum id)
+- -- testProperty "t_sum_shifted" $ t_sum_shifted (sum id)
+- ]
+- , testGroup "Kahan" [
+- -- tests that cannot pass:
+- -- testProprty "t_sum" $ t_sum (sum kahan)
+- -- testProperty "t_sum_error" $ t_sum_error (sum kahan)
+-
+- -- kahan summation only beats normal summation with large values
++tests = testGroup "Summation"
++ [ testGroup "Kahan" [
++ -- Kahan summation only beats naive summation when truly
++ -- catastrophic cancellation occurs
+ testProperty "t_sum_shifted" $ t_sum_shifted (sum kahan)
+ ]
+ , testGroup "KBN" [
+- testProperty "t_sum" $ t_sum (sum kbn)
+- , testProperty "t_sum_error" $ t_sum_error (sum kbn)
++ testProperty "t_sum" $ t_sum (sum kbn)
++ , testProperty "t_sum_error" $ t_sum_error (sum kbn)
+ , testProperty "t_sum_shifted" $ t_sum_shifted (sum kbn)
+ ]
+ , testGroup "KB2" [
+- testProperty "t_sum" $ t_sum (sum kb2)
+- , testProperty "t_sum_error" $ t_sum_error (sum kb2)
++ testProperty "t_sum" $ t_sum (sum kb2)
++ , testProperty "t_sum_error" $ t_sum_error (sum kb2)
+ , testProperty "t_sum_shifted" $ t_sum_shifted (sum kb2)
+ ]
+ ]
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 29f7cf834f44..26a5949bcd1c 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
#hackport: flags: +system-erf,+system-expm1
@@ -10,12 +10,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Special functions and Chebyshev polynomials"
-HOMEPAGE="https://github.com/bos/math-functions"
+HOMEPAGE="https://github.com/haskell/math-functions"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
diff --git a/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild b/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild
new file mode 100644
index 000000000000..cb3dfe1b5008
--- /dev/null
+++ b/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +system-erf,+system-expm1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of tools for numeric computations"
+HOMEPAGE="https://github.com/bos/math-functions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.4.2-fix-test-suite.patch"
+)
+
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/vector-0.11:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/erf
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/tasty-1.2
+ >=dev-haskell/tasty-hunit-0.10
+ >=dev-haskell/tasty-quickcheck-0.10
+ dev-haskell/vector-th-unbox )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=system-erf \
+ --flag=system-expm1
+}
diff --git a/dev-haskell/math-functions/metadata.xml b/dev-haskell/math-functions/metadata.xml
index ac35e1ca28ab..6e48d98c7be5 100644
--- a/dev-haskell/math-functions/metadata.xml
+++ b/dev-haskell/math-functions/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides implementations of special mathematical
- functions and Chebyshev polynomials. These functions are often
- useful in statistical and numerical computing.
- </longdescription>
<upstream>
+ <remote-id type="hackage">math-functions</remote-id>
<remote-id type="github">bos/math-functions</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/megaparsec-tests/Manifest b/dev-haskell/megaparsec-tests/Manifest
new file mode 100644
index 000000000000..8d398d082cba
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/Manifest
@@ -0,0 +1 @@
+DIST megaparsec-tests-9.2.2.tar.gz 31021 BLAKE2B 872222cfe08fc813445275a747c61e3520b076b3a3f6454f5f95ff91cd85f5ed91b86a2273ee4198f6599d6359369ce410cb6290f66cc7dd9e7c9c3f499fa5c5 SHA512 379098b9d87900540c82e3ae17c2d930ee11644f20535e5eb1730159f59a6dc7f181ee6a022a93893b37ca063a097bea0bdecd1278e7fcc581cb7e95b93c665c
diff --git a/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
new file mode 100644
index 000000000000..b6a1029b9e53
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test utilities and the test suite of Megaparsec"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hspec-2.0:=[profile?] <dev-haskell/hspec-3.0:=[profile?]
+ >=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
+ >=dev-haskell/hspec-megaparsec-2.0:=[profile?] <dev-haskell/hspec-megaparsec-3.0:=[profile?]
+ ~dev-haskell/megaparsec-9.2.2:=[profile?]
+ >=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.4.1.0
+ test? ( >=dev-haskell/case-insensitive-1.2 <dev-haskell/case-insensitive-1.3
+ >=dev-haskell/parser-combinators-1.0 <dev-haskell/parser-combinators-2.0
+ >=dev-haskell/scientific-0.3.1 <dev-haskell/scientific-0.4 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev
+}
diff --git a/dev-haskell/megaparsec-tests/metadata.xml b/dev-haskell/megaparsec-tests/metadata.xml
new file mode 100644
index 000000000000..1422b861c8e2
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">megaparsec-tests</remote-id>
+ <remote-id type="github">mrkkrp/megaparsec</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
index 3b448368b47c..e95eebd3d7bf 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1,2 +1 @@
-DIST megaparsec-9.0.1.cabal 3248 BLAKE2B 66276c46371fee1eb8a4de8f380700eff4110f3e5f235b5d65e09a965fd2127e3e6b4c8d1496a0eef9561600d20e6930f6aa889e3cb7df7ae79b5e65848aa2cc SHA512 2d3933a46a909cf44a53d4e30d8bd6fc126e86acac4d297df1d0bbc3364f0463533ee141bbced82dc635bce6d8b86e856ebb358ad97e8c01d822a2623a4ec437
-DIST megaparsec-9.0.1.tar.gz 59734 BLAKE2B 61408e911178a3bd96feaf9def4cba0d47042fbe949ff47b49abd249839ffe52c0df0d8c0f38644aade491e4af2d7f9cd3763cfb73ce9b12a8f49494877f0847 SHA512 24ae5f291611a06ff69199d642de32d6dc5efc40cf6c6ccddcc59ff9d210a7bbd061ca17f1b5e04c2dded72108f140785f4ccfa64898b41f4ac7e21784c7b074
+DIST megaparsec-9.2.2.tar.gz 61325 BLAKE2B eef0cbcf9c46da28e354bdb6b62845957d449248307dfbac4dc6d9c01d16b36b4ea89b406cfdeb2dee2cf350581f8d4cc55d67ea1596e840fbada29380859f5b SHA512 4cd759a91dcdd50a14ffca1f83afe1a2cb8b99f2afe589739f6fac2ad6ea7cbd7c7e8cb22924a1f8c5d64cbf1602f39b1e4137d9c8a2aeb005d8c970255d9fe4
diff --git a/dev-haskell/megaparsec/megaparsec-9.0.1.ebuild b/dev-haskell/megaparsec/megaparsec-9.0.1.ebuild
deleted file mode 100644
index f1779d9f0549..000000000000
--- a/dev-haskell/megaparsec/megaparsec-9.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="
- https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${P}/revision/1.cabal -> ${PF}.cabal
- "
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
- >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.6.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
-"
-
-src_prepare() {
- default
-
- cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev
-}
diff --git a/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild b/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild
new file mode 100644
index 000000000000..fe52dfb49006
--- /dev/null
+++ b/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
+ >=dev-haskell/scientific-0.3.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.4.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev
+}
diff --git a/dev-haskell/megaparsec/metadata.xml b/dev-haskell/megaparsec/metadata.xml
index 937381521944..f054ea68814e 100644
--- a/dev-haskell/megaparsec/metadata.xml
+++ b/dev-haskell/megaparsec/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">megaparsec</remote-id>
+ <remote-id type="github">mrkkrp/megaparsec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
index 10a0607c5c1f..486c42174d9d 100644
--- a/dev-haskell/memory/Manifest
+++ b/dev-haskell/memory/Manifest
@@ -1 +1,3 @@
DIST memory-0.15.0.tar.gz 42299 BLAKE2B fd4cebe132ebc824e88907325d6106ab62d01942f5055481f0ff85248ba1a84211e768e49409b02f45ff224a4149338abb771b1dcad38c31175c340e35063fad SHA512 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
+DIST memory-0.18.0.tar.gz 41957 BLAKE2B 606c197b7ef5ff8189c0ce35b838a9866b9c7996452f77aab5d7632ac5b6c97d44a8a75c3d7e7f707be5fce70de91ec4db727c0732b2a6225d58ce1a8f8dd810 SHA512 5f341dfab54d3f063ac34cc092240082f885f7ee5a23b3b3ed8b58a741ae238df289ccc7e40bbf52f2ce19c4f7bee186e7d9ed6e207e59de6758a7eea5a9fe85
+DIST memory-81.patch 4543 BLAKE2B 451af2f23cd975403604f40129c5112f1f1e2856ec90c34058cfc6c97b5f84069b6379dd49d9167ad6e25365035470a0c20d76d4d441f26c6ac283b7999cfa44 SHA512 663672478660b0c693ebf41cbbb1ea123857b4f9c10560c4b0faeafea2cab49291daa99eac623a2c0b8541bcff3285a8837f407a61bf3e83084170c63d111a4e
diff --git a/dev-haskell/memory/memory-0.15.0-r1.ebuild b/dev-haskell/memory/memory-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..2029df86440b
--- /dev/null
+++ b/dev-haskell/memory/memory-0.15.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="memory and related abstraction stuff"
+HOMEPAGE="https://github.com/vincenthz/hs-memory"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://patch-diff.githubusercontent.com/raw/vincenthz/hs-memory/pull/81.patch -> ${PN}-81.patch"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
+ >=dev-lang/ghc-8.0.1:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( dev-haskell/foundation )
+"
+
+PATCHES=( "${DISTDIR}/${PN}-81.patch" )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=support_basement \
+ --flag=support_bytestring \
+ --flag=support_deepseq \
+ --flag=support_foundation
+}
diff --git a/dev-haskell/memory/memory-0.15.0.ebuild b/dev-haskell/memory/memory-0.15.0.ebuild
deleted file mode 100644
index b7a87029607e..000000000000
--- a/dev-haskell/memory/memory-0.15.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/foundation )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=support_basement \
- --flag=support_bytestring \
- --flag=support_deepseq \
- --flag=support_foundation
-}
diff --git a/dev-haskell/memory/memory-0.18.0.ebuild b/dev-haskell/memory/memory-0.18.0.ebuild
new file mode 100644
index 000000000000..7953c9442466
--- /dev/null
+++ b/dev-haskell/memory/memory-0.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="memory and related abstraction stuff"
+HOMEPAGE="https://github.com/vincenthz/hs-memory"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/basement-0.0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ dev-haskell/foundation
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=support_basement \
+ --flag=support_bytestring \
+ --flag=support_deepseq \
+ --flag=support_foundation
+}
diff --git a/dev-haskell/memory/metadata.xml b/dev-haskell/memory/metadata.xml
index 7b97d9f06cdb..809c410867c2 100644
--- a/dev-haskell/memory/metadata.xml
+++ b/dev-haskell/memory/metadata.xml
@@ -5,18 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Chunk of memory, polymorphic byte array management and manipulation
-
- * A polymorphic byte array abstraction and function similar to strict ByteString.
-
- * Different type of byte array abstraction.
-
- * Raw memory IO operations (memory set, memory copy, ..)
-
- * Aliasing with endianness support.
- </longdescription>
<upstream>
+ <remote-id type="hackage">memory</remote-id>
<remote-id type="github">vincenthz/hs-memory</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
deleted file mode 100644
index dee0f769b649..000000000000
--- a/dev-haskell/memotrie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MemoTrie-0.6.10.tar.gz 8403 BLAKE2B 4d8d3bbefef13d56c16fdd4e3584a811e6cfdca6de27df7d8eee7bd684050275c0e7299073e7ad3edd231db0dec91f3e42725295f21a096796f2a8445d10822a SHA512 73be7e356ad2aeef49abf43975d2e24ee8b883e12453f316366b52998637ac26d98feef34388c2a46f683027dc7132444b17a25a12d3e86748088fadf081b186
diff --git a/dev-haskell/memotrie/memotrie-0.6.10.ebuild b/dev-haskell/memotrie/memotrie-0.6.10.ebuild
deleted file mode 100644
index f8320abeea47..000000000000
--- a/dev-haskell/memotrie/memotrie-0.6.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MemoTrie"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trie-based memo functions"
-HOMEPAGE="https://github.com/conal/MemoTrie"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/newtype-generics-0.5.3:=[profile?]
- dev-haskell/void:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples examples)
-}
diff --git a/dev-haskell/memotrie/metadata.xml b/dev-haskell/memotrie/metadata.xml
deleted file mode 100644
index e265fbb8de9f..000000000000
--- a/dev-haskell/memotrie/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- MemoTrie provides a basis for memoized functions over some domains,
- using tries. It's based on some code I got from Spencer Janssen.
-
- Project wiki page: &lt;http://haskell.org/haskellwiki/MemoTrie&gt;
-
- &amp;#169; 2008,2009,2010 by Conal Elliott; BSD3 license.
- </longdescription>
- <upstream>
- <remote-id type="github">conal/MemoTrie</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mersenne-random-pure64/Manifest b/dev-haskell/mersenne-random-pure64/Manifest
deleted file mode 100644
index 0280e265d311..000000000000
--- a/dev-haskell/mersenne-random-pure64/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mersenne-random-pure64-0.2.2.0.tar.gz 7190 BLAKE2B aaaa92b939f96bc5654694ff63e88c15a3de5b3e6c93607cbebcd0503680787220c84dc40980e85f0bcc2504e70489971f706ba4eaeb3ff86879c0e0e9f65bad SHA512 4329491b2f86dc256f24111ac7ae6ee527113e4fc32ecb3fb81563ca175296cf6fb3844147740845a9d7e6d09f48e2be338bd8e56468075b36c1f00d7c47e331
diff --git a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild b/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
deleted file mode 100644
index 50120bc97bb5..000000000000
--- a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate high quality pseudorandom numbers purely using a Mersenne Twister"
-HOMEPAGE="http://code.haskell.org/~dons/code/mersenne-random-pure64/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/random:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/mersenne-random-pure64/metadata.xml b/dev-haskell/mersenne-random-pure64/metadata.xml
deleted file mode 100644
index 55b6c2517118..000000000000
--- a/dev-haskell/mersenne-random-pure64/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The Mersenne twister is a pseudorandom number generator developed by
- Makoto Matsumoto and Takuji Nishimura that is based on a matrix linear
- recurrence over a finite binary field. It provides for fast generation
- of very high quality pseudorandom numbers. The source for the C code
- can be found here:
-
- &lt;http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt64.html&gt;
-
- This library provides a purely functional binding to the 64 bit
- classic mersenne twister, along with instances of RandomGen, so the
- generator can be used with System.Random. The generator should
- typically be a few times faster than the default StdGen (but a tad
- slower than the impure 'mersenne-random' library based on SIMD
- instructions and destructive state updates.
-
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/microaeson/Manifest b/dev-haskell/microaeson/Manifest
new file mode 100644
index 000000000000..3f627cf820ee
--- /dev/null
+++ b/dev-haskell/microaeson/Manifest
@@ -0,0 +1,2 @@
+DIST microaeson-0.1.0.1-rev2.cabal 4032 BLAKE2B 01dc7e93b8d00024108627326eb01ee9df89326827ce3f42911b2cd02faeb4bf2c184107485e9a4a1724a18950b4933f99601070c78b759fad270b32ac67f6b4 SHA512 b6fb42c04a69f2c478063105d43978d2a150a77b51ce9d57526d9fba730abf5f1c87812bcc962251b466fe03134636f39371e44cd3e57c680e5f15cda9487b6d
+DIST microaeson-0.1.0.1.tar.gz 20630 BLAKE2B 3c2de86b976b4532464623e6452bf9675bc187b8bacde5ebae5915a6640680a4593e40e3d71a9405f09a05d9723c459763a084022cb84b4721e0425c1e9eccfb SHA512 4e8aecd9128bca4e8cddfa5a421d886d630adb03cffe08141223993184f441f87c9e0e5105c9e5e0d0dfde47dc6531b1855d1e0411a403315520e46c282e6cff
diff --git a/dev-haskell/microaeson/metadata.xml b/dev-haskell/microaeson/metadata.xml
new file mode 100644
index 000000000000..3190cd92d667
--- /dev/null
+++ b/dev-haskell/microaeson/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">microaeson</remote-id>
+ <remote-id type="github">haskell-hvr/microaeson</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild b/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild
new file mode 100644
index 000000000000..c9b435941ddd
--- /dev/null
+++ b/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny JSON library with light dependency footprint"
+HOMEPAGE="https://hackage.haskell.org/package/microaeson"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/alex-3.2.0 <dev-haskell/alex-3.3
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/aeson-1.3.1.0 <dev-haskell/aeson-2.2
+ >=dev-haskell/quickcheck-2.11.3 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
+ >=dev-haskell/tasty-1.0.1.1 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+ >=dev-haskell/vector-0.12.0.1 <dev-haskell/vector-0.14
+ )
+"
diff --git a/dev-haskell/microlens-aeson/Manifest b/dev-haskell/microlens-aeson/Manifest
index d7a51c7818d0..caa2cfef11ab 100644
--- a/dev-haskell/microlens-aeson/Manifest
+++ b/dev-haskell/microlens-aeson/Manifest
@@ -1 +1 @@
-DIST microlens-aeson-2.3.0.4.tar.gz 439564 BLAKE2B f8077c78ffb86f8f87afc165651e79c1f2b4737d954c5a720a1e9da0133245e5e8082969af177c4302469c339eeff9a659e334efbf8e5c8320d4683661b2c0b9 SHA512 34986eda7737947357999992f617bfd00079048f9fb75dd60f533e58a9671906d9bd0e4fcee1f4a3df309d98ddcb25144fb59f1a779675b119669c27739c3f6a
+DIST microlens-aeson-2.5.0.tar.gz 439908 BLAKE2B 70f9ca0e7d06988cbe8ef63a26333430a00917a36f3df7deabb5a5913a2a728ae82327fd5023d98b4582f57a8e40c1dc0b689012ce12b7d71f605f6b392c05df SHA512 b8f99796045bc5f014b1535380c680a43b2e5dd4e5543cf3b4a9683c40780a54bf4b7904a4f9cc8a6ef2c5b4caa8f74b7d116ef06011201c28b63ceac22790e4
diff --git a/dev-haskell/microlens-aeson/metadata.xml b/dev-haskell/microlens-aeson/metadata.xml
index 937381521944..68f03216cbf2 100644
--- a/dev-haskell/microlens-aeson/metadata.xml
+++ b/dev-haskell/microlens-aeson/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">fosskers/microlens-aeson</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
deleted file mode 100644
index 813122c70617..000000000000
--- a/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Law-abiding lenses for Aeson, using microlens"
-HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?]
- >=dev-haskell/microlens-0.3:=[profile?]
- >=dev-haskell/scientific-0.3.2:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/tasty-0.10.1.2
- >=dev-haskell/tasty-hunit-0.9.2 )
-"
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
new file mode 100644
index 000000000000..5f467c42bbf8
--- /dev/null
+++ b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Law-abiding lenses for Aeson, using microlens"
+HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ dev-haskell/hashable:=[profile?]
+ >=dev-haskell/microlens-0.3:=[profile?]
+ >=dev-haskell/scientific-0.3.2:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-0.10.1.2
+ >=dev-haskell/tasty-hunit-0.9.2 )
+"
diff --git a/dev-haskell/microlens-mtl/Manifest b/dev-haskell/microlens-mtl/Manifest
index 8728384c620c..9b24b9c7cd19 100644
--- a/dev-haskell/microlens-mtl/Manifest
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -1 +1,2 @@
DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
+DIST microlens-mtl-0.2.0.2.tar.gz 9056 BLAKE2B 3de3ee55d885b1cea8e31512d6ee3ae107bc8c3c06a948baca5d493e73f5db36d32a5d03ba500d52fff6b22652763873a5edf33f39d3590f9105b4386e154775 SHA512 562680ae4cae7879f592af511f48f76573e5d483645a9d7f1096a185d1cc919b0221eb01d65eea1ba219a394592ac4a6c2ec32a93a785d782834ccd238943286
diff --git a/dev-haskell/microlens-mtl/metadata.xml b/dev-haskell/microlens-mtl/metadata.xml
index 6d12e603d811..07612aa0c41e 100644
--- a/dev-haskell/microlens-mtl/metadata.xml
+++ b/dev-haskell/microlens-mtl/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package contains functions (like 'view' or '+=') which work on 'MonadReader', 'MonadWriter', and 'MonadState' from the mtl package.
-
- This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">microlens-mtl</remote-id>
+ <remote-id type="github">monadfix/microlens</remote-id>
+ </upstream>
</pkgmetadata>
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 5e3dbeb42b78..9276e56e3292 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-mtl/microlens-mtl-0.2.0.2.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild
new file mode 100644
index 000000000000..4557a480661d
--- /dev/null
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="microlens support for Reader/Writer/State from mtl"
+HOMEPAGE="https://github.com/monadfix/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+ >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/microlens-th/Manifest b/dev-haskell/microlens-th/Manifest
index c9d05599b46a..c18886914637 100644
--- a/dev-haskell/microlens-th/Manifest
+++ b/dev-haskell/microlens-th/Manifest
@@ -1 +1,2 @@
-DIST microlens-th-0.4.3.4.tar.gz 21662 BLAKE2B 0c228791dae5b4ab10bd47d574b2dfc1a9bd046ee7941ba15be02d5c60f78f495c719ab64cd74434734c7a7ee1ca67eb083621319325bb3fbd518a1a36c1aa90 SHA512 456d0cfe6f93a4adb8c5d0004983bcc7906f8750787eecd2ccbb9063d3e63da824c1bec29f81b37485aeebc356baa478bc26cc439e45ec03642f2d61217cbb7f
+DIST microlens-th-0.4.3.10.tar.gz 24189 BLAKE2B f763ecbe003339bd7102180a97f264c96dcf1e9097663a619e8044c3a03cf3d381189dfa94c1a0f6b326b7882e7017d5e07c12eb88a898592d806a0810dffadb SHA512 8c2c4984eb76ddfbde96b0a429a87fa2643c891fc680e6843abadb2691c2898eb7e89e21e6a82a6631e2115204db443346fe3459764d865b23854dbcd940e5bd
+DIST microlens-th-0.4.3.12.tar.gz 24150 BLAKE2B 6ac749eb4933cbadffcac985a89aa922e1a0f48ab3071c5edf2f46390be0a1711bd63abdb3fe14311e3ce5343df9f9a9bd92097a044e02e31b7586086c3898a5 SHA512 452d9a53c4b1111c45e87260ab31e6fbe06f06185975486c07d28369ed7312b87b96b2b59865f86fcb545ebf782834783bc80e3d49a71a63ea464fe35818f7eb
diff --git a/dev-haskell/microlens-th/metadata.xml b/dev-haskell/microlens-th/metadata.xml
index acf2cb2f607f..20223e7fb486 100644
--- a/dev-haskell/microlens-th/metadata.xml
+++ b/dev-haskell/microlens-th/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package lets you automatically generate lenses for data types; code was extracted from the lens package, and therefore generated lenses are fully compatible with ones generated by lens (and can be used both from lens and microlens).
-
- This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">microlens-th</remote-id>
+ <remote-id type="github">stevenfontanella/microlens</remote-id>
+ </upstream>
</pkgmetadata>
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
new file mode 100644
index 000000000000..990d772f9edd
--- /dev/null
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic generation of record lenses for microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tagged )
+"
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild
new file mode 100644
index 000000000000..a24bdd59eb21
--- /dev/null
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic generation of record lenses for microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tagged )
+"
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
deleted file mode 100644
index 8469da80b613..000000000000
--- a/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic generation of record lenses for microlens"
-HOMEPAGE="https://github.com/monadfix/microlens"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
- >=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell >=2.7 && <2.16' 'template-haskell >=2.7'
-}
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
index 1c5bbbb51960..0d3a0465900a 100644
--- a/dev-haskell/microlens/Manifest
+++ b/dev-haskell/microlens/Manifest
@@ -1 +1,2 @@
DIST microlens-0.4.11.2.tar.gz 26549 BLAKE2B 7b4eb026ed937f5b710fbdaca6154c9f4e37a494d4b01b7ff141a8446b80c1c9eb707076f743d9916adb33de4d30e003c66e235c4ec95ef59c43293713389d2d SHA512 16a70dc5b524dc5165faa6502bb74c7eb48a6eaa3ec9bd4bb16c6cbd6eccf5ab365e2e0e2e10e9e60b65e604de78dd62789b53a7c7d2ccd0da93bce5b09fadc8
+DIST microlens-0.4.13.0.tar.gz 27372 BLAKE2B 1763936e44f4931eb3117e8de23d818e26091f98cdf770f2148220cc85b33a75cc8d78191e0e2998a407c4d613cff33086b516b1070ea6e68e97ac562228cd1a SHA512 dacbab28ac54bab596a353e4707f2f83b4d4e4fa7e40dd14f3acaf4276f1e552a74decd7b1275966fa4dac2a3099dbb55f84b9306116a5e0242aaf5749dad36b
diff --git a/dev-haskell/microlens/metadata.xml b/dev-haskell/microlens/metadata.xml
index 937381521944..058feaa71d9a 100644
--- a/dev-haskell/microlens/metadata.xml
+++ b/dev-haskell/microlens/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">microlens</remote-id>
+ <remote-id type="github">monadfix/microlens</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/microlens/microlens-0.4.11.2.ebuild b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
index c01efa466b75..462bf702c48d 100644
--- a/dev-haskell/microlens/microlens-0.4.11.2.ebuild
+++ b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="A tiny lens library with no dependencies"
-HOMEPAGE="https://github.com/monadfix/microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/microlens/microlens-0.4.13.0.ebuild b/dev-haskell/microlens/microlens-0.4.13.0.ebuild
new file mode 100644
index 000000000000..348155fc573c
--- /dev/null
+++ b/dev-haskell/microlens/microlens-0.4.13.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny lens library with no dependencies"
+HOMEPAGE="https://github.com/monadfix/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/microstache/Manifest b/dev-haskell/microstache/Manifest
index 11bf947486f0..55c362496844 100644
--- a/dev-haskell/microstache/Manifest
+++ b/dev-haskell/microstache/Manifest
@@ -1 +1,4 @@
-DIST microstache-1.0.1.1.tar.gz 20449 BLAKE2B b4f0a6b13e5597ba2c90377032a8b248570977a35bb07d7f8b360add87eff6ea80ee8cbd40cee8e110ff913833b798234d0189e65e4c4964367b3643c15e6837 SHA512 28e0ad58a9724259df176092c125a4ba51fd2278cb0ab2e29bc24bf1e0f1c57a53e5983ff640569e3416fc7cda31b6ba0ae8ad832840a3040ba55fb85fb7f1a1
+DIST microstache-1.0.2-rev3.cabal 2873 BLAKE2B 8d389ffbb9216b19f0d91fa690230e9bb2a79a74f4742394a8d7fe8ec2e0344c7485ebcd40b516dcdce25dd275ff16eae67bdc22bba0c60da54f7ff1199623ba SHA512 2c952588bbd355f313ae63eba4bb0cea38f36da8e0a7f29be6a841836e32cf05ef86d1bbc2b21bc871b218778ca521484ca146cf0f83e9053e0b00d821258e10
+DIST microstache-1.0.2.3-rev2.cabal 3247 BLAKE2B 78c1fd439c104821dd753945f2a6069ca4908cc41ee0bd9d1b0c6b02335bfdccbecbaf9a73f2dece5eb1ea45a5f16911274b491675c0e0758c1b2bf94f0916b8 SHA512 7349239c7b3156d37379caa13e8fba38ab06a97b7959570554eee098f82e5a583e74f432b5ce2589e2f15e8a76c86cd45b0e1e2f356e1c199ddfbffa4990bfab
+DIST microstache-1.0.2.3.tar.gz 22421 BLAKE2B 9d243f5545d95cf48c3acaebbf05f978b69c78e73b0dfd80c94dc5f118033b7917e47b3a9850fdba36d4b46eafed729971c0a4647a109b93996c2990de3bcd34 SHA512 c50fa66a019116ca81e63de59951df29316c39c50d3672197353987ac431f63cc97ee26adb1f8f31ffdad7409f58e2a369502da0e0484af0b0632b6ac8deac4d
+DIST microstache-1.0.2.tar.gz 21333 BLAKE2B 05f726b88c96e47157e76705bf6961bf27f81cdee8f3c7860e9f24f368e450862d854a6a47492da179ed6830006059100470e029183f11164e1042766111cb6d SHA512 bbf1de864c88809cfd159a679ec1709c7fb523e2b3ac91232e2cabb9a4bf2eda0913666b3a6ab81b6ba9c2488ce1200cb6b43e21a7f475d2dc20f9854c47a61e
diff --git a/dev-haskell/microstache/metadata.xml b/dev-haskell/microstache/metadata.xml
index a9b24934427e..02d7514695e0 100644
--- a/dev-haskell/microstache/metadata.xml
+++ b/dev-haskell/microstache/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Mustache templates for Haskell.
-
- Based on @stache@ library, which uses @megaparsec@.
- This library uses @parsec@, thus the name: @microstache@.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">microstache</remote-id>
+ <remote-id type="github">haskellari/microstache</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/microstache/microstache-1.0.1.1.ebuild b/dev-haskell/microstache/microstache-1.0.1.1.ebuild
deleted file mode 100644
index 29864b976b06..000000000000
--- a/dev-haskell/microstache/microstache-1.0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Mustache templates for Haskell"
-HOMEPAGE="https://github.com/phadej/microstache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
- >=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'aeson >=0.11 && < 1.3' 'aeson >=0.11' \
- 'containers >=0.4.2.1 && < 0.6' 'containers >=0.4.2.1'
-}
diff --git a/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild b/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild
new file mode 100644
index 000000000000..10399293c94f
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/aeson
+ >=dev-haskell/base-orphans-0.8.7 <dev-haskell/base-orphans-0.10
+ >=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10.0.3 <dev-haskell/tasty-hunit-0.11
+ dev-haskell/text )
+"
diff --git a/dev-haskell/microstache/microstache-1.0.2.ebuild b/dev-haskell/microstache/microstache-1.0.2.ebuild
new file mode 100644
index 000000000000..9e5d938cee2c
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/aeson
+ >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/mime-mail/Manifest b/dev-haskell/mime-mail/Manifest
deleted file mode 100644
index 37066b8cec9c..000000000000
--- a/dev-haskell/mime-mail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mime-mail-0.5.0.tar.gz 10504 BLAKE2B ba5e1908f64b5056927b5f2a9fa66c41e7d3b6a2b150e741c178cc655a715f604c9cef48285b6c6e186754587d02d6923715d89582fe48a4e0566fc0a0cdc7cc SHA512 b4f18be040d447436c8d180f596f565a0e9ae6f7f771512047b851b32e42dd1410522de755e0b3d5ee6c6db15c076dce0bd9312b43ca71f531c43249b4a6d020
diff --git a/dev-haskell/mime-mail/metadata.xml b/dev-haskell/mime-mail/metadata.xml
deleted file mode 100644
index 97dbd48a5faa..000000000000
--- a/dev-haskell/mime-mail/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides some high-level datatypes for declaring MIME email messages, functions for automatically composing these into bytestrings, and the ability to send bytestrings via the sendmail executable. You can also use any other library you wish to send via different methods, eg directly to SMTP.
- </longdescription>
- <upstream>
- <remote-id type="github">snoyberg/mime-mail</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime-mail/mime-mail-0.5.0.ebuild b/dev-haskell/mime-mail/mime-mail-0.5.0.ebuild
deleted file mode 100644
index e4b58b61fd46..000000000000
--- a/dev-haskell/mime-mail/mime-mail-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compose MIME email messages"
-HOMEPAGE="https://github.com/snoyberg/mime-mail"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/random-1.0:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/mime-types/Manifest b/dev-haskell/mime-types/Manifest
index 00a6c8f89eb9..ac1285ccc1a2 100644
--- a/dev-haskell/mime-types/Manifest
+++ b/dev-haskell/mime-types/Manifest
@@ -1 +1,2 @@
DIST mime-types-0.1.0.9.tar.gz 11384 BLAKE2B 610604f93b5225589478f87b710c32793c07685b4b009cea146399bf68655188f2771d36b82baee6b09ba331441687b270373c22bdc080a803d2bf133fe293a0 SHA512 cffc9d4d808d52b35bf6b5bdd6c069411ec8746bb3951e7c1a6200eecb2ae0617ede9891aa3e077e9ea5fc6f08bc2a1c44547971ed2a66108c96fd9dda30e6db
+DIST mime-types-0.1.1.0.tar.gz 11818 BLAKE2B 9bdc26c7b7eca4aaa936d0dfb885dc6ebe278913035b2da04a56696e440d3e10cf6fdc57987231618a45a56a97a6ab77aed97d4125d45e86a4c69b47d57a94d1 SHA512 48fdb8a4284bf89e76a6875399f7faa082f1a3f0d275a23c1761f8265c33081731bebff8549d248bc31dbf789b0f3a96bdd8ca5fb07efb79085ddd156f635f32
diff --git a/dev-haskell/mime-types/metadata.xml b/dev-haskell/mime-types/metadata.xml
index 6b5972c48ca4..26445a0f3c5a 100644
--- a/dev-haskell/mime-types/metadata.xml
+++ b/dev-haskell/mime-types/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">mime-types</remote-id>
<remote-id type="github">yesodweb/wai</remote-id>
</upstream>
</pkgmetadata>
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 7348ee13f728..f4227fb0dcf2 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild b/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild
new file mode 100644
index 000000000000..05ab823764ba
--- /dev/null
+++ b/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic mime-type handling types and functions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/mime/Manifest b/dev-haskell/mime/Manifest
deleted file mode 100644
index 0d6934f44d03..000000000000
--- a/dev-haskell/mime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mime-0.4.0.2.tar.gz 9438 BLAKE2B 0aef0b6cb44aac122943654e05238616cd13d0b6431911e55df13634623922ed2bb8616ce09ca18d700ab4cd460f8dbde248b7cbb4f723609f4e50a02ade0af4 SHA512 03fad3792a6935ea5ea75cc9756760277ad005db106cf6aa4f951a23e32d170bcb09dea399d2ace5b4f44afc2c73ec1b377f86b8f70616320490cd690ae4ea15
diff --git a/dev-haskell/mime/metadata.xml b/dev-haskell/mime/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/mime/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/mime/mime-0.4.0.2.ebuild b/dev-haskell/mime/mime-0.4.0.2.ebuild
deleted file mode 100644
index af28b2c997b5..000000000000
--- a/dev-haskell/mime/mime-0.4.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Working with MIME types"
-HOMEPAGE="https://github.com/GaloisInc/mime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/minisat/Manifest b/dev-haskell/minisat/Manifest
deleted file mode 100644
index 7e5cc8c0a53f..000000000000
--- a/dev-haskell/minisat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST minisat-0.1.2.tar.gz 45469 BLAKE2B 69a422874c40ec05f97af75ab63d263faafaa4623aa1fe9a40059d2285742ee11ee2fa14aca7ffb8b8503838f0612abea7e8c4b26826dd230abb422fe6c96731 SHA512 557f5f8412adb84784a1edab4981bf5029dea5b0ac731eca2e464f3573ba537c6696613bf494f08cfb7f1b53468f563f758138b60c00edaf046d7ce74f023a85
diff --git a/dev-haskell/minisat/metadata.xml b/dev-haskell/minisat/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/minisat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/minisat/minisat-0.1.2.ebuild b/dev-haskell/minisat/minisat-0.1.2.ebuild
deleted file mode 100644
index 944b45fde360..000000000000
--- a/dev-haskell/minisat/minisat-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell bundle of the Minisat SAT solver"
-HOMEPAGE="https://hackage.haskell.org/package/minisat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mintty/Manifest b/dev-haskell/mintty/Manifest
deleted file mode 100644
index f7b33075eeee..000000000000
--- a/dev-haskell/mintty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mintty-0.1.2.tar.gz 6945 BLAKE2B 6fe05a5d130c807b8dca29e5c207bff3ce73778ed4ca9e27f2a54c1b28410a7043b8d7f8ad4de7b8c93e555f8577e9644a1d7e86cae0fdba94098d34e3fadfce SHA512 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667
diff --git a/dev-haskell/mintty/metadata.xml b/dev-haskell/mintty/metadata.xml
deleted file mode 100644
index 873c60c48741..000000000000
--- a/dev-haskell/mintty/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- MinTTY is a Windows-specific terminal emulator for the
- widely used Cygwin and MSYS projects, which provide
- Unix-like environments for Windows. MinTTY consoles behave
- differently from native Windows consoles (such as
- @cmd.exe@ or PowerShell) in many ways, and in some cases,
- these differences make it necessary to treat MinTTY
- consoles differently in code.
-
- The @mintty@ library provides a simple way to detect if
- your code in running in a MinTTY console on Windows. It
- exports @isMinTTY@, which does the right thing 90% of the
- time (by checking if standard error is attached to
- MinTTY), and it also exports @isMinTTYHandle@ for the
- other 10% of the time (when you want to check is some
- arbitrary handle is attached to MinTTY). As you might
- expect, both of these functions will simply return @False@
- on any non-Windows operating system.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mintty/mintty-0.1.2.ebuild b/dev-haskell/mintty/mintty-0.1.2.ebuild
deleted file mode 100644
index 880586208f2b..000000000000
--- a/dev-haskell/mintty/mintty-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A reliable way to detect the presence of a MinTTY console on Windows"
-HOMEPAGE="https://github.com/RyanGlScott/mintty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index c6063886177b..cc5d48701e4b 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1 +1,3 @@
-DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
+DIST missingh-1.4.3.0-rev2.cabal 4702 BLAKE2B bfdab0fa3c9b7ca3fffe3cfa0b8407b6846253a6088e229b444a28c965054a1107f2553ebc4b5907a350a53280a675eb503a43fee6a5ebba4617c7469f28b04c SHA512 62b58dcef890121fa58b89741ea1704cdde6195f67ded1d8e4d891b2d39a2287fe71c37bfca15b7c23debb98b5b7e6405dc0afc4cf63c8a025189832186de0aa
+DIST missingh-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
+DIST missingh-1.6.0.0.tar.gz 109652 BLAKE2B ff7faa78c0d48108da83ead5bfa8a137270b3c1c520dfca683923d05b1c14ba581b49e6e713535ea6a596684d5ef55ed54ae8cbd9a8605ce3fd4b2dccda5dafe SHA512 f49cf93bf172e5ed41a05af4d12d05d6b2dcde61a94b42f2f8be2931458ed622af45051c02a30f71d8ce359548b13d1a7afcd7b458b4a68e78896014a33923a0
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index 2139218ddd52..6b12c539c764 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="network-3">Use network-3</flag>
- </use>
- <upstream>
- <remote-id type="github">jgoerzen/missingh</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">MissingH</remote-id>
+ <remote-id type="github">hvr/missingh</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
new file mode 100644
index 000000000000..3902a1b62e92
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network--ge-3_0_0
+
+CABAL_HACKAGE_REVISION=2
+CABAL_PN="MissingH"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="https://hackage.haskell.org/package/MissingH"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RESTRICT=test # tests are present for removed modules
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+ >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+ >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ dev-haskell/random
+ >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+ >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+ test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
+ >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=network--ge-3_0_0
+}
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
deleted file mode 100644
index 102bc03f9c1d..000000000000
--- a/dev-haskell/missingh/missingh-1.4.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: network--ge-3-0-0:network-3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="https://hackage.haskell.org/package/MissingH"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
-
-RESTRICT=test # tests are present for removed modules
-
-RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
- >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
- !network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
- >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-3 network--ge-3_0_0)
-}
diff --git a/dev-haskell/missingh/missingh-1.6.0.0.ebuild b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
new file mode 100644
index 000000000000..ccd03c06605a
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: +network--ge-3_0_0
+
+CABAL_PN="MissingH"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="https://hackage.haskell.org/package/MissingH"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+ >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+ >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+ >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+ || ( dev-lang/ghc ( >=dev-haskell/process-1.1.0.1[profile?] <dev-haskell/process-1.7[profile?] ) )
+ >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=network--ge-3_0_0
+}
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index d8e4e14525ab..16646a499746 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.3.3.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/mmorph/Manifest
index e05383d54624..38b246e4fd92 100644
--- a/dev-haskell/mmorph/Manifest
+++ b/dev-haskell/mmorph/Manifest
@@ -1 +1,3 @@
DIST mmorph-1.1.3.tar.gz 6975 BLAKE2B 93316f34fe13ffbf50934394bf7b4831f787e1c79eda625f1ebb5fad92ec143e5744ad0725eec80184c737c8978bf153dad63cdddf153cb69a306ef62dd040cb SHA512 3ef260682b5de48d765f9524abcd6853b5c4bfe94e2ca116ee4077aa0d7e5853f87e8ce1742f59b8753d2c0c3605251188346be7b394fa51d6ff2c5983edc3ec
+DIST mmorph-1.2.0-rev3.cabal 1083 BLAKE2B 82896ec005a74ce05475019f1f72448abef6aeabf96bce5d2b837ce0664ed1225c287f23be9cf7ac145faa7bdd952e866f76a6df29d594bd7aaaccd14cae33e0 SHA512 1f3d778b5d66bde30e37ec18e5507a9bc7a9f6b24bc0c737742cc103744013a97b028c2b026eeccd34bc7f8c2bfa80b2046bf5e2832a2f0e7e73195f463b1f5d
+DIST mmorph-1.2.0.tar.gz 6861 BLAKE2B f79c2fa9ef374ca93755e2ee5b7b3792140266e363b27cb07f95f46f8df0e8e73855b3cbcd4778dc0655c4542642a60dd442dd5e35c8b8750ab19bf6e3ee85bf SHA512 06c9e2b2d7caa65c6049225ba40a54cf9480e561a6ea521b4c83e38094beea0c2ed595244f434793c6964c6161ac3122da5a8b53fe772d527fbefb15e4cc2c14
diff --git a/dev-haskell/mmorph/metadata.xml b/dev-haskell/mmorph/metadata.xml
index c5228db514c4..908cae683347 100644
--- a/dev-haskell/mmorph/metadata.xml
+++ b/dev-haskell/mmorph/metadata.xml
@@ -5,8 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides monad morphism utilities, most commonly used
- for manipulating monad transformer stacks.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">mmorph</remote-id>
+ <remote-id type="github">Gabriella439/Haskell-MMorph-Library</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/mmorph/mmorph-1.1.3.ebuild b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
index 475ebd088407..1055678865db 100644
--- a/dev-haskell/mmorph/mmorph-1.1.3.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/mmorph/mmorph-1.2.0.ebuild b/dev-haskell/mmorph/mmorph-1.2.0.ebuild
new file mode 100644
index 000000000000..d6a1729ee0f2
--- /dev/null
+++ b/dev-haskell/mmorph/mmorph-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad morphisms"
+HOMEPAGE="https://hackage.haskell.org/package/mmorph"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/mockery/mockery-0.3.5.ebuild b/dev-haskell/mockery/mockery-0.3.5.ebuild
index 36136411227a..2b4c0f1ba340 100644
--- a/dev-haskell/mockery/mockery-0.3.5.ebuild
+++ b/dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/mod/Manifest b/dev-haskell/mod/Manifest
deleted file mode 100644
index ac6e7f3277cd..000000000000
--- a/dev-haskell/mod/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod-0.1.1.0.tar.gz 9471 BLAKE2B 5f664e1d35abf143223bc25ab5eec054a5a2403ae43bec41fde0b4c386a68a2ede336c539cae6588c267d2104fa182896212d9ac88493919f4b4e66cecfe91b4 SHA512 08656e15e417f11a6e7980510e091d2a59d4786ae269795aba04d5952b08556cd1ee3b9c38b456bf86e08f505a797e82a68ee36eec27cd155692f14cedc2acb0
diff --git a/dev-haskell/mod/metadata.xml b/dev-haskell/mod/metadata.xml
deleted file mode 100644
index e08e9c53af92..000000000000
--- a/dev-haskell/mod/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="semirings">Derive semiring instances</flag>
- </use>
- <longdescription>
- &lt;https://en.wikipedia.org/wiki/Modular_arithmetic Modular arithmetic&gt;,
- promoting moduli to the type level, with an emphasis on performance.
- Originally part of &lt;https://hackage.haskell.org/package/arithmoi arithmoi&gt; package.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mod/mod-0.1.1.0.ebuild b/dev-haskell/mod/mod-0.1.1.0.ebuild
deleted file mode 100644
index cf308500308e..000000000000
--- a/dev-haskell/mod/mod-0.1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast type-safe modular arithmetic"
-HOMEPAGE="https://github.com/Bodigrim/mod"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semirings"
-
-RDEPEND=">=dev-lang/ghc-8.2.1:=
- semirings? ( >=dev-haskell/semirings-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/quickcheck-classes-base
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11
- semirings? ( >=dev-haskell/quickcheck-classes-0.6.3 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag semirings semirings)
-}
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index a0198bdba132..c1bad6539efd 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -1 +1,2 @@
DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61a2367f7308e15344f81549fd7f0808ef8fa2238a35b0a7c7984d26885352186bd6bf43359dec68b2df93581b021dd794 SHA512 59837326ec9f25220cb6c7329c91a5806b0ec7412d6af24c0f0d52c4fd93b084e92edd4f5f61a4f9c4248034fa540c23b65d2aacdfca737ece98bb132b8f08d4
+DIST monad-control-1.0.3.1.tar.gz 13985 BLAKE2B b7dbf0b579ca114190cfe6a5400950d20825f7455a4924154e8416dd475eafa81310c397f3283e5d77ac70e158caf46f34fe5214b989ae2bd051de1968cde704 SHA512 b82ac2d3b2ab1892f79bab1341c9ff17ea89b988438cfd40c246f5ffe4560cb2b77e4a1ed1aa9dc2bb64644b9d6da76eda7b40acf8cc34bb03e77b18127e93a1
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index 8124363ca0a0..e1666433271d 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -5,28 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package defines the type class @MonadControlIO@, a subset of
- @MonadIO@ into which generic control operations such as @catch@ can
- be lifted from @IO@. Instances are based on monad transformers in
- @MonadTransControl@, which includes all standard monad transformers
- in the @transformers@ library except @ContT@. For convenience, it
- provides a wrapped version of @Control.Exception@ with types
- generalized from @IO@ to all monads in @MonadControlIO@.
-
- Note that this package is a rewrite of Anders Kaseorg's @monad-peel@ library.
- The main difference is that this package provides CPS style
- operators and exploits the @RankNTypes@ language extension to
- simplify most definitions.
-
- The package includes a copy of the @monad-peel@ testsuite written by Anders Kaseorg.
- The tests can be performed by using @cabal test@.
-
- The following @critertion@ based benchmark shows that @monad-control@
- is on average about 2.5 times faster than @monad-peel@:
-
- &lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
- </longdescription>
<upstream>
<remote-id type="github">basvandijk/monad-control</remote-id>
</upstream>
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 53eac3e9ed17..2135619b8435 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-control/monad-control-1.0.3.1.ebuild b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
new file mode 100644
index 000000000000..096011c07e8b
--- /dev/null
+++ b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
+HOMEPAGE="https://github.com/basvandijk/monad-control"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
+ >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/monad-journal/Manifest b/dev-haskell/monad-journal/Manifest
deleted file mode 100644
index a859536a7446..000000000000
--- a/dev-haskell/monad-journal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monad-journal-0.8.1.tar.gz 4694 BLAKE2B a9e901bd3dc049f3565fb3c07289040840205499226c66b14804631cb7e9fbc24fed76cd4d376e7b44552d577831867272574ae759bc18a0795c70cc6b237d40 SHA512 3fbc984b3f74d24fca71bc2530832f3748a64e636adfd504fe48e86fefabe53b0911e5b173b6acbbd85128c11f5bd2a7079d6c3fd622148aee7b56f26173379d
diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
deleted file mode 100644
index bb65d086583e..000000000000
--- a/dev-haskell/monad-journal/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides a typeclass for logging in
- pure code, or more generally, in any kind of
- context. You can do whatever you want with
- logs, especially get them, clear them or even
- sink them through `IO` if you're logging in
- `(MonadIO m) =&gt; m`.
- </longdescription>
- <upstream>
- <remote-id type="github">phaazon/monad-journal</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild b/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild
deleted file mode 100644
index aca4a9189b13..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
index 7ae8d854fcee..223ded43c68e 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -1 +1,2 @@
DIST monad-logger-0.3.32.tar.gz 10984 BLAKE2B d03a94f9b207e5a64a150140d9b4dcdd56e6ca28db1f371c08ffb9d35168602b8cbe478b19b47fdb38e69f0d08431f3a2a98b7ea916448079d27674bb70cf454 SHA512 d65fad10fc4bcc5a597c7a9b03b9e275c40ef7c930d1b7f703115c2f18b8bd3c5a42b4c3cc445889e0878e62709c62fdf5f0b2b60d1a15430064f11853b01ef3
+DIST monad-logger-0.3.40.tar.gz 11909 BLAKE2B 8c61039a2f104e7f257fb4c4b49f69b8a3337445379b0305f2c6de1a354cc17502efb760eda11217253e442da009cf4c303b145d6868ef48aafe2cb3522dd927 SHA512 a4dd32624a9feb399cf30f107b591742ac558180cb3220acb91f833459c9c525947efd5e8c5961a079c8a5b06263ff7a9a8a9a73067031f4551d6dec4a1db218
diff --git a/dev-haskell/monad-logger/metadata.xml b/dev-haskell/monad-logger/metadata.xml
index af578fdf8043..635423e6f19e 100644
--- a/dev-haskell/monad-logger/metadata.xml
+++ b/dev-haskell/monad-logger/metadata.xml
@@ -6,9 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="template-haskell">Enable Template Haskell support.</flag>
+ <flag name="template-haskell">Enable Template Haskell support</flag>
</use>
<upstream>
- <remote-id type="github">kazu-yamamoto/logger</remote-id>
+ <remote-id type="hackage">monad-logger</remote-id>
+ <remote-id type="github">snoyberg/monad-logger</remote-id>
</upstream>
</pkgmetadata>
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 1259e939884f..cd3925731c53 100644
--- a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
+++ b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-logger/monad-logger-0.3.40.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.40.ebuild
new file mode 100644
index 000000000000..b7dd487f6680
--- /dev/null
+++ b/dev-haskell/monad-logger/monad-logger-0.3.40.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class of monads which can log messages"
+HOMEPAGE="https://github.com/snoyberg/monad-logger#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+ >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.3:=[profile?]
+ dev-haskell/lifted-base:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?]
+ dev-haskell/monad-loops:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ dev-haskell/stm-chans:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/transformers-base:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag template-haskell template_haskell)
+}
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
index 937381521944..554c1d669480 100644
--- a/dev-haskell/monad-loops/metadata.xml
+++ b/dev-haskell/monad-loops/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">mokus0/monad-loops</remote-id>
+ </upstream>
</pkgmetadata>
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 e4dfae4f064e..1e179635696a 100644
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 fe9fbbfa59c9..3eea1c28d5de 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/monad-par/Manifest
index b8affc8e2991..7fbec42aafeb 100644
--- a/dev-haskell/monad-par/Manifest
+++ b/dev-haskell/monad-par/Manifest
@@ -1 +1,2 @@
+DIST monad-par-0.3.5-rev2.cabal 6536 BLAKE2B a9181b9df868e6dfcde1faa49cb0761ff79b28b4faba19213b58243fbd4e9d19f493beda6e8324ca6eaaa3a710d64e489a31e0b391d35f6f3996cfe16999127d SHA512 033b672b05222115e5c7d6c22f2333f7482fa7d4eacbc60b59139eb65e5b1fe9ca368d83f0090f0021297e3bbfa660c5af32189d3cca9af4679b6919d7883a57
DIST monad-par-0.3.5.tar.gz 31675 BLAKE2B 02299d3a6813618e43d2786bb6963d1fda74fe50f84f2ada86890e87b38803ef1a1042dddc83c8e813cd9b1461710991a37900ee059222ecf65dc7706ed99450 SHA512 0843753f5a1465f46ade4c60b0707a07e996f12b13f8248e4c3dc6eeb5f0b8b4a321acb4dff685d17ef52d36db32cec5564e6492f7027c9d93f03c5780895b9c
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
new file mode 100644
index 000000000000..fd2b9fa54cfc
--- /dev/null
+++ b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -newgeneric,-chaselev
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for parallel programming based on a monad"
+HOMEPAGE="https://github.com/simonmar/monad-par"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="chaselev"
+
+RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
+ dev-haskell/abstract-par:=[profile?]
+ >=dev-haskell/monad-par-extras-0.3:=[profile?]
+ >=dev-haskell/mwc-random-0.11:=[profile?]
+ >=dev-haskell/parallel-3.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ >=dev-haskell/test-framework-quickcheck2-0.3
+ dev-haskell/test-framework-th )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-chaselev \
+ --flag=-newgeneric
+}
diff --git a/dev-haskell/monad-par/monad-par-0.3.5.ebuild b/dev-haskell/monad-par/monad-par-0.3.5.ebuild
deleted file mode 100644
index a82a39857566..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
- dev-haskell/abstract-par:=[profile?]
- >=dev-haskell/monad-par-extras-0.3:=[profile?]
- >=dev-haskell/mtl-2.0.1.0:=[profile?]
- >=dev-haskell/mwc-random-0.11:=[profile?]
- >=dev-haskell/parallel-3.1:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- >=dev-haskell/test-framework-quickcheck2-0.3
- dev-haskell/test-framework-th )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag chaselev chaselev) \
- --flag=-newgeneric
-}
diff --git a/dev-haskell/monad-parallel/Manifest b/dev-haskell/monad-parallel/Manifest
new file mode 100644
index 000000000000..34a80309842d
--- /dev/null
+++ b/dev-haskell/monad-parallel/Manifest
@@ -0,0 +1 @@
+DIST monad-parallel-0.8.tar.gz 6414 BLAKE2B 84e240ece3100fc75686b6cb548c9118d3d8515994a3302a0c9599d6dcf3dc12ad3027702452d917cc8b26057013b0045454188923210a34e4c82808c23b82e8 SHA512 28231723034ac7a224034d1a8ba6618d38a2abfa139b3185bb8c0d08bc42d265ca8e0564a8f01e9ba2b50b72f789e084bd1aadae730e48b7ed105557c96c6959
diff --git a/dev-haskell/monad-parallel/metadata.xml b/dev-haskell/monad-parallel/metadata.xml
new file mode 100644
index 000000000000..f5df80165715
--- /dev/null
+++ b/dev-haskell/monad-parallel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">monad-parallel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild b/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild
new file mode 100644
index 000000000000..436a92d3daf6
--- /dev/null
+++ b/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parallel execution of monadic computations"
+HOMEPAGE="https://hub.darcs.net/blamario/SCC.wiki/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/parallel:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/monad-unlift/Manifest b/dev-haskell/monad-unlift/Manifest
deleted file mode 100644
index 146b4bb04933..000000000000
--- a/dev-haskell/monad-unlift/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monad-unlift-0.2.0.tar.gz 5845 BLAKE2B a5677a6356678b5bf508d4b06552d452c7d396bf48d9fa37969bdc50da91f0c1f0caacd294e01c1046a3b3930216263cfb7ba8a163d6a2299e843f8555828889 SHA512 4b9db8679532e89c05c63328603bc7e72131b79d31e35225e8655ddc4d32e761de58c6db70bfdde2c148f105daa57ff08976cb79bddbdc99f85f083f8183afb3
diff --git a/dev-haskell/monad-unlift/metadata.xml b/dev-haskell/monad-unlift/metadata.xml
deleted file mode 100644
index 3748879fa116..000000000000
--- a/dev-haskell/monad-unlift/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/monad-unlift</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild b/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
deleted file mode 100644
index 9142fb7ae0a7..000000000000
--- a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for representing monad transformer unlifting"
-HOMEPAGE="https://github.com/fpco/monad-unlift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/constraints:=[profile?]
- >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- dev-haskell/transformers:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/monadcatchio-mtl/Manifest b/dev-haskell/monadcatchio-mtl/Manifest
deleted file mode 100644
index a7e459fa0887..000000000000
--- a/dev-haskell/monadcatchio-mtl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonadCatchIO-mtl-0.3.1.0.tar.gz 1730 BLAKE2B 30d1b5d3f83fd09a1b3e78848d7c1a664374294cde8fca4c60546490adcf9fb14584d7ecf6fe5ec2033b76e0dddb6c367157595f87ac544ac5aaaae7db01bb97 SHA512 b39deb663e1f1aaed287fdcb52d3c452dae32b92ddac3a19e96d37fa7e4605b5631130d92759d28834f90a12e3eab2f0131cf72b2501b5ff1e36723cc0e19d02
diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
deleted file mode 100644
index 29407674743b..000000000000
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <longdescription>
- Provides a monad-transformer version of the @Control.Exception.catch@
- function. For this, it defines the @MonadCatchIO@ class, a subset of
- @MonadIO@. It defines proper instances for most monad transformers in
- the 'mtl' library.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r2.ebuild b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r2.ebuild
deleted file mode 100644
index 9ec899f3c7f2..000000000000
--- a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-mtl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer version of the Control.Exception module"
-HOMEPAGE="http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
- >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # default is not compatible to Cabal-3
- rm Setup.lhs || die
- cabal_chdeps \
- 'MonadCatchIO-transformers==0.3.1.0' 'MonadCatchIO-transformers>=0.3.1.0'
-}
diff --git a/dev-haskell/monadcatchio-transformers/Manifest b/dev-haskell/monadcatchio-transformers/Manifest
deleted file mode 100644
index 9780a28f90d1..000000000000
--- a/dev-haskell/monadcatchio-transformers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonadCatchIO-transformers-0.3.1.3.tar.gz 4526 BLAKE2B d7fd79bf3cb2ace84c969d2566cdd0bb2641452b159c064d4a4bec87deadb1533fae8978bc32e97c661a753ac225caa26eaf37250398306cccd15a8619a081b1 SHA512 7794596851f59bcf3cc60e69bbad7c32f2f35fb4c9b1f53455e92d38503539b06dc50d4a9633ed3b6855bdfd0d69d41c37805c727025a81e9841d0819fea684c
diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
deleted file mode 100644
index 321641777c99..000000000000
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-transformers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
-HOMEPAGE="https://hackage.haskell.org/package/MonadCatchIO-transformers"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- cabal_chdeps \
- 'base < 4.9' 'base' \
- 'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/monadlib/Manifest b/dev-haskell/monadlib/Manifest
deleted file mode 100644
index 3d0205a7021b..000000000000
--- a/dev-haskell/monadlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monadLib-3.10.tar.gz 11475 BLAKE2B d77ba15ab1e4a535a265d4d8f4cd9b6f6cf57e030cd241d5d92e96ab943f895b1102174b65e229f2f39b80732d0a203615c65ff44cd9b24f970ae6dd62f20dfc SHA512 db579c362e1a5d7737c3cadd8cc3cfaea620fc9ee3057a00f1400c84b3d25b52d91a192553898c4ee51f0d8a6ad4a66a4e97bc10bf132b1955abb89cfc4b053d
diff --git a/dev-haskell/monadlib/metadata.xml b/dev-haskell/monadlib/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/monadlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/monadlib/monadlib-3.10.ebuild b/dev-haskell/monadlib/monadlib-3.10.ebuild
deleted file mode 100644
index af1edb68c810..000000000000
--- a/dev-haskell/monadlib/monadlib-3.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="monadLib"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A collection of monad transformers"
-HOMEPAGE="https://wiki.github.com/yav/monadlib"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadplus/Manifest b/dev-haskell/monadplus/Manifest
deleted file mode 100644
index e2a0736ac90b..000000000000
--- a/dev-haskell/monadplus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monadplus-1.4.2.tar.gz 3671 BLAKE2B b256d49436933b446d3aa74e23ea778a6cf092cb858eb8ad1024adc370caeec6a1153a7cba7a25507213f758c3393c9040f354ca5238f8950b3bab6153d8416e SHA512 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
diff --git a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
deleted file mode 100644
index feebd15b06b0..000000000000
--- a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@eafit.edu.co>
-Date: Sun, 7 Jan 2018 23:52:32 -0500
-Subject: [PATCH] Added Semigroup instance.
-
-The instance was required by GHC 8.4.1-alpha1.
----
- src/Control/Monad/Plus.hs | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs
-index 25f4782..654d133 100644
---- a/src/Control/Monad/Plus.hs
-+++ b/src/Control/Monad/Plus.hs
-@@ -1,5 +1,5 @@
-
--{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
-
- -------------------------------------------------------------------------------------
- -- |
-@@ -263,6 +263,9 @@ instance Category Partial where
-
- instance Monoid (Partial a b) where
- mempty = mzero
-+#if !MIN_VERSION_base(4,11,0)
- mappend = mplus
--
--
-+#else
-+instance Semigroup (Partial a b) where
-+ (<>) = mappend
-+#endif
diff --git a/dev-haskell/monadplus/metadata.xml b/dev-haskell/monadplus/metadata.xml
deleted file mode 100644
index 96ca7fff24fe..000000000000
--- a/dev-haskell/monadplus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Filtering and folding over arbitrary `MonadPlus` instances.
- This package generalizes many common stream operations such as
- `filter`, `catMaybes` etc.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
deleted file mode 100644
index 23e0fcb66d7c..000000000000
--- a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
-HOMEPAGE="https://hackage.haskell.org/package/monadplus"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch)
diff --git a/dev-haskell/monadrandom/Manifest b/dev-haskell/monadrandom/Manifest
deleted file mode 100644
index dbfc0443a30e..000000000000
--- a/dev-haskell/monadrandom/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonadRandom-0.5.1.2.tar.gz 10562 BLAKE2B d98ca62c498b31fd7b3bdd3d91753d69687ad7d1d970300ade0113f42fd1e7190c1503113ad733d1b795984687825a1544ae08279301a45c7236111e1bd9722f SHA512 2c92c51868f48e548402c63bccb7bfb13f6ba342f1f6a81e6cc2c8a92248f47ccfb3763907f6e564b284ba4243d4ab1e83cd9a2c309e238fca6b017eb9833198
diff --git a/dev-haskell/monadrandom/metadata.xml b/dev-haskell/monadrandom/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/monadrandom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild b/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild
deleted file mode 100644
index bc661d99d426..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="https://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monads-tf/Manifest b/dev-haskell/monads-tf/Manifest
index 0d3719722467..f37299557660 100644
--- a/dev-haskell/monads-tf/Manifest
+++ b/dev-haskell/monads-tf/Manifest
@@ -1 +1,2 @@
DIST monads-tf-0.1.0.3.tar.gz 14159 BLAKE2B e77b87e274ab8a29af6033fdc69a965b4013f43556bbc65e16eea35d49899e022294a87196a8e7c086659874a939010449102f5c9fa2f17b128212e567bcd588 SHA512 e1be602c584b42390b617cee164c8cb1c4bb17093c44033275924f273c94212e53faceb35aeabadf43e68f9631830e41266858daa10aa2f3af6300ebc20f3ea4
+DIST monads-tf-0.3.0.1.tar.gz 13675 BLAKE2B a363832f9d092708bbdf778acda8fd6c86904c6f43cfc4c596f19c804a33e3450ad6cdd4a3d5cc004cbdfc28086ea1ae6a0156db8a3ff27fb81236f2b0d3e058 SHA512 4074094c1eafa9a4739fd04e183841ac36314c03022f7cacb324d5fa6e6eab4eb6b10efbe9b89181814485a76a3aa64fcf99801c39c831e63e24e88115dbf438
diff --git a/dev-haskell/monads-tf/metadata.xml b/dev-haskell/monads-tf/metadata.xml
index ee84b9d844cb..f9cb3771ae43 100644
--- a/dev-haskell/monads-tf/metadata.xml
+++ b/dev-haskell/monads-tf/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Monad classes using type families, with instances for various
- monad transformers, inspired by the paper /Functional Programming
- with Overloading and Higher-Order Polymorphism/, by Mark P
- Jones, in /Advanced School of Functional Programming/, 1995
- (&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-
- This package is almost a compatible replacement for the @mtl-tf@ package.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">monads-tf</remote-id>
+ <remote-id type="github">typeclasses/monads-tf</remote-id>
+ </upstream>
</pkgmetadata>
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 2eeb9379e7cb..004a35e99960 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/monads-tf/monads-tf-0.3.0.1.ebuild b/dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild
new file mode 100644
index 000000000000..2c384616557c
--- /dev/null
+++ b/dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using type families"
+HOMEPAGE="https://github.com/typeclasses/monads-tf"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/mono-traversable-instances/Manifest b/dev-haskell/mono-traversable-instances/Manifest
deleted file mode 100644
index 377cb417db34..000000000000
--- a/dev-haskell/mono-traversable-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mono-traversable-instances-0.1.1.0.tar.gz 2724 BLAKE2B dbc4a7ddafa8fdab896e606378af43a296852f5122a023418ca8462c85af21e4add08c011b0b703de83ac3fa17aa9cfb969e92a1b1a037089e35f30a57522b44 SHA512 367b92fc60c397816fd71d88133a4dd14f91ee927470b6c7967cf1f8f72de8f91c475a6a504fd4b3e520ceb18950ff300bb9530fccda7a7a81573ac93af41513
diff --git a/dev-haskell/mono-traversable-instances/metadata.xml b/dev-haskell/mono-traversable-instances/metadata.xml
deleted file mode 100644
index a1de5e8eb364..000000000000
--- a/dev-haskell/mono-traversable-instances/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">snoyberg/mono-traversable</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.1.0.ebuild b/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.1.0.ebuild
deleted file mode 100644
index 50b10d6a5e5d..000000000000
--- a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extra typeclass instances for mono-traversable"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
- >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
- >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
- >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?]
- >=dev-haskell/semigroupoids-3.0:=[profile?]
- dev-haskell/semigroups:=[profile?]
- dev-haskell/vector-instances:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
index ec28b37e288c..112de1a2a7fb 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -1 +1,2 @@
DIST mono-traversable-1.0.15.1.tar.gz 40815 BLAKE2B 432b90de9620b1aadd95e4591f678510b3e878a5af98d12856448e0add928e61bbca3fcb9f4796af0befb0bb70dc7cc8650263abb719e133ca227fcf85b6f0d7 SHA512 adf1af35b93af0605667d8b033415f318c6dab225499fdd1d9eab349fb1eedca2623c98f9dce83f94ed27db75b6f0aa88027daa748c7b3db05f47f68b505b0c8
+DIST mono-traversable-1.0.15.3.tar.gz 40461 BLAKE2B 07a9ce225bfc60f3cf838f5d683d325844369ec5e5eba791f115ce60f5028a737e203113b20b7ad7686eb1b283d5221443eee0e6ff06ebd0819ea6c550f2465c SHA512 55f469149b84ace246e6c0791de25fcc73317152986e4949c7ae9ae020bd6540586da090d58ba495ef7f251c4a3a02979a796af9fde975a54d3d1541527b7691
diff --git a/dev-haskell/mono-traversable/metadata.xml b/dev-haskell/mono-traversable/metadata.xml
index 94465aa6a345..a1de5e8eb364 100644
--- a/dev-haskell/mono-traversable/metadata.xml
+++ b/dev-haskell/mono-traversable/metadata.xml
@@ -5,9 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Monomorphic variants of the Functor, Foldable, and Traversable typeclasses. Contains even more experimental code for abstracting containers and sequences.
- </longdescription>
<upstream>
<remote-id type="github">snoyberg/mono-traversable</remote-id>
</upstream>
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 6f25112213a2..8087ede033a9 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hashable:=[profile?]
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/hashable:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?]
>=dev-haskell/vector-0.10:=[profile?]
>=dev-haskell/vector-algorithms-0.6:=[profile?]
- >=dev-lang/ghc-8.2.1:=
+ >=dev-lang/ghc-8.2.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.0.0.2
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild
new file mode 100644
index 000000000000..c3804221ac69
--- /dev/null
+++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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="Type classes for mapping, folding, and traversing monomorphic containers"
+HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+ >=dev-haskell/split-0.2:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?]
+ >=dev-haskell/vector-0.10:=[profile?]
+ >=dev-haskell/vector-algorithms-0.6:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/foldl
+ dev-haskell/hspec
+ dev-haskell/hunit
+ dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
index 83dde002844a..a78113a9b0e9 100644
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mtl-compat/metadata.xml b/dev-haskell/mtl-compat/metadata.xml
index d71baf44fb3a..11043fffaddb 100644
--- a/dev-haskell/mtl-compat/metadata.xml
+++ b/dev-haskell/mtl-compat/metadata.xml
@@ -5,24 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package backports the "Control.Monad.Except" module from
- @mtl@ (if using @mtl-2.2.0.1@ or earlier), which reexports the
- @ExceptT@ monad transformer and the @MonadError@ class.
-
- This package should only be used if there is a need to use the
- @Control.Monad.Except@ module specifically. If you just want
- the @mtl@ class instances for @ExceptT@, use
- @transformers-compat@ instead, since @mtl-compat@ does nothing
- but reexport the instances from that package.
-
- Note that unlike how @mtl-2.2@ or later works, the
- "Control.Monad.Except" module defined in this package exports
- all of @ExceptT@'s monad class instances. Therefore, you may
- have to declare @import Control.Monad.Except ()@ at the top of
- your file to get all of the @ExceptT@ instances in scope.
- </longdescription>
<upstream>
- <remote-id type="github">RyanGlScott/mtl-compat</remote-id>
+ <remote-id type="hackage">mtl-compat</remote-id>
+ <remote-id type="github">haskell-compat/mtl-compat</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
index f849a6a4791a..409eec0f3b25 100644
--- a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
+++ b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.4:=[profile?]
dev-haskell/transformers-compat:=
>=dev-lang/ghc-7.4.1:=
"
diff --git a/dev-haskell/mtl/metadata.xml b/dev-haskell/mtl/metadata.xml
index 4e84518b3cea..2171e4c94b9b 100644
--- a/dev-haskell/mtl/metadata.xml
+++ b/dev-haskell/mtl/metadata.xml
@@ -5,14 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Monad classes using functional dependencies, with instances
- for various monad transformers, inspired by the paper
- /Functional Programming with Overloading and Higher-Order Polymorphism/,
- by Mark P Jones, in /Advanced School of Functional Programming/, 1995
- (&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
- </longdescription>
<upstream>
- <remote-id type="github">ekmett/mtl</remote-id>
+ <remote-id type="hackage">mtl</remote-id>
+ <remote-id type="github">haskell/mtl</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/mtl/mtl-2.2.2-r1.ebuild b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..377dc6705b05
--- /dev/null
+++ b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using functional dependencies"
+HOMEPAGE="https://github.com/haskell/mtl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}"
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
deleted file mode 100644
index 83bb28e42722..000000000000
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/haskell/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/multipart/Manifest b/dev-haskell/multipart/Manifest
deleted file mode 100644
index 928fe45ee101..000000000000
--- a/dev-haskell/multipart/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST multipart-0.2.0.tar.gz 6593 BLAKE2B e7528c1d95df96ada9b9c17315ebe9c9f304842c0783007e37c545769195b87105dce4a0ee9690bbd8143ca9dfd43a8ad7c1b0e98fd386944f1af5e868fd1a4d SHA512 e2ea580113a84a6ad218e9c0ef79da94ab92017c81969c864847df020759cd94555f53ea0722c230555af2d2ccb531bd9d07cb2da1342d0e3556b70a58678be0
diff --git a/dev-haskell/multipart/metadata.xml b/dev-haskell/multipart/metadata.xml
deleted file mode 100644
index 74d7e930f9f1..000000000000
--- a/dev-haskell/multipart/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">silkapp/multipart</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/multipart/multipart-0.2.0.ebuild b/dev-haskell/multipart/multipart-0.2.0.ebuild
deleted file mode 100644
index 9da933fdb468..000000000000
--- a/dev-haskell/multipart/multipart-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP multipart split out of the cgi package"
-HOMEPAGE="http://www.github.com/silkapp/multipart"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?]
- dev-haskell/stringsearch:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/murmur-hash/Manifest b/dev-haskell/murmur-hash/Manifest
deleted file mode 100644
index a1b11996902c..000000000000
--- a/dev-haskell/murmur-hash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST murmur-hash-0.1.0.9.tar.gz 4204 BLAKE2B 33781f0a94f767d8f4fc9e10e3c94718308e24370ebfd9f66cd5279bf9c7204136103a8e4aa86f3025559e87075e47bde6930135215cd9b1c4275d696f2c2490 SHA512 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486
diff --git a/dev-haskell/murmur-hash/metadata.xml b/dev-haskell/murmur-hash/metadata.xml
deleted file mode 100644
index 16436cf1bbe8..000000000000
--- a/dev-haskell/murmur-hash/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Implements MurmurHash2, a good, fast, general-purpose,
- non-cryptographic hashing function. See
- &lt;http://murmurhash.googlepages.com/&gt; for details.
-
- This implementation is pure Haskell, so it might be a bit slower
- than a C FFI binding.
- </longdescription>
- <upstream>
- <remote-id type="github">nominolo/murmur-hash</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild b/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
deleted file mode 100644
index 517a13f53dab..000000000000
--- a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="MurmurHash2 implementation for Haskell"
-HOMEPAGE="https://github.com/nominolo/murmur-hash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mustache/Manifest b/dev-haskell/mustache/Manifest
deleted file mode 100644
index b595bbadb82d..000000000000
--- a/dev-haskell/mustache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mustache-2.3.1.tar.gz 20207 BLAKE2B 87691b14e85ac5934c08d1b3f8261d6e7bb3786b808d0f1a04630b96b4f2ed4aeae4d049ccf0e408b47586e990db2bbc09e3eac56af67922538e73250ef486d5 SHA512 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3
diff --git a/dev-haskell/mustache/metadata.xml b/dev-haskell/mustache/metadata.xml
deleted file mode 100644
index 328b0ce87aef..000000000000
--- a/dev-haskell/mustache/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Allows parsing and rendering template files with mustache markup. See the
- mustache &lt;http://mustache.github.io/mustache.5.html language reference&gt;.
-
- Implements the mustache spec version 1.1.3.
-
- /Note/: Versions including and beyond 0.4 are compatible with ghc 7.8 again.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mustache/mustache-2.3.1.ebuild b/dev-haskell/mustache/mustache-2.3.1.ebuild
deleted file mode 100644
index 23b768a9e9d5..000000000000
--- a/dev-haskell/mustache/mustache-2.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A mustache template parser library"
-HOMEPAGE="https://github.com/JustusAdam/mustache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tries to access network
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/cmdargs:=[profile?]
- dev-haskell/either:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/th-lift:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- dev-haskell/yaml:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/base-unicode-symbols
- dev-haskell/hspec
- dev-haskell/lens
- dev-haskell/tar
- dev-haskell/temporary
- dev-haskell/wreq
- dev-haskell/zlib )
-"
diff --git a/dev-haskell/mutable-containers/Manifest b/dev-haskell/mutable-containers/Manifest
deleted file mode 100644
index e506f94305b9..000000000000
--- a/dev-haskell/mutable-containers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mutable-containers-0.3.4.tar.gz 12286 BLAKE2B f782c4b7a80699317814ae57c867314cbb374f90a84e9647010d29c6a5ca58a6812febd07cbff07572d6a76f2df89dd9056186adada25989ea86bdb4c263013a SHA512 1731380fd57c8c79a77cea781fb7630f90e11cfa977ca836695981bcecf10b7d2d5f3e89e8a6de5fd3fb32ac441b0512c7a6fd356107e6efa47b0d5fd491157c
diff --git a/dev-haskell/mutable-containers/metadata.xml b/dev-haskell/mutable-containers/metadata.xml
deleted file mode 100644
index fcc9d3f996fb..000000000000
--- a/dev-haskell/mutable-containers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/mutable-containers</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
deleted file mode 100644
index 67661330e68e..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
- >=dev-haskell/primitive-0.5.2.1:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/hspec
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mwc-random/Manifest b/dev-haskell/mwc-random/Manifest
index 9e7fc0f45b1e..dc55022b9c51 100644
--- a/dev-haskell/mwc-random/Manifest
+++ b/dev-haskell/mwc-random/Manifest
@@ -1 +1,3 @@
DIST mwc-random-0.14.0.0.tar.gz 19674 BLAKE2B 3410f8d237c8e4a0f079c13567082273fc79d287c8de2b9ea0c1f396271ba7571caf890d6065ae7f0e5aae41f66575d90df178b981db24c9792213facf1d9c3d SHA512 bb262d6f4a37d91e4c0667ec5140894ed36bf3ef4b90e487f4d689a6bc4eddd09dcdc3c8b75013124908ca1642e990c3e074fb728acc1b36f63b3db66528301d
+DIST mwc-random-0.15.0.2-rev1.cabal 3372 BLAKE2B 1e565e2028fe1cba958684ebfef4c3c248776402c8310e389c553084cae82c2451c19bd78567df9aa58fb926a8b10bf5e8fbec211c9bd0a33c3d0ac15b4f16e3 SHA512 7b3f2bb05148fc85ed4f85bbd96fbe6e836857a117c839cb2ceb51c4b17aa4ebc03b8989970cbf9b51aadfc6a9507a6af4dd864ec65b8b421456f46eee0974ed
+DIST mwc-random-0.15.0.2.tar.gz 26591 BLAKE2B 8320eaa28e5bc302104c8e9617e8e50728934d7143ea5a243570aed28cec5c98bb17d128460aed27dcbf5b3b71570a39f6247a3868cb18eb3f3c0325c20fed67 SHA512 7e30a4584bca7f5e5147388dc9c081ac417d3aff1e9bd431535eac695db0779b4d20c6b3bedbda06a4780d9d57ab1f7880743f7bad20e4f5d2b7d32ce7f373bd
diff --git a/dev-haskell/mwc-random/metadata.xml b/dev-haskell/mwc-random/metadata.xml
index 3bcd47064ae2..c6a1cbc7566e 100644
--- a/dev-haskell/mwc-random/metadata.xml
+++ b/dev-haskell/mwc-random/metadata.xml
@@ -5,21 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package contains code for generating high quality random
- numbers that follow either a uniform or normal distribution. The
- generated numbers are suitable for use in statistical applications.
-
- The uniform PRNG uses Marsaglia's MWC256 (also known as MWC8222)
- multiply-with-carry generator, which has a period of 2^8222 and
- fares well in tests of randomness. It is also extremely fast,
- between 2 and 3 times faster than the Mersenne Twister.
-
- Compared to the mersenne-random package, this package has a more
- convenient API, is faster, and supports more statistical
- distributions.
- </longdescription>
<upstream>
+ <remote-id type="hackage">mwc-random</remote-id>
<remote-id type="github">bos/mwc-random</remote-id>
</upstream>
</pkgmetadata>
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 d9bb642a9cd4..8c625cf12c31 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/math-functions-0.2.1.0:=[profile?]
diff --git a/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild b/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild
new file mode 100644
index 000000000000..017026e79567
--- /dev/null
+++ b/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, high quality pseudo random number generation"
+HOMEPAGE="https://github.com/bos/mwc-random"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'doctest >=0.15 && <0.20' 'doctest >=0.15'
+)
+
+RDEPEND="
+ >=dev-haskell/math-functions-0.2.1.0:=[profile?]
+ >=dev-haskell/primitive-0.6.2:=[profile?]
+ >=dev-haskell/random-1.2:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/doctest-0.15
+ >=dev-haskell/quickcheck-2.2
+ >=dev-haskell/tasty-1.3.1
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ >=dev-haskell/vector-0.12.1
+ )
+"
diff --git a/dev-haskell/mysql-simple/Manifest b/dev-haskell/mysql-simple/Manifest
deleted file mode 100644
index 0eeed70cb7e7..000000000000
--- a/dev-haskell/mysql-simple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mysql-simple-0.4.5.tar.gz 18867 BLAKE2B 578d84c6416f67edc8d148122838c50cf864a2bedda7670d04307b99fe3fc4e957952c5602c8c8d64c0acc31f38b0c6da2bdd95c7dba3911df76e97a78964ca1 SHA512 a0f254d9adeeab7cf3e738163be900e8947903336cb3d0c6e6e847280d6aefa230cd44722d2b2eea418d098aebe610e595fc69dd54df759465e21244e763510c
diff --git a/dev-haskell/mysql-simple/metadata.xml b/dev-haskell/mysql-simple/metadata.xml
deleted file mode 100644
index 1f6d5e1a08be..000000000000
--- a/dev-haskell/mysql-simple/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A mid-level client library for the MySQL database, intended to be
- fast and easy to use.
-
- /Important licensing note/: This library is BSD-licensed under the
- terms of the MySQL FOSS License Exception
- &lt;http://www.mysql.com/about/legal/licensing/foss-exception/&gt;.
-
- Since this library links against the GPL-licensed @mysqlclient@
- library, a non-open-source application that uses it /may/ be
- subject to the terms of the GPL.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild b/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild
deleted file mode 100644
index 72f2b2c8d56c..000000000000
--- a/dev-haskell/mysql-simple/mysql-simple-0.4.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: developer:debug
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A mid-level MySQL client library"
-HOMEPAGE="https://github.com/paul-rouse/mysql-simple"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # need running mysql, missing files
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.0:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- dev-haskell/blaze-textual:=[profile?]
- >=dev-haskell/mysql-0.1.1.1:=[profile?]
- dev-haskell/old-locale:=[profile?]
- dev-haskell/pcre-light:=[profile?]
- >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/text-0.11.0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hspec )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug developer)
-}
diff --git a/dev-haskell/mysql/Manifest b/dev-haskell/mysql/Manifest
deleted file mode 100644
index ab6ba5ef4a0b..000000000000
--- a/dev-haskell/mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mysql-0.1.7.tar.gz 16544 BLAKE2B a7617293f2dc970b9ace46c0b2a9452f23a90524181a1b37aa10176f2ba4ee3f9e967d94faa9e714a947e50b59d368c79fc59602cbc8e0792e4e396a09b4596c SHA512 45074050e17fed48f865c21ccca72cdcca02631715ee4a34b46f71fda74b50ab6332d8998d1047e6ae43df84e3fc865610153f15c3092c6b300e3e5ada30efa1
diff --git a/dev-haskell/mysql/metadata.xml b/dev-haskell/mysql/metadata.xml
deleted file mode 100644
index 3463542c56bc..000000000000
--- a/dev-haskell/mysql/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A low-level client library for the MySQL database, implemented as
- bindings to the C @mysqlclient@ API.
-
- /Important licensing note/: This library is BSD-licensed under the
- terms of the MySQL FOSS License Exception
- &lt;http://www.mysql.com/about/legal/licensing/foss-exception/&gt;.
-
- Since this library links against the GPL-licensed @mysqlclient@
- library, a non-open-source application that uses it /may/ be
- subject to the terms of the GPL.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mysql/mysql-0.1.7.ebuild b/dev-haskell/mysql/mysql-0.1.7.ebuild
deleted file mode 100644
index 0e759fb01ffc..000000000000
--- a/dev-haskell/mysql/mysql-0.1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A low-level MySQL client library"
-HOMEPAGE="https://github.com/paul-rouse/mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs local mysql
-
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-
-RDEPEND+=" dev-db/mysql-connector-c:="
-
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hspec )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
index 937381521944..8f1b8ce8ed3a 100644
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">nanospec</remote-id>
+ <remote-id type="github">hspec/nanospec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/nanospec/nanospec-0.2.2.ebuild b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
index 126fa7b9a6ce..c14d160d5dfb 100644
--- a/dev-haskell/nanospec/nanospec-0.2.2.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
@@ -1,26 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# ebuild generated by hackport 0.5.5.9999
+# ebuild generated by hackport 0.8.0.0.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # drop test-suite: cyclic depend
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
HOMEPAGE="https://github.com/hspec/nanospec#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT=test # cyclic depend: silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/hspec-1.3
+ >=dev-haskell/silently-1.2.4
+ )
"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index fa84eee00c07..a8cf5a997b14 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1 +1,2 @@
+DIST nats-1.1.2-r1.cabal 2749 BLAKE2B b0b7406ce0362cfea14dd8cc492b9d0a5a1e34ae4cf5c4aba78d3cd7052a24a3be1c742287d85e6f9699fecbeee491a0eadcdf1994e92ce86e559c6965774cc2 SHA512 0702e4a69cbc368de33993ab49ab5aa458202df538606b73dd9291a6cf61f82ab44e4b12e3e82d2690ba151fe8b1c65e8791ac0f45a24a7f2534abdebd2e87cb
DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 71c786410ce6..268af54dfd5c 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -10,4 +10,7 @@
<flag name="hashable">enable hashable instances</flag>
<flag name="template-haskell">enable template_haskell</flag>
</use>
+ <upstream>
+ <remote-id type="github">ekmett/nats</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/nats/nats-1.1.2-r1.ebuild b/dev-haskell/nats/nats-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..e67bc613e041
--- /dev/null
+++ b/dev-haskell/nats/nats-1.1.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Natural numbers"
+HOMEPAGE="https://github.com/ekmett/nats/"
+SRC_URI="
+ https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/3.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+binary +hashable +template-haskell"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+ hashable? ( >=dev-haskell/hashable-1.1.2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag binary binary) \
+ $(cabal_flag hashable hashable) \
+ $(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/nats/nats-1.1.2.ebuild b/dev-haskell/nats/nats-1.1.2.ebuild
deleted file mode 100644
index 5b6fa802bbcd..000000000000
--- a/dev-haskell/nats/nats-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +hashable +template-haskell"
-
-RESTRICT=test # avoid circular dep: nats[hashable]->hashable[test]->quickcheck->nats
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] )
- hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag binary binary) \
- $(cabal_flag hashable hashable) \
- $(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
deleted file mode 100644
index 65bc3136364f..000000000000
--- a/dev-haskell/neat-interpolation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST neat-interpolation-0.5.1.2.tar.gz 5757 BLAKE2B dd7b39a56d127d0be25a8968ec8047bcad58a0eb75956056bd71af01979f79a304119738026a46d215052dc2899817371ec24e6184866d2f9770080ee5a2a9c1 SHA512 147bfca831dccc4646cce7c91635d3885049c67c93c3da83a774eaf1c7f485fba14e695efa173fd3a125380c13d70fe3ca017c2179e161d8e53d60278bb0b7a8
diff --git a/dev-haskell/neat-interpolation/metadata.xml b/dev-haskell/neat-interpolation/metadata.xml
deleted file mode 100644
index ed6b90a78780..000000000000
--- a/dev-haskell/neat-interpolation/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A quasiquoter for producing Text values with support for
- a simple interpolation of input values.
- It removes the excessive indentation from the input and
- accurately manages the indentation of all lines of the interpolated variables.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.5.1.2.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.5.1.2.ebuild
deleted file mode 100644
index 2b836782cfc2..000000000000
--- a/dev-haskell/neat-interpolation/neat-interpolation-0.5.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
-HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-10:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-3
- >=dev-haskell/quickcheck-instances-0.3.22 <dev-haskell/quickcheck-instances-0.4
- <dev-haskell/rerebase-2
- >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-2
- >=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
index 9159af396554..11ba1c5afa1d 100644
--- a/dev-haskell/netlink/metadata.xml
+++ b/dev-haskell/netlink/metadata.xml
@@ -5,7 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="generators">build the generator scripts for constants</flag>
- </use>
+ <upstream>
+ <remote-id type="github">Ongy/netlink-hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b6db6924e6eb
--- /dev/null
+++ b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.6
+#hackport: flags: -generators
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Netlink communication for Haskell"
+HOMEPAGE="https://github.com/Ongy/netlink-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+ >=dev-haskell/monad-loops-0.3:=[profile?]
+ dev-haskell/pretty-hex:=[profile?]
+ >=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-generators
+}
diff --git a/dev-haskell/netlink/netlink-1.1.1.0.ebuild b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
index a67eebc1a617..7e28c549bf00 100644
--- a/dev-haskell/netlink/netlink-1.1.1.0.ebuild
+++ b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# ebuild generated by hackport 0.5.6
-
+#hackport: flags: -generators
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -14,15 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="generators"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
>=dev-haskell/monad-loops-0.3:=[profile?]
dev-haskell/pretty-hex:=[profile?]
>=dev-lang/ghc-7.6.1:=
- generators? ( <dev-haskell/language-c-0.7:=[profile?]
- dev-haskell/regex-pcre:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.16.0
@@ -30,5 +27,5 @@ DEPEND="${RDEPEND}
src_configure() {
haskell-cabal_src_configure \
- $(cabal_flag generators generators)
+ --flag=-generators
}
diff --git a/dev-haskell/network-bsd/metadata.xml b/dev-haskell/network-bsd/metadata.xml
index f57c90ca3f8d..9dfa95250f48 100644
--- a/dev-haskell/network-bsd/metadata.xml
+++ b/dev-haskell/network-bsd/metadata.xml
@@ -10,4 +10,7 @@
See newer versions of &lt;https://hackage.haskell.org/package/network-bsd network-bsd&gt; for more information.
</longdescription>
+ <upstream>
+ <remote-id type="github">haskell/network-bsd</remote-id>
+ </upstream>
</pkgmetadata>
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
new file mode 100644
index 000000000000..89a6c97d38da
--- /dev/null
+++ b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Network.BSD"
+HOMEPAGE="https://github.com/haskell/network-bsd"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+ >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+CABAL_CHDEPS=(
+ 'network >= 3.0.0.0 && < 3.0.1' 'network >= 3.0.0.0'
+)
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
deleted file mode 100644
index 0681ee2efcf9..000000000000
--- a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Network.BSD"
-HOMEPAGE="https://github.com/haskell/network-bsd"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
- >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'network >= 3.0.0.0 && < 3.0.1' 'network >= 3.0.0.0'
-}
diff --git a/dev-haskell/network-byte-order/Manifest b/dev-haskell/network-byte-order/Manifest
index 066a7079849d..4b4e63879627 100644
--- a/dev-haskell/network-byte-order/Manifest
+++ b/dev-haskell/network-byte-order/Manifest
@@ -1 +1 @@
-DIST network-byte-order-0.1.4.0.tar.gz 6426 BLAKE2B fc4f414622f8feab70bbc76dec977a591099bf81bb050aa0426791523d75bc4bb7fed877d08e9c55cda881638b47d84beee9a6c5ffbba89a95b3e40afdade3b8 SHA512 b0b9f468df51963bb6ef6cd6dcd90345cbee7ec96686b8c4f5b94639f6a78280f30af55779208a14f468ec9c5509aea0e65865a7e8966f9779d4c0eb83933dc2
+DIST network-byte-order-0.1.6.tar.gz 6648 BLAKE2B 4cacbf0af40b2763663456dbc551da9305e10d80ea2e749214b6617aac8cfdedcf2070c8d9d40d2d37d0886a4d3d43bb58addfce3983f8e402a92e51abca6282 SHA512 bfb15f6e1aa863af7f81dc35518273e936d04f5f9decf6a0938a972dc9780ab5c9c10ed062ea027d1e92aa1e61dfb0059dcbc38324dbd4124f89d08017a2ae97
diff --git a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild b/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
deleted file mode 100644
index af15bd60f417..000000000000
--- a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Network byte order utilities"
-HOMEPAGE="https://hackage.haskell.org/package/network-byte-order"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/doctest )
-"
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
new file mode 100644
index 000000000000..61bc2393fe13
--- /dev/null
+++ b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Network byte order utilities"
+HOMEPAGE="https://hackage.haskell.org/package/network-byte-order"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( dev-haskell/doctest )
+"
diff --git a/dev-haskell/network-conduit/Manifest b/dev-haskell/network-conduit/Manifest
deleted file mode 100644
index bf6f484edcbf..000000000000
--- a/dev-haskell/network-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-conduit-1.1.0.tar.gz 1357 BLAKE2B 7952df2ab1a141a6d9b5460bc128ea1b45df0ea178a1d75e8e746d66d5d11c9cee278e56bb99dc4aed62af94312b1c3e6eb9f89be4ba94c198d96091b90100a5 SHA512 1bda46190bc9759e9d85f61f4555dca4444c307305b8a7ebfc3e88519ae8119e313eaf4095541c487b8431ad342320d83ff4dd1ebf271cf10c11414c652b34d1
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/network-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
deleted file mode 100644
index 688fb8141181..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-network-bytestring
-}
diff --git a/dev-haskell/network-data/Manifest b/dev-haskell/network-data/Manifest
deleted file mode 100644
index 55766ff70382..000000000000
--- a/dev-haskell/network-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-data-0.5.3.tar.gz 5795 BLAKE2B 38946312b36f27dc6dc4e6324f716fc7a7d3e19af41e309be17eeeda9139cc1385bafabeaa33dcd9de1d3a9302f279c4b069c7ec9eb37519d0dd7b8b200f93a4 SHA512 911cd9cc5af3b0bd49939b6ce79886c8d07fb2e4700a837560f5e6b6bb2a74dca319889f01dea87f463c6ee0df2d7b9442f4ed5201ed4acd4aadceb85b69ddec
diff --git a/dev-haskell/network-data/metadata.xml b/dev-haskell/network-data/metadata.xml
deleted file mode 100644
index 2f7fcca0ab7c..000000000000
--- a/dev-haskell/network-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="small-base">Build the split-up base package.</flag>
- </use>
- <longdescription>
- This library includes definitions for common headers such as
- Ethernet, IPv4, IPv6, UDP, TCP, etc. This code is untested for any serious
- work - use at your own risk.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-data/network-data-0.5.3.ebuild b/dev-haskell/network-data/network-data-0.5.3.ebuild
deleted file mode 100644
index 26571def8913..000000000000
--- a/dev-haskell/network-data/network-data-0.5.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for network data structures and their serialization"
-HOMEPAGE="https://hackage.haskell.org/package/network-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+small-base"
-
-# dev-haskell/prettyclass is not required for ghc 7.10.1, just adding
-# it for backwards compatibility with <ghc 7.10.1
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
- >=dev-haskell/prettyclass-1.0:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
- default
-
- if has_version "<dev-lang/ghc-7.10.1"; then
- cabal_chdeps \
- 'pretty >= 1.1.2' 'pretty >= 1.0, prettyclass >= 1.0'
- fi
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag small-base small_base)
-}
diff --git a/dev-haskell/network-info/Manifest b/dev-haskell/network-info/Manifest
index 0dafbaa22964..3f1755712c23 100644
--- a/dev-haskell/network-info/Manifest
+++ b/dev-haskell/network-info/Manifest
@@ -1 +1,2 @@
DIST network-info-0.2.0.10.tar.gz 6278 BLAKE2B 52cec7dc2866ff0aad9f0180391c2e093d3147f7de1dd96baa7ec1f9d149792aca371d7f5bb3a32d254f2fd3a35f6a6b3fb479967ad7cb0a125944aca7eeaa88 SHA512 d578f64860fb3c04d11a444d9636bde57402b6728529e73c7741b056ef0d8f68cb0958118212f2d47826dc28ba9b2bfcc9aef8b5b2e9fc3da8eaadc796160895
+DIST network-info-0.2.1.tar.gz 6387 BLAKE2B 82ff522ddf8bb4b22fabda228148cc428cb847589727dfa18182d6516c1367a6549c07fdca4492c56a012e61b9e3fe168827bd31e837d8f6bea30f0dfef3e19d SHA512 a252bd5c34cbbde9dcdd9606b31ed9b9fa802edfc694795f8779fd8f4ffa9092df0ab25426e0a1dca836d74a9357c1b31acb2aa01a9e46e8ffd5959be7a5d619
diff --git a/dev-haskell/network-info/metadata.xml b/dev-haskell/network-info/metadata.xml
index 275cdcb01d77..870e8e27d82c 100644
--- a/dev-haskell/network-info/metadata.xml
+++ b/dev-haskell/network-info/metadata.xml
@@ -5,19 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides simple read-only access to the
- local computer's networking configuration. It is
- currently capable of getting a list of all the network
- interfaces and their respective IPv4, IPv6 and MAC
- addresses.
-
- network-info has been tested and is known to work on
- Ubuntu 10.10, FreeBSD 9.0, Mac OS X 10.6.4 and Windows
- XP/7. It probably works on other flavours of Linux,
- OS X, FreeBSD and Windows as well.
- </longdescription>
<upstream>
- <remote-id type="github">jystic/network-info</remote-id>
+ <remote-id type="hackage">network-info</remote-id>
+ <remote-id type="github">jacobstanley/network-info</remote-id>
</upstream>
</pkgmetadata>
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 a44f81fbfdda..aca2a535bd68 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-info/network-info-0.2.1.ebuild b/dev-haskell/network-info/network-info-0.2.1.ebuild
new file mode 100644
index 000000000000..eb5ab6b19e2a
--- /dev/null
+++ b/dev-haskell/network-info/network-info-0.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Access the local computer's basic network configuration"
+HOMEPAGE="https://github.com/jacobstanley/network-info"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.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 f435fbf8a7cf..bffad67dceec 100644
--- a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
+++ b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/network-run/Manifest b/dev-haskell/network-run/Manifest
new file mode 100644
index 000000000000..a7d60f7e8cce
--- /dev/null
+++ b/dev-haskell/network-run/Manifest
@@ -0,0 +1 @@
+DIST network-run-0.2.4.tar.gz 3092 BLAKE2B 6297645c5ae200dc584fad8a9a6be1403087cddf7c0bdcb1c928745bed7cc92302d9ffab1b66678941239b478ed595406c299e08f6aa417021f1dc36829d865d SHA512 45f5490e3f3409919a0c9405c96f6529a322dc145017347321a3bceafbefca3f19aba39d8acfcd5b31ee05a324c63355833fce5fabed8ea87a358bf7e3a1ab05
diff --git a/dev-haskell/network-run/metadata.xml b/dev-haskell/network-run/metadata.xml
new file mode 100644
index 000000000000..cc983e9d2a29
--- /dev/null
+++ b/dev-haskell/network-run/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">network-run</remote-id>
+ <remote-id type="github">kazu-yamamoto/network-run</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/network-run/network-run-0.2.4.ebuild b/dev-haskell/network-run/network-run-0.2.4.ebuild
new file mode 100644
index 000000000000..ab9398987ed9
--- /dev/null
+++ b/dev-haskell/network-run/network-run-0.2.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple network runner library"
+HOMEPAGE="https://hackage.haskell.org/package/network-run"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/network-3.1.0:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
index b0033493710e..e6efe7b1d15e 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,2 +1,2 @@
-DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
-DIST network-uri-2.6.3.0.tar.gz 31997 BLAKE2B 305a32a14eb32bb723ade1b20665e1f37a14111a7725bfcba99bd59120e5ac08c0f30c7fa32692a64f5a0bd4b26292e93bb079b89aa043c3fa0188316d0908f8 SHA512 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0
+DIST network-uri-2.6.4.1.tar.gz 32373 BLAKE2B cceeb533cae70b4b3e2a4caa2a2f3722949698bcc6c2c454787195ec33050c0a3f6ff9f2d60d5d965eb13043b22759525298a1840ac7046e765bc40b3ae960c7 SHA512 8e5b01fd11197ac36de9b804d37256662f904f2b94a997a2e262439bb1706d1c460db368e935bf3971fd1581162abbc07439a0bae391e1e616264bd00fe7104e
+DIST network-uri-2.6.4.2.tar.gz 31309 BLAKE2B 4ff7d3211ac89ef06ecc6f769c0a0a6933f23bd191dbfdae90697eb31c898d05d42094dec67161ff7cff648b2a6115b7a49d40218037cd838d2160a45cb0b445 SHA512 999e94a3053a101d1dc737a26ff93f832040365e949805b1ff5327ade9ab63d20f686c9f1bb3544d6d22c7c6d0b10bfcb64b30aa226d74ed6ad8bbb28fce6c0f
diff --git a/dev-haskell/network-uri/metadata.xml b/dev-haskell/network-uri/metadata.xml
index a4f8ab16450e..9e1b07f449dd 100644
--- a/dev-haskell/network-uri/metadata.xml
+++ b/dev-haskell/network-uri/metadata.xml
@@ -5,30 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides an URI manipulation inteface.
-
- In network-2.6 the @Network.URI@ module was split off from the
- network package into this package. If you're using the @Network.URI@
- module you can automatically get it from the right package by adding
- this to your .cabal file:
-
- &gt; flag network-uri
- &gt; description: Get Network.URI from the network-uri package
- &gt; default: True
- &gt;
- &gt; library
- &gt; -- ...
- &gt; if flag(network-uri)
- &gt; build-depends: network-uri &gt;= 2.6
- &gt; else
- &gt; build-depends: network &lt; 2.6
-
- If you want to use other modules from the network package while
- using the @Network.URI@ modules from this package, add a @network &gt;
- 2.6@ clause to the first @build-depends@ line.
- </longdescription>
<upstream>
+ <remote-id type="hackage">network-uri</remote-id>
<remote-id type="github">haskell/network-uri</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
deleted file mode 100644
index 5c57b210fa22..000000000000
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
deleted file mode 100644
index a542da827e19..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depend
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
-
-RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
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
new file mode 100644
index 000000000000..4624897d973e
--- /dev/null
+++ b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="URI manipulation"
+HOMEPAGE="https://github.com/haskell/network-uri"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
+
+RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( dev-haskell/hunit
+# dev-haskell/quickcheck
+# dev-haskell/tasty
+# dev-haskell/tasty-hunit
+# dev-haskell/tasty-quickcheck )
+# "
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
new file mode 100644
index 000000000000..78efe4ef49f6
--- /dev/null
+++ b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="URI manipulation"
+HOMEPAGE="https://github.com/haskell/network-uri"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 300618fd5429..d64e643810e4 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,6 +1,2 @@
-DIST network-2.4.1.2.tar.gz 140424 BLAKE2B 7e9d3036caa1ecdec1ffbc684310271cdd92998cebc35a51d65b858975ab8210612e445bc26071bebc67bb7ece5af31a6082de46932724a4afca63fb68238791 SHA512 a9a0237477fbb484ff8a66121a7808e35d4df68552c18cead1f96243f945e9517583f39c769c3ecbd643ec86a253bb3cba638ffb780feb503d60595ad7c4c7f5
-DIST network-2.4.2.2.tar.gz 141558 BLAKE2B a2e9137b79da5e9d136a9e10eee796b2aeaa81bd38cdfa5b4a2822711a9ec2fed3019ecf91c84f2ca6dc00824455814fac53c6a75bf7a5af89ec733ea4be0c6f SHA512 e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
-DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b04179b1608b6ca55f755dcbe08a468546a52c69f2a3f681e9e2ff05a952d1dbbd87831dd03e3a8a2f911eb17a379c0 SHA512 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
-DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
-DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
-DIST network-3.0.1.1.tar.gz 114777 BLAKE2B 05ced39ff17eb68e5e70ddb1036770413224839d5a2c84ee568823feb364f1da898bdc56ae7e64f0e24db80dbc2ec739e42763708b3373f49a85ecf911c72621 SHA512 faca3b25c8724a0c832b6e12e21381fa9642a60bce8a01ea7b570216cd429b2332b14903011f4a554af227de5e502f9619860c230a8f2a69cb5e2289b1947e3d
+DIST network-3.1.2.5.tar.gz 139267 BLAKE2B 682726d42db1d899810fbe6c0aa89f1b25770a46041a9136260d104f658611bc747c4695f403ae52234ac3506221619d7741e75bea987d0cc19e6a5066172f9f SHA512 671429b18f11285b157c70e669051f57a30bf5e85ada1134464f80dd978f71878f8b4d2564242c9ff4bb100b49af771e449c556654486f5eb433f39401ec6c00
+DIST network-3.1.3.0.tar.gz 139436 BLAKE2B e689f4a7ff235e07029f3d24714a8a1b465b8884aad8c0067f8980fd6a7876ef110f3759a0a7bd4cb3565d99ba1ae60b31ee0a2a87409b59c101c0862bd9f43b SHA512 000e2bf2bb9143e4808b02d8065809c67de9562aca35d043d15c064ae2b9e946a717862253add5ae65bf4bddc720ee266931c798238d2b5a546b52a5ab133cb8
diff --git a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch b/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
deleted file mode 100644
index eeb41c960c7b..000000000000
--- a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/network.buildinfo.in b/network.buildinfo.in
-index 69e63a6..2079179 100644
---- a/network.buildinfo.in
-+++ b/network.buildinfo.in
-@@ -2,3 +2,2 @@ ghc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
- ghc-prof-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
--ld-options: @LDFLAGS@
- cc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
diff --git a/dev-haskell/network/metadata.xml b/dev-haskell/network/metadata.xml
index 5d869e8ffe66..dd74ff6d9d5c 100644
--- a/dev-haskell/network/metadata.xml
+++ b/dev-haskell/network/metadata.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">haskell/network</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="devel">using tests for developers</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">network</remote-id>
+ <remote-id type="github">haskell/network</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
deleted file mode 100644
index b5f4686252ff..000000000000
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- )"
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
deleted file mode 100644
index 0bf78717bbcb..000000000000
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
deleted file mode 100644
index 12eb7390366c..000000000000
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
deleted file mode 100644
index 4a93655738cd..000000000000
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
deleted file mode 100644
index fde706ca8f3a..000000000000
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # missing regression test file
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/doctest-0.10.1
- dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
diff --git a/dev-haskell/network/network-3.0.1.1.ebuild b/dev-haskell/network/network-3.0.1.1.ebuild
deleted file mode 100644
index ba075bfdb94a..000000000000
--- a/dev-haskell/network/network-3.0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.6
- dev-haskell/hunit )
-"
diff --git a/dev-haskell/network/network-3.1.2.5.ebuild b/dev-haskell/network/network-3.1.2.5.ebuild
new file mode 100644
index 000000000000..f5a9d12439a4
--- /dev/null
+++ b/dev-haskell/network/network-3.1.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="https://github.com/haskell/network"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="devel"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.6
+ dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag devel devel)
+}
diff --git a/dev-haskell/network/network-3.1.3.0.ebuild b/dev-haskell/network/network-3.1.3.0.ebuild
new file mode 100644
index 000000000000..caff0339fd4c
--- /dev/null
+++ b/dev-haskell/network/network-3.1.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="https://github.com/haskell/network"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="devel"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2.6
+ dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag devel devel)
+}
diff --git a/dev-haskell/newtype-generics/Manifest b/dev-haskell/newtype-generics/Manifest
deleted file mode 100644
index bf45efe58281..000000000000
--- a/dev-haskell/newtype-generics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST newtype-generics-0.5.4.tar.gz 6878 BLAKE2B c260a0eeaecfe3d97aa6b7f794f588d64252373ecd92a5bbae55ab373620d96b4dece32fae0e96a74b1c9c1a0744fc222480c7271cd21addf93a7747465a14e5 SHA512 33128015f68a01633b778b8fd7f3d3df8f13b33479705edd4b47036641d7b358667998eb56a6fecdb1f65cb7fb0ac456b8d08ef264e1c17b2fad08ce0a0ffea1
diff --git a/dev-haskell/newtype-generics/metadata.xml b/dev-haskell/newtype-generics/metadata.xml
deleted file mode 100644
index 3d6e740a0543..000000000000
--- a/dev-haskell/newtype-generics/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype,
- and allows you to operatate under that newtype with functions such as ala.
- Generics support was added in version 0.4, making this package a full replacement
- for the original newtype package, and a better alternative to newtype-th.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild b/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
deleted file mode 100644
index 105dcb183f0b..000000000000
--- a/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass for working with newtypes, with generics support"
-HOMEPAGE="https://github.com/sjakobi/newtype-generics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.1 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.6 && < 4.14' 'base >= 4.6'
-}
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
deleted file mode 100644
index 41af45f516a8..000000000000
--- a/dev-haskell/newtype/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST newtype-0.2.2.0.tar.gz 4853 BLAKE2B 7b4b14b3ff158b6ceba22465421933fdadeddf20a6309cb107078f792087c63a614eb8df99f5ad515cbedd0897342252929ab34aa1694013d95d2e165c2a02e8 SHA512 9d8b344ac5f6ff62d8100b95dd879715639af2d8d1f63a8cb17a18fa7c4f427eade49aa3d6b47034351ac0f2cb5061013f6321038bff1053eb3aa84faf157a5b
diff --git a/dev-haskell/newtype/metadata.xml b/dev-haskell/newtype/metadata.xml
deleted file mode 100644
index d3c7261d5f98..000000000000
--- a/dev-haskell/newtype/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype, and allows you to operatate under that newtype with functions such as ala.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
deleted file mode 100644
index f3a91654edfc..000000000000
--- a/dev-haskell/newtype/newtype-0.2.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass and set of functions for working with newtypes"
-HOMEPAGE="https://hackage.haskell.org/package/newtype"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5'
-}
diff --git a/dev-haskell/nonce/Manifest b/dev-haskell/nonce/Manifest
deleted file mode 100644
index 2f6e00b54e7d..000000000000
--- a/dev-haskell/nonce/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nonce-1.0.7.tar.gz 2956 BLAKE2B 1b03b7b51c27f44ad9ec095865efb20fa19ef3b60b536970d28e9dc10db870b49600fe9454f804cafdd480b3e5054d5bcc22039d323019b0ac46fda2cb8ba69b SHA512 89fb70578c8f52c652cdb4c1e6243529701bc21685862d7bbc750e2000424a029a8b164bde6c422a38e61944a15a8b788aa4aa70212bca9f12b5eaae801d8db0
diff --git a/dev-haskell/nonce/metadata.xml b/dev-haskell/nonce/metadata.xml
deleted file mode 100644
index a783e06ed36c..000000000000
--- a/dev-haskell/nonce/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- According to the Wikipedia, a nonce is an arbitrary number used
- only once in a cryptographic communication. This package
- contain helper functions for generating nonces.
-
- There are many kinds of nonces used in different situations.
- It's not guaranteed that by using the nonces from this package
- you won't have any security issues. Please make sure that the
- nonces generated via this package are usable on your design.
- </longdescription>
- <upstream>
- <remote-id type="github">prowdsponsor/nonce</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/nonce/nonce-1.0.7-r1.ebuild b/dev-haskell/nonce/nonce-1.0.7-r1.ebuild
deleted file mode 100644
index 4dc5e78c00d9..000000000000
--- a/dev-haskell/nonce/nonce-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate cryptographic nonces"
-HOMEPAGE="https://github.com/prowdsponsor/nonce"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
- >=dev-haskell/entropy-0.3.7:=[profile?]
- >=dev-haskell/text-0.9:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base64-bytestring == 1.0.*' 'base64-bytestring >= 1.0 && < 1.3' \
- 'entropy >= 0.3.7 && < 0.4.2' 'entropy >= 0.3.7'
-}
diff --git a/dev-haskell/nonce/nonce-1.0.7.ebuild b/dev-haskell/nonce/nonce-1.0.7.ebuild
deleted file mode 100644
index 153271b53d81..000000000000
--- a/dev-haskell/nonce/nonce-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate cryptographic nonces"
-HOMEPAGE="https://github.com/prowdsponsor/nonce"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/entropy-0.3.7:=[profile?]
- >=dev-haskell/text-0.9:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'entropy >= 0.3.7 && < 0.4.2' 'entropy >= 0.3.7'
-}
diff --git a/dev-haskell/nothunks/Manifest b/dev-haskell/nothunks/Manifest
new file mode 100644
index 000000000000..922334f3ab1e
--- /dev/null
+++ b/dev-haskell/nothunks/Manifest
@@ -0,0 +1 @@
+DIST nothunks-0.1.4.tar.gz 18501 BLAKE2B 5f5bda104990dbecf7e313134d1d723f5ecb0dfb9b3abdb0ab68774f55e416b954720de7ccc449047f795cb03464c15cbf37dd4e20bdac71d0188f8fb76dc70e SHA512 6decd4bcc6c72c09c87692e772affeb4bb22d6312974bfb184567e399844d437bd4c68814f2f208d82a012498090a780958d138a946e907258e9a5d221a697c4
diff --git a/dev-haskell/nothunks/metadata.xml b/dev-haskell/nothunks/metadata.xml
new file mode 100644
index 000000000000..de0c1b2d1b19
--- /dev/null
+++ b/dev-haskell/nothunks/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="bytestring">Provide instances for bytestring</flag>
+ <flag name="text">Provide instances for text</flag>
+ <flag name="vector">Provide instances for vector</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">nothunks</remote-id>
+ <remote-id type="github">input-output-hk/nothunks</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild b/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..f70ecce1a7c2
--- /dev/null
+++ b/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Examine values for unexpected thunks"
+HOMEPAGE="https://hackage.haskell.org/package/nothunks"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+bytestring +text +vector"
+
+CABAL_CHDEPS=(
+ 'hedgehog >= 1.1 && < 1.3' 'hedgehog >= 1.1'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+ text? (
+ || (
+ ( >=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+ )
+ vector? (
+ >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hedgehog-1.1
+ >=dev-haskell/random-1.1 <dev-haskell/random-1.3
+ >=dev-haskell/tasty-1.3 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hedgehog-1.1 <dev-haskell/tasty-hedgehog-1.5
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bytestring bytestring) \
+ $(cabal_flag text text) \
+ $(cabal_flag vector vector)
+}
diff --git a/dev-haskell/numinstances/Manifest b/dev-haskell/numinstances/Manifest
deleted file mode 100644
index 6d8af659cbe1..000000000000
--- a/dev-haskell/numinstances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NumInstances-1.4.tar.gz 4749 BLAKE2B d25b62c0396c85ceed1bc1fe384a9d6f7a7601c0d1e3952ef482884db91f3a33306be2e2637a58fccd51cafd03ac3e0203ba65906a0c167f97a08726b68d2bd4 SHA512 d36b6d924345142004c3fdfe5d329a8679ddab2763a117d80b7f8a7077cd98961696fdca573578ce2389bc54563a926445cb63c3d3b888a1c54d22bc329236c6
diff --git a/dev-haskell/numinstances/metadata.xml b/dev-haskell/numinstances/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/numinstances/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/numinstances/numinstances-1.4.ebuild b/dev-haskell/numinstances/numinstances-1.4.ebuild
deleted file mode 100644
index 99c14d59cbc7..000000000000
--- a/dev-haskell/numinstances/numinstances-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="NumInstances"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Instances of numeric classes for functions and tuples"
-HOMEPAGE="https://github.com/conal/NumInstances"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/numtype-dk/Manifest b/dev-haskell/numtype-dk/Manifest
deleted file mode 100644
index 71996d0c2f8c..000000000000
--- a/dev-haskell/numtype-dk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST numtype-dk-0.5.0.2.tar.gz 7495 BLAKE2B bef39bff1eaec5cfb38ccc16001c670dead2605070645f0015567179c0267a13ce672938b61768489fd027df0a05fe3adbba26053f18bbb1bc91a6c53175dea3 SHA512 4c157fca67313f2ba5c761322b069d488e84574c837a5c708c9f80f21fff3118eb2f7e45f80a420f6b206026c7252b6afd3e46f59421e5c41675cdf067b6bec3
diff --git a/dev-haskell/numtype-dk/metadata.xml b/dev-haskell/numtype-dk/metadata.xml
deleted file mode 100644
index b5fb17a503c0..000000000000
--- a/dev-haskell/numtype-dk/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides type level representations of the
- (positive and negative) integers and basic operations (addition,
- subtraction, multiplication, division, exponentiation) on these.
- The numtype-dk package differs from the numtype package in that
- the NumTypes are implemented using Data Kinds, TypeNats, and
- Closed Type Families rather than Functional Dependencies.
- Requires GHC 7.8 or later.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild b/dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild
deleted file mode 100644
index cd0e9877f714..000000000000
--- a/dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"
-HOMEPAGE="https://github.com/bjornbm/numtype-dk"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/objectname/Manifest b/dev-haskell/objectname/Manifest
deleted file mode 100644
index dc8702094198..000000000000
--- a/dev-haskell/objectname/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ObjectName-1.1.0.1.tar.gz 2557 BLAKE2B ba67de5c6bf8dc522dbb245064ceaf9b6498979d511fb0b7624083362c6d954c70e292c03edec1663e4265cf935c5eb833dc4833b2acb17b29f957e6b028a98e SHA512 e0b94813d29ccba4a54c699e039ab101039a9482f594c990547a04f9de511e4d27d5a93fc5f176ea5e3a8d940d31477f0e69dcd6f7c867f67bb117933d2cce64
diff --git a/dev-haskell/objectname/metadata.xml b/dev-haskell/objectname/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/objectname/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/objectname/objectname-1.1.0.1.ebuild b/dev-haskell/objectname/objectname-1.1.0.1.ebuild
deleted file mode 100644
index 9c1581f36b04..000000000000
--- a/dev-haskell/objectname/objectname-1.1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
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 4dd378590025..75fdf036433b 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -26,8 +26,6 @@ DEPEND="${RDEPEND}
# it's not quite true, but there was no major releases
CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
-src_prepare() {
- default
- cabal_chdeps \
- 'base >= 4.2 && < 4.9' 'base >= 4.2'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.2 && < 4.9' 'base >= 4.2'
+)
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 ae3b02d9319e..0bc605e4e901 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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?]
@@ -27,8 +27,6 @@ DEPEND="${RDEPEND}
# it's not quite true, but there was no major releases
CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
-src_prepare() {
- default
- cabal_chdeps \
- 'base >= 4.7 && < 4.9' 'base >= 4.7'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.7 && < 4.9' 'base >= 4.7'
+)
diff --git a/dev-haskell/onetuple/Manifest b/dev-haskell/onetuple/Manifest
new file mode 100644
index 000000000000..cb540b679187
--- /dev/null
+++ b/dev-haskell/onetuple/Manifest
@@ -0,0 +1,3 @@
+DIST onetuple-0.3.1-rev2.cabal 2262 BLAKE2B 8cc887f52d2dc6efba347c945c3d7e2075b0051259179e6e46c3a3c5bc53434cc03ba07d5d2fb4427a6a158fa716038478b1f6337c4721f1303369c7bbf95e08 SHA512 c665b01a6c234f90c662cc48b268ea970da8ba29b38c8cdd43426d9361d2d1b6a8f9ec56fd4166358c3be35d4b45373d7f83c7e1c650207173d5149d949681a0
+DIST onetuple-0.3.1.tar.gz 5148 BLAKE2B 114cb7d8ba0ff28b7ad2ff7b3874446259a9a88f18a8ff6114975e60f712c466cd31861cac4bc2bf47f02280c155b3f2eb2f0880f0f39dfb855f6ad1b6dd4d69 SHA512 92678ca3e05c6da7d60e460efa88dbd8c19f8ec6b149dc5a9a493f93bd944b7d0c3ac650a3c1ad9d3742bc2a8bfaef1bab8a6e4ba71ebbb1fc0c9f7a07c0906c
+DIST onetuple-0.4.1.1.tar.gz 5601 BLAKE2B d847f732babbc5a692ca00cc483be1ca8f4912321bbcbfca5704827706d4e0d8e49127bcfb33b453a730fdb1161f0ba31878cfb53bfe97f51f9a885784e42cc2 SHA512 ee82a427558ad81ec95884794871c1a9245fefe32e21500e82d4f0539e4677dd6048e82bfd0f2b02c6d1a52d4d2392bb8f969c4fd663c35f4f7348a97aba8a26
diff --git a/dev-haskell/onetuple/metadata.xml b/dev-haskell/onetuple/metadata.xml
new file mode 100644
index 000000000000..5f2bfc74586b
--- /dev/null
+++ b/dev-haskell/onetuple/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">OneTuple</remote-id>
+ <remote-id type="github">phadej/OneTuple</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/onetuple/onetuple-0.3.1.ebuild b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
new file mode 100644
index 000000000000..76c167ec07f2
--- /dev/null
+++ b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_HACKAGE_REVISION="2"
+CABAL_PN="OneTuple"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Singleton Tuple"
+HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild b/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild
new file mode 100644
index 000000000000..cdbeb54747e4
--- /dev/null
+++ b/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_PN="OneTuple"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Singleton Tuple"
+HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.6:=[profile?]
+ >=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+ >=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/only/only-0.1.ebuild b/dev-haskell/only/only-0.1.ebuild
index a6ad69db5abe..eb3d6ce1b6f7 100644
--- a/dev-haskell/only/only-0.1.ebuild
+++ b/dev-haskell/only/only-0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.3.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/open-browser/Manifest b/dev-haskell/open-browser/Manifest
deleted file mode 100644
index 70e6a72eb6d2..000000000000
--- a/dev-haskell/open-browser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST open-browser-0.2.1.0.tar.gz 2629 BLAKE2B 5b56acd53d887e92e5a10cdb36e62ccd4bfdb4002988ebb553b9a5d52af5d7d13f02e5d6d37df52788191d951c401e7497eaf972e59884fd0eb41a28342a0f1d SHA512 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1
diff --git a/dev-haskell/open-browser/metadata.xml b/dev-haskell/open-browser/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/open-browser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild b/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
deleted file mode 100644
index cc4e2e804dfd..000000000000
--- a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Open a web browser from Haskell"
-HOMEPAGE="https://github.com/rightfold/open-browser"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'executable example' 'executable open-browser-example'
-}
diff --git a/dev-haskell/openal/Manifest b/dev-haskell/openal/Manifest
deleted file mode 100644
index 51f7aa732035..000000000000
--- a/dev-haskell/openal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OpenAL-1.7.0.5.tar.gz 40744 BLAKE2B 44c5a0e9ba3bc336cc63fbf4efc743d8403ce448ad84ecaad476ec0e9c0c8fdeea1fe0b42e7e950dc6606736c69cd59d90bb1c9557277dc4aa2b3a89b567a3f8 SHA512 b8c9fb4227fd55dbd173301c4960bc7bbaa3d460a9892366ffe20ad9e5c6a85b7b5f2c740d9ff2aaf70a3a91956daf339813d93d46ee01407a86f3b6bfb0df57
diff --git a/dev-haskell/openal/metadata.xml b/dev-haskell/openal/metadata.xml
deleted file mode 100644
index cf70ab7eb803..000000000000
--- a/dev-haskell/openal/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">haskell-openal/ALUT</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/openal/openal-1.7.0.5.ebuild b/dev-haskell/openal/openal-1.7.0.5.ebuild
deleted file mode 100644
index eae49d704508..000000000000
--- a/dev-haskell/openal/openal-1.7.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
- >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
- >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- media-libs/openal
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples buildexamples) \
- --flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
deleted file mode 100644
index ce7e563b1210..000000000000
--- a/dev-haskell/opengl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OpenGL-3.0.3.0.tar.gz 130752 BLAKE2B 3378cc470f68d51900d54ee3a1cdf78a01f096f5efaa0c0fdc73910fea661ebf4db8338d8563c3f593d0a1fcf947b17b65af6548276266a7bf72b6571e1b1ed9 SHA512 1ccd11095d5d36346bd22c8ebeab3b9bcb267744d6c3ddfe3c76dc2ed620493d688353a778454a053c710464db0de8228823a95f63dfae5784c2f1ca931b0ae9
diff --git a/dev-haskell/opengl/metadata.xml b/dev-haskell/opengl/metadata.xml
deleted file mode 100644
index 2e890bd21064..000000000000
--- a/dev-haskell/opengl/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its
- accompanying utility library (GLU, version 1.3).
-
- OpenGL is the industry's most widely used and supported 2D and 3D graphics
- application programming interface (API), incorporating a broad set of
- rendering, texture mapping, special effects, and other powerful visualization
- functions. For more information about OpenGL and its various extensions,
- please see &lt;http://www.opengl.org/&gt;
- and &lt;http://www.opengl.org/registry/&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild b/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
deleted file mode 100644
index 5fe15f8d0947..000000000000
--- a/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://wiki.haskell.org/OpenGL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
- >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
- >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
- >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
- >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- #as per https://hackage.haskell.org/package/OpenGL-3.0.3.0/revisions/
- cabal_chdeps \
- 'StateVar >= 1.1 && < 1.2' 'StateVar >= 1.1 && < 1.3'
-}
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
deleted file mode 100644
index 5b2d9edd30ca..000000000000
--- a/dev-haskell/openglraw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OpenGLRaw-3.3.4.0.tar.gz 882560 BLAKE2B 10cddf9b739d40394859090ea7a7f237fa4f48e1a219a5adf87329424cf2c2d2ef2465793b53f431cc6382de0adf2188ad8b093031ed3cb3290c66be4e340291 SHA512 1db7196cc59d7107ba53a497b6cf78a82b280a9bdc115bd49109193e3fa4077c84eb34b757669a3da95d6bce214fc523a9b75444f9a7019049649e2431a2f076
diff --git a/dev-haskell/openglraw/metadata.xml b/dev-haskell/openglraw/metadata.xml
deleted file mode 100644
index 5066bb8dbad2..000000000000
--- a/dev-haskell/openglraw/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
- lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
- intended as a basis for a nicer interface. OpenGLRaw offers access to all
- necessary functions, tokens and types plus a general facility for loading
- extension entries. The module hierarchy closely mirrors the naming structure
- of the OpenGL extensions, making it easy to find the right module to import.
- All API entries are loaded dynamically, so no special C header files are
- needed for building this package. If an API entry is not found at runtime, a
- userError is thrown.
-
- OpenGL is the industry's most widely used and supported 2D and 3D graphics
- application programming interface (API), incorporating a broad set of
- rendering, texture mapping, special effects, and other powerful visualization
- functions. For more information about OpenGL and its various extensions,
- please see &lt;http://www.opengl.org/&gt;
- and &lt;http://www.opengl.org/registry/&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
deleted file mode 100644
index bfce4ad892c0..000000000000
--- a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?]
- >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?]
- >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- virtual/opengl
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-osandroid \
- --flag=-usegles2 \
- --flag=-useglxgetprocaddress \
- --flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
deleted file mode 100644
index e38e0c7d52e5..000000000000
--- a/dev-haskell/openssl-streams/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openssl-streams-1.2.3.0.tar.gz 6304 BLAKE2B c957be3a5d45f8785220f1bf645ab49df17f3c21dc609810651bc345c9bf6e576cbbb3a35f46b9f979ed48b525caaf8bd6c75f1fc41a38407fa8948b2719f17b SHA512 86c5f9348af82ad0ac9e8103ee078c78647e61345ecf0c48b02749206147a82a3a798f681b9cd20ec866276aca75a3739965ca2b76a0b302da4792bf1fc4917e
diff --git a/dev-haskell/openssl-streams/metadata.xml b/dev-haskell/openssl-streams/metadata.xml
deleted file mode 100644
index 2508c4550175..000000000000
--- a/dev-haskell/openssl-streams/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- The openssl-streams library contains io-streams routines for secure
- networking using OpenSSL (by way of HsOpenSSL).
-
- /ChangeLog/
-
- [@1.1.0.0@] Updated @openssl-streams@ to work with @io-streams@ 1.1.0.0.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
deleted file mode 100644
index 7e5e5490e1ff..000000000000
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="OpenSSL network support for io-streams"
-HOMEPAGE="https://hackage.haskell.org/package/openssl-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
- >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
- >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index c7c54738adab..53b51528f0b1 100644
--- a/dev-haskell/options/Manifest
+++ b/dev-haskell/options/Manifest
@@ -1 +1,2 @@
DIST options-1.2.1.1.tar.gz 25327 BLAKE2B 66611694e5beb558e185cd9a89e9368ebac035118360a4c1cb9bcba5ad2a0be74c32848e3983aec999b4cee6e3138c527fe31c869b52c84719ee89afe3aad232 SHA512 615a3767b74ca0ba2eae993f6e475963df2a0933f1e6c9bbfe35144c4dc6018af276144b2ec1b608b695dc7fca904784ebc63cd58a432f966588846cb36f94ea
+DIST options-1.2.1.2.tar.gz 22693 BLAKE2B 4e17e038a910deb114182a5f98860cf4bef6ee6b03901105a23760cd108352e5be63ba762dadbd225ec10ef7c3b34c76184ccc927a36f2ff4720d6c0ee77ae5f SHA512 82c366adce56a27ab68a4388bc759b90ee4bfe38fd72325af954bef2eb3aee360729d5ed2de2964c8087b3b5a51d321321d9c02024b34b6167f09d7412aa2568
diff --git a/dev-haskell/options/metadata.xml b/dev-haskell/options/metadata.xml
index 284861e4945d..c78c1cd7c4aa 100644
--- a/dev-haskell/options/metadata.xml
+++ b/dev-haskell/options/metadata.xml
@@ -5,59 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The @options@ package lets library and application developers easily work
- with command-line options.
-
- The following example is a full program that can accept two options,
- @--message@ and @--quiet@:
-
- @
- import Control.Applicative
- import Options
-
- data MainOptions = MainOptions
- &amp;#x20; &amp;#x7b; optMessage :: String
- &amp;#x20; , optQuiet :: Bool
- &amp;#x20; &amp;#x7d;
-
- instance 'Options' MainOptions where
- &amp;#x20; defineOptions = pure MainOptions
- &amp;#x20; \&lt;*\&gt; simpleOption \"message\" \"Hello world!\"
- &amp;#x20; \"A message to show the user.\"
- &amp;#x20; \&lt;*\&gt; simpleOption \"quiet\" False
- &amp;#x20; \"Whether to be quiet.\"
-
- main :: IO ()
- main = runCommand $ \\opts args -&gt; do
- &amp;#x20; if optQuiet opts
- &amp;#x20; then return ()
- &amp;#x20; else putStrLn (optMessage opts)
- @
-
- &gt;$ ./hello
- &gt;Hello world!
- &gt;$ ./hello --message='ciao mondo'
- &gt;ciao mondo
- &gt;$ ./hello --quiet
- &gt;$
-
- In addition, this library will automatically create documentation options
- such as @--help@ and @--help-all@:
-
- &gt;$ ./hello --help
- &gt;Help Options:
- &gt; -h, --help
- &gt; Show option summary.
- &gt; --help-all
- &gt; Show all help options.
- &gt;
- &gt;Application Options:
- &gt; --message :: text
- &gt; A message to show the user.
- &gt; default: "Hello world!"
- &gt; --quiet :: bool
- &gt; Whether to be quiet.
- &gt; default: false
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">options</remote-id>
+ <remote-id type="github">typeclasses/options</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index a6d4c06bbb96..410373f86de7 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # circular depends: options[test]->chell->options
diff --git a/dev-haskell/options/options-1.2.1.2.ebuild b/dev-haskell/options/options-1.2.1.2.ebuild
new file mode 100644
index 000000000000..f8c85444f9d0
--- /dev/null
+++ b/dev-haskell/options/options-1.2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Powerful and easy command-line option parser"
+HOMEPAGE="https://github.com/typeclasses/options/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+)
+
+RDEPEND="
+ >=dev-haskell/monads-tf-0.3:=[profile?] <dev-haskell/monads-tf-0.4:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hspec-2.9.7 <dev-haskell/hspec-2.12
+ >=dev-haskell/patience-0.3 <dev-haskell/patience-0.4
+ )
+"
diff --git a/dev-haskell/optparse-applicative/Manifest b/dev-haskell/optparse-applicative/Manifest
index 5bc87cc48bf0..6fb42cf25fa4 100644
--- a/dev-haskell/optparse-applicative/Manifest
+++ b/dev-haskell/optparse-applicative/Manifest
@@ -1 +1,3 @@
-DIST optparse-applicative-0.15.1.0.tar.gz 56203 BLAKE2B b4db1a96d0dbe1e4f1a4969e5fe1597ca314364bc71da505b9582b8cd0bf0025edc1dea3d1d39b84c108a7b38bea2c53ecd660d1d0b7d44c56b8d18dde14d812 SHA512 e7ab0a2b4812bbfe7802c2d51a45a4f5a5ea162b094631dc6ee4cd79e5def4101ccb04305cfa16942926809ed656f91aa6f68c4d98e93171ca9be99ba40cc51e
+DIST optparse-applicative-0.16.1.0.cabal 4982 BLAKE2B 7e9fed3ff6f09f8b7994d4fd2177ade79e62bc2292dd5fa78bfdf15b0b6f7af0bd696d61ef02ed358460a61f0e2f960d01455091168687f6d2db0b07caf182f6 SHA512 31a1e01b4d0a247c10b1eec2f5bb40e518b447527736b8692846980d182ef2ac4d839b4a24b3d17414fac28700d43d0317deb481c1e0c7ac2b7b38aaafc654a1
+DIST optparse-applicative-0.16.1.0.tar.gz 58315 BLAKE2B 3998ef8594abd3f0f1e85cc44a3efa19d78751f5d17181e1b203504221c219ebf3fa36ccde7351e5821fe1c4a4c0c16a20fffe92259710dbcc7656f4e3a83c50 SHA512 46bdb37b1328a6dbf271dcdb3483266c0c8412fc489e68e32b114745d9cf0108dd49df6cb565df3470121931a769f11996f5fd9fd8e9e38ed6b6853faab56710
+DIST optparse-applicative-0.18.1.0.tar.gz 60682 BLAKE2B 7fc64b6d135fbec6165050e059235a34b0cbe0633076acc97f645af9e25d805ddd5bc03101823ac4645bf7c390dd6c19d96505aeb6c54a4253317b6cbc160d8a SHA512 a5a7667cadd3c2785d787cb6bddb009750308376c771f45d72e2245577f42c2946a069bf420d3404653f9f3662cb798341ee96d1ead35dbf95ab42447698e41d
diff --git a/dev-haskell/optparse-applicative/metadata.xml b/dev-haskell/optparse-applicative/metadata.xml
index 3e2bcf92c04b..2a153711a9ce 100644
--- a/dev-haskell/optparse-applicative/metadata.xml
+++ b/dev-haskell/optparse-applicative/metadata.xml
@@ -5,68 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Here is a simple example of an applicative option parser:
-
- @
- data Sample = Sample
- &amp;#x20; &amp;#x7b; hello :: String
- &amp;#x20; , quiet :: Bool &amp;#x7d;
-
- sample :: Parser Sample
- sample = Sample
- &amp;#x20; \&lt;$\&gt; strOption
- &amp;#x20; ( long \"hello\"
- &amp;#x20; &amp; metavar \"TARGET\"
- &amp;#x20; &amp; help \"Target for the greeting\" )
- &amp;#x20; \&lt;*\&gt; switch
- &amp;#x20; ( long \"quiet\"
- &amp;#x20; &amp; help \"Whether to be quiet\" )
- @
-
- The parser is built using applicative style starting from a set of basic
- combinators. In this example, @hello@ is defined as an 'option' with a
- @String@ argument, while @quiet@ is a boolean 'flag' (called 'switch').
-
- A parser can be used like this:
-
- @
- greet :: Sample -&gt; IO ()
- greet (Sample h False) = putStrLn $ \"Hello, \" ++ h
- greet _ = return ()
-
- main :: IO ()
- main = execParser opts \&gt;\&gt;= greet
- &amp;#x20; where
- &amp;#x20; opts = info (helper \&lt;*\&gt; sample)
- &amp;#x20; ( fullDesc
- &amp;#x20; &amp; progDesc \"Print a greeting for TARGET\"
- &amp;#x20; &amp; header \"hello - a test for optparse-applicative\" )
- @
-
- The @greet@ function is the entry point of the program, while @opts@ is a
- complete description of the program, used when generating a help text. The
- 'helper' combinator takes any parser, and adds a @help@ option to it (which
- always fails).
-
- The @hello@ option in this example is mandatory (since it doesn't have a
- default value), so running the program without any argument will display a
- help text:
-
- &gt;hello - a test for optparse-applicative
- &gt;
- &gt;Usage: hello --hello TARGET [--quiet]
- &gt; Print a greeting for TARGET
- &gt;
- &gt;Available options:
- &gt; -h,--help Show this help text
- &gt; --hello TARGET Target for the greeting
- &gt; --quiet Whether to be quiet
-
- containing a short usage summary, and a detailed list of options with
- descriptions.
- </longdescription>
<upstream>
+ <remote-id type="hackage">optparse-applicative</remote-id>
<remote-id type="github">pcapriotti/optparse-applicative</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
deleted file mode 100644
index 4e1407187440..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
-"
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
new file mode 100644
index 000000000000..ca54409218be
--- /dev/null
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackage: flags: +process
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities and combinators for parsing command line options"
+HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
+HACKAGE_REV="2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=process
+}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild
new file mode 100644
index 000000000000..69832dbebf11
--- /dev/null
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +process
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities and combinators for parsing command line options"
+HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+ >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-1.2:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=process
+}
diff --git a/dev-haskell/optparse-simple/Manifest b/dev-haskell/optparse-simple/Manifest
deleted file mode 100644
index d324cd3f07aa..000000000000
--- a/dev-haskell/optparse-simple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST optparse-simple-0.1.1.3.tar.gz 5096 BLAKE2B 56dccf13f5b2ef7b7b3f9fefa5562097fd934297f619d9f9e53aaecad1f26f8ab484cecfb19805b8efb7e1830493bf2eb14cfd29d82969af3d47b7d77d33f9e5 SHA512 9ab7208b459a196ec54511de6b51c98eabe29f5756c09c1f23653a0ff12cbd402ab8366ccfdc12467dce4be0fa1cae96571925ac5858d12478f0ed41168ecdf9
diff --git a/dev-haskell/optparse-simple/metadata.xml b/dev-haskell/optparse-simple/metadata.xml
deleted file mode 100644
index 435c89de469b..000000000000
--- a/dev-haskell/optparse-simple/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="build-example">Build the example executable</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.1.1.3.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.1.1.3.ebuild
deleted file mode 100644
index a1356dfda28f..000000000000
--- a/dev-haskell/optparse-simple/optparse-simple-0.1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to optparse-applicative"
-HOMEPAGE="https://github.com/fpco/optparse-simple#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-example"
-
-RDEPEND=">=dev-haskell/githash-0.1.3.0:=[profile?]
- dev-haskell/optparse-applicative:=[profile?]
- >=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag build-example build-example)
-}
diff --git a/dev-haskell/ordered-containers/Manifest b/dev-haskell/ordered-containers/Manifest
new file mode 100644
index 000000000000..e266df26597a
--- /dev/null
+++ b/dev-haskell/ordered-containers/Manifest
@@ -0,0 +1 @@
+DIST ordered-containers-0.2.3.tar.gz 7404 BLAKE2B 1e731a5bcf78a3ab8262fcc6edfc5e51ea286d93271f605b7d6b43356994f704eaa438887671f72f4811638108ff52924029fb956d05b1ed6fcc18d9c37f2911 SHA512 a5e141705f9bdbccf152238bcd6be22f3a04966bf57cdf9485f1ea5efd9cc25de80b2d2dd92f281520fddaa74906e9fbbb789e111d19b46854f1cf5297b1b7e9
diff --git a/dev-haskell/ordered-containers/metadata.xml b/dev-haskell/ordered-containers/metadata.xml
new file mode 100644
index 000000000000..1f356cb193b1
--- /dev/null
+++ b/dev-haskell/ordered-containers/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">ordered-containers</remote-id>
+ <remote-id type="github">dmwit/ordered-containers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild b/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild
new file mode 100644
index 000000000000..5552b1a0d557
--- /dev/null
+++ b/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Set- and Map-like types that remember the order elements were inserted"
+HOMEPAGE="https://hackage.haskell.org/package/ordered-containers"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
deleted file mode 100644
index 66930925f619..000000000000
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pandoc-citeproc-0.17.0.2.tar.gz 344577 BLAKE2B f2b4687fe5de8cb8b76d1d8022ec9629c7834a3f3d3bc2735c52ec40ea0132caa8d7b9ad3c603d6120800e2c1f75e76cb13a3c45a4cbdd0e4bbba6d6fd54ed24 SHA512 5ce079a542b096c06d6e4e205625a993422a972f04787495ac9013dd3131df62733f30e4c3004335e3738b02bb22a7ad50a31c1eb3f67d2b4ef51605c7fcbf16
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
deleted file mode 100644
index 640f7ab93cd5..000000000000
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="bibutils">Use Chris Putnam's Bibutils.</flag>
- <flag name="debug">Turn on debug tracing.</flag>
- <flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
- <flag name="static">Use static linking.</flag>
- <flag name="unicode-collation">Use Haskell bindings to the International Components for Unicode (ICU) libraries</flag>
- </use>
- <longdescription>
- The pandoc-citeproc library supports automatic
- generation of citations and a bibliography in pandoc
- documents using the Citation Style Language (CSL)
- macro language. More details on CSL can be found at
- &lt;http://citationstyles.org/&gt;.
-
- In addition to a library, the package includes
- an executable, pandoc-citeproc, which works as a pandoc
- filter and also has a mode for converting bibliographic
- databases into CSL JSON and pandoc YAML metadata formats.
-
- pandoc-citeproc originated as a fork of Andrea
- Rossato's citeproc-hs.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
deleted file mode 100644
index b5c9b3c6e24d..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -small_base,-test_citeproc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files static unicode-collation"
-
-RESTRICT=test # tests fail when system already has pandoc-citeproc installed
-
-RDEPEND=">=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?]
- >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/aeson-pretty-0.8:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/hsyaml-aeson-0.2:=[profile?] <dev-haskell/hsyaml-aeson-0.3:=[profile?]
- dev-haskell/libyaml:=[profile?]
- dev-haskell/mtl:=[profile?]
- <dev-haskell/network-3.2:=[profile?]
- dev-haskell/old-locale:=[profile?]
- >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
- dev-haskell/parsec:=[profile?]
- dev-haskell/safe:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
- dev-haskell/split:=[profile?]
- dev-haskell/syb:=[profile?]
- dev-haskell/tagsoup:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
- >=dev-haskell/yaml-0.11:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- bibutils? ( >=dev-haskell/hs-bibutils-6.4:=[profile?] )
- debug? ( dev-haskell/pretty-show:=[profile?] )
- embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
- unicode-collation? ( dev-haskell/text-icu:=[profile?] )
- !unicode-collation? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( >=dev-haskell/temporary-1.1 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag bibutils bibutils) \
- $(cabal_flag debug debug) \
- $(cabal_flag embed-data-files embed_data_files) \
- --flag=-small_base \
- $(cabal_flag static static) \
- --flag=-test_citeproc \
- $(cabal_flag unicode-collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-lua-engine/Manifest b/dev-haskell/pandoc-lua-engine/Manifest
new file mode 100644
index 000000000000..64df061cf7b0
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/Manifest
@@ -0,0 +1,2 @@
+DIST pandoc-lua-engine-0.2.1.2-rev1.cabal 6835 BLAKE2B 70217c170c8eeb59571b208fab3ea34b7e1bcf30afad7365249fbd292a8c571910a3afe868f2b1fd68f8801eeeeb95f08810901f8dd5a32f511fdfc0ea665b98 SHA512 6c0fa6f266ab796f3c041f839a8fdb11f511dd76b88f2a48b6aa3df717e9a137a571ea204398a92be39bdc5e0d3a1e1e1814374192a9a9ea243c6303770ed4ae
+DIST pandoc-lua-engine-0.2.1.2.tar.gz 81179 BLAKE2B b6e8c29a754b093ebd17695a12a28a8755417033068668b6f8154f30ed649031b03c94f9a4ba262f7fa644b718f44c470273371cfa9866d1d7da1d5526fffc42 SHA512 4226463f889ae08fd6449ee3cc66b47830e3c0afee70cf897500461924176a62a2e7123cda8c1c2f8b47bcfdd67ae41502cc01cc04fc73f489c01dff6c897232
diff --git a/dev-haskell/pandoc-lua-engine/metadata.xml b/dev-haskell/pandoc-lua-engine/metadata.xml
new file mode 100644
index 000000000000..daccca3763a8
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">pandoc-lua-engine</remote-id>
+ <remote-id type="github">jgm/pandoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild b/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild
new file mode 100644
index 000000000000..b0b2b0d9301c
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua engine to power custom pandoc conversions"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access to fetch .svg
+
+RDEPEND=">=dev-haskell/pandoc-3.1.4:=[profile?] <dev-haskell/pandoc-3.2:=[profile?]
+ dev-haskell/aeson:=[profile?]
+ >=dev-haskell/citeproc-0.8:=[profile?] <dev-haskell/citeproc-0.9:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+ >=dev-haskell/hslua-2.3:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+ >=dev-haskell/hslua-module-doclayout-1.1:=[profile?] <dev-haskell/hslua-module-doclayout-1.2:=[profile?]
+ >=dev-haskell/hslua-module-path-1.1:=[profile?] <dev-haskell/hslua-module-path-1.2:=[profile?]
+ >=dev-haskell/hslua-module-system-1.1:=[profile?] <dev-haskell/hslua-module-system-1.2:=[profile?]
+ >=dev-haskell/hslua-module-text-1.1:=[profile?] <dev-haskell/hslua-module-text-1.2:=[profile?]
+ >=dev-haskell/hslua-module-version-1.1:=[profile?] <dev-haskell/hslua-module-version-1.2:=[profile?]
+ >=dev-haskell/hslua-module-zip-1.1:=[profile?] <dev-haskell/hslua-module-zip-1.2:=[profile?]
+ >=dev-haskell/hslua-repl-0.1.1:=[profile?] <dev-haskell/hslua-repl-0.2:=[profile?]
+ >=dev-haskell/lpeg-1.0.4:=[profile?] <dev-haskell/lpeg-1.1:=[profile?]
+ >=dev-haskell/pandoc-lua-marshal-0.2.2:=[profile?] <dev-haskell/pandoc-lua-marshal-0.3:=[profile?]
+ >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+ >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-2.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ >=dev-haskell/tasty-lua-1.1 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/pandoc-lua-marshal/Manifest b/dev-haskell/pandoc-lua-marshal/Manifest
new file mode 100644
index 000000000000..c01529711831
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/Manifest
@@ -0,0 +1,2 @@
+DIST pandoc-lua-marshal-0.1.6.tar.gz 41737 BLAKE2B 878f28c9f20b752f09c9c94215a90d7d2e43f32f598f95272aac0e1847d90cbe03df1a52cc93c025f24b8c439e633599d5b0d0b4c9f224f21c505b2a82cd8290 SHA512 be425707b82da8d82d544da5c67f58537ddaa7eabf2508ab4e7bd4c0cff05b394a784bea744e6f702047ee733e259369eef43de615436607b38ceb8bda89417d
+DIST pandoc-lua-marshal-0.2.2.tar.gz 38236 BLAKE2B 34685d34caa523390639fcdbf98faa19ef4f91f7bfab8e3a99016562280712409a2ddedc45be370f30165e66af849cd9e4d8c4069f1020c604ca2974236aeee3 SHA512 4a861beb82d2abd95c4c671c9962c99d5302d1fa44de7d80e6e0896c172a6cd3c3758fc4b51b29667dcec1a6d51385cbe8d8e53c15e6eab761840e39270cfe3d
diff --git a/dev-haskell/pandoc-lua-marshal/metadata.xml b/dev-haskell/pandoc-lua-marshal/metadata.xml
new file mode 100644
index 000000000000..b4ca44993479
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">pandoc-lua-marshal</remote-id>
+ <remote-id type="github">pandoc/pandoc-lua-marshal</remote-id>
+ </upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..f57a09a97e7d
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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="Use pandoc types in Lua"
+HOMEPAGE="https://github.com/pandoc/pandoc-lua-marshal"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?]
+ >=dev-haskell/pandoc-types-1.22.1:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild
new file mode 100644
index 000000000000..d240a29a02ac
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use pandoc types in Lua"
+HOMEPAGE="https://github.com/pandoc/pandoc-lua-marshal"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+ >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+ >=dev-haskell/hslua-list-1.1:=[profile?] <dev-haskell/hslua-list-1.2:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/lua-2.2:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+ >=dev-haskell/pandoc-types-1.23:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-lua-1.0
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/pandoc-server/Manifest b/dev-haskell/pandoc-server/Manifest
new file mode 100644
index 000000000000..b58a33eb3d8d
--- /dev/null
+++ b/dev-haskell/pandoc-server/Manifest
@@ -0,0 +1 @@
+DIST pandoc-server-0.1.0.3.tar.gz 12779 BLAKE2B a2265acd435053d8c7bbe61c9dd2ada19b75554ca49be2fe6dddd232dcf44e41194c984a4cde6c4dcb060ebd630ee0584cf6217d31080cacaae27fa026ae345b SHA512 3fc7af2fcc16dfcbd05f12f04ac7682c56d2ea8e19d554d3abc803e3cc3ccedfdaaa14583fe5afa69961b86ba6a52d5ef099bf51330c70c4f5dc401d615098c6
diff --git a/dev-haskell/pandoc-server/metadata.xml b/dev-haskell/pandoc-server/metadata.xml
new file mode 100644
index 000000000000..53c2244508b1
--- /dev/null
+++ b/dev-haskell/pandoc-server/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">pandoc-server</remote-id>
+ <remote-id type="github">jgm/pandoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild b/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild
new file mode 100644
index 000000000000..4f55a6ec2a51
--- /dev/null
+++ b/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc document conversion as an HTTP servant-server"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/pandoc-3.0:=[profile?]
+ >=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/base64-0.4:=[profile?] <dev-haskell/base64-0.5:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+ >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ >=dev-haskell/servant-server-0.19:=[profile?] <dev-haskell/servant-server-0.21:=[profile?]
+ >=dev-haskell/skylighting-0.13:=[profile?] <dev-haskell/skylighting-0.15:=[profile?]
+ >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.2:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/wai-cors-0.2.7:=[profile?] <dev-haskell/wai-cors-0.3:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index dbe4fc293c3b..6dcbaa2575ee 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,2 +1,2 @@
-DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
-DIST pandoc-types-1.22.tar.gz 34702 BLAKE2B 17c4a33c1d9c5afed2eae2dfc805273c949bfea583c705c469560c0cb58d8b0d31a29afd698062493e8452d9d63c717ef3c26f75afe640dec98b924f083a3e93 SHA512 b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0
+DIST pandoc-types-1.22.2.tar.gz 35887 BLAKE2B 7a884551a1c1ed94308a1b2529806aee42b9e04a7de94d6a0ded0ad106a6653b9c290b8781ff4197ff86bd132645ef96b5984987206b67173e057258a9fd4c43 SHA512 c4e78de0d6f2df67a716f7e549d629b9ead7f2569674cd84cd73a430c7ee97d1ebe30e0a95e84b5f45dab2a5cee6c6d5cc30f6c47f11859c938c75f63406878b
+DIST pandoc-types-1.23.1.tar.gz 36480 BLAKE2B 7c25cc294d0180c4c8a694b0471e76049ff9236a0c9dcf1fac37e6dbe47f7166948c8468b9232c6900a2fc231fd3210edd32b7c504e58b5ed749ce66cfbc3454 SHA512 c09dd9966da80e7121d2033d175832fef190f17044f3fa340c554b4f3ec1a288ffe3b0bb1c1fb0bbd477de0633adfdf111cda39d2e09d8e6d5019f6c28be3fb4
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
index 937381521944..05ac3948269e 100644
--- a/dev-haskell/pandoc-types/metadata.xml
+++ b/dev-haskell/pandoc-types/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">pandoc-types</remote-id>
+ <remote-id type="github">jgm/pandoc-types</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
deleted file mode 100644
index 0afc02176b72..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://pandoc.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/string-qq-0.0.2
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
new file mode 100644
index 000000000000..0966156abcb5
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/string-qq-0.0.2 <dev-haskell/string-qq-0.1
+ >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild
deleted file mode 100644
index 79aa10c82703..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://pandoc.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/string-qq-0.0.2 <dev-haskell/string-qq-0.1
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
new file mode 100644
index 000000000000..e02997758c0e
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/pandoc/Manifest b/dev-haskell/pandoc/Manifest
new file mode 100644
index 000000000000..3afdee24cae4
--- /dev/null
+++ b/dev-haskell/pandoc/Manifest
@@ -0,0 +1 @@
+DIST pandoc-3.1.8.tar.gz 7315618 BLAKE2B 6e24c1e113be040f413f9e351d020ca911a1e895144cbc2182d10bedf82f75f5d4fbc05fd15c575bb2f6b6605a2574aa3e2a6a9ee36599d1344ee76612a93b53 SHA512 2de648e7f3808d3139c214882a53157b2003c3fd340d7beee77a1cc49c2438004c03016f870d2348032457da5c6a63dd075eb7098e6f126db5a185325cbcc528
diff --git a/dev-haskell/pandoc/metadata.xml b/dev-haskell/pandoc/metadata.xml
new file mode 100644
index 000000000000..d70da6d9333b
--- /dev/null
+++ b/dev-haskell/pandoc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">pandoc</remote-id>
+ <remote-id type="github">jgm/pandoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild b/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..f66010e6cc3a
--- /dev/null
+++ b/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -static,-lua53,-nightly
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RESTRICT=test # test case fails
+
+RDEPEND=">=dev-haskell/aeson-2.0.1.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+ >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base64-0.4:=[profile?] <dev-haskell/base64-0.5:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+ >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/citeproc-0.8.1:=[profile?] <dev-haskell/citeproc-0.9:=[profile?]
+ >=dev-haskell/commonmark-0.2.3:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+ >=dev-haskell/commonmark-extensions-0.2.3.5:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+ >=dev-haskell/commonmark-pandoc-0.2.1.3:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+ >=dev-haskell/crypton-connection-0.3.1:=[profile?] <dev-haskell/crypton-connection-0.4:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/doclayout-0.4.0.1:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+ >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+ >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+ >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+ >=dev-haskell/gridtables-0.1:=[profile?] <dev-haskell/gridtables-0.2:=[profile?]
+ >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.12:=[profile?]
+ >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+ >=dev-haskell/jira-wiki-markup-1.5.1:=[profile?] <dev-haskell/jira-wiki-markup-1.6:=[profile?]
+ >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+ >=dev-haskell/mime-types-0.1.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/pandoc-types-1.23.1:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+ >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+ >=dev-haskell/skylighting-0.14:=[profile?] <dev-haskell/skylighting-0.15:=[profile?]
+ >=dev-haskell/skylighting-core-0.14:=[profile?] <dev-haskell/skylighting-core-0.15:=[profile?]
+ >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+ >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+ >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+ >=dev-haskell/texmath-0.12.8.2:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
+ >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.2:=[profile?]
+ >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+ >=dev-haskell/typst-0.3.2.0:=[profile?] <dev-haskell/typst-0.3.3:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
+ >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+ >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+ >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+ >=dev-haskell/zip-archive-0.4.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+ >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ !<app-text/pandoc-3
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+ >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag embed-data-files embed_data_files) \
+ --flag=-lua53 \
+ --flag=-nightly \
+ --flag=-static
+}
+
+src_install() {
+ haskell-cabal_src_install
+ doman "${S}/man/${PN}.1"
+}
+
+pkg_postinst() {
+ einfo "As of version 3, ${PN} no longer packages the pandoc executable"
+ einfo "as standard. For the executable, run 'emerge -av app-text/pandoc-cli'."
+}
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index 03ae24f14f6b..e7d95edab6a2 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -1 +1 @@
-DIST pango-0.13.8.1.tar.gz 52671 BLAKE2B b3e4067adc4fb2963c054e82f37864c1e57be57bb76b5d6f139cbb7ea41625a9edae12888e847194955f164f1d35bbd4555a389c3eec61da5822d046bee2ba16 SHA512 b17938143332976d048793db5c43647b2a7278713821166c1f13aa74f3c8a77e7c990481add77090418d260dd4b80df7b1eb9b0fdcc415df47b64198e3c1f5fb
+DIST pango-0.13.10.0.tar.gz 52695 BLAKE2B 5551b0352b8c444de6ad6cfb216e571ef71b38e76d4d174ac9dd090bc3cec7c3c395065cf2a90e889ce945939ef5cd64715d443283cb350c78b99bc7ab02879b SHA512 050729ddf2a35bd21836a3a67eaa7218faf3534ff1affe74be840b6a7cfff256cc207b7805d5e3a48f6f6c365e3b0793818f98e94fc4a9dd03c31e1a60e7d078
diff --git a/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch b/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
deleted file mode 100644
index fbe18552e3e5..000000000000
--- a/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/702986
-
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -8,7 +8,7 @@ import Distribution.Simple ( defaultMainWithHooks, UserHooks(postConf),
- import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages)
- import Distribution.Simple.Setup ( ConfigFlags(configVerbosity), fromFlag)
- import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) )
--import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
-+import Distribution.Simple.BuildPaths ( autogenModulesDir )
- import Distribution.Text ( display )
- import Distribution.Version ( Version(..) )
- import Distribution.Verbosity
-@@ -49,7 +49,7 @@ writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = d
- , "#define PANGO_VERSION_MICRO " ++ show micro
- ]
- where
-- targetDir = autogenPackageModulesDir lbi
-+ targetDir = autogenModulesDir lbi
- targetFile = targetDir </> "hspangoversion.h"
-
- writeVersionHeaderFile _ _ version =
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -43,7 +43,7 @@ writePangoVersionHeaderFile verbosity lbi (versionNumbers -> (major:minor:micro:
- writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = do
- #endif
- createDirectoryIfMissingVerbose verbosity True targetDir
-- rewriteFileEx verbosity targetFile $ unlines
-+ rewriteFile targetFile $ unlines
- [ "#define PANGO_VERSION_MAJOR " ++ show major
- , "#define PANGO_VERSION_MINOR " ++ show minor
- , "#define PANGO_VERSION_MICRO " ++ show micro
diff --git a/dev-haskell/pango/metadata.xml b/dev-haskell/pango/metadata.xml
index 937381521944..584240bb2f12 100644
--- a/dev-haskell/pango/metadata.xml
+++ b/dev-haskell/pango/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">pango</remote-id>
+ <remote-id type="github">gtk2hs/gtk2hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/pango/pango-0.13.10.0.ebuild b/dev-haskell/pango/pango-0.13.10.0.ebuild
new file mode 100644
index 000000000000..1beb5cff52e8
--- /dev/null
+++ b/dev-haskell/pango/pango-0.13.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Pango text rendering engine"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
+ >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+ >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ x11-libs/cairo
+ x11-libs/pango
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND="virtual/pkgconfig
+ >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+"
+
+GHC_BOOTSTRAP_PACKAGES=( gtk2hs-buildtools )
diff --git a/dev-haskell/pango/pango-0.13.8.1.ebuild b/dev-haskell/pango/pango-0.13.8.1.ebuild
deleted file mode 100644
index d95b4a030462..000000000000
--- a/dev-haskell/pango/pango-0.13.8.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
- >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- x11-libs/cairo
- x11-libs/pango
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
- >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- # https://bugs.gentoo.org/702986
- if has_version "<dev-haskell/cabal-3.0.0.0"; then
- eapply "${FILESDIR}"/${PN}-0.13.6.1-cabal-1.24.patch
- fi
-}
diff --git a/dev-haskell/pantry/Manifest b/dev-haskell/pantry/Manifest
deleted file mode 100644
index 24d5402699af..000000000000
--- a/dev-haskell/pantry/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pantry-0.4.0.2.tar.gz 89491 BLAKE2B df082f4bf08f345fd64d54950241cc27af8259f1ae40ed3b123a10aeda3596c70029b1de08f8d551542af6b9cbdd77184e5dc1bda031be79d371a1051589771a SHA512 17e564825b9b7fa3bf2b091d0d0ba261c5ba17105ae34193b1aeb45db823877240d8d138f9bfb9699e87c946a5c87ce83ba12144aae73919d94c7cf3e7df1d7c
diff --git a/dev-haskell/pantry/metadata.xml b/dev-haskell/pantry/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/pantry/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pantry/pantry-0.4.0.2.ebuild b/dev-haskell/pantry/pantry-0.4.0.2.ebuild
deleted file mode 100644
index 553d2801748c..000000000000
--- a/dev-haskell/pantry/pantry-0.4.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Content addressable Haskell package management"
-HOMEPAGE="https://github.com/commercialhaskell/pantry#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # seems related to http-download, requiring network access
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/ansi-terminal:=[profile?]
- >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.3:=[profile?]
- dev-haskell/casa-client:=[profile?]
- dev-haskell/casa-types:=[profile?]
- dev-haskell/conduit:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/cryptonite-conduit:=[profile?]
- dev-haskell/digest:=[profile?]
- dev-haskell/filelock:=[profile?]
- dev-haskell/generic-deriving:=[profile?]
- dev-haskell/hackage-security:=[profile?]
- >=dev-haskell/hpack-0.31.2:=[profile?]
- dev-haskell/http-client:=[profile?]
- dev-haskell/http-client-tls:=[profile?]
- dev-haskell/http-conduit:=[profile?]
- dev-haskell/http-download:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/network-uri:=[profile?]
- dev-haskell/path:=[profile?]
- dev-haskell/path-io:=[profile?]
- dev-haskell/persistent:=[profile?]
- >=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
- dev-haskell/persistent-template:=[profile?]
- dev-haskell/primitive:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/rio:=[profile?]
- dev-haskell/rio-orphans:=[profile?]
- dev-haskell/rio-prettyprint:=[profile?]
- dev-haskell/tar-conduit:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/text-metrics:=[profile?]
- dev-haskell/unix-compat:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- dev-haskell/yaml:=[profile?]
- dev-haskell/zip-archive:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/exceptions
- dev-haskell/hedgehog
- dev-haskell/hspec
- dev-haskell/quickcheck
- dev-haskell/raw-strings-qq )
-"
diff --git a/dev-haskell/parallel-io/Manifest b/dev-haskell/parallel-io/Manifest
index 95d437720d5c..e3b9e0581737 100644
--- a/dev-haskell/parallel-io/Manifest
+++ b/dev-haskell/parallel-io/Manifest
@@ -1 +1 @@
-DIST parallel-io-0.3.3.tar.gz 9435 BLAKE2B 97d3e1343a20748173d9bc15e1bd84cde4e66f4e8bc916a18550c9f5e9c7a97a06861ab83db6ed3c7975da0142e287da0c6dc1c6483d9f78544564516181e650 SHA512 4d2ddb9ad4b3b362e431774495fa7e4cc4476768257f2915f3a6e64c1872a5bcf880d71e1f678997a23fbf9cfa22bc2b38df9f2866897d3cbb6d35e65eb542db
+DIST parallel-io-0.3.5.tar.gz 9422 BLAKE2B 55fbcf6aa8aa2742b53cd549917edde83a1399255be35cc4c023b4a150913699e13398bcd900f4c6971ec550b3b3f030e0d2d6e974baf21ad4fc92266d3cfd73 SHA512 5a77f66c32603a8d15d10508de6f8e7e7f3523927217974350d79ea2639b0eb3bde08fc7cd3a6b14226c67e7637271f5aaddfcbd07d163764e44df0babedd570
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
deleted file mode 100644
index 960d1f046d6a..000000000000
--- a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
-HOMEPAGE="http://batterseapower.github.com/parallel-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#hackport: flags: -test -fuzz -benchmark
-
-RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
- # Hackage metadata revision -r1.
- cabal_chdeps \
- 'random >= 1.0 && < 1.1' 'random >= 1.0 && < 1.2'
-
- # Hackage metadata revision -r2.
- cabal_chdeps \
- 'containers >= 0.2 && < 0.6' 'containers >= 0.2 && < 0.7'
-
- default
-}
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
new file mode 100644
index 000000000000..0ca40c57fc97
--- /dev/null
+++ b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -tests,-fuzz,-benchmark
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
+HOMEPAGE="https://batterseapower.github.io/parallel-io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-benchmark \
+ --flag=-fuzz \
+ --flag=-tests
+}
diff --git a/dev-haskell/parallel/parallel-3.2.2.0.ebuild b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
index 064e0025d86c..dfcf7d93965f 100644
--- a/dev-haskell/parallel/parallel-3.2.2.0.ebuild
+++ b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,8 +13,8 @@ HOMEPAGE="https://hackage.haskell.org/package/parallel"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.13' 'base >= 4.3'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.3 && < 4.13' 'base >= 4.3'
+)
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 d1eb1f1a6e53..3927d7c46437 100644
--- a/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
+++ b/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="parsec1"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 32a912d49a6c..9b16df62bf2d 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1 +1,3 @@
+DIST parsec-3.1.14.0-rev4.cabal 4356 BLAKE2B 6c0d7b4ae6c2adad8e79eee1f90ce51b6451b5929bddbd553e9a58cf4f9c169d48910ed8a6254afec54c096caf473230ce3f5672da60c4c170dcadfe9e1d1120 SHA512 4f5cef855f39497f7c84cb9f033cde9b8326a38a81d6ed1dab310078a935a14f36aa3f660b0ff1ef73333841c603c4a28237e96df1737de70ba9f88df84780c1
DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
+DIST parsec-3.1.15.0.tar.gz 36412 BLAKE2B b7d0b0eb022c0662a023d94e83106a528ed2fe280e3aa4cbd643479045d8afdee66a6dee938d5b7932e823fa39dddff18a407efb03a26d0029f1aea59b8738ef SHA512 fab7c48f43fae2708ee2d345897f827111408f82f4370442047d49d703de5d7a9666753926486764a3cfab15df98cf0f8e37d5b73811ffc80797ee498b4eb591
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index 34bd558d2be0..5e5863ecfd97 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Parsec is designed from scratch as an industrial-strength parser
- library. It is simple, safe, well documented (on the package
- homepage), has extensive libraries and good error messages,
- and is also fast. It is defined as a monad transformer that can be
- stacked on arbitrary monads, and it is also parametric in the
- input stream type.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">parsec</remote-id>
+ <remote-id type="github">haskell/parsec</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
new file mode 100644
index 000000000000..066780005d1d
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depends: test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/haskell/parsec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+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
+
+CABAL_CHDEPS=(
+ 'base >= 4.5.0 && < 4.16' 'base >= 4.5.0'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+# >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+# >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
+# )
+
+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"
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
deleted file mode 100644
index d2120fe88cb5..000000000000
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depens: test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/haskell/parsec"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
new file mode 100644
index 000000000000..e31e8cee36c8
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/haskell/parsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+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
+
+RDEPEND="
+ >=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# )
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/parsec1/Manifest b/dev-haskell/parsec1/Manifest
index 998a1bd4ede2..fc973842a4cb 100644
--- a/dev-haskell/parsec1/Manifest
+++ b/dev-haskell/parsec1/Manifest
@@ -1 +1,2 @@
DIST parsec1-1.0.0.7.tar.gz 13440 BLAKE2B c445585d3db87a1abf7ea0a3157145241396ced3202c70927d355e76ad7b40f802ec0701efdc4e4dcbcdd024d6837d8eae118513acaedd44b77634befd89f7d7 SHA512 6ce75332064f811b105091d6adbdc2d0cfe571ec04674cf7b8f79d50df5b6d81f4a32a703151c09dfd9022b6df0929ceafc7f7451b4dff7bbc79382dc5ac743c
+DIST parsec1-1.0.0.8.tar.gz 12933 BLAKE2B 414077432a74a719754c634f16815bfd9c78892067f275d0dbdeed929950c88a2e87c56ffd9e2c07560d92ed6640d8778d0b4ff83a8d73313f7fb6276d7d7550 SHA512 fa7185ff5392130c5fd538f93a613046e667bd95596951dd04340d818f8e6412e5c254c10517bd8decd1547d547da2b920acfb32fcc90980627bb0214b9941b0
diff --git a/dev-haskell/parsec1/metadata.xml b/dev-haskell/parsec1/metadata.xml
index 927852cac2d5..937381521944 100644
--- a/dev-haskell/parsec1/metadata.xml
+++ b/dev-haskell/parsec1/metadata.xml
@@ -5,30 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Parsec is designed from scratch as an industrial-strength parser
- library. It is simple, safe, well documented (on the package
- homepage), has extensive libraries and good error messages,
- and is also fast.
-
- This package is the core haskell98 part of the parsec2
- package, intended to preserve its simplicity and portability.
-
- Note, that the module names overlap with those of parsec from the Haskell
- Platform, therefore I do not recommend to unconditionally use parsec1 (or
- parsec2 and parsec3) as dependency in cabal files of packages for hackage.
- But you may want to develop your code using these limited and portable
- parsec1 functions and finally change the dependency from parsec1 to parsec
- in order to avoid module ambiguities for users just installing your package.
- Your own module ambiguities are best avoided by hiding packages.
-
- This version only differs from the pervious one by improved error messages
- for try (positions are not reset), tokens and thus string (longer
- unexpected strings are now reported to match the error position).
- The notFollowedBy-parser was generalized (as in parsec-3) so
- characters in messages are now shown in single instead of double
- quotes.
- Also (as since parsec-3.1.2) lookAhead no longer consumes tokens on success
- (so that the many-parser can detect this).
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
index e9718d6c2c2c..67a49598a3ef 100644
--- a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
+++ b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild
new file mode 100644
index 000000000000..ee19cfb2e456
--- /dev/null
+++ b/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable monadic parser combinators"
+HOMEPAGE="https://hackage.haskell.org/package/parsec1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 519cbe1cc8ce..465db364cdf3 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1 +1,2 @@
-DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
+DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71
+DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index 937381521944..d9090efa8693 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">parser-combinators</remote-id>
+ <remote-id type="github">mrkkrp/parser-combinators</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
deleted file mode 100644
index e5d497098a32..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev
-}
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
new file mode 100644
index 000000000000..8c34b94aff0f
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+TEST_PN="${PN}-tests"
+TEST_P="${TEST_PN}-${PV}"
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI+=" test? ( https://hackage.haskell.org/package/${TEST_P}/${TEST_P}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT+=" !test? ( test )"
+
+RDEPEND=">=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? (
+ >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+ >=dev-haskell/hspec-expectations-0.8 <dev-haskell/hspec-expectations-0.9
+ >=dev-haskell/hspec-megaparsec-2.0 <dev-haskell/hspec-megaparsec-3.0
+ >=dev-haskell/megaparsec-8.0 <dev-haskell/megaparsec-10.0
+ >=dev-haskell/megaparsec-tests-8.0 <dev-haskell/megaparsec-tests-10.0
+ >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev
+}
+
+src_test() {
+ if use test; then
+ cabal-register-inplace || die
+ local pkg_db="${S}/dist/package.conf.inplace"
+
+ local old_S="${S}"
+ export S="${WORKDIR}/${TEST_P}"
+ pushd "${S}" > /dev/null || die
+
+ export CABAL_TEST_SUITE=yes
+ export CABAL_USE_HADDOCK=''
+ haskell-cabal_src_configure \
+ --package-db="${pkg_db}" \
+ --flag=-dev
+
+ haskell-cabal_src_compile
+
+ SKIP_REGISTER_INPLACE=yes haskell-cabal_src_test
+
+ popd > /dev/null || die
+ export S="${old_S}"
+ fi
+}
diff --git a/dev-haskell/parsers/Manifest b/dev-haskell/parsers/Manifest
index be0190f33d01..3458589c17f8 100644
--- a/dev-haskell/parsers/Manifest
+++ b/dev-haskell/parsers/Manifest
@@ -1 +1,3 @@
+DIST parsers-0.12.10-rev2.cabal 3428 BLAKE2B ff4fa52451f5f85a76dc8a3cd7fecfacfd74bfc5836b46b1c463ff7d021c0f680feedb5816f0cc1e66bc32fddde491c58108fde60d7073bd150b33185c218c76 SHA512 3861ecd2139dadc721b3e3a0ae45f83e488c48b067fc600cffe7b194102e9ac135ce1bbdc8094f10d670367dd5d2571c88b2943be136a682b53d0408d50836b8
DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
+DIST parsers-0.12.11.tar.gz 24004 BLAKE2B 4d5d700e1dd8e89b3025b9d659c9bb35ede45c327359ea18d4db2961bec2ad05c44c7484ca6a8aff8f10679107996bb989516889df311c44de464b2d593b0928 SHA512 7ffa8b092aa731dc263151f755b52126924a8dd0a6c51aa52b044937976ad6410dd0755af5d361f5255c212e6cadc5793d15fa3a3fe26514c1324eeee71b4019
diff --git a/dev-haskell/parsers/metadata.xml b/dev-haskell/parsers/metadata.xml
index 6c5cd9b30d1d..88974e5372c2 100644
--- a/dev-haskell/parsers/metadata.xml
+++ b/dev-haskell/parsers/metadata.xml
@@ -6,14 +6,12 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="parsec">Enable the use of the `parsec` package</flag>
- <flag name="attoparsec">Enable the use of the `attoparsec` package</flag>
+ <flag name="attoparsec">You can disable the use of the `attoparsec` package using `-f-attoparsec`.</flag>
+ <flag name="binary">You can disable the use of the `binary` package using `-f-binary`.</flag>
+ <flag name="parsec">You can disable the use of the `parsec` package using `-f-parsec`.</flag>
</use>
- <longdescription>
- This library provides convenient combinators for working with and building parsing combinator libraries.
-
- Given a few simple instances, e.g. for the class 'Text.Parser.Combinators.Parsing' in "Text.Parser.Combinators.Parsing" you
- get access to a large number of canned definitions. Instances exist for the parsers provided by @parsec@,
- @attoparsec@ and base’s "Text.Read".
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">parsers</remote-id>
+ <remote-id type="github">ekmett/parsers</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/parsers/parsers-0.12.10-r1.ebuild b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
new file mode 100644
index 000000000000..9e9fd1bf7044
--- /dev/null
+++ b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="2"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Parsing combinators"
+HOMEPAGE="https://github.com/ekmett/parsers/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+attoparsec +binary +parsec"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+ >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag attoparsec attoparsec) \
+ $(cabal_flag binary binary) \
+ $(cabal_flag parsec parsec)
+}
diff --git a/dev-haskell/parsers/parsers-0.12.10.ebuild b/dev-haskell/parsers/parsers-0.12.10.ebuild
deleted file mode 100644
index a262cb26304a..000000000000
--- a/dev-haskell/parsers/parsers-0.12.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing combinators"
-HOMEPAGE="https://github.com/ekmett/parsers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+attoparsec +parsec"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] )
- parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/quickcheck
- dev-haskell/quickcheck-instances )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag attoparsec attoparsec) \
- $(cabal_flag parsec parsec)
-}
diff --git a/dev-haskell/parsers/parsers-0.12.11.ebuild b/dev-haskell/parsers/parsers-0.12.11.ebuild
new file mode 100644
index 000000000000..a635ff0fbc7d
--- /dev/null
+++ b/dev-haskell/parsers/parsers-0.12.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing combinators"
+HOMEPAGE="https://github.com/ekmett/parsers/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+attoparsec +binary +parsec"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+ >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag attoparsec attoparsec) \
+ $(cabal_flag binary binary) \
+ $(cabal_flag parsec parsec)
+}
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
deleted file mode 100644
index af41e87d8b5e..000000000000
--- a/dev-haskell/path-io/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST path-io-1.6.0.tar.gz 20848 BLAKE2B 89236aca7c41b5095bb989c7638640ce6735843db36028b2b9d4f0427b0bb94403d915eb3abdfd34cf02f5b6b02cb02e57525eb9e056c942481802b24401117c SHA512 dcafbbfe1531d7b00a9df751c093e6affdefafe7589c0243530579b9f5733ef1357b1085cfd88bf53ff9794accddbc789b927a199f4c4a2b7778268cf1719477
diff --git a/dev-haskell/path-io/metadata.xml b/dev-haskell/path-io/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/path-io/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild b/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
deleted file mode 100644
index fdde596e893d..000000000000
--- a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface to 'directory' package for users of 'path'"
-HOMEPAGE="https://github.com/mrkkrp/path-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/path-0.6:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- dev-haskell/unix-compat:=[profile?]
- >=dev-lang/ghc-8.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'path >= 0.6 && < 0.7' 'path >= 0.6'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev
-}
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 e44cb79ef1f3..a4dd67858e9d 100644
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/text-0.5:=[profile?]
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
deleted file mode 100644
index 9054b6e13331..000000000000
--- a/dev-haskell/path/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST path-0.7.0.tar.gz 24227 BLAKE2B b2f3347c29dfae0e7674f4de39f07bb7ee681735d1509c7eefd29cc2141dcf974212fc970095a783fdb47dbffaac9489097116768bfe996a160bb9b8886cc9e6 SHA512 b07fc95eab12188d49e4525ea5bbadfda9d5bfb61cc306d624730087d2fc1f946407e4861f7f66de48d9cdf2541591d4518fcc77f28d65671bfa65a963e18a9c
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/path/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/path/path-0.7.0.ebuild b/dev-haskell/path/path-0.7.0.ebuild
deleted file mode 100644
index c53f870c9dda..000000000000
--- a/dev-haskell/path/path-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-#hackport: flags: -validity,-dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for well-typed paths"
-HOMEPAGE="https://hackage.haskell.org/package/path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( >=dev-haskell/genvalidity-0.8
- >=dev-haskell/genvalidity-hspec-0.7
- >=dev-haskell/genvalidity-property-0.4
- >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
- >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
- dev-haskell/quickcheck
- >=dev-haskell/validity-0.8.0.0 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev \
- --flag=-validity
-}
diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
index bc128bc0b24b..e591252ebdf2 100644
--- a/dev-haskell/patience/Manifest
+++ b/dev-haskell/patience/Manifest
@@ -1 +1,2 @@
DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
+DIST patience-0.3.tar.gz 6247 BLAKE2B d461e0739a0f03f31bee30f5940e7f3803984643b0a90b65f968ce00b5487efed7b44176d9c603f1fe566966169fd18e188c0c7efb3812ffed6db3cb5569b4e5 SHA512 12bc0005d6ca47ac9954aee8950d00f5c6af133958015fe791d2e100295660bebe967e37ce859abb67ae38bedefa1bd1d81a7770842448485d2f7466652e7ea5
diff --git a/dev-haskell/patience/metadata.xml b/dev-haskell/patience/metadata.xml
index c447e25538a3..ee2f452d0522 100644
--- a/dev-haskell/patience/metadata.xml
+++ b/dev-haskell/patience/metadata.xml
@@ -5,17 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library implements the \"patience diff\" algorithm, as well as the patience
- algorithm for the longest increasing subsequence problem.
-
- Patience diff computes the difference between two lists, for example the
- lines of two versions of a source file. It provides a good balance of
- performance, nice output for humans, and implementation simplicity. For more
- information, see &lt;http://alfedenzo.livejournal.com/170301.html&gt; and
- &lt;http://bramcohen.livejournal.com/73318.html&gt;.
-
- New in version 0.1.1: relaxed @containers@ dependency, so it should build on
- GHC 6.10.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">patience</remote-id>
+ <remote-id type="github">chessai/patience</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
index 3d1dfa9cc9eb..56ca2d60b402 100644
--- a/dev-haskell/patience/patience-0.1.1-r1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/patience/patience-0.3.ebuild b/dev-haskell/patience/patience-0.3.ebuild
new file mode 100644
index 000000000000..0ea1c786e96d
--- /dev/null
+++ b/dev-haskell/patience/patience-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Patience diff and longest increasing subsequence"
+HOMEPAGE="https://github.com/chessai/patience"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/pcap/Manifest b/dev-haskell/pcap/Manifest
deleted file mode 100644
index 79e479c282f2..000000000000
--- a/dev-haskell/pcap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pcap-0.4.5.2.tar.gz 49414 BLAKE2B 3218a30d1b5fe14981578ee95648e0b5f38a6800351645bac7590ece92cadab4f5e2feb67fd9599861751f205240be757e15f0374ad381edeab6f7fb5692bb48 SHA512 75bdaf3700826d94309e7b26f7ed9b367c33df0a7c8e7f4104230f57fff6916c193b0123dbb64f12d2031a1c350d029e471a58ea6bad0dd36de3a40eafbeab33
diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
deleted file mode 100644
index a9a1682a69a5..000000000000
--- a/dev-haskell/pcap/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">bos/pcap</remote-id>
- <remote-id type="bitbucket">bos/pcap</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
deleted file mode 100644
index cd8c09c0c381..000000000000
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A system-independent interface for user-level packet capture"
-HOMEPAGE="https://github.com/bos/pcap"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
- >=dev-lang/ghc-6.12.1:=
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/pcg-random/Manifest b/dev-haskell/pcg-random/Manifest
new file mode 100644
index 000000000000..df133729331e
--- /dev/null
+++ b/dev-haskell/pcg-random/Manifest
@@ -0,0 +1 @@
+DIST pcg-random-0.1.3.7.tar.gz 25416 BLAKE2B e964c59aafd7114cd6c731ab35da9154e698dd3b1445be37408018d09a623c007eedbfc18fc3d4b0cfcda1fba58a50abd0a58f72e8999680f7014c0af443da4d SHA512 995c7ef160dfcde373cda3cab185bdf8f2448168d9d08409291b0e7c77d6cd7e9ec14933fa2e61896ea62eaaae49a1ddf99979dd6b7364ae7b788e5773cac984
diff --git a/dev-haskell/pcg-random/metadata.xml b/dev-haskell/pcg-random/metadata.xml
new file mode 100644
index 000000000000..ea3ec888549e
--- /dev/null
+++ b/dev-haskell/pcg-random/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">pcg-random</remote-id>
+ <remote-id type="github">cchalmers/pcg-random</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild b/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild
new file mode 100644
index 000000000000..ce7bbed88311
--- /dev/null
+++ b/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to the PCG random number generator"
+HOMEPAGE="https://github.com/cchalmers/pcg-random"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+GHC_BOOTSTRAP_PACKAGES=(
+ cabal-doctest
+)
+
+RDEPEND="dev-haskell/entropy:=[profile?]
+ >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+ test? ( dev-haskell/doctest )
+"
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 0f291f743a7c..5cebcf4343c0 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 7578a04b72aa..0d60ca26657f 100644
--- a/dev-haskell/pem/pem-0.2.4.ebuild
+++ b/dev-haskell/pem/pem-0.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/persistent-mysql/Manifest b/dev-haskell/persistent-mysql/Manifest
deleted file mode 100644
index d78162e6bf73..000000000000
--- a/dev-haskell/persistent-mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST persistent-mysql-2.10.2.3.tar.gz 21760 BLAKE2B f997d0250cb639ce5f5b77e234388678ed45d499e283ffc9436c9d39171d7dfa35980525ffb911a492d28f147b5239220035452b2c9c6c8c154d4e5f82eb556f SHA512 6fbc72345a6fba4880fdcc87cd220cae3a574d7e945fe5d7a02124177b597d8a19d6b429ea16bd993e73b79cd8b74351f220d30b806567f0eec6cb7641788040
diff --git a/dev-haskell/persistent-mysql/metadata.xml b/dev-haskell/persistent-mysql/metadata.xml
deleted file mode 100644
index c5a48fe48188..000000000000
--- a/dev-haskell/persistent-mysql/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package contains a backend for persistent using the
- MySQL database server. Internally it uses the @mysql-simple@
- and @mysql@ packages in order to access the database.
-
- This package supports only MySQL 5.1 and above. However, it
- has been tested only on MySQL 5.5.
-
- Known problems:
-
- * This package does not support statements inside other
- statements.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild b/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild
deleted file mode 100644
index a284caa095ef..000000000000
--- a/dev-haskell/persistent-mysql/persistent-mysql-2.10.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using MySQL database server"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # tests require mysql
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/conduit-1.2.12:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- >=dev-haskell/mysql-0.1.4:=[profile?] <dev-haskell/mysql-0.2:=[profile?]
- >=dev-haskell/mysql-simple-0.4.4:=[profile?] <dev-haskell/mysql-simple-0.5:=[profile?]
- >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-3:=[profile?]
- dev-haskell/resource-pool:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/fast-logger
- >=dev-haskell/hspec-2.4
- dev-haskell/hunit
- dev-haskell/persistent-qq
- dev-haskell/persistent-template
- dev-haskell/persistent-test
- dev-haskell/quickcheck
- dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/persistent-postgresql/Manifest b/dev-haskell/persistent-postgresql/Manifest
deleted file mode 100644
index a58da00237b0..000000000000
--- a/dev-haskell/persistent-postgresql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST persistent-postgresql-2.10.1.2.tar.gz 27624 BLAKE2B 6ffbab607819d725cc85e7f9f8939d3d7397214d4ae19bf1ce20deab2ddf5433479d5b5e521cafa8595d6c1938140ff4b0e054981f73bea47d7150b3f0edcfa0 SHA512 0b0e33ede6ec38f8030b127e4073202dd7fe6a8c14d3b7e4a739a6ff197500bf4c013fb7d54a76f2d56b4d9f143409a23f2a4a33658e3bce5a2960657c6742fd
diff --git a/dev-haskell/persistent-postgresql/metadata.xml b/dev-haskell/persistent-postgresql/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/persistent-postgresql/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild b/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild
deleted file mode 100644
index f663f52a22d9..000000000000
--- a/dev-haskell/persistent-postgresql/persistent-postgresql-2.10.1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using postgresql"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests require postgresql
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/conduit-1.2.12:=[profile?]
- >=dev-haskell/monad-logger-0.3.25:=[profile?]
- >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
- >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?]
- >=dev-haskell/postgresql-simple-0.6.1:=[profile?] <dev-haskell/postgresql-simple-0.7:=[profile?]
- dev-haskell/resource-pool:=[profile?]
- >=dev-haskell/resourcet-1.1.9:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/fast-logger
- >=dev-haskell/hspec-2.4
- dev-haskell/hspec-expectations
- dev-haskell/hunit
- dev-haskell/persistent-qq
- dev-haskell/persistent-template
- dev-haskell/persistent-test
- dev-haskell/quickcheck
- dev-haskell/quickcheck-instances
- dev-haskell/unordered-containers
- dev-haskell/vector )
-"
diff --git a/dev-haskell/persistent-qq/Manifest b/dev-haskell/persistent-qq/Manifest
deleted file mode 100644
index f4cf00a0cfd5..000000000000
--- a/dev-haskell/persistent-qq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST persistent-qq-2.9.2.tar.gz 7627 BLAKE2B 250017bdd75a78322633f603f4976ff8c6ae42db373b75e604d96a10fd8c138811a6161a33d9913dac71122ccc35ea09fbd6d942dbb05867a09d2f786c7d6b95 SHA512 48d6783abf366b327e68e5a1619585c056836885e552b6596eda056cf7758a8b426c3cf27ac7c67cb772bd482de9afbe7365b7647bbf31c529089810b5d5dd97
diff --git a/dev-haskell/persistent-qq/metadata.xml b/dev-haskell/persistent-qq/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/persistent-qq/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/persistent-qq/persistent-qq-2.9.2.ebuild b/dev-haskell/persistent-qq/persistent-qq-2.9.2.ebuild
deleted file mode 100644
index d8b867b4fe32..000000000000
--- a/dev-haskell/persistent-qq/persistent-qq-2.9.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides a quasi-quoter for raw SQL for persistent"
-HOMEPAGE="https://github.com/yesodweb/persistent#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND="dev-haskell/haskell-src-meta:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/persistent-2.10:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/aeson
- dev-haskell/fast-logger
- dev-haskell/hspec
- dev-haskell/hunit
- dev-haskell/monad-logger
- dev-haskell/persistent-sqlite
- dev-haskell/persistent-template
- dev-haskell/resourcet
- dev-haskell/unliftio )
-"
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index d9ec9aa7dc0f..c51087274175 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1 +1,2 @@
-DIST persistent-sqlite-2.10.6.2.tar.gz 2220390 BLAKE2B f146ec84ae45d0d4b4cb3c809bf694182c8592369e222029824f6eb6a39abbbb67acc6bdd2af4a9b8080d50ffcdc20968fa14cac237a475b220dcefe3329fc2d SHA512 b1db41bf77ae53b99c28f3224c9a2b7335faa4a78c96487270249959cc9491fa542e28d38dd63a2b417580f6a41608ffcee152e8609fe16392005c728862c7bc
+DIST persistent-sqlite-2.13.1.0.tar.gz 2276809 BLAKE2B acc9f4b0e351313486e89f695b69756ea165146fd8aaafcc2d3da8dc620c109cee8d922fe0246e688691748c18e75fa64f9f4a992ca2cd28e01677766d56326b SHA512 19842dcd867f57ac2f81d8651838f41f6a4f0074293c0b3a21a52d2fb96410c26d5340307983da21ca89170a01621da257320e36f33170657acb6890f70299d4
+DIST persistent-sqlite-2.13.1.1.tar.gz 2276814 BLAKE2B e408ce749a1648874a33fc99677540ee609cb3ffe30eb2043e9425df724f15db41a692b7b3b0cb43388629db52b8e3a74e3025489290cc412dfdf8878490c92b SHA512 12489af434a9748670f621072872bd43abbecafde3ff01960a2fb446466f6320137e13e0029a944ad6efb60dc2bcf8632c4b60541292e8627065e34d5f467d22
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
index 0dc6e47275b2..d634eb999f8a 100644
--- a/dev-haskell/persistent-sqlite/metadata.xml
+++ b/dev-haskell/persistent-sqlite/metadata.xml
@@ -5,10 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
- </longdescription>
<use>
- <flag name="build-sanity-exe">Build a sanity check test executable.</flag>
+ <flag name="build-sanity-exe">Build a sanity check test executable</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">persistent-sqlite</remote-id>
+ <remote-id type="github">yesodweb/persistent</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
deleted file mode 100644
index d00865d77b15..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- >=dev-haskell/conduit-1.2.12:=[profile?]
- >=dev-haskell/microlens-th-0.4.1.1:=[profile?]
- >=dev-haskell/monad-logger-0.3.25:=[profile?]
- >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
- dev-haskell/resource-pool:=[profile?]
- >=dev-haskell/resourcet-1.1.9:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- virtual/libc
- >=dev-db/sqlite-3.0
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/exceptions
- dev-haskell/fast-logger
- >=dev-haskell/hspec-2.4
- dev-haskell/hunit
- dev-haskell/persistent-template
- dev-haskell/persistent-test
- dev-haskell/quickcheck
- dev-haskell/system-fileio
- dev-haskell/system-filepath
- dev-haskell/temporary )
-"
-
-src_configure() {
- # most flags disabled since they have no effect when system-sqlite is used.
- haskell-cabal_src_configure \
- $(cabal_flag build-sanity-exe build-sanity-exe) \
- --flag=-full-text-search \
- --flag=-have-usleep \
- --flag=-json1 \
- --flag=systemlib \
- --flag=-uri-filenames \
- --flag=-use-stat3 \
- --flag=-use-stat4
-}
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
new file mode 100644
index 000000000000..e0fe59ff9da2
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1,-use-pkgconfig
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+ >=dev-haskell/aeson-1.0:=[profile?]
+ >=dev-haskell/conduit-1.2.12:=[profile?]
+ >=dev-haskell/microlens-th-0.4.1.1:=[profile?]
+ >=dev-haskell/monad-logger-0.3.25:=[profile?]
+ >=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
+ dev-haskell/resource-pool:=[profile?]
+ >=dev-haskell/resourcet-1.1.9:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ virtual/libc
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/exceptions
+ dev-haskell/fast-logger
+ >=dev-haskell/hspec-2.4
+ dev-haskell/hunit
+ dev-haskell/microlens
+ dev-haskell/persistent-test
+ dev-haskell/quickcheck
+ dev-haskell/system-fileio
+ dev-haskell/system-filepath
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag build-sanity-exe build-sanity-exe) \
+ --flag=-full-text-search \
+ --flag=-have-usleep \
+ --flag=-json1 \
+ --flag=systemlib \
+ --flag=-uri-filenames \
+ --flag=-use-pkgconfig \
+ --flag=-use-stat3 \
+ --flag=-use-stat4
+}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild
new file mode 100644
index 000000000000..3a486c7720cd
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1,-use-pkgconfig
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+ >=dev-haskell/aeson-1.0:=[profile?]
+ >=dev-haskell/conduit-1.2.12:=[profile?]
+ >=dev-haskell/microlens-th-0.4.1.1:=[profile?]
+ >=dev-haskell/monad-logger-0.3.25:=[profile?]
+ >=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
+ dev-haskell/resource-pool:=[profile?]
+ >=dev-haskell/resourcet-1.1.9:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ virtual/libc
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/exceptions
+ dev-haskell/fast-logger
+ >=dev-haskell/hspec-2.4
+ dev-haskell/hunit
+ dev-haskell/microlens
+ dev-haskell/persistent-test
+ dev-haskell/quickcheck
+ dev-haskell/system-fileio
+ dev-haskell/system-filepath
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag build-sanity-exe build-sanity-exe) \
+ --flag=-full-text-search \
+ --flag=-have-usleep \
+ --flag=-json1 \
+ --flag=systemlib \
+ --flag=-uri-filenames \
+ --flag=-use-pkgconfig \
+ --flag=-use-stat3 \
+ --flag=-use-stat4
+}
diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
index ff6f710fddde..b29023adf369 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1 +1 @@
-DIST persistent-template-2.8.2.3.tar.gz 25949 BLAKE2B 2b2fbfcb4e8dad68da8a820ae082db8cee9f683db9509b55b4ba908bff0a20cdf4e925db4bfe2d5c0014912e58469aa593e24a428f181928e8024917a3ab7db8 SHA512 eef94f07783f2b61ed4d00c75a57e976e2546ee1cb564471ea33e5faf01634701a7b60b4c1ee64594e0058949966f132fe46f1a5efc5a64f949fc6e6b27d5ddb
+DIST persistent-template-2.12.0.0.tar.gz 4506 BLAKE2B 1246629206981e4631a48055d23ab2f2a5851e7c200c0c809117217d3531d1b7ccc36cb27cb79ab33abef14f298ea80e2ccee9e4c115d362b132e0bf980f4c34 SHA512 5098c88f92d5e8609de62f6571d8c7f1b2f08d0286974f1ba5eabc01e3479b48a2ae1a0e85e54f1e9956902189142c5d04a4b314a1945341f4e76828959405a7
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
new file mode 100644
index 000000000000..312c22eb83d8
--- /dev/null
+++ b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
deleted file mode 100644
index 6cde28db4c0a..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/http-api-data-0.3.7:=[profile?]
- >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- dev-haskell/path-pieces:=[profile?]
- >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( >=dev-haskell/hspec-2.4
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
index 9c8f14d6ae45..a4d43bb3a26b 100644
--- a/dev-haskell/persistent-test/Manifest
+++ b/dev-haskell/persistent-test/Manifest
@@ -1 +1 @@
-DIST persistent-test-2.0.3.0.tar.gz 24642 BLAKE2B a1f94ffd7d574ac575db79f2afcd9f627be9dffff8c29811d104b1c30239f0518c90b096a34689c18e9e1a4fa63a3dccb819bd910ecfdadb5239806d53e5cb17 SHA512 511aa72db39687b2b90ef262d5dd83a64887902c2fe57bb87bfd437421170f39af4ebf54ba217eddce80d2afac54ed7e546214775f056e478f20de27c518fdf1
+DIST persistent-test-2.13.1.3.tar.gz 32262 BLAKE2B 77bfae47292edd08cec0504d4006f44f349ba6fef2d670833d5f2c339bbe75f5d5e5afe924793d2f4ae9afb57f018d1e32a11b2cdecfe5c451f5aaa94897dbcf SHA512 906df4039bbd6e054cbcc18b300ea293814b7365c6267348a88abc9902cd30d60bd314b42331a1341befe787f566bca311ca7fb398594ae56cbc2e764d5a8ba2
diff --git a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch b/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
deleted file mode 100644
index e27746b85731..000000000000
--- a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- a/src/CompositeTest.hs
-+++ b/src/CompositeTest.hs
-@@ -1,6 +1,8 @@
- {-# LANGUAGE DeriveGeneric #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
- module CompositeTest where
-
---- a/src/CustomPersistFieldTest.hs
-+++ b/src/CustomPersistFieldTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module CustomPersistFieldTest (specsWith, customFieldMigrate) where
-
---- a/src/CustomPrimaryKeyReferenceTest.hs
-+++ b/src/CustomPrimaryKeyReferenceTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421
- -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.
---- a/src/DataTypeTest.hs
-+++ b/src/DataTypeTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE ScopedTypeVariables #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module DataTypeTest
- ( specsWith
---- a/src/EmbedOrderTest.hs
-+++ b/src/EmbedOrderTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where
-
---- a/src/EmbedTest.hs
-+++ b/src/EmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-orphans -O0 #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedTest (specsWith, cleanDB, embedMigrate) where
---- a/src/EmptyEntityTest.hs
-+++ b/src/EmptyEntityTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmptyEntityTest (specsWith, migration, cleanDB) where
-
---- a/src/EntityEmbedTest.hs
-+++ b/src/EntityEmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module EntityEmbedTest where
-
- -- because we are using a type alias we need to declare in a separate module
---- a/src/EquivalentTypeTest.hs
-+++ b/src/EquivalentTypeTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
-
---- a/src/HtmlTest.hs
-+++ b/src/HtmlTest.hs
-@@ -1,4 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
-+
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module HtmlTest (specsWith, cleanDB, htmlMigrate) where
-
---- a/src/LargeNumberTest.hs
-+++ b/src/LargeNumberTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module LargeNumberTest where
-
- import Data.Word
---- a/src/MaxLenTest.hs
-+++ b/src/MaxLenTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
-
- module MaxLenTest (specsWith, maxlenMigrate) where
---- a/src/MigrationColumnLengthTest.hs
-+++ b/src/MigrationColumnLengthTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationColumnLengthTest where
-
- import qualified Data.Text as T
---- a/src/MigrationIdempotencyTest.hs
-+++ b/src/MigrationIdempotencyTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationIdempotencyTest where
-
- import qualified Data.Text as T
---- a/src/MigrationOnlyTest.hs
-+++ b/src/MigrationOnlyTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationOnlyTest (specsWith, migrateAll1, migrateAll2) where
-
- import qualified Data.Text as T
---- a/src/MigrationTest.hs
-+++ b/src/MigrationTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationTest where
-
- import Database.Persist.TH
---- a/src/PersistUniqueTest.hs
-+++ b/src/PersistUniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PersistUniqueTest where
-
- import Init
---- a/src/PersistentTestModels.hs
-+++ b/src/PersistentTestModels.hs
-@@ -1,6 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
- module PersistentTestModels where
-
- import Data.Aeson
---- a/src/PrimaryTest.hs
-+++ b/src/PrimaryTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PrimaryTest where
-
- import Init
---- a/src/Recursive.hs
-+++ b/src/Recursive.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module Recursive (specsWith, recursiveMigrate, cleanup) where
-
---- a/src/RenameTest.hs
-+++ b/src/RenameTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module RenameTest where
-
- import qualified Data.Map as Map
---- a/src/SumTypeTest.hs
-+++ b/src/SumTypeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module SumTypeTest (specsWith, sumTypeMigrate) where
-
---- a/src/TransactionLevelTest.hs
-+++ b/src/TransactionLevelTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
-
- module TransactionLevelTest where
-
---- a/src/TreeTest.hs
-+++ b/src/TreeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module TreeTest where
-
- import Database.Persist.TH (mkDeleteCascade)
---- a/src/UniqueTest.hs
-+++ b/src/UniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module UniqueTest where
-
- import Init
diff --git a/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild b/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
deleted file mode 100644
index 92690bf1c566..000000000000
--- a/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tests for Persistent"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- >=dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/conduit-1.2.12:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?]
- >=dev-haskell/hspec-2.4:=[profile?]
- dev-haskell/hspec-expectations:=[profile?]
- dev-haskell/hunit:=[profile?]
- dev-haskell/monad-control:=[profile?]
- >=dev-haskell/monad-logger-0.3.25:=[profile?]
- >=dev-haskell/path-pieces-0.2:=[profile?]
- dev-haskell/persistent:=[profile?]
- dev-haskell/persistent-template:=[profile?]
- >=dev-haskell/quickcheck-2.9:2=[profile?]
- >=dev-haskell/quickcheck-instances-0.3:=[profile?]
- >=dev-haskell/random-1.1:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-PATCHES=("${FILESDIR}"/${P}-new-exts.patch)
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
new file mode 100644
index 000000000000..8bac9b253e70
--- /dev/null
+++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tests for Persistent"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?]
+ >=dev-haskell/conduit-1.2.12:=[profile?]
+ >=dev-haskell/hspec-2.4:=[profile?]
+ dev-haskell/hspec-expectations:=[profile?]
+ dev-haskell/http-api-data:=[profile?]
+ dev-haskell/hunit:=[profile?]
+ dev-haskell/monad-control:=[profile?]
+ >=dev-haskell/monad-logger-0.3.25:=[profile?]
+ >=dev-haskell/path-pieces-0.2:=[profile?]
+ >=dev-haskell/persistent-2.14:=[profile?] <dev-haskell/persistent-2.15:=[profile?]
+ >=dev-haskell/quickcheck-2.9:=[profile?]
+ >=dev-haskell/quickcheck-instances-0.3:=[profile?]
+ >=dev-haskell/random-1.1:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?]
+ dev-haskell/transformers-base:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
index 9fdd902d3c5d..44f03fce73dc 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -1 +1,3 @@
-DIST persistent-2.10.5.2.tar.gz 72570 BLAKE2B fb5fe4704076e66b6aa24615e4faa14803879b18da6dc972f7f05a5ecc27435ee4e7f46376a2082bb327b189db4cc51aa04f673ffc8df46d8b85a56e2c26b111 SHA512 5d7fe9259d89ab210bd136d9f9b0f3e52d48825a003cc02dfb01f50457324daf2c8659b9123cc0e958b636613fa61004f649f97980c6a5427d425656ceb166f1
+DIST persistent-2.14.0.3.tar.gz 171536 BLAKE2B 2659ebf0acd64a4dde77f8d17f0081676a4215093eaace2f847d8aa7bff736535ca15fe0a7b023a4ec145f4091fa4f3ae9b9dc3b8a77086b44d61d6968ad006b SHA512 63256b0a4e32f5b229e4924f787db3ffa18f40b4101c4610ea51311d6f0b5ac295abfea632bc8cf095de858f19bfe0649c2d2c07289e50ac845e6c945ac172ba
+DIST persistent-2.14.5.1-rev1.cabal 7162 BLAKE2B 99345333efb85d4308a882c4ad292cf6d52e53340540c88a2d5a61cd2cf0799e28c4081b466cf7f33313b4c5609b7409e6d549a1b71c85e492a41cce19036088 SHA512 3f1b880c3cff83e6094bd62879bb5b0e0d3f0c94c68b5f4e2596c64fc5603a53ea5f10b6128e300be7183fdfd133a34da720149e8d3e83581b377462c24c8995
+DIST persistent-2.14.5.1.tar.gz 175205 BLAKE2B d064d07b90e29c0b738962e537da433444d25a2688013034e4b22de3ae45735600e707d036cebdd565eb32f69ce0d184573832e33d17bde6d9811b7192915326 SHA512 a3969142f77d9fc54a0e73ac54b53a96de0b93fadf67326f6b8d9fdb668fc4acf78eece4502cc557873b011e2191fc1607836a5aa0d5d287e79820c0bf6e90a4
diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml
index 937381521944..f8895bd89e6f 100644
--- a/dev-haskell/persistent/metadata.xml
+++ b/dev-haskell/persistent/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">persistent</remote-id>
+ <remote-id type="github">yesodweb/persistent</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/persistent/persistent-2.10.5.2.ebuild b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
deleted file mode 100644
index 8d61a278b2a5..000000000000
--- a/dev-haskell/persistent/persistent-2.10.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -nooverlap
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/conduit-1.2.12:=[profile?]
- >=dev-haskell/fast-logger-2.4:=[profile?]
- >=dev-haskell/http-api-data-0.3:=[profile?]
- >=dev-haskell/monad-logger-0.3.28:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/path-pieces-0.2:=[profile?]
- >=dev-haskell/resource-pool-0.2.3:=[profile?]
- >=dev-haskell/resourcet-1.1.10:=[profile?]
- dev-haskell/scientific:=[profile?]
- dev-haskell/silently:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-2.4 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-nooverlap
-}
diff --git a/dev-haskell/persistent/persistent-2.14.0.3.ebuild b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
new file mode 100644
index 000000000000..0f9ad39d2eaf
--- /dev/null
+++ b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -nooverlap
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, multi-backend data serialization"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?]
+ >=dev-haskell/conduit-1.2.12:=[profile?]
+ >=dev-haskell/fast-logger-2.4:=[profile?]
+ >=dev-haskell/http-api-data-0.3:=[profile?]
+ >=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?]
+ >=dev-haskell/monad-logger-0.3.28:=[profile?]
+ >=dev-haskell/path-pieces-0.2:=[profile?]
+ >=dev-haskell/resource-pool-0.2.3:=[profile?]
+ >=dev-haskell/resourcet-1.1.10:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/silently:=[profile?]
+ >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vault:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.4
+ dev-haskell/quickcheck
+ >=dev-haskell/quickcheck-instances-0.3
+ dev-haskell/shakespeare )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-nooverlap
+}
diff --git a/dev-haskell/persistent/persistent-2.14.5.1.ebuild b/dev-haskell/persistent/persistent-2.14.5.1.ebuild
new file mode 100644
index 000000000000..26db569711a4
--- /dev/null
+++ b/dev-haskell/persistent/persistent-2.14.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -nooverlap
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, multi-backend data serialization"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?]
+ >=dev-haskell/fast-logger-2.4:=[profile?]
+ >=dev-haskell/http-api-data-0.3:=[profile?]
+ >=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?]
+ >=dev-haskell/monad-logger-0.3.28:=[profile?]
+ >=dev-haskell/path-pieces-0.2:=[profile?]
+ >=dev-haskell/resource-pool-0.2.3:=[profile?]
+ >=dev-haskell/resourcet-1.1.10:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/silently:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vault:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2.4
+ dev-haskell/quickcheck
+ >=dev-haskell/quickcheck-instances-0.3
+ dev-haskell/shakespeare )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-nooverlap
+}
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index 102c2b65a363..9fe7cea78594 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -20,4 +20,7 @@
For further information, see
&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
</longdescription>
+ <upstream>
+ <remote-id type="github">quchen/pgp-wordlist</remote-id>
+ </upstream>
</pkgmetadata>
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 38991ca8a028..90f3843d10b6 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # ambiguous packages: AC-Vector-Fancy vector
diff --git a/dev-haskell/pid1/Manifest b/dev-haskell/pid1/Manifest
deleted file mode 100644
index b4c66defb082..000000000000
--- a/dev-haskell/pid1/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pid1-0.1.2.0.tar.gz 7289 BLAKE2B 449f309a21c16e97e6cd7e33c91469bc27241312aeb33efe78016a62bf180490b8146a5390b308a0149d06b4bac071707a88146ecb46c17b04723e05b30adf28 SHA512 92d639637d13ad2cd4db2e4c5a0858ebd2fb6784b5826e4446b0a873e193a614e960a3fce8353742fd7439a93c9af309b254b55cf1b32f43620199a93864b729
diff --git a/dev-haskell/pid1/metadata.xml b/dev-haskell/pid1/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/pid1/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pid1/pid1-0.1.2.0.ebuild b/dev-haskell/pid1/pid1-0.1.2.0.ebuild
deleted file mode 100644
index 01ad6150cc62..000000000000
--- a/dev-haskell/pid1/pid1-0.1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Do signal handling and orphan reaping for Unix PID1 init processes"
-HOMEPAGE="https://github.com/fpco/pid1#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/pipes/Manifest b/dev-haskell/pipes/Manifest
deleted file mode 100644
index 5bb4e5c74169..000000000000
--- a/dev-haskell/pipes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pipes-4.3.14.tar.gz 42576 BLAKE2B 2d14d39f615965eb27d8c2a1bc92bc6e306bf5604760939121de74bd7752825f646e0f55e3c044f31b937357e97a2a1633f7fea6434b1a12522618d77df08559 SHA512 4dac195772876c62d187a123c99ec2c624ce9f5b4c8ea8de9621d01c4eaaaf99a2f856a2c9faf94ec35c531df29f0e82aa9015ad8dd4eb2b2d7478a0da4bacf5
diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
deleted file mode 100644
index d5894163855e..000000000000
--- a/dev-haskell/pipes/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- \"Coroutines done right\". This library generalizes iteratees and coroutines
- simply and elegantly.
-
- Advantages over traditional iteratee\/coroutine implementations:
-
- * /Concise API/: Use three simple commands: ('&gt;-&gt;'), 'request', and 'respond'
-
- * /Bidirectionality/: Implement duplex channels
-
- * /Blazing fast/: Implementation tuned for speed
-
- * /Elegant semantics/: Use practical category theory
-
- * /Extension Framework/: Mix and match extensions and create your own
-
- * /ListT/: Correct implementation of ListT that interconverts with pipes
-
- * /Lightweight Dependency/: @pipes@ depends only on @transformers@ and
- @mmorph@ and compiles rapidly
-
- * /Extensive Documentation/: Second to none!
-
- Import "Control.Proxy" to use the library.
-
- Read "Control.Proxy.Tutorial" for an extensive tutorial.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pipes/pipes-4.3.14.ebuild b/dev-haskell/pipes/pipes-4.3.14.ebuild
deleted file mode 100644
index 4b0d2f65d5a9..000000000000
--- a/dev-haskell/pipes/pipes-4.3.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="https://hackage.haskell.org/package/pipes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/mmorph-1.0.4:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
- >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
- >=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pointed/Manifest b/dev-haskell/pointed/Manifest
deleted file mode 100644
index 7930624337fd..000000000000
--- a/dev-haskell/pointed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pointed-5.0.2.tar.gz 7236 BLAKE2B 573a771f30b170cd1c394faa3ae5115b648c0c140bfb3253c0ecd790109c2a860ec1c2374ea2e55e76bbf2362c737f7725fee8dafc255e20d8bfc8f6411d297a SHA512 dc1c60108cf13f089c66511c6cc6cc695de3614fcaa93be54f9b71eb2ed07d4b3b8d9a550e9ba4d73322445eda36679d7abc554ec807755a2e13722cc68627e0
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
deleted file mode 100644
index 7bf780270265..000000000000
--- a/dev-haskell/pointed/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="comonad">optional instances</flag>
- <flag name="containers">optional instances</flag>
- <flag name="kan-extensions">optional instances</flag>
- <flag name="semigroupoids">optional instances</flag>
- <flag name="semigroups">optional instances</flag>
- <flag name="stm">optional instances</flag>
- <flag name="tagged">optional instances</flag>
- <flag name="transformers">optional instances</flag>
- <flag name="unordered-containers">optional instances</flag>
- </use>
- <upstream>
- <remote-id type="github">ekmett/pointed</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pointed/pointed-5.0.2.ebuild b/dev-haskell/pointed/pointed-5.0.2.ebuild
deleted file mode 100644
index 116cf93a1b1d..000000000000
--- a/dev-haskell/pointed/pointed-5.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
- kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
- semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
- semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
- stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] )
- tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
- transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
- unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag comonad comonad) \
- $(cabal_flag containers containers) \
- $(cabal_flag kan-extensions kan-extensions) \
- $(cabal_flag semigroupoids semigroupoids) \
- $(cabal_flag semigroups semigroups) \
- $(cabal_flag stm stm) \
- $(cabal_flag tagged tagged) \
- $(cabal_flag transformers transformers) \
- $(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/polyparse/Manifest b/dev-haskell/polyparse/Manifest
deleted file mode 100644
index 3c61ee584e31..000000000000
--- a/dev-haskell/polyparse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST polyparse-1.13.tar.gz 33144 BLAKE2B 0b142e4e82df045d838861124b204c06bfc62e642ea8a6a88697be0312df2a33998984a7e85ded35e4a0bb5eec304447b66a0d61dab196db32e63843a4b3e1cc SHA512 3b66a73f97d6b5b6628193f87cae1ae1a68d63df0058532b2ac9a62af82dabe28e15fe1464075a2f436e70a7d20b57e72fdd7831f8b11035ff8117becb08d18e
diff --git a/dev-haskell/polyparse/metadata.xml b/dev-haskell/polyparse/metadata.xml
deleted file mode 100644
index e5ab95ac816d..000000000000
--- a/dev-haskell/polyparse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A variety of alternative parser combinator libraries, including
- the original HuttonMeijer set. The Poly sets have features like
- good error reporting, arbitrary token type, running state, lazy
- parsing, and so on. Finally, Text.Parse is a proposed
- replacement for the standard Read class, for better
- deserialisation of Haskell values from Strings.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/polyparse/polyparse-1.13.ebuild b/dev-haskell/polyparse/polyparse-1.13.ebuild
deleted file mode 100644
index 56e5391cec99..000000000000
--- a/dev-haskell/polyparse/polyparse-1.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3.1.0 && < 4.14' 'base >= 4.3.1.0'
-}
diff --git a/dev-haskell/postgresql-libpq/Manifest b/dev-haskell/postgresql-libpq/Manifest
deleted file mode 100644
index 37d3ba2599d6..000000000000
--- a/dev-haskell/postgresql-libpq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST postgresql-libpq-0.9.4.2.tar.gz 31349 BLAKE2B 3f590eacc034eedeec7c9e83122ac0d52faf29dea1c0d929eaac50a199f933fe755dadaa99b6a25abb9db46b13f51a8f581fb37c628f70ab850fb599347c88bc SHA512 8bb811d8a25a09e232391412a78125a419db00bd293eaff8f0d3c652a65a5d312e3f42fae41babe9edf820adead5c243dc5a055ab16d7f9725c861b464a8d4f4
diff --git a/dev-haskell/postgresql-libpq/metadata.xml b/dev-haskell/postgresql-libpq/metadata.xml
deleted file mode 100644
index 0db8116727ff..000000000000
--- a/dev-haskell/postgresql-libpq/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is a binding to libpq: the C application
- programmer's interface to PostgreSQL. libpq is a
- set of library functions that allow client
- programs to pass queries to the PostgreSQL
- backend server and to receive the results of
- these queries.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild b/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild
deleted file mode 100644
index c077b890a0ed..000000000000
--- a/dev-haskell/postgresql-libpq/postgresql-libpq-0.9.4.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -use-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="low-level binding to libpq"
-HOMEPAGE="https://github.com/phadej/postgresql-libpq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/postgresql-7:*
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10 <dev-haskell/cabal-3.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.3 && <4.13' 'base >=4.3' \
- 'Cabal >= 1.10 && <2.5' 'Cabal >= 1.10 && <3.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-use-pkg-config
-}
diff --git a/dev-haskell/postgresql-simple/Manifest b/dev-haskell/postgresql-simple/Manifest
deleted file mode 100644
index 76a193f55913..000000000000
--- a/dev-haskell/postgresql-simple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST postgresql-simple-0.6.2.tar.gz 93740 BLAKE2B c8aff5f0db21c9b83ade8b8f763f937eb03fbc7432499483e617dca0c0b99a76d98357c7401c3aadf88c21e3765151e42c326d265e83e81df5623ad7c4eeb1cb SHA512 508f599e70a09aa4e80e5f76b9774d0aeb8d741abc16611fa6b9acd4a08a6d300133d1bdffe5893f3bca68ac77f0aedb4a0a8e6724dbd462b982db436fd944d8
diff --git a/dev-haskell/postgresql-simple/metadata.xml b/dev-haskell/postgresql-simple/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/postgresql-simple/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild b/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild
deleted file mode 100644
index f1ba2211f744..000000000000
--- a/dev-haskell/postgresql-simple/postgresql-simple-0.6.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Mid-Level PostgreSQL client library"
-HOMEPAGE="https://hackage.haskell.org/package/postgresql-simple"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # requires running postgres
-
-RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/bytestring-builder-0.10.8.1.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/hashable-1.2.7.0:=[profile?]
- >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
- >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?]
- >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
- >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/base16-bytestring
- >=dev-haskell/cryptohash-md5-0.11.100.1 <dev-haskell/cryptohash-md5-0.12
- dev-haskell/hunit
- >=dev-haskell/inspection-testing-0.4.1.1 <dev-haskell/inspection-testing-0.5
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.6.0.0 && <4.13' 'base >=4.6.0.0' \
- 'time >=1.4.0.1 && <1.9' 'time >=1.4.0.1' \
- 'template-haskell >=2.8.0.0 && <2.15' 'template-haskell >=2.8.0.0' \
- 'hashable >=1.2.7.0 && <1.3' 'hashable >=1.2.7.0' \
- 'semigroups >=0.18.5 && <0.19' 'semigroups >=0.18.5'
-}
diff --git a/dev-haskell/pqueue/Manifest b/dev-haskell/pqueue/Manifest
deleted file mode 100644
index c9c8e6e1f5a5..000000000000
--- a/dev-haskell/pqueue/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pqueue-1.4.1.3.tar.gz 23396 BLAKE2B 13b745070d8102ecbcf5fc74ad8adfa8fd470915567b85db80498c2e241a2a31edb2645adfd2a11a6644e257085be1421f26034f47a85443718060ba597f1160 SHA512 e1d77cdb034530891d03e44bb4aa02e3383e5659c61637c8821a94983f7ce42e0a10aa7480cb12774ac4dec4ff93a55f1a6f8baf4f4604ac52b1135d0c055163
diff --git a/dev-haskell/pqueue/metadata.xml b/dev-haskell/pqueue/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/pqueue/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pqueue/pqueue-1.4.1.3.ebuild b/dev-haskell/pqueue/pqueue-1.4.1.3.ebuild
deleted file mode 100644
index e9bdeea48012..000000000000
--- a/dev-haskell/pqueue/pqueue-1.4.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, persistent, fast priority queues"
-HOMEPAGE="https://hackage.haskell.org/package/pqueue"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/prelude-extras/Manifest b/dev-haskell/prelude-extras/Manifest
deleted file mode 100644
index 1164933580e1..000000000000
--- a/dev-haskell/prelude-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prelude-extras-0.4.0.3.tar.gz 8141 BLAKE2B 3889146248c758595ccc4dc3a63b31154ee1c412c9f6112b6362fa57aa456184f6121c153553f909436f782c1f6bcea7650f0b5e0c4f72cd18423ebf7a5e041c SHA512 a8a934166ede50654035075978fbd7406245c38d38c2bc90b9349522f93ba2d6a1bd77d8bba3ac47d819c767d15a3f3f6b663defba7a108f8e2f494709b8f76b
diff --git a/dev-haskell/prelude-extras/metadata.xml b/dev-haskell/prelude-extras/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/prelude-extras/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
deleted file mode 100644
index 37b0aaa85f84..000000000000
--- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Higher order versions of Prelude classes"
-HOMEPAGE="https://github.com/ekmett/prelude-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/preprocessor-tools/Manifest b/dev-haskell/preprocessor-tools/Manifest
deleted file mode 100644
index 12cf57d5b0ad..000000000000
--- a/dev-haskell/preprocessor-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST preprocessor-tools-2.0.2.tar.gz 9892 BLAKE2B bebe957c2c312a166bda3b973eede491a6604cedcd1a82e78455298f9074701324b98b4b8c0c469299cd69829167e1c05535db2f7328f2f6fe6c5eb32d14b9d7 SHA512 7a88f62aa06cca5234e6e6eae68ddfb8790023f0f090412164eb1728dd6c3c409c665498e00f5b19f2e6765a3e4eaca205590605c4b88bf7164890e449edb1fa
diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
deleted file mode 100644
index 414f85cc7de3..000000000000
--- a/dev-haskell/preprocessor-tools/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library provides a quick-and-dirty (but often effective)
- method for extending Haskell's syntax using a custom
- preprocessor. It parses Haskell into a bare-bones AST with just
- enough knowledge of the syntax to preserve nesting, and then
- allows transformations on the AST.
-
- See the package ixdopp
- (&lt;http://hackage.haskell.org/cgi-bin/hackage-scripts/package/ixdopp&gt;)
- for an example of how to do this.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild
deleted file mode 100644
index 9a9a7e2627a0..000000000000
--- a/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
-HOMEPAGE="https://github.com/tov/preprocessor-tools-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc 8.4
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
diff --git a/dev-haskell/pretty-hex/Manifest b/dev-haskell/pretty-hex/Manifest
index 7afc93878430..040fbe7fccf6 100644
--- a/dev-haskell/pretty-hex/Manifest
+++ b/dev-haskell/pretty-hex/Manifest
@@ -1 +1,2 @@
DIST pretty-hex-1.0.tar.gz 2950 BLAKE2B 7fd2049eb42e4e596a54207820d66874620554e72d8f3dae48f5f42b7be089e2b9fe9c9e318a5b13fa4448630a54a7aab3eff593882e6e8df1ed2466a502f35e SHA512 a5ffdecf56b586a23b1243bcace040c7043cc67ced07c5f94d459a2e6a00cade98c70e1480be763ef75946d2aedf87e00d2b653a6f8f23d21cd8e9ab198ea45d
+DIST pretty-hex-1.1.tar.gz 3305 BLAKE2B 833b6056cd8b3ecf0601757cb5b51284e80af613afb81b50a6329fb690d0b8d7d67a263d96ab67794e5bbb17b8dac5b36e39e08e0f1a2b47038f216033f94e66 SHA512 e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c
diff --git a/dev-haskell/pretty-hex/metadata.xml b/dev-haskell/pretty-hex/metadata.xml
index 6c7bc22ecf52..937381521944 100644
--- a/dev-haskell/pretty-hex/metadata.xml
+++ b/dev-haskell/pretty-hex/metadata.xml
@@ -5,8 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library generates pretty hex dumps of ByteStrings in the
- style of other common *nix hex dump tools.
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
index ae36f580a847..563b7c3e4a57 100644
--- a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
+++ b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild
new file mode 100644
index 000000000000..ef4d96251f2e
--- /dev/null
+++ b/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for hex dumps of ByteStrings"
+HOMEPAGE="https://hackage.haskell.org/package/pretty-hex"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
index d8f28adf4589..562698bebdf2 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1 +1 @@
-DIST pretty-show-1.9.5.tar.gz 42378 BLAKE2B 3d8fb41c00aa95049b88c75f0b2c107b6000d837e3761c74bc888b561fcd36b1da21c502cbf8e905b601eda3ed5c2a242a710945cf5aee5e2c4413581ba3788e SHA512 7bf382ad3531227588a82d7bcff3a795df0c425b27d7f4448a94fd617fbc8a4fb6087eb859480fe4702771bf560a353a3a3d5079cd6576c620d5258686c41193
+DIST pretty-show-1.10.tar.gz 42233 BLAKE2B 55a84a5224b61560f0cf527c103393e590d107c1a08ffc76fc9ad1070f60acedeea97630f9a30a04c620604e9912aa22629705c3297785f73a7c00666b197325 SHA512 90ecf41790246c85ee7c738de2bb1a23a56a0a1d547cee627cb0a5f6c2691adfc73851ca0ebc928f3584912bc2b1148b115db03eea271e67f55d6a1466db8711
diff --git a/dev-haskell/pretty-show/metadata.xml b/dev-haskell/pretty-show/metadata.xml
index 1754ff68b46d..52d472789714 100644
--- a/dev-haskell/pretty-show/metadata.xml
+++ b/dev-haskell/pretty-show/metadata.xml
@@ -12,4 +12,7 @@
human-readable versions of 'Show' instances, which can be quite handy for
debugging Haskell programs.
</longdescription>
+ <upstream>
+ <remote-id type="github">yav/pretty-show</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/pretty-show/pretty-show-1.10.ebuild b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
new file mode 100644
index 000000000000..f0577eb5a34b
--- /dev/null
+++ b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
+HOMEPAGE="https://github.com/yav/pretty-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/haskell-lexer-1.1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ dev-haskell/happy
+"
diff --git a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild b/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
deleted file mode 100644
index 11370d8d5e0c..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="https://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- dev-haskell/happy
-"
diff --git a/dev-haskell/prettyclass/Manifest b/dev-haskell/prettyclass/Manifest
deleted file mode 100644
index a1ce5c1b1397..000000000000
--- a/dev-haskell/prettyclass/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prettyclass-1.0.0.0.tar.gz 1542 BLAKE2B b1497565728b2a580f4ff9117a62a2e2013888a07a9893ee207e0392a014373cb17eb9eeff3ce3d30a69dc7d2f5ff6d136e4a00b8bdae3533c8f240658bf6bf4 SHA512 f0785e7780f71ee0f8f6b6ca5db6a82f030f75b34f618ff9ee0025032516114769f4cd4e6094b5fefd13e645a7eece9d87b82c2d4c144dddf5093bc2c600af4a
diff --git a/dev-haskell/prettyclass/metadata.xml b/dev-haskell/prettyclass/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/prettyclass/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild b/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
deleted file mode 100644
index 6f54c307926a..000000000000
--- a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pretty printing class similar to Show"
-HOMEPAGE="https://hackage.haskell.org/package/prettyclass"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.0
-"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/Manifest b/dev-haskell/prettyprinter-ansi-terminal/Manifest
index de0fdbb50de2..80bf8dc5fc10 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/Manifest
+++ b/dev-haskell/prettyprinter-ansi-terminal/Manifest
@@ -1 +1,2 @@
-DIST prettyprinter-ansi-terminal-1.1.1.2.tar.gz 6378 BLAKE2B 5c8c4a224bb2832f31ce8a52b8cdc35ee84b3e288a38f507f7bec22beb5fa2877c6ea178a60bcf189bca75be1afa35903582614f0a209f4d6f5d8072b3683bda SHA512 b2ac6c76ce6570b285370c9b1a466272aa5a3ba86a9f1de996392d750d212ff62a743e9c3c28f7de7951c9b270d64c97cb695166b65d642751942d682ff1a71b
+DIST prettyprinter-ansi-terminal-1.1.2.tar.gz 8836 BLAKE2B f1220169d02db0927468ba7af922e2631c5a18780edd786d37e0c273043cb3c1c653f70af70ca963a093cf7936284c73f6131d94f8ffaef1f60125e6ab574846 SHA512 6f3f077f3f171b6a2c1ca811d267f5311328cd3538ace0c174dd87960fd2617a6543e4bfe239f231ef68c6cce87ce563d0f2068631c084a1faa56a3e051f3fae
+DIST prettyprinter-ansi-terminal-1.1.3.tar.gz 8879 BLAKE2B 64d796a28cf3ce3930bc2de87643c173ca1b7e26837be1e47807e0eef13be54e830328a18515183cd21544836776f92798606e48007591e01c5fcd22f59f6a2b SHA512 985e965f78c767234b9f30e9cc1590d037e00d211385ebfa833b96f9b9aa092840e2587236d848c66ff1c58c97748f6ae9bd5cc02ea5175aa66d2654392ea1b6
diff --git a/dev-haskell/prettyprinter-ansi-terminal/metadata.xml b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
index 937381521944..7beb07893938 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
+++ b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">prettyprinter-ansi-terminal</remote-id>
+ <remote-id type="github">quchen/prettyprinter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
deleted file mode 100644
index c327439b8d7b..000000000000
--- a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
- >=dev-haskell/prettyprinter-1.1.1:=[profile?]
- >=dev-haskell/semigroups-0.1:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/doctest-0.9 )
-"
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
new file mode 100644
index 000000000000..fe6d4dbccc86
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+ >=dev-haskell/prettyprinter-1.1.1:=[profile?]
+ >=dev-haskell/semigroups-0.1:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild
new file mode 100644
index 000000000000..c28dd6963b7c
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI terminal backend for the »prettyprinter« package"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+ >=dev-haskell/prettyprinter-1.7.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/doctest-0.9 )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest
new file mode 100644
index 000000000000..629384f46251
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest
@@ -0,0 +1 @@
+DIST prettyprinter-compat-ansi-wl-pprint-1.0.2.tar.gz 3894 BLAKE2B 4683b62a44e021a19859c0deb45685b3c93feb17cce81dd5d924882e4e5175b758919188497fa6b3a3b0d4129227392f60d8fd4d9fd51a2ddbc6b80ce2a6ba11 SHA512 06f9f2380e85ed392173fa459e650153d9965346fc39fbfaa09e358150015ab99a8ad529c456b35c4c7e5350242f9c9db11bc1296e384b5f7a5e0de7e93a4300
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml
new file mode 100644
index 000000000000..5b373e016290
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">prettyprinter-compat-ansi-wl-pprint</remote-id>
+ <remote-id type="github">quchen/prettyprinter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild
new file mode 100644
index 000000000000..5979258f7d51
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Drop-in compatibility package from ansi-wl-pprint to prettyprinter"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/prettyprinter-1.7.0:=[profile?]
+ >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
index 8ebf88970d35..965b137ff7da 100644
--- a/dev-haskell/prettyprinter/Manifest
+++ b/dev-haskell/prettyprinter/Manifest
@@ -1 +1,2 @@
-DIST prettyprinter-1.6.1.tar.gz 52818 BLAKE2B 171667a7483802a6e55f599af89831ac4e13931f4ce203313ab5126c975963de13c39dba124d81cef29bbeb1a98f1f2001dd9beb02b00dfe1d34160dd8167d30 SHA512 4623cec5c2034f08bce57320d9cedce4c893977868e2c98191c060d6442c2c19c946a07dc8dc2a31dd03c726f392dfff6509ca837d9c75974637e7ffc5099496
+DIST prettyprinter-1.7.0.tar.gz 55569 BLAKE2B fbcdad5485f8139c71f5e34a438adbe59822ef1eb77ae55f9f86228c934e7c751947dcae0900250ea2cfd8638493352759b40c68d91d6b4887289cc475c08163 SHA512 4f1b756b3284a0319bb73229e8445f6d92c3d3d12a879f651df5624389bd6c449b2d9bc440dbf70d8752a6ba574d0539f91950d4bafbe7f9d3fd79d0d30ec95d
+DIST prettyprinter-1.7.1.tar.gz 56907 BLAKE2B a05d9153b8b0eccd84b110d8e785c758b407757f54424d37b17ba5452e4b34fbfe4b4d7a6238d8a6b73d65cb23dc51ca3af320b577ae645fdf63190159f2e695 SHA512 26289e579cc1a2826dc11daedbdfd5ce31acf4a2382f827c20194d910f05201e3f332a6544aa0c3f941188d9eaee8d6dee3cf3d319dc3c5a7bfe4f35d77b4dd9
diff --git a/dev-haskell/prettyprinter/metadata.xml b/dev-haskell/prettyprinter/metadata.xml
index 46c9ce7b1d0c..fcd7bf78e975 100644
--- a/dev-haskell/prettyprinter/metadata.xml
+++ b/dev-haskell/prettyprinter/metadata.xml
@@ -1,8 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
- A prettyprinter/text rendering engine. Easy to use, well-documented, ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, Text-based, extensible.
- </longdescription>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="buildreadme">Build the readme generator</flag>
+ <flag name="text">While it&#39;s a core value of @prettyprinter@ to use @Text@, there are rare
+circumstances (mostly when @prettyprinter@ arises as a dependency of
+test suites of packages like @bytestring@ or @text@ themselves) when
+this is inconvenient. In this case one can disable this flag, so that
+@prettyprinter@ fallbacks to @String@.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">prettyprinter</remote-id>
+ <remote-id type="github">quchen/prettyprinter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
deleted file mode 100644
index 41a7db096c72..000000000000
--- a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/semigroups-0.16.1:=[profile?]
- >=dev-haskell/text-1.2:=[profile?]
- >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/pgp-wordlist-0.1
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
new file mode 100644
index 000000000000..a8b3dbd4dbbd
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+ >=dev-haskell/semigroups-0.17:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/pgp-wordlist-0.1
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild
new file mode 100644
index 000000000000..02d35e6a2de1
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="buildreadme +text"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/doctest-0.9
+ >=dev-haskell/quickcheck-2.5
+ text? ( >=dev-haskell/pgp-wordlist-0.1
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 ) )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag buildreadme buildreadme) \
+ $(cabal_flag text text)
+}
diff --git a/dev-haskell/primitive-addr/metadata.xml b/dev-haskell/primitive-addr/metadata.xml
index 937381521944..e937f72e52d3 100644
--- a/dev-haskell/primitive-addr/metadata.xml
+++ b/dev-haskell/primitive-addr/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">byteverse/primitive-addr</remote-id>
+ </upstream>
</pkgmetadata>
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 ce29f2d74df9..1040356e724b 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.2
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/primitive/Manifest
index 3d1ebad64ca2..26738b0d4919 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -1 +1,4 @@
-DIST primitive-0.7.1.0.tar.gz 52184 BLAKE2B c99f4e3bb37981a1c290914636460304203083817be8e83c2d756820b139b185e9594042fa41b9cafce03ae849a55a58899a6787890f81e4d78f7f35c5057c15 SHA512 8ade11d0b2221cfdf042da0263b5b5367a7ca2a9b9e1141844e4a65bb0467df879c92cd3515440d715b59345860c1ec3cb3efd7a3d702269ea15e18692586367
+DIST primitive-0.7.3.0-rev2.cabal 3080 BLAKE2B eb2e4c196978ca8534801c62b09302d1426564047b740fce992e81eb22136c123e07ae7240b03fd6983c496da563e7e2ed0a60d038e436966db9771644b57736 SHA512 d2dabfa4e2833886ec4430fdb50b2b53eea4eb94ed77350d53fcbaaad74b3b673d9dd7b3a48c69dda596f77743c70b31c9f1a5b6dc19114f80bf148af894f04c
+DIST primitive-0.7.3.0.tar.gz 55161 BLAKE2B 2963b9cea320ebcceddc4760c8890636a8f99b3eb5bb944a40ec5e097d8d92c92a18618126e23d345cb072b8245d4979a4b4988c64e2eb5fe30c7182ac11d386 SHA512 7fe593c24d990ce113c7dd155479b30a1c74aa9cfd10d2f0903dc185fc00d725b36d340e5eea6f1af7547d47bbde27339c56e2949e7f518674a7306ed8e56342
+DIST primitive-0.7.4.0-rev1.cabal 2982 BLAKE2B c85ee94b899932b6d465c29aaab1b5f1ba31a7b7a6581ae6a05927b4bd1b471ba120c228142913a28bf3e4142621d7d1f95944d372e4d29c4166881c3615565f SHA512 25fb5d4292d6cff46d351a9ae4fba058448d1065b455ee09bb6085a8725d0b5abc0f30225d66d11da09ad4ba48321ff9677e5554fe6c236fd35b06c0ea2079af
+DIST primitive-0.7.4.0.tar.gz 56575 BLAKE2B 3ecfe44a0e043bb80e5875aa45cfe1e8b48daa88c6dcda942604f2eb9903d2656dd13dbda7abcae3bee35f38750c3bb57823200500522e64e882f48f000150e1 SHA512 5c01ea4fc509ccb8f00b7d282948e8fa120d2ee3abd09c4efa473496ce6a716e26a95994a30bb8e18754a6226cbcaf102264e263e517d4ff2cea2d67216eb6c7
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
index eaebbf3da9a8..d5f01e1981ab 100644
--- a/dev-haskell/primitive/metadata.xml
+++ b/dev-haskell/primitive/metadata.xml
@@ -3,32 +3,10 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides wrappers for primitive array operations from
- GHC.Prim.
-
- Changes in version 0.4.0.1
-
- * Critical bug fix in @fillByteArray@
-
- Changes in version 0.4
-
- * Support for GHC 7.2 array copying primitives
-
- * New in "Data.Primitive.ByteArray": @copyByteArray@,
- @copyMutableByteArray@, @moveByteArray@, @fillByteArray@
-
- * Deprecated in "Data.Primitive.ByteArray": @memcpyByteArray@,
- @memcpyByteArray'@, @memmoveByteArray@, @memsetByteArray@
-
- * New in "Data.Primitive.Array": @copyArray@, @copyMutableByteArray@
-
- * New in "Data.Primitive.Addr": @copyAddr@, @moveAddr@
-
- * Deprecated in "Data.Primitive.Addr": @memcpyAddr@
- </longdescription>
<upstream>
+ <remote-id type="hackage">primitive</remote-id>
<remote-id type="github">haskell/primitive</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/primitive/primitive-0.7.1.0.ebuild b/dev-haskell/primitive/primitive-0.7.1.0.ebuild
deleted file mode 100644
index 318fc14a0b8f..000000000000
--- a/dev-haskell/primitive/primitive-0.7.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
-"
diff --git a/dev-haskell/primitive/primitive-0.7.3.0.ebuild b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
new file mode 100644
index 000000000000..51483f7534cc
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Primitive memory-related operations"
+HOMEPAGE="https://github.com/haskell/primitive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/primitive/primitive-0.7.4.0.ebuild b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
new file mode 100644
index 000000000000..1a4f19a9b655
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Primitive memory-related operations"
+HOMEPAGE="https://github.com/haskell/primitive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+CABAL_CHDEPS=(
+ 'tasty ^>= 1.2 || ^>= 1.3 || ^>= 1.4' 'tasty >= 1.2'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/base-orphans
+ >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-classes-base-0.6 <dev-haskell/quickcheck-classes-base-0.7
+ dev-haskell/tagged
+ >=dev-haskell/tasty-1.2
+ dev-haskell/tasty-quickcheck
+ dev-haskell/transformers-compat
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/process-extras/Manifest b/dev-haskell/process-extras/Manifest
deleted file mode 100644
index b1a9468e4955..000000000000
--- a/dev-haskell/process-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST process-extras-0.7.4.tar.gz 14256 BLAKE2B 876c0bbda21f07c67fd70042f9fc1045b73d3180c8ab32ba1573f657dd5c4650ba00a0167eed67de4f789a5b1b79e73c21a22bc660267737f2fefe3f89392d0e SHA512 4747b4bd920796b7b4ddf32d0e72a3af556c9db66c828b725ac7a7467442dad2b0dc85aa66e03d7a8c5afdb02658611e64d390b6c71219b380a986e245495536
diff --git a/dev-haskell/process-extras/metadata.xml b/dev-haskell/process-extras/metadata.xml
deleted file mode 100644
index f508742b3c36..000000000000
--- a/dev-haskell/process-extras/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">seereason/process-extras</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-extras/process-extras-0.7.4.ebuild b/dev-haskell/process-extras/process-extras-0.7.4.ebuild
deleted file mode 100644
index f10bae8be214..000000000000
--- a/dev-haskell/process-extras/process-extras-0.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Process extras"
-HOMEPAGE="https://github.com/seereason/process-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default:=[profile?]
- >=dev-haskell/generic-deriving-1.10:=[profile?]
- >=dev-haskell/listlike-4.4:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/profunctor-extras/Manifest b/dev-haskell/profunctor-extras/Manifest
deleted file mode 100644
index 2da63869d26a..000000000000
--- a/dev-haskell/profunctor-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST profunctor-extras-4.0.tar.gz 2588 BLAKE2B 1bee159f740c3e49797756a54ed5e14053d43458316f19e9f9f0e6882f2f07766b6d5aad915f096a8bfc6d1b08269cd349cf5f56a31c1ba8a1f28f9ea9c59857 SHA512 0bf2000b18ccc5d85be28d48199f1e64c6fc8813b0e08b9e1c7bab756ebfe432c3e3c1e2ae87da81e54b1dac183776348a80f089f595ff318f9447d75ff7e358
diff --git a/dev-haskell/profunctor-extras/metadata.xml b/dev-haskell/profunctor-extras/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/profunctor-extras/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
deleted file mode 100644
index 807a59466824..000000000000
--- a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into profunctors 4.0"
-HOMEPAGE="https://github.com/ekmett/profunctor-extras/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/profunctors-4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
index c21c8b2ee4c5..70b9fb352a7f 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -1 +1,2 @@
-DIST profunctors-5.5.1.tar.gz 29825 BLAKE2B 6a2fb21790e7ad7edc1cced8fb14cd02dab080ad832926edbd81a1aaf95c3aa9590c8c6b6216265103d1be9977ed64bbefe49000d1fa350d26af29a850c98333 SHA512 6f2b3cfe7ab629dd224319eef020bf92068a0b6b66019ab11dacb0e3540a2581605849037a9f2c0e1bca4330a4bce63266c9378cdb1bd612cdce52e7dae53481
+DIST profunctors-5.6.2-rev3.cabal 2484 BLAKE2B bbc95a6ce16d9740b7ff65000743e5dd9cbd036f2638b1678161fc304f7edcbb7044fde7c9c74d13b4cc2e15588f3b7563cbaeedcb840cb8dcd6863341217b86 SHA512 4996281dd2f69d065bd8dc49ed02407f882937885a1b6260014820e4ff0084ee19d82a1e0a6af6fe75f9704383f0f0943439ccf7f8b1d87d693c853e4e6f2d3d
+DIST profunctors-5.6.2.tar.gz 28522 BLAKE2B 812692b257caf7443ff03bf0e9268df8b4b7cd6af4ce95addb7bba6a2fa198b52a98121f63847a4402719a50c95535f379a111f4e943aa9937840920466a04b5 SHA512 ddf33426fdf52dbe0ffea5c9124e1d35b79696564b8e88bcd7a015b8361634566e5d35135cee69c6dc2fa2bbb870d9f624710f98e122078f7f3a82bbdacad690
diff --git a/dev-haskell/profunctors/metadata.xml b/dev-haskell/profunctors/metadata.xml
index 62b8af2487a2..19c6c8c12b75 100644
--- a/dev-haskell/profunctors/metadata.xml
+++ b/dev-haskell/profunctors/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">profunctors</remote-id>
<remote-id type="github">ekmett/profunctors</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/profunctors/profunctors-5.5.1.ebuild b/dev-haskell/profunctors/profunctors-5.5.1.ebuild
deleted file mode 100644
index af45db76dac3..000000000000
--- a/dev-haskell/profunctors/profunctors-5.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 profunctors package"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
- >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild b/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild
new file mode 100644
index 000000000000..a653eff5be86
--- /dev/null
+++ b/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Profunctors package, authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/profunctors/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+ >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+ >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/project-template/Manifest b/dev-haskell/project-template/Manifest
deleted file mode 100644
index cf5349fb7680..000000000000
--- a/dev-haskell/project-template/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST project-template-0.2.1.0.tar.gz 8485 BLAKE2B 43a15ee73dd4efb256567bb29320c41a5715f0a7bf4416fd930712d46f85b819d564cb8d2035436017a0195499ee2f308d0274cb3697457230fd5a0f8b3a5619 SHA512 ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c
diff --git a/dev-haskell/project-template/metadata.xml b/dev-haskell/project-template/metadata.xml
deleted file mode 100644
index b57c7eee24c9..000000000000
--- a/dev-haskell/project-template/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/haskell-ide</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/project-template/project-template-0.2.1.0.ebuild b/dev-haskell/project-template/project-template-0.2.1.0.ebuild
deleted file mode 100644
index 008ebca62988..000000000000
--- a/dev-haskell/project-template/project-template-0.2.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Specify Haskell project templates and generate files"
-HOMEPAGE="https://github.com/fpco/haskell-ide"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?]
- >=dev-haskell/resourcet-0.4.3:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/psqueue/Manifest b/dev-haskell/psqueue/Manifest
deleted file mode 100644
index 3c4a85c6de5d..000000000000
--- a/dev-haskell/psqueue/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PSQueue-1.1.0.1.tar.gz 6408 BLAKE2B 5852064aabcea6e9495234cf16d4292878ed5b645fa822aaafb5d1bc869ba2fc30ce83ef4b5fa009faae4616b814cc776f796b38f51bae877324194755ab5bcb SHA512 76d5cd09d7955c4d7500b7e68fd4776b84d5cbbcc6eb1a101549119e11fdd8a452bc87cb473eef37655a18f5a5e616d126e020edb907901feae77a0b10b86eb9
diff --git a/dev-haskell/psqueue/metadata.xml b/dev-haskell/psqueue/metadata.xml
deleted file mode 100644
index 8d1d3cb246f9..000000000000
--- a/dev-haskell/psqueue/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A /priority search queue/ efficiently supports the
- opperations of both a search tree and a priority queue. A
- 'Binding' is a product of a key and a priority. Bindings
- can be inserted, deleted, modified and queried in
- logarithmic time, and the binding with the least priority
- can be retrieved in constant time. A queue can be built
- from a list of bindings, sorted by keys, in linear time.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild b/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild
deleted file mode 100644
index acc11464c422..000000000000
--- a/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="PSQueue"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Priority Search Queue"
-HOMEPAGE="https://hackage.haskell.org/package/PSQueue"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.13' 'base >= 4.3'
-}
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
index 3e240fa2f636..cd01ec5f836e 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -1 +1 @@
-DIST psqueues-0.2.7.2.tar.gz 27455 BLAKE2B b9d69b445173c4b8972e3f4a0a601c2e1c9d96c02b4426c5fbdba7220274ddd4c45138bfe94b23744b99cc0b538d114fb045095c1e9d2cf1d7e1f3295466662c SHA512 cc70bc22568d24b8618d43be7a2261ab7b55005e7e68a49a4d09b323e03954c05fe8d4de2c344760cdfef26b04bc6937bc331f7e310e1bc9b6b512068eed3be3
+DIST psqueues-0.2.7.3.tar.gz 27328 BLAKE2B f237482c54cdbe7bdd69c119bca0ff159efa3a242e06bb503a62ae453a1445cd1c6216aa426fd7ae752f88c77e26401516b06f5a9b30a99e548b8a48dbeb1bf2 SHA512 7a089a68f8b99f93780cc05e1b3454c266077f47a453f139bbe368cdca889e8b7098aa2770c86fcb32eddcb15837a7d60c70da946ad5a234a72bf01fff017fff
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
deleted file mode 100644
index 0b189c2996d5..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
- >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14
- dev-haskell/tagged
- >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
new file mode 100644
index 000000000000..f8145482f182
--- /dev/null
+++ b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure priority search queues"
+HOMEPAGE="https://hackage.haskell.org/package/psqueues"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+ dev-haskell/tagged
+ >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/publicsuffixlist/Manifest b/dev-haskell/publicsuffixlist/Manifest
deleted file mode 100644
index 893508697e0d..000000000000
--- a/dev-haskell/publicsuffixlist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST publicsuffixlist-0.1.tar.gz 72704 BLAKE2B e8cf5ec65eccc7a7b335d753057a3ccd877691cd760cabf6b9fdbea5bb595d2051021799756f93048a9b144cae6f2721370df7d869c7cb38fbf00f3d7b6ed6d3 SHA512 ca9035f33eaeb222684574e3be2dfb25d60fb840cf5e7684d816cbf696f90782e86caaf7d39b826e00b444739624432a0c02b23890a17864c416afb2bbcd7dc3
diff --git a/dev-haskell/publicsuffixlist/metadata.xml b/dev-haskell/publicsuffixlist/metadata.xml
deleted file mode 100644
index e2b4e44ff25f..000000000000
--- a/dev-haskell/publicsuffixlist/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="create">export Network.PublicSuffixList.Create module</flag>
- <flag name="runtimelist">read suffix list from dist at startup instead of embedding list into library</flag>
- </use>
- <upstream>
- <remote-id type="github">litherum/publicsuffixlist</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
deleted file mode 100644
index 9957846f6ef3..000000000000
--- a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Is a given string a domain suffix?"
-HOMEPAGE="https://github.com/litherum/publicsuffixlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="create runtimelist"
-
-RDEPEND="dev-haskell/cereal:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?]
- >=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- !create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag create create) \
- $(cabal_flag runtimelist runtimelist)
-}
diff --git a/dev-haskell/punycode/Manifest b/dev-haskell/punycode/Manifest
deleted file mode 100644
index 973e104d3890..000000000000
--- a/dev-haskell/punycode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST punycode-2.0.tar.gz 6243 BLAKE2B b6a0b5123ea3dbd8b8c28ea56b4cf7425962011224549ece1c3c2c5b6a951e7e8c76c46f33a548f43ec650a42ef98f373769f623b4094ab6e222f5e2b91ce621 SHA512 106ee29667582f0341b993b8fd888046e70aff02bf9a31fb883488ed0f1fe346ae6dacd60ceacf088c056b50cb99d633322f066be391585af9c37fd8e5e4ff44
diff --git a/dev-haskell/punycode/metadata.xml b/dev-haskell/punycode/metadata.xml
deleted file mode 100644
index 58862ebc5a9e..000000000000
--- a/dev-haskell/punycode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Encode unicode strings to ascii forms according to RFC 3492. It is written in pure Haskell, as opposed to gnuidn's Data.Text.IDN.Punycode. Please note that Data.Encoding.BootString from the 'encoding' package also contains an implementation of the Punycode algorithm.
- </longdescription>
- <upstream>
- <remote-id type="github">litherum/punycode</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
deleted file mode 100644
index 064e6d0602da..000000000000
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492"
-HOMEPAGE="https://github.com/litherum/punycode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs slow, finds error.
-
-RDEPEND="dev-haskell/cereal:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
- # test? ( dev-haskell/encoding
- # dev-haskell/hunit
- # dev-haskell/quickcheck
- # )"
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
index ad628660c2cc..74fce8964f80 100644
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-haskell/pwstore-fast/Manifest b/dev-haskell/pwstore-fast/Manifest
deleted file mode 100644
index 8712c78af2e2..000000000000
--- a/dev-haskell/pwstore-fast/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pwstore-fast-2.4.4.tar.gz 8901 BLAKE2B 27e26a1c934264ea18797c6e5c9bd91dacd00e02ee67a0ec7e39dd51fa10c37b9999b1698800ffdfc7954aced9f3d076a94cc5d423b022af5d0168862e81415a SHA512 707381466d22b9d4cb45884be1df0c1567b11c1ed698b19c968f72b0b68898aa384df5f7c12fb5944ebc2bbcf28fd22c4cefed696d37503ac8b39ab9cdebb0f1
diff --git a/dev-haskell/pwstore-fast/metadata.xml b/dev-haskell/pwstore-fast/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/pwstore-fast/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild b/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
deleted file mode 100644
index 1303a14bfc7d..000000000000
--- a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Secure password storage"
-HOMEPAGE="https://github.com/PeterScott/pwstore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
- >=dev-haskell/byteable-0.1:=[profile?]
- >=dev-haskell/cryptohash-0.6:=[profile?]
- >=dev-haskell/random-1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
index daab939f5ac3..f4b1db0172f8 100644
--- a/dev-haskell/quickcheck-classes-base/metadata.xml
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -9,4 +9,7 @@
<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors.</flag>
</use>
+ <upstream>
+ <remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+ </upstream>
</pkgmetadata>
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 7bd0238e1887..ec6966e5a141 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,14 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+binary-laws +unary-laws"
RDEPEND="dev-haskell/contravariant:=[profile?]
>=dev-lang/ghc-8.4.3:=
- binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
- unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
- !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+ binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+ unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+ !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-2.4
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
index c6932af438a5..7ff6ea58d8da 100644
--- a/dev-haskell/quickcheck-classes/Manifest
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -1 +1,2 @@
DIST quickcheck-classes-0.6.4.0.tar.gz 19976 BLAKE2B 614ebc6e1be382a942a55a039921021fd4bcaa2f5c977a8d83bd7b1fb76feebb31f94da908c2389d5f9ab5f7e2481f76223375db41d12b3583658d5d7361ed9b SHA512 2d5786d3cd386a795d5e1ca58ef55fb2efb9285724cf8cbb2f28577973ac2b2a9058ba6185904bc29da88f6d080f4a38629df272502796a0c2e31f9a0e8b658c
+DIST quickcheck-classes-0.6.5.0.tar.gz 20242 BLAKE2B 6b058b9991ad60bc7f9409d9b85d6f02236174eb39765cad3ced0b633ba1877a2866cccd36968e6902e8bae2b2382c319075ce71922afbc1a9e01a6563378b28 SHA512 d0f894d0357522f59440bd795746b3c17802332e3833982cf1d2d20c2a5dc3e4ac1e54f6b3aeac93c0a1beed9f0f4838e20d8798d99bf161b49fc50bdf1f0670
diff --git a/dev-haskell/quickcheck-classes/metadata.xml b/dev-haskell/quickcheck-classes/metadata.xml
index 5f5d00f85a27..b5d22a614586 100644
--- a/dev-haskell/quickcheck-classes/metadata.xml
+++ b/dev-haskell/quickcheck-classes/metadata.xml
@@ -6,42 +6,14 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="aeson">
- Enable the use of the `aeson` package. This may be useful for
- accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="semigroupoids">
- Enable the use of the `semigroupoids` package. This may be
- useful for accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="semirings">
- Enable the use of the `semirings` package. This may be useful
- for accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="vector">
- Enable the use of the `vector` package. This may be useful
- for accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="unary-laws">
- Include infrastructure for testing class laws of unary type constructors.
- </flag>
- <flag name="binary-laws">
- Include infrastructure for testing class laws of binary type constructors.
- Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported
- configuration.
- </flag>
+ <flag name="aeson">You can disable the use of the `aeson` package using `-f-aeson`. This may be useful for accelerating builds in sandboxes for expert users.</flag>
+ <flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. It is required that this flag match the value that the `unary-laws` flag was given when building `quickcheck-classes-base`. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
+ <flag name="semigroupoids">You can disable the use of the `semigroupoids` package using `-f-semigroupoids`. This may be useful for accelerating builds in sandboxes for expert users.</flag>
+ <flag name="semirings">You can disable the use of the `semirings` package using `-f-semirings`. This may be useful for accelerating builds in sandboxes for expert users.</flag>
+ <flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors. It is required that this flag match the value that the `unary-laws` flag was given when building `quickcheck-classes-base`.</flag>
+ <flag name="vector">You can disable the use of the `vector` package using `-f-vector`. This may be useful for accelerating builds in sandboxes for expert users.</flag>
</use>
- <longdescription>
- This library provides QuickCheck properties to ensure
- that typeclass instances adhere to the set of laws that
- they are supposed to. There are other libraries that do
- similar things, such as `genvalidity-hspec` and `checkers`.
- This library differs from other solutions by not introducing
- any new typeclasses that the user needs to learn.
-
- /Note:/ on GHC &lt; 8.5, this library uses the higher-kinded typeclasses
- ('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
- but on GHC &gt;= 8.5, it uses `-XQuantifiedConstraints` to express these
- constraints more cleanly.
- </longdescription>
+ <upstream>
+ <remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+ </upstream>
</pkgmetadata>
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 e4dbaa884075..1ff3c61eeb83 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.2
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
@@ -28,11 +28,11 @@ RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
dev-haskell/tagged:=[profile?]
>=dev-lang/ghc-8.0.1:=
aeson? ( >=dev-haskell/aeson-0.9:=[profile?] )
- binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+ binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] )
- unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
- !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+ unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+ !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
vector? ( >=dev-haskell/vector-0.12:=[profile?] )
"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
new file mode 100644
index 000000000000..451810b4b4c0
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
+
+RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?]
+ >=dev-haskell/quickcheck-classes-base-0.6.2:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ aeson? ( >=dev-haskell/aeson-0.9:=[profile?] )
+ binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+ semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
+ semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] )
+ unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+ !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
+ vector? ( >=dev-haskell/vector-0.12:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4
+ test? ( >=dev-haskell/base-orphans-0.5
+ dev-haskell/tagged
+ !vector? ( dev-haskell/vector ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag aeson aeson) \
+ $(cabal_flag binary-laws binary-laws) \
+ $(cabal_flag semigroupoids semigroupoids) \
+ $(cabal_flag semirings semirings) \
+ $(cabal_flag unary-laws unary-laws) \
+ $(cabal_flag vector vector)
+}
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
index e29ed4ae7bd4..0efd0b6aa0d2 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1 +1,4 @@
-DIST quickcheck-instances-0.3.22.tar.gz 9939 BLAKE2B 329117de28253bd6319b84a7e51c6428b90fed4ca4f49c7bb127ed1676d2438ce682a80fb819d60df300d6b56c005a9dd424e3b9d7c858119cb0e871d19c06f1 SHA512 cd36e6833752fbc5501a4fe8459381fe3c07f73b706a438effee06bd1b5e17ecb12b1347fdacb65556e339de58ca8ac32480dc1339cb43b1416c4aeb4f714f8c
+DIST quickcheck-instances-0.3.27.cabal 4710 BLAKE2B 591e79f2435e7ae7d7f179b8b7f4cda7fd1f96cfdbf573e48e17393e2f2d47a44b0e86745128fb5be396d5736bf8ce7d70eeee3f735409f5e5697e412cdbceb6 SHA512 653e5b249d0138db38df962fc061c2df089de8ba43f2a13d2dc47282e35b9221844af8beb9d01bdb474e99e9736464b929a27c35a12fcbbc6a6ab3359cd78586
+DIST quickcheck-instances-0.3.27.tar.gz 12711 BLAKE2B f3424d88d4a41924a156bf00490f34b2094bde7d0bfadf375dc0316b89a4774d84fe45a7a964f64f5953deb10a6132e2cd745f67bfb6b10f991a5490d23bc433 SHA512 be2b7525a1433b3cd038b5bcc55c01cc1a9ab2fa02fb89b4cf0d3c4748b6ee4a384b0ff101727a30c6f788a2da72adf87a8c97a36a57ce626f9269e1464f3a90
+DIST quickcheck-instances-0.3.29.1-rev2.cabal 4908 BLAKE2B d261d3a71e6231db20192d9435c2e06843a94195ff745aa7ac75ee243d1dd8bfc31f8e9eb331e942181c6921973bddf88d60d38b2cb1e709a6291a767dd295da SHA512 219ee8c9dbaf39fab98bf04bea787d8f0a6177f78092489b3fe61aa6eaf3c41894ae8c2d9c1cdaa4e8d2bc9c5e6212791131200122b38b5d82bedbb55fe3d2c4
+DIST quickcheck-instances-0.3.29.1.tar.gz 13288 BLAKE2B 7189752a460bf81a00998012c2a45e6653e9d279fd1b272173702fda3f37ac8b7942d01253e2a52a302b93df5871b11e0e921a61dbfb3ef506d4acaa3a61dc5c SHA512 67d9c83cdc40825221bcd88d41911d2c91ab5f8515b2ac1c3c1d3baf1580fbd5793e9069d0d7c630e9a60c1c150d90e4b8cd51c0d76e8a89375c19bcdae8cf7c
diff --git a/dev-haskell/quickcheck-instances/metadata.xml b/dev-haskell/quickcheck-instances/metadata.xml
index 1ab7acdaa0f1..080d41cb81f3 100644
--- a/dev-haskell/quickcheck-instances/metadata.xml
+++ b/dev-haskell/quickcheck-instances/metadata.xml
@@ -5,22 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- QuickCheck instances.
-
- The goal is to supply QuickCheck instances for
- types provided by the Haskell Platform.
-
- Since all of these instances are provided as
- orphans, I recommend that you do not use this library
- within another library module, so that you don't
- impose these instances on down-stream consumers of
- your code.
-
- For information on writing a test-suite with Cabal
- see &lt;http://www.haskell.org/cabal/users-guide/#test-suites&gt;
- </longdescription>
<upstream>
- <remote-id type="github">aslatter/qc-instances</remote-id>
+ <remote-id type="hackage">quickcheck-instances</remote-id>
+ <remote-id type="github">haskellari/qc-instances</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
deleted file mode 100644
index 57aaeb77b538..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/phadej/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.9.3:=[profile?]
- >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
- >=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?]
- >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.5 && <4.13' 'base >=4.5' \
- 'base-compat >=0.9.3 && <0.11' 'base-compat >=0.9.3'
-}
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
new file mode 100644
index 000000000000..9356b57ae4e2
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+DESCRIPTION="Common quickcheck instances"
+HOMEPAGE="https://github.com/haskellari/qc-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/integer-logarithms-1.0.3:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?]
+ >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+ >=dev-haskell/quickcheck-2.14.1:=[profile?] <dev-haskell/quickcheck-2.14.3:=[profile?]
+ >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-short-0.1.3:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild
new file mode 100644
index 000000000000..3460fbf27534
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common quickcheck instances"
+HOMEPAGE="https://github.com/haskellari/qc-instances"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+ >=dev-haskell/data-fix-0.3:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/integer-logarithms-1.0.3:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?]
+ >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-haskell/quickcheck-2.14.1:=[profile?] <dev-haskell/quickcheck-2.14.4:=[profile?]
+ >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+ >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-short-0.1.3:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-haskell/vector-0.12.3.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
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 5f31655c1639..d0d77abef81c 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,11 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
- >=dev-haskell/quickcheck-2.7:2=[profile?]
+ >=dev-haskell/quickcheck-2.7:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/quickcheck-unicode/metadata.xml b/dev-haskell/quickcheck-unicode/metadata.xml
index ce85de215f61..0efb136df64e 100644
--- a/dev-haskell/quickcheck-unicode/metadata.xml
+++ b/dev-haskell/quickcheck-unicode/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">quickcheck-unicode</remote-id>
<remote-id type="github">bos/quickcheck-unicode</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
index 79e0d7fabb7a..ffae93f746d1 100644
--- a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
+++ b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# ebuild generated by hackport 0.5.2.9999
+# ebuild generated by hackport 0.8.4.0.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Generator and shrink functions for testing Unicode-related software"
HOMEPAGE="https://github.com/bos/quickcheck-unicode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
- >=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-haskell/quickcheck-2.7:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
+ >=dev-haskell/cabal-3.2.1.0
"
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index 7253415496cc..337abbc91663 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1 +1,2 @@
-DIST QuickCheck-2.13.2.tar.gz 70427 BLAKE2B a2676dfd98f8aafa2ccc2e0dbe32d23d70d811e940ec8f6ae7e85b65feef07094d8edd66548961b6217b05eba30e19b6a76eed3b15cdd0293591d97252c9662a SHA512 d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98
+DIST QuickCheck-2.14.2.tar.gz 75246 BLAKE2B a64ad51f3daa858a224c00fb785979460b638d76f20c7a19d95a6303cd5da61adaa40cb52e154dd15218adbf54fff184f16ab3b932895294cf37f24982a2b9cc SHA512 84decd354e6093bc72afd125410499dd4be3ae8fdbf0a3b466011b4dbcb5c5657e51ab75cfe22790e22bf4ac54cbb1203ff7a0d108e872ce60f4831be827a6e5
+DIST quickcheck-2.14.3.tar.gz 76849 BLAKE2B e3a0eefaebd27fe5e11c4ed8dd7120b42e688be1cd249ee88a8b6b25a248376fae6d3f2f0506f675040314e019baeb60eac993421a0a7d87f821cdab01e93be5 SHA512 d00499fcdbe66d384a40c66a0d01dfe80f0622599f2f19ab569b45ef13c8d726c855b4687c7a1be022ea22df4bc66c48cf12fc156fadc558714fccc5a3deef7e
diff --git a/dev-haskell/quickcheck/metadata.xml b/dev-haskell/quickcheck/metadata.xml
index c64f613cab7c..6d0a1dba3e0c 100644
--- a/dev-haskell/quickcheck/metadata.xml
+++ b/dev-haskell/quickcheck/metadata.xml
@@ -6,23 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="template-haskell">Enable additional test modules requiring Template Haskell support.</flag>
+ <flag name="template-haskell">Build Test.QuickCheck.All, which uses Template Haskell.</flag>
</use>
- <longdescription>
- QuickCheck is a library for random testing of program properties.
-
- The programmer provides a specification of the program, in
- the form of properties which functions should satisfy, and
- QuickCheck then tests that the properties hold in a large number
- of randomly generated cases.
-
- Specifications are expressed in
- Haskell, using combinators defined in the QuickCheck library.
- QuickCheck provides combinators to define properties, observe
- the distribution of test data, and define test
- data generators.
- </longdescription>
<upstream>
+ <remote-id type="hackage">QuickCheck</remote-id>
<remote-id type="github">nick8325/quickcheck</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
deleted file mode 100644
index b22abf4396ab..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/splitmix-0.0.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-base3 \
- --flag=base4 \
- $(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
new file mode 100644
index 000000000000..ab6efc03e6ab
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +base4,-base3,-old-random,templatehaskell:template-haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-7.8.2:=
+ >=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-base3 \
+ --flag=base4 \
+ --flag=-old-random \
+ $(cabal_flag template-haskell templatehaskell)
+}
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
new file mode 100644
index 000000000000..6af1c5d02f8f
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +base4,-base3,-old-random,templatehaskell:template-haskell
+
+CABAL_PN="QuickCheck"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-base3 \
+ --flag=base4 \
+ --flag=-old-random \
+ $(cabal_flag template-haskell templatehaskell)
+}
diff --git a/dev-haskell/random-bytestring/Manifest b/dev-haskell/random-bytestring/Manifest
new file mode 100644
index 000000000000..b01268cee054
--- /dev/null
+++ b/dev-haskell/random-bytestring/Manifest
@@ -0,0 +1 @@
+DIST random-bytestring-0.1.4.tar.gz 79911 BLAKE2B 2d4eb685a231a891a04050a6c2c71c6088b77220872b1aebc02e8db77fd12ab01aeed30f724207f1a544206eb79fab3499222d9997e4ea7ed967a4ea34922492 SHA512 17d7a2a758fbfc88ef1bcf6231f28276ecc5e363521b5fab38b539cf191c80c2dedeefe6d59346b7dff2def87b1e18657f13db8f43cf3c447142909fb3012ed5
diff --git a/dev-haskell/random-bytestring/metadata.xml b/dev-haskell/random-bytestring/metadata.xml
new file mode 100644
index 000000000000..20123659e2c8
--- /dev/null
+++ b/dev-haskell/random-bytestring/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="pcg">compile with support for PCG from pcg-random</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">larskuhtz/random-bytestring</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild b/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild
new file mode 100644
index 000000000000..77e5d04ff939
--- /dev/null
+++ b/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient generation of random bytestrings"
+HOMEPAGE="https://www.github.com/larskuhtz/random-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+pcg"
+
+RDEPEND=">=dev-haskell/mwc-random-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ pcg? ( >=dev-haskell/pcg-random-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag pcg with-pcg)
+}
diff --git a/dev-haskell/random/Manifest b/dev-haskell/random/Manifest
index 45fc2dd8247d..5075de49a7fd 100644
--- a/dev-haskell/random/Manifest
+++ b/dev-haskell/random/Manifest
@@ -1 +1,2 @@
-DIST random-1.1.tar.gz 10870 BLAKE2B e26794bf5dd05b39bdd92afb55abde54d35ff4f7116753ff8b901c8cc18ea71a73fbcb5fc7c1c4a2d35f33ebcf1a3dbbdc0018cb2f8fb1978c35960b95e90606 SHA512 7f128b1c88adfe7ee6405578d3c999bb77e9e3c21e16f82a5197c0ad1d6731851e99e08d8169c6a8b1068ad8a1614c1c0ef8c04c1958337a6e325f1de0c718a3
+DIST random-1.2.1.1.tar.gz 47109 BLAKE2B a7234569569cfd87c04e9f294390cb8f6be1a068d56f1fc5b19b098474d66b8b82211c688d07570de23f2bd6379adf4869b0444af237bf95017abeb3f3c1a42a SHA512 4d5565390849cf85b2f307cd93f284a1f9094cfcd692beb5dd5f3ec917dd69ad7158fb52b1faa581eb573af25beee1f6c2830472ebb6553da6cfa01a4e954326
+DIST random-1.2.1.tar.gz 47143 BLAKE2B 861a216b063aa893a9de645cca231fb1a1914609ea4dd8ec222b35db6ee9cc60760a613896e979f731d3e1a55ea792a294d380313e78549c6effc21b77d57564 SHA512 b130a90981de53b4fc3e7cf660224268d24bcceb9498d33827d9f43dc705c9a724c23999c4cf0222127f4c69daebf0d049d963abbea0a860135d661f9cc55731
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
deleted file mode 100644
index 3bafae5494bf..000000000000
--- a/dev-haskell/random/random-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="https://hackage.haskell.org/package/random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/random/random-1.2.1.1.ebuild b/dev-haskell/random/random-1.2.1.1.ebuild
new file mode 100644
index 000000000000..b0f7e3246305
--- /dev/null
+++ b/dev-haskell/random/random-1.2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 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 circular depend
+inherit haskell-cabal
+
+DESCRIPTION="Pseudo-random number generation"
+HOMEPAGE="https://hackage.haskell.org/package/random"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+# circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( >=dev-haskell/doctest-0.15 <dev-haskell/doctest-0.21
+# >=dev-haskell/mwc-random-0.13 <dev-haskell/mwc-random-0.16
+# >=dev-haskell/primitive-0.6 <dev-haskell/primitive-0.8
+# >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
+# dev-haskell/stm
+# >=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# dev-haskell/tasty-inspection-testing
+# >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
+# >=dev-haskell/unliftio-0.2 <dev-haskell/unliftio-0.3
+# >=dev-haskell/vector-0.10 <dev-haskell/vector-0.14 )
+# "
diff --git a/dev-haskell/random/random-1.2.1.ebuild b/dev-haskell/random/random-1.2.1.ebuild
new file mode 100644
index 000000000000..f0b36315ebd3
--- /dev/null
+++ b/dev-haskell/random/random-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depend
+inherit haskell-cabal
+
+DESCRIPTION="Pseudo-random number generation"
+HOMEPAGE="https://hackage.haskell.org/package/random"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+# circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
diff --git a/dev-haskell/ranges/Manifest b/dev-haskell/ranges/Manifest
deleted file mode 100644
index 14b3599c4140..000000000000
--- a/dev-haskell/ranges/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ranges-0.2.4.tar.gz 2244 BLAKE2B 5aa880d0dd101924ecdf1f5c6e22ed71b795ac3d7f07155e49c3a462437527e4d3bce279b02758940257bc14de8cd9a6bee69c62a7d6b67820a92882e8d03778 SHA512 384982a7a3d9a2cf5e8cd525a4175671258869ed9bf676e607e02158daa5e658b5924559a9e223d121039efe9f097516d04703d39dba9cdf6bd53bf7b240f18e
diff --git a/dev-haskell/ranges/metadata.xml b/dev-haskell/ranges/metadata.xml
deleted file mode 100644
index 09d9bc5f09fc..000000000000
--- a/dev-haskell/ranges/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Ranges and some functions allowing things like fast membership
- lookup on ranges with holes in them and so on.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild b/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
deleted file mode 100644
index b17d8368855b..000000000000
--- a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ranges and various functions on them"
-HOMEPAGE="https://hackage.haskell.org/package/ranges"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/raw-strings-qq/metadata.xml b/dev-haskell/raw-strings-qq/metadata.xml
index 937381521944..222aa0dca204 100644
--- a/dev-haskell/raw-strings-qq/metadata.xml
+++ b/dev-haskell/raw-strings-qq/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">23Skidoo/raw-strings-qq</remote-id>
+ </upstream>
</pkgmetadata>
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 a3fa35fcd57c..c96364a9b776 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/readable/Manifest b/dev-haskell/readable/Manifest
deleted file mode 100644
index f8a74eb7a162..000000000000
--- a/dev-haskell/readable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST readable-0.3.1.tar.gz 2907 BLAKE2B af3dab05bb8eba05bca049cb8991e3b46c38e8a4bab73f81c4c2fd4fb62f9e4134071eac0f69d4354be6b02df70ddfe1bd2a7bf59407434ba265371d0006c979 SHA512 237467c4b6dfef9fe090c53e45a1f4261e34fc947b16878575c2b1d2b93400a67678bfde3ad8500f82c56a4b87c5b45e561304c9936572a033d7b295740fb3be
diff --git a/dev-haskell/readable/metadata.xml b/dev-haskell/readable/metadata.xml
deleted file mode 100644
index 895e8e5c3800..000000000000
--- a/dev-haskell/readable/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Provides a Readable type class for reading data types from ByteString and
- Text. Also includes efficient implementations for common data types.
- </longdescription>
- <upstream>
- <remote-id type="github">mightybyte/readable</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readable/readable-0.3.1.ebuild b/dev-haskell/readable/readable-0.3.1.ebuild
deleted file mode 100644
index a0d6385a7f69..000000000000
--- a/dev-haskell/readable/readable-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reading from Text and ByteString"
-HOMEPAGE="https://github.com/mightybyte/readable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/readargs/Manifest b/dev-haskell/readargs/Manifest
deleted file mode 100644
index dc8389fd6ffa..000000000000
--- a/dev-haskell/readargs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ReadArgs-1.2.3.tar.gz 5100 BLAKE2B 8d0ee19cb417a0159b9a0488f30d11319c7ce278713bbf6c0531385b6c337c2aad5f85a3d22e8559c8b13b3a89a9f42174cb53fe6e4ae2190740845c9c70002b SHA512 6fd78b26c6c0d7d2f40f1b4eef248eb55d8dc91668b578b2cf88132a364dd7741f6f4d389aeb0c80bdca7cb5dfc1524228113495a2ea3595b888eb27fb8d2dff
diff --git a/dev-haskell/readargs/metadata.xml b/dev-haskell/readargs/metadata.xml
deleted file mode 100644
index b48729aeab8d..000000000000
--- a/dev-haskell/readargs/metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- ReadArgs provides the @readArgs@ IO action, which lets you tell the compiler
- to parse the command line arguments to fit the type signature you give.
-
- For example @(a :: Int, b :: String, c :: Float) &lt;- readArgs@ would
- parse the first runtime argument as an @Int@, the second as a @String@ (no
- quotes required) and the third as a @Float@.
-
- If the runtime arguments are incompatible with the type signature,
- then a simple usage statement is given of the types needed.
-
- Continuing the previous example, if it was used in a
- program named @Example@, the error message for the above
- action would be:
-
- @
- usage: Example Int String Float
- @
-
- Any type that has both @Typeable@ and @Read@ instances
- can be used. @Char@, @String@, and @Text@ are handled specially so that
- command line arguments for both do not require quotes (as their
- @Read@ instances do). A special instance is provided for @FilePath@ so
- that no constructor or quotes are required.
-
- @readArgs@ also supports optional arguments and variadic arguments.
- Optional arguments are specified using @Maybe@, and variadic arguments
- using a list. @(a :: Int, b :: Maybe String, c :: [Float]) &lt;- readArgs@
- would successfully parse any of the following sets of command line arguments:
-
- @
- Example 1
- Example 1 2 3 4
- Example 1 foo
- Example 1 foo 2 3 4
- @
-
- But not
-
- @
- Example
- Example foo
- Example 1.0
- @
-
- Usage statements for optional and variadic arguments use command-line
- parlance:
-
- @
- usage: Example Int [String] [Float..]
- @
-
- Note that both optional and variadic parsers are greedy by default
- (so @Example 1 2 3 4@ was parsed as @(1, "2", [3.0,4.0])@. They
- may both be made non-greedy through use of the @NonGreedy@ constructor:
-
- @
- ( a :: Int
- , NonGreedy b :: NonGreedy Maybe String
- , NonGreedy c :: NonGreedy [] Float
- ) &lt;- readArgs
- @
- </longdescription>
- <upstream>
- <remote-id type="github">rampion/ReadArgs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readargs/readargs-1.2.3.ebuild b/dev-haskell/readargs/readargs-1.2.3.ebuild
deleted file mode 100644
index 11eac0f1647a..000000000000
--- a/dev-haskell/readargs/readargs-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ReadArgs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple command line argument parsing"
-HOMEPAGE="https://github.com/rampion/ReadArgs"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
- >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/readline/Manifest b/dev-haskell/readline/Manifest
deleted file mode 100644
index 5014cfbe8f5a..000000000000
--- a/dev-haskell/readline/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST readline-1.0.3.0.tar.gz 52261 BLAKE2B 2b474efd091be91c46f121b144de719531943aba17d7cf845b2960b3f3dea77905a5838c8b7ab26975628763041321c0cd1aa8c34114205228466fb41c357e8e SHA512 30a8705323fe0185cadccd8ddf7069ce70007a8fc29761f31d0a4d585a5f3b622c9ae71d41577a7eec3a1c6f78949f9c56695df3a7986abef228e7ceb7375520
diff --git a/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch b/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch
deleted file mode 100644
index d6055164bab2..000000000000
--- a/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/690268
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,3 +57,4 @@ else
- AC_CHECK_LIB(curses, tputs, HaveLibTermcap=YES; LibTermcap=curses,
-- HaveLibTermcap=NO; LibTermcap=not-installed)))
-+ AC_CHECK_LIB(tinfo, tputs, HaveLibTermcap=YES; LibTermcap=tinfo,
-+ HaveLibTermcap=NO; LibTermcap=not-installed))))
-
diff --git a/dev-haskell/readline/metadata.xml b/dev-haskell/readline/metadata.xml
deleted file mode 100644
index c7bb0e775ab0..000000000000
--- a/dev-haskell/readline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/readline/readline-1.0.3.0-r1.ebuild b/dev-haskell/readline/readline-1.0.3.0-r1.ebuild
deleted file mode 100644
index 397dd859a5f4..000000000000
--- a/dev-haskell/readline/readline-1.0.3.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit autotools haskell-cabal
-
-DESCRIPTION="An interface to the GNU readline library"
-HOMEPAGE="https://hackage.haskell.org/package/readline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}"/${P}-tinfo.patch)
-
-src_prepare() {
- default
-
- # Default setup is not compatible to cabal-3
- rm Setup.hs || die
-
- eautoconf
-}
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
deleted file mode 100644
index 2f24e814cad4..000000000000
--- a/dev-haskell/rebase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
diff --git a/dev-haskell/rebase/metadata.xml b/dev-haskell/rebase/metadata.xml
deleted file mode 100644
index 582001c49632..000000000000
--- a/dev-haskell/rebase/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package is intended for those who are tired of keeping
- long lists of dependencies to the same essential libraries in each package
- as well as the endless imports of the same APIs all over again.
- It also supports the modern tendencies in the language.
-
- To solve those problems this package does the following:
-
- * Reexport the original APIs under the \"Rebase\" namespace.
-
- * Export all the possible non-conflicting symbols from the \"Rebase.Prelude\" module.
-
- * Give priority to the modern practices in the conflicting cases.
-
- The policy behind the package is only to reexport the non-ambiguous
- and non-controversial APIs, which the community has obviously settled on.
- The package is intended to rapidly evolve with the contribution from the community,
- with the missing features being added with pull-requests.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rebase/rebase-1.4.1.ebuild b/dev-haskell/rebase/rebase-1.4.1.ebuild
deleted file mode 100644
index 7aa91c52580e..000000000000
--- a/dev-haskell/rebase/rebase-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A more progressive alternative to the 'base' package"
-HOMEPAGE="https://github.com/nikita-volkov/rebase"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?]
- >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
- >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?]
- >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
- >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
- >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
- >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?]
- >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
deleted file mode 100644
index d22e2f62b0db..000000000000
--- a/dev-haskell/recaptcha/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST recaptcha-0.1.0.4.tar.gz 2724 BLAKE2B 21513aa79f74a8442deeb2355113cb545eef90392d1090ff1623ee094801f5d989d3d46e094c0a3af40bfb3ff294c4f0e611d5c4cb56cc4653945728d65e5a38 SHA512 e1827f03b70131dfdfe087f139c1ace6da8bd1849ea83ddf4fe7ee33e224369f9530cf6e9d93c38acdf92ff0470c42e79774ae3cddce3209210f597ddb82e41f
diff --git a/dev-haskell/recaptcha/metadata.xml b/dev-haskell/recaptcha/metadata.xml
deleted file mode 100644
index 6c5cd3d6ca87..000000000000
--- a/dev-haskell/recaptcha/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- reCAPTCHA (http://recaptcha.net/) is a service that provides
- captchas for preventing automated spam in web applications.
- recaptcha-hs provides functions for using reCAPTCHA in Haskell
- web applications.
- </longdescription>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- </use>
- <upstream>
- <remote-id type="github">jgm/recaptcha</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
deleted file mode 100644
index 85ace8c37878..000000000000
--- a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
-HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/http-3001.1.4:=[profile?]
- >=dev-haskell/xhtml-3000.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/recv/Manifest b/dev-haskell/recv/Manifest
new file mode 100644
index 000000000000..fecfaff17093
--- /dev/null
+++ b/dev-haskell/recv/Manifest
@@ -0,0 +1 @@
+DIST recv-0.1.0.tar.gz 5158 BLAKE2B b0a935096b620c5b1026998d175ddfde2d775852d777b767a3aeea590b4ac7bcf64b9b3c42a2c1d791a49d8e36c6ae413480794cc1d05aed5842a3bd8fe3f592 SHA512 24fc55bac9e96da56328fa04901041330f9b89e36ec9c4663a6a66b57d38d16e4d374126ff634086449b71e3546d66dcbcfe69d4096d7a2f94fab42b5d35d49f
diff --git a/dev-haskell/recv/metadata.xml b/dev-haskell/recv/metadata.xml
new file mode 100644
index 000000000000..2073c88a22ff
--- /dev/null
+++ b/dev-haskell/recv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">recv</remote-id>
+ <remote-id type="github">yesodweb/wai</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/recv/recv-0.1.0.ebuild b/dev-haskell/recv/recv-0.1.0.ebuild
new file mode 100644
index 000000000000..53bd8f3d0d2b
--- /dev/null
+++ b/dev-haskell/recv/recv-0.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient network recv"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/network-3.1.0:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/reducers/Manifest b/dev-haskell/reducers/Manifest
index dafcc234f9b4..07ffc9485b1c 100644
--- a/dev-haskell/reducers/Manifest
+++ b/dev-haskell/reducers/Manifest
@@ -1 +1,3 @@
DIST reducers-3.12.3.tar.gz 13405 BLAKE2B 8631ac257a24958be7446ff7bdb2e02ccad4e591d4f8334baf322fc58cdbadfc7c0eaa73f6a371ebf24b263057263b3230e3ff0e1b5aced348cebe979199e7aa SHA512 7bb78ccf107d7bc6bce8d68c3766b799ce2c2a41587ee4d2b7197c2dae1d27a6ce47110f1abd655108d7fcc306e9069a25562e53b00ff97704af0b8aac9139d9
+DIST reducers-3.12.4-rev2.cabal 2587 BLAKE2B bdb182b2ede577aa99b3a8146194a1fb7f20e06f402225092e6cc72bbb453443c09b23cc9a10fecd4c5748606b8268f34c89f35e9465e2aab2dc5eb1f00198d5 SHA512 7255995503c9d47ae035a773d3c61900203564b36dec91f6cf4390252b58c8e69d9b7fcd39fe5a7a77d33f28468621f2697c65a198e10b063ee9569b89c2eb51
+DIST reducers-3.12.4.tar.gz 11938 BLAKE2B d98fc9bcb4735f0dfa21230f34bba3c0d2624c1bc8d8caa11eb87a1a566d44c3ac6e36f78dd38d2a7e462dd96df32c6e483f3e8ff76d7acf867add0154c8c88a SHA512 5640cb567b21e06884d0f8cbdc90530f90ef2bebf783e3d02e0fd5fd7ed2fd24876d612a6e5ece14ccfe80e963f19a2925b2af4c5317c44de75b1b1894457f1f
diff --git a/dev-haskell/reducers/metadata.xml b/dev-haskell/reducers/metadata.xml
index a2632f709ce3..d3d0c2bd801c 100644
--- a/dev-haskell/reducers/metadata.xml
+++ b/dev-haskell/reducers/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">reducers</remote-id>
<remote-id type="github">ekmett/reducers</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
index 48488e1be2c4..ff4a631e7b31 100644
--- a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
+++ b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
@@ -23,15 +23,12 @@ RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[
>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'hashable >= 1.1.2.1 && < 1.3' 'hashable >= 1.1.2.1'
-}
+CABAL_CHDEPS=(
+ 'hashable >= 1.1.2.1 && < 1.3' 'hashable >= 1.1.2.1'
+)
diff --git a/dev-haskell/reducers/reducers-3.12.4.ebuild b/dev-haskell/reducers/reducers-3.12.4.ebuild
new file mode 100644
index 000000000000..a57a5ba40ed0
--- /dev/null
+++ b/dev-haskell/reducers/reducers-3.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
+HOMEPAGE="https://github.com/ekmett/reducers/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+ >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+ >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/refact/Manifest b/dev-haskell/refact/Manifest
deleted file mode 100644
index b8d796e249ce..000000000000
--- a/dev-haskell/refact/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST refact-0.3.0.2.tar.gz 2345 BLAKE2B d92132b057030175eae17cf858349e6e8c86fa02c33651f74b385fe0a2ebec1260ec99993bbb38748af0dafb3bb46b61057195fc4883e93886cf39645d91dfc5 SHA512 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e
diff --git a/dev-haskell/refact/metadata.xml b/dev-haskell/refact/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/refact/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/refact/refact-0.3.0.2.ebuild b/dev-haskell/refact/refact-0.3.0.2.ebuild
deleted file mode 100644
index e0ed59135797..000000000000
--- a/dev-haskell/refact/refact-0.3.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Specify refactorings to perform with apply-refact"
-HOMEPAGE="https://hackage.haskell.org/package/refact"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/reflection/reflection-2.1.6.ebuild b/dev-haskell/reflection/reflection-2.1.6.ebuild
index e869c96dbe2a..04c4f57eb44c 100644
--- a/dev-haskell/reflection/reflection-2.1.6.ebuild
+++ b/dev-haskell/reflection/reflection-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-lang/ghc-8.4.3:=
"
diff --git a/dev-haskell/regex-applicative-text/Manifest b/dev-haskell/regex-applicative-text/Manifest
deleted file mode 100644
index 2c5e54146212..000000000000
--- a/dev-haskell/regex-applicative-text/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-applicative-text-0.1.0.1.tar.gz 3975 BLAKE2B 87623f18720173712b8245c86902a30471779e27a5a2e8a938934f5a1b6cd8ec9f41e480f82cebd29db2c9e383e983a6f6ba03856e509fb30a67c51b158707a7 SHA512 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339
diff --git a/dev-haskell/regex-applicative-text/metadata.xml b/dev-haskell/regex-applicative-text/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/regex-applicative-text/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
deleted file mode 100644
index 8c3401cb953f..000000000000
--- a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="regex-applicative on text"
-HOMEPAGE="https://github.com/phadej/regex-applicative-text#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && <4.10' 'base >= 4.3'
-}
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
index 2bf8f53ff20d..8547830270cc 100644
--- a/dev-haskell/regex-applicative/metadata.xml
+++ b/dev-haskell/regex-applicative/metadata.xml
@@ -9,4 +9,7 @@
regex-applicative is a Haskell library for parsing using regular expressions.
Parsers can be built using Applicative interface.
</longdescription>
+ <upstream>
+ <remote-id type="github">UnkindPartition/regex-applicative</remote-id>
+ </upstream>
</pkgmetadata>
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 22dfbee50406..e6b190e94852 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index ac8fc07a6f98..5cf943fe9b36 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1 +1,4 @@
-DIST regex-base-0.94.0.0.tar.gz 9679 BLAKE2B c998f856c51e3d3abfdc389ea6f8451198f6c6f2d0b3b56c79704febb53f9a3d54c7ed57ddabd10f97c465e1f591cd7f06a4b9c8aaebc6e67fd2741d26fc69b2 SHA512 4e7120e1a2b63fd3e4e15cefc540e82ab0949f51e19f495d4cf4edbe8428ffdf2f114df3504f66049fbb790d5310c59daaf0ed3a71c5acccfe205dccc4567045
+DIST regex-base-0.94.0.1-rev1.cabal 2608 BLAKE2B 2bdd9416441c197db9f5114099ffb5d21d803aa3e120c536d56a9ef52ee016c547ff57ef350b72a4db2fe5f501f09ae6fe50567973a639266ff2b3a98e642aa4 SHA512 0f416380b81d353bd60990317d97d73aa4831321c1048da099ed8c612a2b7a4327d785ccd76d4cd65abc416c3f1d9fe6c062fe07eca61e847c6f4104c2e34d57
+DIST regex-base-0.94.0.1.tar.gz 10095 BLAKE2B 89dd1bf850c072ba8b0283e363415f82bd47557590161e6a65c3a570ff01042b63f85361b4910bba50e8ddbc64887ebf249d8e9b1d60f954d03dad1f29965b93 SHA512 2a1f088532c4488e4dea417222b8723436fbffcf8a8a3596d66c5fd4941250e97c0271c23025244ef3f4ba5295cff82ad8b49a6776d9410210efa7f199bc8b7e
+DIST regex-base-0.94.0.2-rev1.cabal 2643 BLAKE2B 707879e0ddb6cccdad35b034b14b45438fd3d72598f287441bf37ea0c8e756975b447123c160b107633119d0a55f4b758c69fe130038a901263ea952fcd0cfe6 SHA512 e55e3e199035f3271b687463a60423cdbb1814b55a8669c3b49f97b8935825b3527ab527e016ac0ee3a009bbae64160f74568d803cb0d65a065294e236bfb2a3
+DIST regex-base-0.94.0.2.tar.gz 10488 BLAKE2B c401e66232c402ebc8d3ea2b3cba42caa8297951af43a9bc1a2c8a59e4d7d12ae96b17ca56db3cc187227478cf97664d38869a062d77d6883bcde1ffb31fb202 SHA512 cef8177c35b98f31a12044033dca95b767df593c6830d253cee6e31677c99a5cebf67d6e64f24ec9ba736e36256e9da3bfbe66e2ac8450582d36a4c5cad25c88
diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
index 13b8f14085dd..21701273e298 100644
--- a/dev-haskell/regex-base/metadata.xml
+++ b/dev-haskell/regex-base/metadata.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">lazy-regex</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">regex-base</remote-id>
+ <remote-id type="github">hvr/regex-base</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
deleted file mode 100644
index e4d7ed28a87b..000000000000
--- a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
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
new file mode 100644
index 000000000000..cdb10b0b9edd
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Common \"Text.Regex.*\" API for Regex matching"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
new file mode 100644
index 000000000000..8b827f831b00
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Common \"Text.Regex.*\" API for Regex matching"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
deleted file mode 100644
index a48d51d6d258..000000000000
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
deleted file mode 100644
index efe655a7cf3b..000000000000
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode Support version of Text.Regex, using regex-tdfa"
-HOMEPAGE="http://hub.darcs.net/shelarcy/regex-compat-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
- >=dev-haskell/regex-tdfa-1.1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=newbase \
- --flag=splitbase
-}
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index a61e0cb61a88..08f1bff57313 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1 +1,2 @@
-DIST regex-compat-0.95.2.0.tar.gz 4019 BLAKE2B 13825a59d2edaf5df3c4726f3b040d9354eaa95220cc907a74e5141aa95d2299107bfaa5037d327011bc3ccf3f0aeeb00ad9bd086e20b393eb898a19a46e5ca1 SHA512 8b1b421f5e7688a1d4a61711a255505a047e90e9f9283a8cf2ebfa9774631e8fb3a071d61877ab22548a0c63e30237603196f043dac9cb64da4df2fdc4422300
+DIST regex-compat-0.95.2.1-rev2.cabal 1705 BLAKE2B 99c4b12e120b2360edebe97899ce66e520ee05171cca7e2888fa2b0f30fbb0440a8d2d81c3bbf432d08de9ac10cbed3bead4a8ae20162711f6dd667be558e8b5 SHA512 4eb8c7a86268c7e5b834ff093e843cfb8bde1e72d51bd53346998a2743cc5999b1f8efd08e4b091dad662e5f1cc466eadf490af94d122e8b12799726a6824b85
+DIST regex-compat-0.95.2.1.tar.gz 4285 BLAKE2B 5b1b7adf71c2903bf6647cc0bfefae230f59dbd3ab655a03083f279e7557b533ab745c15e36c51dcd6c4da9239e49a85c64a37a50458ee1a20e0d33a5abecc38 SHA512 87a671729dcdb2c89ce079fbb124cd2f16407f2dca0ed5d0d898a9cf06f893b82c184566efe80d966afbc7dde2cab1693b81516adc4832a9c65283a65fecd919
diff --git a/dev-haskell/regex-compat/metadata.xml b/dev-haskell/regex-compat/metadata.xml
index 13b8f14085dd..116bb696237e 100644
--- a/dev-haskell/regex-compat/metadata.xml
+++ b/dev-haskell/regex-compat/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">lazy-regex</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">regex-compat</remote-id>
+ <remote-id type="github">haskell-hvr/regex-compat</remote-id>
+ <remote-id type="sourceforge">lazy-regex</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
deleted file mode 100644
index ea2e40edd74a..000000000000
--- a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
- >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=newbase \
- --flag=splitbase
-}
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild
new file mode 100644
index 000000000000..a8b58590ce60
--- /dev/null
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +newbase,+splitbase
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/enhances \"Text.Regex\""
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=newbase \
+ --flag=splitbase
+}
diff --git a/dev-haskell/regex-pcre-builtin/Manifest b/dev-haskell/regex-pcre-builtin/Manifest
deleted file mode 100644
index efaac74e22a0..000000000000
--- a/dev-haskell/regex-pcre-builtin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-pcre-builtin-0.95.1.3.8.43.tar.gz 564837 BLAKE2B 57db54ada6996a49ab9ed92ac419e81b0595f531d77c83db783707b70ef2df065375afe7b3aa74d5dd8344aa68470f1cd516376a93dff15beb417dca4745a072 SHA512 1e5cf167e9e46cf0287b37973dcdb7531a5dea5e39d406a931e6d295763c35b8487f31cbe9c3cd5aa2ad8ef76061ce16d7096b0947936c36d91c6d81d1b9c99e
diff --git a/dev-haskell/regex-pcre-builtin/metadata.xml b/dev-haskell/regex-pcre-builtin/metadata.xml
deleted file mode 100644
index df2d49a25f2b..000000000000
--- a/dev-haskell/regex-pcre-builtin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">lazy-regex</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild
deleted file mode 100644
index b8e52983ce9a..000000000000
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="PCRE Backend for \"Text.Regex\" (regex-base)"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre-builtin"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
- >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=newbase \
- --flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre/Manifest b/dev-haskell/regex-pcre/Manifest
deleted file mode 100644
index d24cd1af8b59..000000000000
--- a/dev-haskell/regex-pcre/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-pcre-0.95.0.0.tar.gz 9766 BLAKE2B 05df9a80021d436fe1b7c6d6328cf23df96a481d55407f3e737ab70dd92a73f70a06eede4b3355c743cbdb813a1ae422c5aaa1faa30c16608fa04d513317d8ad SHA512 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
diff --git a/dev-haskell/regex-pcre/metadata.xml b/dev-haskell/regex-pcre/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/regex-pcre/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
deleted file mode 100644
index ba4ad6f9ff9b..000000000000
--- a/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +newbase,+splitbase,+pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=newbase \
- --flag=pkg-config \
- --flag=splitbase
-}
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index 79d1f41416ff..b9a93f01cf00 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1 +1,4 @@
+DIST regex-posix-0.96.0.0-rev2.cabal 2861 BLAKE2B 593fde1c9acd274a1e813aa7013ac7f085696156ad216b56c578b05a241d37713b635244bba6c2347d538995669d9ccf92325129a40d8e15c008118059aa1a65 SHA512 6b5fe50e2d9ec0dbdcdec5362c97beb8a80d3d9e9c0a95f766181f49b080d231ae5802d48efd02d8ab006e48354e32b9ea209adb4fb4ef7efb9736ca7aeca7d6
DIST regex-posix-0.96.0.0.tar.gz 12529 BLAKE2B e949fd28a8fee8c0ae056dc0037dc9eb03b3814145740a053752ac121f6ffc60bad5db72832626340f0f201d06ccc649225af9506be671f63fd5b850e20bda6c SHA512 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a
+DIST regex-posix-0.96.0.1-rev1.cabal 2954 BLAKE2B e53df5885439c8e29cc562a5bbbcbb9434b72ee3c0abba83e5b1a1cbb5f39b1fa002585bbb1d70b3cad5c88ea4b83c4767799bbafed35d7f32fc658c98a53042 SHA512 d8720a871133a1cd8388474766889fd560686a941eef845202fe45c2191908ec444bc93b423e763d183dda2ed06f1cd3c3c44ee846dd01f288dfc4d9832835d0
+DIST regex-posix-0.96.0.1.tar.gz 12853 BLAKE2B 8b01c71287cd4477f6fdc11eae0a2447efc39ee538313713de8e851430bb480c56c011389748b113d2ae8b0ec8f6f8306ded2bbfed2226ff3c172fa7a2eb0241 SHA512 4d6383e34fd6144af3004caee70bc83c8894c8e78c147c2e829cdbd9c74af3d1807604db0927554aea20c69a8b5c1eb3dd01d3963b2e615ee39beaa48095125b
diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
index df2d49a25f2b..1287ec351796 100644
--- a/dev-haskell/regex-posix/metadata.xml
+++ b/dev-haskell/regex-posix/metadata.xml
@@ -6,6 +6,8 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">lazy-regex</remote-id>
+ <remote-id type="hackage">regex-posix</remote-id>
+ <remote-id type="github">hvr/regex-base</remote-id>
+ <remote-id type="github">hvr/regex-posix</remote-id>
</upstream>
</pkgmetadata>
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 517f29f00542..1027d4a26bca 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
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
#hackport: flags: +newbase,+splitbase,-_regex-posix-clib
+CABAL_HACKAGE_REVISION=2
+
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Replaces/Enhances Text.Regex"
HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
@@ -26,12 +26,9 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.12
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.3 && < 4.16' 'base >= 4.3'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
new file mode 100644
index 000000000000..be58429a3bc1
--- /dev/null
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +newbase,+splitbase,-_regex-posix-clib
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="POSIX Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-_regex-posix-clib \
+ --flag=newbase \
+ --flag=splitbase
+}
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 31f0a1081a23..8e5ff0f84c27 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1 +1,2 @@
-DIST regex-tdfa-1.3.1.1.tar.gz 78057 BLAKE2B f18f87bdace5a14d2c80b4797e5e05b3b5fb042a84a7ddaf44a153c1d34631c9b722b3cbb1a2024464ab549c058c25ff94372046d6aeab064ba4f6acda86fb20 SHA512 d90461dd142602ee392e8861d6a44a15b59ffae9ed9aae150aa0f27245f04839da46ed3c8cb87e11f8c35ff017b0a596e2874b6a1ec653452a2fab3ee1f83b4e
+DIST regex-tdfa-1.3.2.2.tar.gz 83016 BLAKE2B 77f6698a5c42eece0eb9f2166017a6a9334f917ba2134e963d06a443088e6d594765e846083052d91fc7944b8fea776c5e188afcbad2b25ce57939255f5cc3b4 SHA512 be5d93b0e989a3232f9d0e37f002085d500d334ec554ade30177b22dd0d873321aa2a4f8b3cacb4156d002659f67b6d6f50d5f8c8b2da513a43be49572dc9c6c
+DIST regex-tdfa-1.3.2.tar.gz 82839 BLAKE2B e381bc951dfad53b0cd2c83f6c77e3a71fe6b1fd64988f75544e631f49a9d108f39e27bc5bb42fbccc4887321c7655d609c0c13cc58f7be3b93e8131059f4320 SHA512 88bbf8f4d7ac15fb85c899bdeb8f8556c7a284075bf2b600051f529f0e2109dcda6ba74fc95969b824cfb03f00a9eb47e9c375c70b1b9e17096c95acbe517168
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
new file mode 100644
index 000000000000..c491fb877d05
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctest-parallel does not currently work with Setup.hs
+
+See: <martijnbastiaan/doctest-parallel#45>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal 2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal 2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+ ghc-options: -O2
+
+ test-suite doc-test
++ buildable: False
+ type: exitcode-stdio-1.0
+ hs-source-dirs: test
+ main-is: DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
new file mode 100644
index 000000000000..769ff7f34191
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctests don't seem to work with Setup.hs
+
+The hackage tarball doesn't include cabal.project which seems to be necessary
+for doctest-parallel to work. Even when this file is copied to $S, Setup.hs
+doesn't seem to recognize it.
+
+The necessary flag is not recognized by `./setup configure`:
+ --write-ghc-environment-files=always
+See: <https://cabal.readthedocs.io/en/3.4/cabal-project.html#cfg-field-write-ghc-environment-files>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal 2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal 2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+ ghc-options: -O2
+
+ test-suite doctest
++ buildable: False
+ type: exitcode-stdio-1.0
+ hs-source-dirs: test
+ main-is: DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
index 6883f6fe98a6..1192b9e7aef1 100644
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ b/dev-haskell/regex-tdfa/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">ChrisKuklewicz/regex-tdfa</remote-id>
+ <remote-id type="hackage">regex-tdfa</remote-id>
+ <remote-id type="github">haskell-hvr/regex-tdfa</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild
deleted file mode 100644
index 7cdc06a6deaa..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +base4,-devel,+force-o2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
-HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
- >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=base4 \
- --flag=-devel \
- --flag=force-o2
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
new file mode 100644
index 000000000000..a47592f6b41f
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +base4,-devel,+force-o2,-doctest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-doctests.patch"
+)
+
+RDEPEND=">=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+ >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4 \
+ --flag=-devel \
+ --flag=force-o2
+}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
new file mode 100644
index 000000000000..9d20edf4bf52
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +base4,-devel,+force-o2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.2-disable-doctests.patch"
+)
+
+RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4 \
+ --flag=-devel \
+ --flag=force-o2
+}
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
deleted file mode 100644
index 56c9eac9ea2a..000000000000
--- a/dev-haskell/rerebase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
diff --git a/dev-haskell/rerebase/metadata.xml b/dev-haskell/rerebase/metadata.xml
deleted file mode 100644
index 28609600f5eb..000000000000
--- a/dev-haskell/rerebase/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A rich drop-in replacement for \"base\".
- For details and docs please visit
- &lt;https://github.com/nikita-volkov/rerebase the project's GitHub page&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rerebase/rerebase-1.4.1.ebuild b/dev-haskell/rerebase/rerebase-1.4.1.ebuild
deleted file mode 100644
index bdbac1e730ae..000000000000
--- a/dev-haskell/rerebase/rerebase-1.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reexports from 'base' with a bunch of other standard libraries"
-HOMEPAGE="https://github.com/nikita-volkov/rerebase"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/rebase-1.4.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
new file mode 100644
index 000000000000..a17699a7dd22
--- /dev/null
+++ b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs a port to new srcloc
+inherit haskell-cabal
+
+DESCRIPTION="Domain Name Service (DNS) lookup via the libresolv standard library routines"
+HOMEPAGE="https://hackage.haskell.org/package/resolv"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT=test # fails to build test suite
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+"
+
+CABAL_CHDEPS=(
+ 'base >= 4.5 && <4.15' 'base >= 4.5'
+ 'base16-bytestring ^>= 0.1' 'base16-bytestring >= 0.1'
+ 'bytestring ^>=0.9.2 || ^>= 0.10' 'bytestring >=0.9.2'
+)
diff --git a/dev-haskell/resolv/resolv-0.1.2.0.ebuild b/dev-haskell/resolv/resolv-0.1.2.0.ebuild
deleted file mode 100644
index b93b0da4fc23..000000000000
--- a/dev-haskell/resolv/resolv-0.1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs a port to new srcloc
-inherit haskell-cabal
-
-DESCRIPTION="Domain Name Service (DNS) lookup via the libresolv standard library routines"
-HOMEPAGE="https://hackage.haskell.org/package/resolv"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to build test suite
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
-"
diff --git a/dev-haskell/resource-pool/Manifest b/dev-haskell/resource-pool/Manifest
index e7286464935a..2cb0993b2ec4 100644
--- a/dev-haskell/resource-pool/Manifest
+++ b/dev-haskell/resource-pool/Manifest
@@ -1 +1,2 @@
DIST resource-pool-0.2.3.2.tar.gz 6527 BLAKE2B e57d2406a483f0252cc564de91f74c51b62b9c1e7b52ae147e5c60a647130c2803af469d5b33389a5ff618d259f110738a973580e7633d2ff2dc9e7d57cd82a7 SHA512 42b0bb6dea35c08884f65604acc0dd93707b8d4de780c584877e92fbfe534d4f754282e9c9f7257c203f1152d85ac8170f84ee9a95573343d02a774006c4118b
+DIST resource-pool-0.4.0.0.tar.gz 8128 BLAKE2B 2aff7704d00f352ab8972335223cd0e713de2be60c91a01020e39155c4666247313a73d88af2cb53227cba17ca23533219f25b0cd124536ac4c29043a4371345 SHA512 714db44aa41efbe684b589d20242a8fb3ad6112287fa797954e69c19432c83a2bc0c37bbcd9674ad2980a45ce6f38acea5393753caa05de609ac958e53057b92
diff --git a/dev-haskell/resource-pool/metadata.xml b/dev-haskell/resource-pool/metadata.xml
index 937381521944..11d1ddb06d9c 100644
--- a/dev-haskell/resource-pool/metadata.xml
+++ b/dev-haskell/resource-pool/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">resource-pool</remote-id>
+ <remote-id type="github">scrive/pool</remote-id>
+ </upstream>
</pkgmetadata>
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 2f9a99428beb..1fe1025c6b36 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: -developer
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/hashable:=[profile?]
diff --git a/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild b/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild
new file mode 100644
index 000000000000..1bdf11331bcf
--- /dev/null
+++ b/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A high-performance striped resource pooling implementation"
+HOMEPAGE="https://hackage.haskell.org/package/resource-pool"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.1.0.0:=[profile?]
+ >=dev-haskell/primitive-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer
+}
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index d9192237f689..cf8bfa3dbb92 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -1 +1,2 @@
DIST resourcet-1.2.4.2.tar.gz 16862 BLAKE2B 041997adc9db44e4e99d878f001191eff853fc2d473f544a107d3526924273bda32de9ff39ebd93ec6fddb81fa1dd1180f6a6e1c06361a33486bf7c56a98c750 SHA512 9f415a902261e64916e8c937a3d464eb29ff3a59fde511a17304aa4aa58c01f882d29c304375a0f23d87fa770763f09c84e428ed9f75c9b187fe2aabbbf4adf2
+DIST resourcet-1.2.6.tar.gz 17196 BLAKE2B e82da2b2cf2329182d46a331b1bbcd8437268a90501c38acc299b80377ccb3a7d53e9c97d07565830c9f993b8cf6e9189e930622d7ede7510e35350b07aa7883 SHA512 2b08c99ad102fd3bef1e1e9363c000f48f03d1ac3e5122c8c764c71f90905697a818a70391f0f67e5074b4cc0b030bd5cfecd3477930e3e4ec64049e10d8fa3a
diff --git a/dev-haskell/resourcet/metadata.xml b/dev-haskell/resourcet/metadata.xml
index 601f5a295165..ed3c0820e087 100644
--- a/dev-haskell/resourcet/metadata.xml
+++ b/dev-haskell/resourcet/metadata.xml
@@ -5,9 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package was originally included with the conduit package, and has since been split off. For more information, please see &lt;http://www.yesodweb.com/book/conduits&gt;.
- </longdescription>
<upstream>
<remote-id type="github">snoyberg/conduit</remote-id>
</upstream>
diff --git a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
index 79b84d5108fd..a55ca295082d 100644
--- a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/resourcet/resourcet-1.2.6.ebuild b/dev-haskell/resourcet/resourcet-1.2.6.ebuild
new file mode 100644
index 000000000000..b13e58ee12aa
--- /dev/null
+++ b/dev-haskell/resourcet/resourcet-1.2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 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="Deterministic allocation and freeing of scarce resources"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+ >=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
index cd0754415c73..c2cac5759f82 100644
--- a/dev-haskell/retry/Manifest
+++ b/dev-haskell/retry/Manifest
@@ -1 +1,2 @@
-DIST retry-0.8.1.1.tar.gz 15800 BLAKE2B fa01f4e6df405d1f71bcb8c7cad6ba9b166222527c70b687feef7b6577446bf790681a189675995bfba3bb362257130bd74119e35893f4497a4f9f57fb37491d SHA512 6907d04314b10fbcbb6680608bbd5926ab56f5916fc032339d5793f2813983d5db3f40d4fc25f8e0befcb3649e753aec737a7ef3cf98fe05252a3a8c1bd546a1
+DIST retry-0.9.0.0.tar.gz 15863 BLAKE2B 2ebe8e71b700f0bedf19a43e08171f98219009dc9ff4f6069ada64945128839f5321c9a2f0602a976431cedbb0c77a56b01805005b8cb4c746b4d4d875b90921 SHA512 89c6ab55a5b0050f7132566d0c9d6ddbbdb927d21c5fcf8fe959fb04228398bc87aa9b51752a881f8a581e6030ac7d21d344dc2c3fea192b0330519e94b33269
+DIST retry-0.9.3.1.tar.gz 18717 BLAKE2B 6db19277fb92e9a12f68f8ce0bd0017426540ca8d842fce85d36c62f553afdc91019e0a8326d3f52e15762a6129192f69b73ab61954222bbe0f6d2171b6b133d SHA512 6ce93f69bffcc6a13da9878ea1ec9547dbd3ba5f84148b3ee408292138297329ded6e3aa0daf0cfa76a9b5e99696f66721e0abc711d0a92383c3ec6584de0861
diff --git a/dev-haskell/retry/metadata.xml b/dev-haskell/retry/metadata.xml
index bd401a627e00..8e465ebd89e3 100644
--- a/dev-haskell/retry/metadata.xml
+++ b/dev-haskell/retry/metadata.xml
@@ -5,16 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package exposes combinators that can wrap arbitrary
- monadic actions. They run the action and potentially retry
- running it with some configurable delay for a configurable
- number of times.
- The purpose is to make it easier to work with IO and
- especially network IO actions that often experience temporary
- failure and warrant retrying of the original action. For
- example, a database query may time out for a while, in which
- case we should hang back for a bit and retry the query instead
- of simply raising an exception.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">retry</remote-id>
+ <remote-id type="github">Soostone/retry</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/retry/retry-0.8.1.1.ebuild b/dev-haskell/retry/retry-0.8.1.1.ebuild
deleted file mode 100644
index e6991bfb0f39..000000000000
--- a/dev-haskell/retry/retry-0.8.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -lib-Werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Retry combinators for monadic actions that may fail"
-HOMEPAGE="https://github.com/Soostone/retry"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
- >=dev-haskell/random-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hedgehog
- >=dev-haskell/hunit-1.2.5.2
- dev-haskell/mtl
- dev-haskell/stm
- dev-haskell/tasty
- dev-haskell/tasty-hedgehog
- dev-haskell/tasty-hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-lib-Werror
-}
diff --git a/dev-haskell/retry/retry-0.9.0.0.ebuild b/dev-haskell/retry/retry-0.9.0.0.ebuild
new file mode 100644
index 000000000000..206db31cacc8
--- /dev/null
+++ b/dev-haskell/retry/retry-0.9.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
+ >=dev-haskell/random-1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hedgehog
+ >=dev-haskell/hunit-1.2.5.2
+ dev-haskell/mtl
+ dev-haskell/stm
+ dev-haskell/tasty
+ dev-haskell/tasty-hedgehog
+ dev-haskell/tasty-hunit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-lib-werror
+}
diff --git a/dev-haskell/retry/retry-0.9.3.1.ebuild b/dev-haskell/retry/retry-0.9.3.1.ebuild
new file mode 100644
index 000000000000..5ba3167745a0
--- /dev/null
+++ b/dev-haskell/retry/retry-0.9.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/mtl-compat:=[profile?]
+ >=dev-haskell/random-1:=[profile?]
+ >=dev-haskell/unliftio-core-0.1.0.0:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hedgehog-1.0
+ >=dev-haskell/hunit-1.2.5.2
+ dev-haskell/tasty
+ dev-haskell/tasty-hedgehog
+ dev-haskell/tasty-hunit
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-lib-werror
+}
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
deleted file mode 100644
index b84670fd8e11..000000000000
--- a/dev-haskell/rfc5051/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rfc5051-0.1.0.4.tar.gz 218105 BLAKE2B 456ab3fe7d1cffebaeaef0aea1b0867ef69729076af9317cdf8f0f802800552a5a1e6ce27e6684eee94457acc925ad9d7c750864b6098b687af576b5aa74d772 SHA512 5a8a3f3ccb846986242152c8c30a0069466072f2b3fb449565b7fb95615c7909be04a320b9215d313d8b8e442a01959ffead0d5076bc61ee7f33f5ff1d9dd67b
-DIST rfc5051-0.2.tar.gz 285338 BLAKE2B a54f411a00c8f961f9691e2a75e85530f314518f31477f0c43cde23b75b4de3d3cfff0ce41794901e7803ffffcaaf4ec410e4f9eafd512e08667c3919b60390e SHA512 93222535d9c94ac947d9760c8d856ec150b17b93342999f6594a048905c791b08220e656f26c95702bec3c1e835b537635395d1dae6f3607fd8a8a767b24a23f
diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
deleted file mode 100644
index 895f26e1d410..000000000000
--- a/dev-haskell/rfc5051/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="mkunicodedata">build codes generator itself</flag>
- </use>
- <longdescription>
- This library implements @i;unicode-casemap@,
- the simple, non locale-sensitive unicode collation
- algorithm described in RFC 5051 (&lt;http://www.rfc-editor.org/rfc/rfc5051.txt&gt;).
- Proper unicode collation can be done using text-icu, but that is a big
- dependency that depends on a large C library, and rfc5051 might be better
- for some purposes.
-
- Here is a list of strings sorted by the Prelude's @sort@ function:
-
- @Abe Oeb abe ab&amp;#233; oeb &amp;#193;be &amp;#196;be &amp;#212;eb &amp;#225;be &amp;#228;be &amp;#244;eb@
-
- Here is the same list sorted by @sortBy compareUnicode@:
-
- @Abe abe ab&amp;#233; &amp;#193;be &amp;#225;be &amp;#196;be &amp;#228;be Oeb oeb &amp;#212;eb &amp;#244;eb@
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
deleted file mode 100644
index 62d9e8871b7f..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mkunicodedata"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag mkunicodedata mkunicodedata)
-}
diff --git a/dev-haskell/rfc5051/rfc5051-0.2.ebuild b/dev-haskell/rfc5051/rfc5051-0.2.ebuild
deleted file mode 100644
index 00f73561cfbf..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
-"
diff --git a/dev-haskell/riff/Manifest b/dev-haskell/riff/Manifest
deleted file mode 100644
index eda2bc50e266..000000000000
--- a/dev-haskell/riff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST riff-0.3.0.1.tar.gz 9420 BLAKE2B 28715306b6c6ff6e630da306606f2946f05a5b0470576eae46761d7c368c502084cb4dcae0ddd6af2525491f83f7eb54101645a9d05fce53e117ab0d16123f69 SHA512 9b488fa0853dec662109809627c451ec22766595e710a14d25598e1232bc1e286a649a9fd4933bf42737b68554f1a0401c0fee12e833d6fd79b9eb989a4d23b2
diff --git a/dev-haskell/riff/metadata.xml b/dev-haskell/riff/metadata.xml
deleted file mode 100644
index 4b64068799e1..000000000000
--- a/dev-haskell/riff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library provides a RIFF parser for Haskell for easy manipulation
- of common file formats like WAVE and RIFF container AVI files.
- </longdescription>
- <upstream>
- <remote-id type="bitbucket">robertmassaioli/riff</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/riff/riff-0.3.0.1.ebuild b/dev-haskell/riff/riff-0.3.0.1.ebuild
deleted file mode 100644
index e646cf168f18..000000000000
--- a/dev-haskell/riff/riff-0.3.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="RIFF parser for Haskell"
-HOMEPAGE="https://bitbucket.org/robertmassaioli/riff/overview"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.3:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'binary >=0.7 && <0.8' 'binary >=0.7' \
- 'either == 4.3.*' 'either >= 4.3' \
- 'filepath >=1.3 && <1.4' 'filepath >=1.3' \
- 'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/rio-orphans/Manifest b/dev-haskell/rio-orphans/Manifest
deleted file mode 100644
index ac4e731f10f9..000000000000
--- a/dev-haskell/rio-orphans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rio-orphans-0.1.1.0.tar.gz 3098 BLAKE2B 83308c4dc8c1306e8c00c6ef0365169e6787a159a17efff86a754eb2ba797328eb8358a6a83069b97389399a0416a45c945fc636c941bfc5930a76e25c6b41ff SHA512 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a
diff --git a/dev-haskell/rio-orphans/metadata.xml b/dev-haskell/rio-orphans/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/rio-orphans/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild b/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
deleted file mode 100644
index 0906c97f03f3..000000000000
--- a/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for the RIO type in the rio package"
-HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
- dev-haskell/fast-logger:=[profile?]
- dev-haskell/monad-control:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/rio:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/rio-prettyprint/Manifest b/dev-haskell/rio-prettyprint/Manifest
deleted file mode 100644
index 00be4394bce0..000000000000
--- a/dev-haskell/rio-prettyprint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rio-prettyprint-0.1.1.0.tar.gz 11503 BLAKE2B a2056a98d28b3313beeef5487e1ee927d058326bba1ee758ce1d5e46b5a8709b1b53c788ce9d57a2c2f7496c097bad4960ac4b7429a553c5121043afcde51b30 SHA512 3f519fa0dd4ea51af565221504358ca5728b9ebe07df8a2b34b83198bb19d6653c048cd45701fed6d99b5204da05449f35c0be8e98df2da1c34ea99023f06bf4
diff --git a/dev-haskell/rio-prettyprint/metadata.xml b/dev-haskell/rio-prettyprint/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/rio-prettyprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild b/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild
deleted file mode 100644
index fc95a6524cd1..000000000000
--- a/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pretty-printing for RIO"
-HOMEPAGE="https://github.com/commercialhaskell/rio-prettyprint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/annotated-wl-pprint:=[profile?]
- >=dev-haskell/ansi-terminal-0.9:=[profile?]
- dev-haskell/cabal:=[profile?]
- dev-haskell/colour:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/path:=[profile?]
- dev-haskell/rio:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/rio/Manifest b/dev-haskell/rio/Manifest
index a9592f041482..3a8fa2e9af75 100644
--- a/dev-haskell/rio/Manifest
+++ b/dev-haskell/rio/Manifest
@@ -1 +1,2 @@
-DIST rio-0.1.18.0.tar.gz 58618 BLAKE2B c249006fa7a04f7db39168cfd324f61bf01862e57cec272a0b9551b6db4345ba813ac07c595ce795b4d0be06fa950cdeb626a30bef11e8eb03e98e575c04a397 SHA512 dd5fcf3611289108c154fb77d2bba4132ef80943b5ffcf9aa76e0d93d37fe3b6992d9804a3815b3aca1cbfaa21cb09c693022032649b6d1bb0e5fbfc2e161ab1
+DIST rio-0.1.21.0.tar.gz 59157 BLAKE2B 5455a0056efc32f0120182a65adee665cfc33fbf2b6627bf420b26db7d472ca8b3d0797d996600f8538cc1dcfe34d87c0b6ce93f88dfc4c7e8b9516be334f25d SHA512 5a049c7af44f0811e402d641815453be0af1f437a89cada613940085ceb8b8bb66ab92753f31bf400ff16f72ff08a9e83ff422c988e434ffef0c64b4c1cc7224
+DIST rio-0.1.22.0.tar.gz 59262 BLAKE2B 1db8d70ab0d740c95d80db3bcb16a395ab1c2bed522f2ebb989821a73e091919967b23e6be57d2ab35ff2c661560463f80f278e4abf532ecb261bcabcd6ce617 SHA512 a324bdc62341f7da9300c429712963de3926d5585a5772d412ba50d75503fd1c08edb7e6712d9ddc5d825910a5d59e13d9f0c48a2dca98efe33fead44ec7f8bd
diff --git a/dev-haskell/rio/metadata.xml b/dev-haskell/rio/metadata.xml
index 937381521944..cc574ab28b0d 100644
--- a/dev-haskell/rio/metadata.xml
+++ b/dev-haskell/rio/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">rio</remote-id>
+ <remote-id type="github">commercialhaskell/rio</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/rio/rio-0.1.18.0.ebuild b/dev-haskell/rio/rio-0.1.18.0.ebuild
deleted file mode 100644
index e8707658616b..000000000000
--- a/dev-haskell/rio/rio-0.1.18.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A standard library for Haskell"
-HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
- dev-haskell/hashable:=[profile?]
- dev-haskell/microlens:=[profile?]
- dev-haskell/microlens-mtl:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/primitive:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/typed-process-0.2.5.0:=[profile?]
- >=dev-haskell/unliftio-0.2.12:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/hspec
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/rio/rio-0.1.21.0.ebuild b/dev-haskell/rio/rio-0.1.21.0.ebuild
new file mode 100644
index 000000000000..5c2c3257095f
--- /dev/null
+++ b/dev-haskell/rio/rio-0.1.21.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 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 standard library for Haskell"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+ dev-haskell/microlens:=[profile?]
+ dev-haskell/microlens-mtl:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/typed-process-0.2.5.0:=[profile?]
+ >=dev-haskell/unliftio-0.2.14:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec
+ dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/rio/rio-0.1.22.0-r1.ebuild b/dev-haskell/rio/rio-0.1.22.0-r1.ebuild
new file mode 100644
index 000000000000..4e9a92cd357c
--- /dev/null
+++ b/dev-haskell/rio/rio-0.1.22.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A standard library for Haskell"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/hashable:=[profile?]
+ dev-haskell/microlens:=[profile?]
+ dev-haskell/microlens-mtl:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/typed-process-0.2.5.0:=[profile?]
+ >=dev-haskell/unliftio-0.2.14:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? (
+ dev-haskell/hspec
+ dev-haskell/quickcheck
+ )
+"
diff --git a/dev-haskell/rsa/Manifest b/dev-haskell/rsa/Manifest
deleted file mode 100644
index 86a9aca3dad7..000000000000
--- a/dev-haskell/rsa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RSA-2.3.1.tar.gz 14705 BLAKE2B 065341bd3360410ca1e2ae1057b6b8112bc6cf1253ef12733d9d9564666b7c97e8088d35e0736a76768ebc8d40f497536ec0bb84565d849285666c591f1df3c6 SHA512 b4d3f406cd7b97237c2b36e2ba659f35871e02a6144b6cb48482fdc7999d9822758472c25b9eaef9ef6aeb8c503fa49b424350a543897217f3aec3084dd7572f
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
deleted file mode 100644
index 2c985b3b5f62..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8d867a693f91406f9b45e24d79a0637013c0e272
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date: Wed Sep 18 14:48:23 2019 +0100
-
- Update Pure.hs
-
-diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
-index 8e0f483..a69907d 100644
---- a/src/Codec/Crypto/RSA/Pure.hs
-+++ b/src/Codec/Crypto/RSA/Pure.hs
-@@ -111,7 +111,7 @@ instance Binary PrivateKey where
- d <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
- return (PrivateKey pub d 0 0 0 0 0)
-
--failOnError :: (Monad m, Show a) => Either a b -> m b
-+failOnError :: (MonadFail m, Show a) => Either a b -> m b
- failOnError (Left e) = fail (show e)
- failOnError (Right b) = return b
-
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
deleted file mode 100644
index e2c7348eb38c..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d621ae1603f27b3de867b46e5ad4d28460097dac
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date: Wed Sep 18 14:52:34 2019 +0100
-
- Update Pure.hs
-
-diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
-index a69907d..e3513a9 100644
---- a/src/Codec/Crypto/RSA/Pure.hs
-+++ b/src/Codec/Crypto/RSA/Pure.hs
-@@ -111,8 +111,8 @@ instance Binary PrivateKey where
- d <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
- return (PrivateKey pub d 0 0 0 0 0)
-
--failOnError :: (MonadFail m, Show a) => Either a b -> m b
--failOnError (Left e) = fail (show e)
-+failOnError :: (Monad m, Show a) => Either a b -> m b
-+failOnError (Left e) = error (show e)
- failOnError (Right b) = return b
-
- -- ----------------------------------------------------------------------------
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
deleted file mode 100644
index 6aebe6fab6ce..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit bb712862c868975ab033e1079751d9e3787d3a33
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date: Wed Sep 18 14:54:22 2019 +0100
-
- Update Test.hs
-
-diff --git a/Test.hs b/Test.hs
-index dd61302..4fa26ca 100644
---- a/Test.hs
-+++ b/Test.hs
-@@ -98,10 +98,10 @@ instance Arbitrary LargePrime where
- arbitrary =
- do seed <- BSS.pack `fmap` replicateM 4096 arbitrary
- case newGen seed of
-- Left _ -> fail "DRBG initialization error."
-+ Left _ -> error "DRBG initialization error."
- Right (g :: HashDRBG) ->
- case largeRandomPrime g 64 of
-- Left _ -> fail "Large prime generation failure."
-+ Left _ -> error "Large prime generation failure."
- Right (i, _) -> return (LP i)
-
- data KeyPairIdx = KPI Int
diff --git a/dev-haskell/rsa/metadata.xml b/dev-haskell/rsa/metadata.xml
deleted file mode 100644
index 89642b8bdd30..000000000000
--- a/dev-haskell/rsa/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This library implements the RSA encryption and signature
- algorithms for arbitrarily-sized ByteStrings. While the
- implementations work, they are not necessarily the fastest ones
- on the planet. Particularly key generation. The algorithms
- included are based of RFC 3447, or the Public-Key Cryptography
- Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rsa/rsa-2.3.1.ebuild b/dev-haskell/rsa/rsa-2.3.1.ebuild
deleted file mode 100644
index f0a8153fa08a..000000000000
--- a/dev-haskell/rsa/rsa-2.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -oldbase,-buildtestexecutable
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="RSA"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementation of RSA, using the padding schemes of PKCS#1 v2.1"
-HOMEPAGE="https://hackage.haskell.org/package/RSA"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?]
- >=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/crypto-pubkey-types-0.4 <dev-haskell/crypto-pubkey-types-0.6
- >=dev-haskell/drbg-0.5.2 <dev-haskell/drbg-0.7
- >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
- >=dev-haskell/tagged-0.2 <dev-haskell/tagged-0.9
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.10
- >=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-0.5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-p1-ghc-8.8.patch
- "${FILESDIR}"/${P}-p2-ghc-8.8.patch
- "${FILESDIR}"/${P}-p3-ghc-8.8.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-buildtestexecutable \
- --flag=-oldbase
-}
diff --git a/dev-haskell/safe-exceptions/Manifest b/dev-haskell/safe-exceptions/Manifest
index ec7c2d0a7bcb..41208c432ca3 100644
--- a/dev-haskell/safe-exceptions/Manifest
+++ b/dev-haskell/safe-exceptions/Manifest
@@ -1 +1,2 @@
DIST safe-exceptions-0.1.7.0.tar.gz 13533 BLAKE2B 4dbf6ebdb5dcd2d1f691cac540fe4cdaf3557bfc90f702b7120b4b6a8d1e2be7ff4e6d22851be5d2650a35e074551e48643152c25a76a2ab0ffd3c37fab663b0 SHA512 05fc32ea80ce1f733a6ea09655fecccf813ea9b7736dbd1d8ef84f54e3fb58f1017756cc9eb507d381cb73f22f100e9166bef1b7198a1d9edbda21e38626e351
+DIST safe-exceptions-0.1.7.3.tar.gz 14169 BLAKE2B 96750575daec4deba15f0302381b17b7f63f77c6b671c34f14a7eb2e947b94419317c94a831e8361e65096f577e392343f6b2eba811b7a6d8d2c7640872ae328 SHA512 380165ad904868982fd1ae1c1eeafecb0458e837563e1279e35eb7865582b44d27b766c9d66695d1bf6fe5d4eb10897c114d79b35395ee89612b78b3eaa55208
diff --git a/dev-haskell/safe-exceptions/metadata.xml b/dev-haskell/safe-exceptions/metadata.xml
index 6e64c173a240..32c35127060f 100644
--- a/dev-haskell/safe-exceptions/metadata.xml
+++ b/dev-haskell/safe-exceptions/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">safe-exceptions</remote-id>
<remote-id type="github">fpco/safe-exceptions</remote-id>
</upstream>
</pkgmetadata>
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 87ccbee51499..9957997ddc4c 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?]
@@ -26,10 +26,7 @@ DEPEND="${RDEPEND}
dev-haskell/void )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.7 && < 4.11' 'base >= 4.7' \
- 'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.7 && < 4.11' 'base >= 4.7'
+ 'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
+)
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild
new file mode 100644
index 000000000000..c35b689b5b48
--- /dev/null
+++ b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe, consistent, and easy exception handling"
+HOMEPAGE="https://github.com/fpco/safe-exceptions#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/hspec
+ dev-haskell/void )
+"
diff --git a/dev-haskell/safe/safe-0.3.19.ebuild b/dev-haskell/safe/safe-0.3.19.ebuild
index bc16cc4eeacc..6c0fffac4019 100644
--- a/dev-haskell/safe/safe-0.3.19.ebuild
+++ b/dev-haskell/safe/safe-0.3.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.10.1:=
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
index 937381521944..8020260c76d9 100644
--- a/dev-haskell/safesemaphore/metadata.xml
+++ b/dev-haskell/safesemaphore/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">ChrisKuklewicz/SafeSemaphore</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index 4d4f9cbbf31d..440e0ae96ec0 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 5ff1d36abf72..f50b99738749 100644
--- a/dev-haskell/sandi/sandi-0.5.ebuild
+++ b/dev-haskell/sandi/sandi-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
#hackport: flags: with-conduit:conduit
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+conduit"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/say/Manifest b/dev-haskell/say/Manifest
deleted file mode 100644
index 0d9ee47905d3..000000000000
--- a/dev-haskell/say/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST say-0.1.0.0.tar.gz 5728 BLAKE2B 0d0827a9b397a3b68b21bb1cd81b8303b81d17eb134704f2d54157194595ebfd43ca488b603514f8fcd9d4b69b0e8a8f74721637f2743fa1e3358c52479e3712 SHA512 8bbf2953e9b09e7f783688ccc7323ed0f91d1043db531844d875b5d12bdfbc0fa31148a9a193ea717b05704c25d56c66d8ad53376ba8b120d42f1173e5fde83c
diff --git a/dev-haskell/say/metadata.xml b/dev-haskell/say/metadata.xml
deleted file mode 100644
index 92aadd8435b9..000000000000
--- a/dev-haskell/say/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/say</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/say/say-0.1.0.0.ebuild b/dev-haskell/say/say-0.1.0.0.ebuild
deleted file mode 100644
index 6fd40e4dddac..000000000000
--- a/dev-haskell/say/say-0.1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Initial project template from stack"
-HOMEPAGE="https://github.com/fpco/say#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index a8fa4b963ef1..db6ffb23739d 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1 +1,2 @@
-DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
+DIST scientific-0.3.7.0-rev5.cabal 4854 BLAKE2B b9490a11d6cea1395cf1cea0bc85627a097aeff7db397de045195b2d0a0db093a39861d5b50e447d98a4b96da3c61eb6d53dffba216c6257ec5b7a009290d6c2 SHA512 3a2c8babc65040692c95f5bbf033d31ec4a3e63382739dfa27a6c0920c96cbcebb982a05222983c796cb04ac81a7b641a742f1d6b9a657f3450bb07242859e90
+DIST scientific-0.3.7.0.tar.gz 24723 BLAKE2B b50d995f6b46d37011823cdd096b1166244c1ab453db490da61eefcf0913f28b9a0b70798aa4ec3c29e6b836d473800b556b6ff062e1e2bee6a25174cd18d52d SHA512 dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index 2900651af244..1b6ea2a6660c 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -5,21 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A @Scientific@ number is an arbitrary-precision floating-point number
- represented using scientific notation.
-
- A scientific number with 'coefficient' @c@ and
- 'base10Exponent' @e@ corresponds to the
- 'Fractional' number: @'fromInteger' c * 10 '^^' e@
-
- Its primary use-case is to serve as the target of
- parsing floating point numbers. Since the textual
- representation of floating point numbers use
- scientific notation they can be efficiently
- parsed to a @Scientific@ number.
- </longdescription>
<upstream>
+ <remote-id type="hackage">scientific</remote-id>
<remote-id type="github">basvandijk/scientific</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/scientific/scientific-0.3.6.2.ebuild b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
deleted file mode 100644
index a65f4fad1a1a..000000000000
--- a/dev-haskell/scientific/scientific-0.3.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -integer-simple
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/hashable-1.1.2:=[profile?]
- >=dev-haskell/integer-logarithms-1:=[profile?]
- >=dev-haskell/primitive-0.1:=[profile?]
- >=dev-haskell/text-0.8:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flags=-integer-simple
-}
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
new file mode 100644
index 000000000000..68dbd52ad020
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -integer-simple
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/quickcheck-2.14.2
+ >=dev-haskell/smallcheck-1.0
+ >=dev-haskell/tasty-1.4.0.1
+ >=dev-haskell/tasty-hunit-0.8
+ >=dev-haskell/tasty-quickcheck-0.8
+ >=dev-haskell/tasty-smallcheck-0.2
+ )
+"
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-integer-simple
+}
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
index d8917ccf3057..f170c46ea720 100644
--- a/dev-haskell/securemem/securemem-0.1.10.ebuild
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/selective/Manifest b/dev-haskell/selective/Manifest
deleted file mode 100644
index ed11e54467ae..000000000000
--- a/dev-haskell/selective/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST selective-0.3.tar.gz 29161 BLAKE2B 786df49e4c05a53537e34f4ab4ba56075166140cee721db1ff517dfcfea92889a97dc3c558877a4a4c91a390e1cbcf684ddb6c2287079cfabeb75f19f3be7c35 SHA512 ecc5777c4692680032c2b758c0447200df3f42d4c97de0aef3d732d38c0813f85fec2d6f9825b044cf20e918631ce649b6f6cc932580277f50692ff609973dc6
diff --git a/dev-haskell/selective/metadata.xml b/dev-haskell/selective/metadata.xml
deleted file mode 100644
index bda6fc5af0fc..000000000000
--- a/dev-haskell/selective/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Selective applicative functors: declare your effects statically,
- select which to execute dynamically.
-
- This is a library for /selective applicative functors/, or just
- /selective functors/ for short, an abstraction between
- applicative functors and monads, introduced in
- &lt;https://www.staff.ncl.ac.uk/andrey.mokhov/selective-functors.pdf this paper&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/selective/selective-0.3.ebuild b/dev-haskell/selective/selective-0.3.ebuild
deleted file mode 100644
index 86949794165c..000000000000
--- a/dev-haskell/selective/selective-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Selective applicative functors"
-HOMEPAGE="https://github.com/snowleopard/selective"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/mtl-2.2.1 <dev-haskell/mtl-2.3
- >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-expected-failure-0.11
- >=dev-haskell/tasty-quickcheck-0.8.4 )
-"
diff --git a/dev-haskell/semialign/Manifest b/dev-haskell/semialign/Manifest
new file mode 100644
index 000000000000..46466dd4dda7
--- /dev/null
+++ b/dev-haskell/semialign/Manifest
@@ -0,0 +1,3 @@
+DIST semialign-1.2.0.1.cabal 2836 BLAKE2B f637909d2c3e3d9a5b7c0e1dd06c9df1236f55fb353e32f944f7f9ba8140044b882b360e98139c2620a585f3a01820b89fcbea1785a9c5acadfa609d0e9c46c4 SHA512 fc97232dbbb35b3578572129fa52e8f9835ea4d9edc8d927db9b57a501c626acd1fd30ca70ab3a669905c36828f680c744f56873966cd1ec011cb8aa4a8298ad
+DIST semialign-1.2.0.1.tar.gz 10371 BLAKE2B ac77920eb72eb6d39798bb84d8ef5f1c52ae99ce2300e1db57a84f495796dbd120007abefae8d0a6be51b5625814682f7b9ae5c743dff77cfa3dcd8667882915 SHA512 ba4c680ec2f301c6b76e2198a422bd9c540915fd89a12cbb1787e95c0ccd1bb05abdf59ab1678f46141939673418c650d9624af2ddb7370f2b6bccf704ade83d
+DIST semialign-1.3.tar.gz 10543 BLAKE2B 27b5cf6071cced022d5122db550e172e25111cdf54d1d3ff339a1791064c582d0a0cc52d4b05031446ea3d3c67d588aa7c8b589931300a16f684cf7e460853f1 SHA512 4f8ce9c01a145e16f5b203c4ffc0131c42f1d348e2d9c812fc83107a8a4515507da335fa2690f3740d9c89d4d8f2c88fd3b9c9e1862f4726a0874f773a3569b3
diff --git a/dev-haskell/semialign/metadata.xml b/dev-haskell/semialign/metadata.xml
new file mode 100644
index 000000000000..23370b585b31
--- /dev/null
+++ b/dev-haskell/semialign/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="semigroupoids">Build with semigroupoids dependency</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">semialign</remote-id>
+ <remote-id type="github">haskellari/these</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/semialign/semialign-1.2.0.1.ebuild b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
new file mode 100644
index 000000000000..dc93d459bd44
--- /dev/null
+++ b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +semigroupoids
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+DESCRIPTION="Align and Zip type-classes from the common Semialign ancestor"
+HOMEPAGE="https://github.com/haskellari/these"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+ >=dev-haskell/semigroupoids-5.3.2:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=semigroupoids
+}
diff --git a/dev-haskell/semialign/semialign-1.3.ebuild b/dev-haskell/semialign/semialign-1.3.ebuild
new file mode 100644
index 000000000000..6ded9ff887e3
--- /dev/null
+++ b/dev-haskell/semialign/semialign-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Align and Zip type-classes from the common Semialign ancestor"
+HOMEPAGE="https://github.com/haskellari/these"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroupoids"
+
+RDEPEND="
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/these-1.2:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ semigroupoids? (
+ >=dev-haskell/semigroupoids-5.3.2:=[profile?] <dev-haskell/semigroupoids-6.1:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semigroupoids semigroupoids)
+}
diff --git a/dev-haskell/semigroupoid-extras/Manifest b/dev-haskell/semigroupoid-extras/Manifest
deleted file mode 100644
index 933342d99669..000000000000
--- a/dev-haskell/semigroupoid-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST semigroupoid-extras-5.tar.gz 6026 BLAKE2B e2dbde9a8495d80b61447d7091c682df1945f2ef9489abee3dac3c80a5f5c5b68b236bc52a038fc9c92c15805f8bd9d3afc640481253e158f48f51996d1065e3 SHA512 1eb8f12ee31b183038fd00705045b825c21b50dcafa58d8416315be99055d3c750dec59ce437b6f983c54237a889b150678dfa089559d361325a95b047cbd95d
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
deleted file mode 100644
index def7110be6d1..000000000000
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="profunctors">
- You can disable the use of the
- `profunctors` package using `-f-profunctors`. Disabing this is
- an unsupported configuration, but it may be useful for
- accelerating builds in sandboxes for expert users.
- </flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
deleted file mode 100644
index 6d6dd2a2a5f8..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids that depend on PolyKinds"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+profunctors"
-
-RDEPEND=">=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
- >=dev-lang/ghc-7.6.2:=
- profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag profunctors profunctors)
-}
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index a08ff107d301..e02a30b623bc 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1 +1 @@
-DIST semigroupoids-5.3.4.tar.gz 26307 BLAKE2B ad22d061c6b5773c6717d00226a41f3b765513a50034d7a805605630314fd4d284b80d1eeb0f85829877ae9a51c8b5e0408e53c27d8dd206216d7eab893885ee SHA512 b4053a856e1c2d3f20f984216f008ff264cedd2ccc3cc39ca3b70bc296d81ea8c1e6dd655bb8a6d1b9a44084e02d74a26cd4eb7264e4732e98be3ec351dc6e3a
+DIST semigroupoids-5.3.7.tar.gz 35349 BLAKE2B c911fe203638714236211a9f40f638fd7e43255e57a4b1b3d0df0cf10a97cc93815776bb53c864a8a4c95fda74402f9a5f6003e3899c35015eacd9df8cc5b86b SHA512 5e908f3b1618cfeb45e03335284e8811ff443f3d7cd8013813337729da62570c052e854bde64c56535809340d0ba281e246d7d0cc8f14627deeb7b1047623849
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 6d33aa5c8457..20ce9f7e06c1 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -5,32 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="contravariant">
- You can disable the use of the `contravariant`
- package using `-f-contravariant`. Disabling this is an unsupported
- configuration, but it may be useful for accelerating builds in sandboxes for
- expert users. If disabled we will not supply instances of `Contravariant`
- </flag>
- <flag name="distributive">
- You can disable the use of the `distributive`
- package using `-f-distributive`. Disabling this is an unsupported
- configuration, but it may be useful for accelerating builds in sandboxes for
- expert users. If disabled we will not supply instances of `Distributive`
- </flag>
- <flag name="tagged">
- You can disable the use of the `tagged` package
- using `-f-tagged`. Disabing this is an unsupported
- configuration, but it may be useful for accelerating builds in
- sandboxes for expert users.
- </flag>
- <flag name="unordered-containers">
- Enable the use of the `unordered-containers` package (and also its
- dependency `hashable`). Disabling this is an unsupported configuration,
- but it may be useful for accelerating builds in sandboxes for expert users.
- </flag>
-
- </use>
<upstream>
<remote-id type="github">ekmett/semigroupoids</remote-id>
</upstream>
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
deleted file mode 100644
index bb93a243b594..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: +doctests,+containers,+comonad
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+contravariant +distributive +tagged +unordered-containers"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
- >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
- distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
- tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
- unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=comonad \
- --flag=containers \
- $(cabal_flag contravariant contravariant) \
- $(cabal_flag distributive distributive) \
- --flag=doctests \
- $(cabal_flag tagged tagged) \
- $(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
new file mode 100644
index 000000000000..9ce22936e45e
--- /dev/null
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: +doctests,+comonad,+containers,+contravariant,+distributive,+tagged,+unordered-containers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroupoids: Category sans id"
+HOMEPAGE="https://github.com/ekmett/semigroupoids"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+ >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=comonad \
+ --flag=containers \
+ --flag=contravariant \
+ --flag=distributive \
+ --flag=doctests \
+ --flag=tagged \
+ --flag=unordered-containers
+}
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index 496b7a41373b..ebb0074b6109 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1 +1 @@
-DIST semigroups-0.18.5.tar.gz 20162 BLAKE2B 6580b1f1ac5bf85aced9dfaea1fc8d6daf4a0536395428f629af651b3717d06d36a33b1d50e38e0b420937cead33fa986d060243a788d83e440dfd73b5413572 SHA512 c1a3376041ea32e9f4ddae79ad5ec649ff3a09c5e0a07ac4f731c05b7615ac2c33deadd24c5c9ee81a6747373ae928f3b3bcaa131dce7a7ff1e3efa56cf57db3
+DIST semigroups-0.20.tar.gz 18788 BLAKE2B 8cd5e82bc1af79a5c688e16c1d1c4aeec12923ed3be2fe9e1aa4f6a431a1e5be56f373ca952536054c2c7530da1adb579fccd8382ddc5031eddcce44815d73b3 SHA512 76e61ffb854276a7760619acd093df0c80c17a58a553ba9f9be3148998c4905784ca5840041a9afb800eab220c62b59567d1be95be478c21b4446021bab7b923
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index b4dd2202b059..084aeb7925f9 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -5,21 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Haskell 98 semigroups
-
- In mathematics, a semigroup is an algebraic structure
- consisting of a set together with an associative binary
- operation. A semigroup generalizes a monoid in that there
- might not exist an identity element. It also (originally)
- generalized a group (a monoid with all inverses) to a type
- where every element did not have to have an inverse, thus the
- name semigroup.
- </longdescription>
- <use>
- <flag name="binary">provide instances for binary package</flag>
- <flag name="transformers">provide instances for transformers package.</flag>
- </use>
<upstream>
<remote-id type="github">ekmett/semigroups</remote-id>
</upstream>
diff --git a/dev-haskell/semigroups/semigroups-0.18.5.ebuild b/dev-haskell/semigroups/semigroups-0.18.5.ebuild
deleted file mode 100644
index 6de986302e7f..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
- >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
- >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
- >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag binary binary) \
- --flag=bytestring \
- --flag=containers \
- --flag=deepseq \
- --flag=hashable \
- --flag=tagged \
- --flag=text \
- $(cabal_flag transformers transformers) \
- --flag=unordered-containers
-}
diff --git a/dev-haskell/semigroups/semigroups-0.20.ebuild b/dev-haskell/semigroups/semigroups-0.20.ebuild
new file mode 100644
index 000000000000..2e0d40dfe471
--- /dev/null
+++ b/dev-haskell/semigroups/semigroups-0.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers,+binary,-bytestring-builder,+template-haskell,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Anything that associates"
+HOMEPAGE="https://github.com/ekmett/semigroups/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=binary \
+ --flag=bytestring \
+ --flag=-bytestring-builder \
+ --flag=containers \
+ --flag=deepseq \
+ --flag=hashable \
+ --flag=tagged \
+ --flag=template-haskell \
+ --flag=text \
+ --flag=transformers \
+ --flag=unordered-containers
+}
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index dd6b8548cf78..d934fe605edf 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1 +1,2 @@
-DIST semirings-0.5.4.tar.gz 18490 BLAKE2B d3d67bca474ae7cbf3e016ef17da5ead593250d9cdda051a0fcd84bdb142ced3af74a0f287921e6edcde9916dea4d128f11cc77d8a65bff85470d533565e4749 SHA512 d24a178031e494e1b337585272e0cc960da7935007affc0fea893fe1cac0acd79569a6d8dc9cfddbb7f435a48c34b7aa0d6e589a16741c7c9b5fe00d52b95441
+DIST semirings-0.6-rev1.cabal 2668 BLAKE2B d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838 SHA512 1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
+DIST semirings-0.6.tar.gz 19640 BLAKE2B 9cd6d17cfdc2fde31741a6db085d972fd8ed131ad003102c1b4991e8157f4b22a05508306c64b1a4f730ce1f99e3d40861b60332689d9b16e122c3ff59a80e0c SHA512 01675527d47b5283ae6beb6feb38b4a5527a46a780b75e4b712c0b1e4b57218fa8238ba100a20947a2e2b53c4a314ad4e1a71f989bd5194fe6378dba048c870c
diff --git a/dev-haskell/semirings/metadata.xml b/dev-haskell/semirings/metadata.xml
index 7695d99e80cf..bfc3eb60560a 100644
--- a/dev-haskell/semirings/metadata.xml
+++ b/dev-haskell/semirings/metadata.xml
@@ -5,36 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <use>
- <flag name="hashable">
- Enisable the use of the `hashable` package. Disabling this may be useful
- for accelerating builds in sandboxes for expert users.
- Note: `-hashable` implies `-unordered-containers`, as we are necessarily
- not able to supply those instances as well.
- </flag>
- <flag name="containers">
- Enable the use of the `containers` package. Disabling this may be useful
- for accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="unordered-containers">
- Enable the use of the `unordered-containers` package. Disabling this may
- be useful for accelerating builds in sandboxes for expert users.
- </flag>
- </use>
- <longdescription>
- Haskellers are usually familiar with monoids and semigroups. A monoid has an appending operation `&lt;&gt;` (or `mappend`),
- and an identity element, `mempty`. A semigroup has an appending `&lt;&gt;` operation, but does not require a `mempty` element.
-
- A Semiring has two appending operations, `plus` and `times`, and two respective identity elements, `zero` and `one`.
-
- More formally, a Semiring R is a set equipped with two binary relations `+` and `*`, such that:
-
- (R,+) is a commutative monoid with identity element 0,
-
- (R,*) is a monoid with identity element 1,
-
- (*) left and right distributes over addition, and
-
- multiplication by '0' annihilates R.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">semirings</remote-id>
+ <remote-id type="github">chessai/semirings</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/semirings/semirings-0.5.4.ebuild b/dev-haskell/semirings/semirings-0.5.4.ebuild
deleted file mode 100644
index 37ae6599ef4c..000000000000
--- a/dev-haskell/semirings/semirings-0.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="two monoids as one, in holy haskimony"
-HOMEPAGE="https://github.com/chessai/semirings"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +hashable +unordered-containers"
-
-RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
- >=dev-lang/ghc-7.10.1:=[gmp]
- hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag containers containers) \
- $(cabal_flag hashable hashable) \
- $(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semirings/semirings-0.6-r2.ebuild b/dev-haskell/semirings/semirings-0.6-r2.ebuild
new file mode 100644
index 000000000000..1d556bcd783c
--- /dev/null
+++ b/dev-haskell/semirings/semirings-0.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +containers,+unordered-containers
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="two monoids as one, in holy haskimony"
+HOMEPAGE="https://github.com/chessai/semirings"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/base-compat-batteries:=[profile?]
+ >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5
+ =dev-haskell/unordered-containers-0.2*:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=containers \
+ --flag=unordered-containers
+}
diff --git a/dev-haskell/sendfile/Manifest b/dev-haskell/sendfile/Manifest
deleted file mode 100644
index 5740fd5f7e6d..000000000000
--- a/dev-haskell/sendfile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sendfile-0.7.11.1.tar.gz 10678 BLAKE2B 492c9de894bf1150eb380ac1f2013600c1c473651fb91157a9599efabb2f25ef430e5b92f29113762c26fc39e5524ce6ea58fc83a3a02f55913b2a0897c0a711 SHA512 284b26bf210f2fc5e7c9e56bdff9f296fca0367c78b7a3ac1a2d2a86a76d0a1508480d9324825cd183d7b8e72c18d24eaa603f9e284fe7ba8d7d4b614e490094
diff --git a/dev-haskell/sendfile/metadata.xml b/dev-haskell/sendfile/metadata.xml
deleted file mode 100644
index a848c96c5a11..000000000000
--- a/dev-haskell/sendfile/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A library which exposes zero-copy sendfile functionality in a portable way. If a platform does not support sendfile, a fallback implementation in haskell is provided.
-
- Currently supported platforms: Windows 2000+ (Native), Linux 2.6+ (Native), FreeBSD (Native), OS-X 10.5+ (Native), Everything else (Portable Haskell code).
- </longdescription>
- <use>
- <flag name="portable">Explicitly enable portable sendfile support (implemented in Haskell)</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
deleted file mode 100644
index ed983e088680..000000000000
--- a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A portable sendfile library"
-HOMEPAGE="https://hub.darcs.net/stepcut/sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="portable"
-
-RDEPEND=">=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag portable portable)
-}
diff --git a/dev-haskell/servant-server/Manifest b/dev-haskell/servant-server/Manifest
new file mode 100644
index 000000000000..3d58affe3a12
--- /dev/null
+++ b/dev-haskell/servant-server/Manifest
@@ -0,0 +1,4 @@
+DIST servant-server-0.19.1-rev1.cabal 5695 BLAKE2B 949da62888d2d0a5e98e4b6c874ab3f6e0278e010e7ec22c355d7b01f53aa20f8020502e219f289cefb0f57ced891ac4a0cc9ae04ebd0f4c96468cb1bbf0675c SHA512 14d16cc02a765cfdbe28c024c07b857a40b91379c48a4418a24a4d0b8e23ffa563bbd14a794a5594a86288bf14d039152ade3783a572d8314a32a13bf7e17e9f
+DIST servant-server-0.19.1.tar.gz 53170 BLAKE2B 1e93a208995e78550b01a3cd417d427ac759e436b881a1ce38e3f171635798a9f24fb3ddfd94f3300ad79b6301cfbbf2a42df8f7e7a2928a5bcf8b85fa40e174 SHA512 1489455605b73b3ed40f4fd73c7891bf5af71cad39c36948ddef8aaf7f91c76d6d371e96cd2492923ca10ec6c0b5ace8c4d3538abef46be2fb491962e8fb8a04
+DIST servant-server-0.20-rev1.cabal 5739 BLAKE2B aafdedd66f6749c5bc48514830c19ecec2ac5d3ce1621cd1f847047fc8a4bf7629bc44b4bd181c13e03a975d281583446110258c7a929ff5191702cea32958ac SHA512 ad65c05a6880855555ca7e61fa9399f08a27b08203231bf25ca94f6f59743824540162ef914fad3fd8391e1661233e44b2720ecfb93e4bbad14c0c2a127c0f61
+DIST servant-server-0.20.tar.gz 55745 BLAKE2B bf2216382f7b1da7ac62554387a7341dbc8a276cc70014b38992e1e5927c909e5f046290904e9c46a36e7e920b4a0ea7dbc3e08bf78c1d7c01eb7140f5981f5d SHA512 4db1d8f6b08ce3af835cbc6232951a1fc6d5d8a5d63a713b33c70be1d587f1c4e6825fa3893e27056ab4635477444ebb5479add8825e3e50473833e586c0c397
diff --git a/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch b/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch
new file mode 100644
index 000000000000..4c85484dd6bc
--- /dev/null
+++ b/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch
@@ -0,0 +1,31 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Add 'examples' USE flag and rename the example executable from 'greet' to
+'servant-server-example'.
+
+diff -urN servant-server-0.18.3/servant-server.cabal servant-server-0.18.3-r1/servant-server.cabal
+--- servant-server-0.18.3/servant-server.cabal 2022-02-11 02:33:28.463223367 -0700
++++ servant-server-0.18.3-r1/servant-server.cabal 2022-02-11 02:35:38.242984376 -0700
+@@ -33,6 +33,10 @@
+ type: git
+ location: http://github.com/haskell-servant/servant.git
+
++flag examples
++ description: Build the servant-server-example executable
++ default: False
++
+ library
+ exposed-modules:
+ Servant
+@@ -99,7 +103,9 @@
+
+ ghc-options: -Wall -Wno-redundant-constraints
+
+-executable greet
++executable servant-server-example
++ if !flag(examples)
++ buildable: False
+ main-is: greet.hs
+ hs-source-dirs: example
+ ghc-options: -Wall
diff --git a/dev-haskell/servant-server/metadata.xml b/dev-haskell/servant-server/metadata.xml
new file mode 100644
index 000000000000..ed10557de666
--- /dev/null
+++ b/dev-haskell/servant-server/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">servant-server</remote-id>
+ <remote-id type="github">haskell-servant/servant</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/servant-server/servant-server-0.19.1.ebuild b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
new file mode 100644
index 000000000000..3bccb542658e
--- /dev/null
+++ b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A family of combinators for defining webservices APIs and serving them"
+HOMEPAGE="https://docs.servant.dev/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-add-examples-flag.patch" )
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
+ >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?]
+ >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+ >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/monad-control-1.0.2.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/network-2.8:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/resourcet-1.2.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/servant-0.19:=[profile?]
+ >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
+ >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-haskell/wai-3.2.1.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/wai-app-static-3.1.6.2:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+ >=dev-haskell/word8-0.1.3:=[profile?] <dev-haskell/word8-0.2:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ examples? ( >=dev-haskell/warp-3.2.25:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.10
+ >=dev-haskell/hspec-wai-0.10.1 <dev-haskell/hspec-wai-0.12
+ >=dev-haskell/quickcheck-2.12.6.1 <dev-haskell/quickcheck-2.15
+ dev-haskell/safe
+ >=dev-haskell/should-not-typecheck-2.1.0 <dev-haskell/should-not-typecheck-2.2
+ >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+ dev-haskell/transformers-compat
+ >=dev-haskell/wai-extra-3.0.24.3 <dev-haskell/wai-extra-3.2 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/servant-server/servant-server-0.20.ebuild b/dev-haskell/servant-server/servant-server-0.20.ebuild
new file mode 100644
index 000000000000..178b133e31cc
--- /dev/null
+++ b/dev-haskell/servant-server/servant-server-0.20.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A family of combinators for defining webservices APIs and serving them"
+HOMEPAGE="https://docs.servant.dev/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
+ >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.6:=[profile?]
+ >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+ >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/monad-control-1.0.2.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/network-2.8:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/resourcet-1.2.2:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ >=dev-haskell/servant-0.20:=[profile?] <dev-haskell/servant-0.21:=[profile?]
+ >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
+ >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-haskell/wai-3.2.2.1:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/wai-app-static-3.1.6.2:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+ >=dev-haskell/warp-3.2.25:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+ >=dev-haskell/word8-0.1.3:=[profile?] <dev-haskell/word8-0.2:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.12
+ >=dev-haskell/hspec-wai-0.10.1 <dev-haskell/hspec-wai-0.12
+ >=dev-haskell/quickcheck-2.12.6.1 <dev-haskell/quickcheck-2.15
+ dev-haskell/safe
+ >=dev-haskell/should-not-typecheck-2.1.0 <dev-haskell/should-not-typecheck-2.2
+ >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+ dev-haskell/transformers-compat
+ >=dev-haskell/wai-extra-3.0.24.3 <dev-haskell/wai-extra-3.2 )
+"
diff --git a/dev-haskell/servant/Manifest b/dev-haskell/servant/Manifest
new file mode 100644
index 000000000000..c63b21440fad
--- /dev/null
+++ b/dev-haskell/servant/Manifest
@@ -0,0 +1,4 @@
+DIST servant-0.19-rev4.cabal 5562 BLAKE2B 317773458ecb9ffae30c5f16a478d3587db7e5dec1f578e670af51e3a5b73d5212f08cea18a7826b337d54266e3bb68aaf7ef0097b0c684748db69a2fb924ec3 SHA512 6d9c75d7b598f57a523c4e4c8b3cf5c3fa14cd542007a178cca4b206708a07797e689a82169deba9a76ccf670ec51836ad61a8cef1212c7f3b5a056b12e91864
+DIST servant-0.19.tar.gz 54480 BLAKE2B 0066fc21e6bcc1f572b20048e6fee85e093b15a292d4916fc0de39462f4ac5292aab1007eecdfd553ea37bcb4ce93f24f8180d9efe0c1a0be8a729971e36db6c SHA512 5f7a7a03e7cb1f729cf4265a767006b4d65dfadea878540df3ffb8347e1d2ff5d8faaa58a5e032535a489fd45e1da81dc9424c2d931b6d26adf156ee59f1c003
+DIST servant-0.20-rev1.cabal 5622 BLAKE2B 112493e257801317eee5f1341b2cc4d27262f5bb1ad48cad4bb983ccb47ad610fc3233af9deb8a944080ab47c2f9604ad3502e9c88dcf2ab81efb95116fa0a2d SHA512 f15582d6badf85eca1b0914d0ae0eb1b9a6e18bb4a5c2aa8c116e44b9aaf0c239fb30e7beef3c7616d4283e657c898ac01f6f0b34a14aa59f2f8d6caa393f628
+DIST servant-0.20.tar.gz 56212 BLAKE2B d2c9c2fe9b9dd0e6c6d5b4f1ef4ad5b14b101723052a6a7b3f9fd3517a902f04b05686ed9851567a108ecd6e175fde703902b226bcddeed9eeb71e55d1b2857c SHA512 fd87b30fa3f212104d354fdd52eb5813c2bf79dc2d36917312604c56c4e8d4bc48e373cc2ad6d648225300ecd130dbc50caacfefb567226312f01dcbce4456b0
diff --git a/dev-haskell/servant/metadata.xml b/dev-haskell/servant/metadata.xml
new file mode 100644
index 000000000000..f7c1681a8eea
--- /dev/null
+++ b/dev-haskell/servant/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">servant</remote-id>
+ <remote-id type="github">haskell-servant/servant</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/servant/servant-0.19.ebuild b/dev-haskell/servant/servant-0.19.ebuild
new file mode 100644
index 000000000000..000cd5defb16
--- /dev/null
+++ b/dev-haskell/servant/servant-0.19.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 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"
+CABAL_HACKAGE_REVISION="4"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A family of combinators for defining webservices APIs"
+HOMEPAGE="https://docs.servant.dev/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+ >=dev-haskell/bifunctors-5.5.3:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+ >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/constraints-0.2:=[profile?]
+ >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?]
+ >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+ >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/mmorph-1.1.2:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
+ >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/quickcheck-2.12.6.1:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/singleton-bool-0.1.4:=[profile?] <dev-haskell/singleton-bool-0.1.7:=[profile?]
+ >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
+ >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/vault-0.3.1.2:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.10
+ >=dev-haskell/quickcheck-instances-0.3.19 <dev-haskell/quickcheck-instances-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/servant/servant-0.20.ebuild b/dev-haskell/servant/servant-0.20.ebuild
new file mode 100644
index 000000000000..e6badfc221b5
--- /dev/null
+++ b/dev-haskell/servant/servant-0.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A family of combinators for defining webservices APIs"
+HOMEPAGE="https://docs.servant.dev/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+ >=dev-haskell/bifunctors-5.5.3:=[profile?] <dev-haskell/bifunctors-5.7:=[profile?]
+ >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/constraints-0.2:=[profile?]
+ >=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.6:=[profile?]
+ >=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+ >=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/mmorph-1.1.2:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
+ >=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/quickcheck-2.12.6.1:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/singleton-bool-0.1.4:=[profile?] <dev-haskell/singleton-bool-0.2:=[profile?]
+ >=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
+ >=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/vault-0.3.1.2:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.12
+ >=dev-haskell/quickcheck-instances-0.3.19 <dev-haskell/quickcheck-instances-0.4 )
+"
diff --git a/dev-haskell/setenv/setenv-0.1.1.3.ebuild b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
index 6911a94429b3..5319dd520b4c 100644
--- a/dev-haskell/setenv/setenv-0.1.1.3.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
index 1f1983adf7fd..69105c7a04fd 100644
--- a/dev-haskell/setlocale/Manifest
+++ b/dev-haskell/setlocale/Manifest
@@ -1 +1,3 @@
+DIST setlocale-1.0.0.10-rev3.cabal 869 BLAKE2B 41f9149bb87fa917abf4341a16d0b9682471324775b5a9effab759f50c1f807b62a8a390c23bad908695c1d55b4b6851b8bdee9c2803408e4b420950a2a8740e SHA512 6d75abe8592182b03479bcd035f91474baa377e2eef713312a6b7974e6452b5f589282615f1a91f41cbe7ed5bc2eefabef1527d9b86fa4866a3c62245ea5afcd
+DIST setlocale-1.0.0.10.tar.gz 2096 BLAKE2B 37451ba55f20e558dcdc766fca9f52dae0cda40ae48636ba780c6850a66c98c553d1ce2fab79d8691e424864e479c40680fe626065b67db5e8c2de02b5e2cf64 SHA512 ef05da7ed2acfa6f4b7acd988282d545897428272e5d5a9818563afc5138df32268f705946093ba33628ad42de2c19ed9cce139f0e1fa15e4a87c6cd18da02ef
DIST setlocale-1.0.0.9.tar.gz 2098 BLAKE2B b12b847957807038da6fb7bb31a8a9dbeb55ce17062a3060ab66aae75d840f9fb44cfe51b3b2644361e457d21cca3f325e0bc09c6d453c5d28074efed56bd6c6 SHA512 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
diff --git a/dev-haskell/setlocale/metadata.xml b/dev-haskell/setlocale/metadata.xml
index fc72bbb2e26a..130b364c7328 100644
--- a/dev-haskell/setlocale/metadata.xml
+++ b/dev-haskell/setlocale/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="bitbucket">IchUndNichtDu/haskell-setlocale</remote-id>
+ <remote-id type="hackage">setlocale</remote-id>
+ <remote-id type="gitlab">Kritzefitz/haskell-setlocale</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild
new file mode 100644
index 000000000000..4e056d4686db
--- /dev/null
+++ b/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to setlocale"
+HOMEPAGE="https://gitlab.com/Kritzefitz/haskell-setlocale/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
index 89678002e584..a5c23639b2f2 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.6.1:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.16.0
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.6 && <4.14' 'base >=4.6'
-}
+CABAL_CHDEPS=(
+ 'base >=4.6 && <4.14' 'base >=4.6'
+)
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
index f0fd33c8e0da..a3e428f01d9e 100644
--- a/dev-haskell/sha/sha-1.6.4.4.ebuild
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-css/Manifest b/dev-haskell/shakespeare-css/Manifest
deleted file mode 100644
index e04ba2317ec9..000000000000
--- a/dev-haskell/shakespeare-css/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shakespeare-css-1.1.0.tar.gz 1572 BLAKE2B d9c15b65d24ac507c57d013bc440230fa3307e80b5a4a113e8fc7daebb81380c07c86fb18d019c2deed457e18ef6827e36d0d00bd1d2eec08056038b5d1fc2cb SHA512 e855c2be0af9d5d8ed8f9c0ec6e78305a75df983342ebf05300e16c858c28f6316e46cf435f3653c13316dcfbe07ab1fa80e428153a219696eb3de4afd8aacff
diff --git a/dev-haskell/shakespeare-css/metadata.xml b/dev-haskell/shakespeare-css/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/shakespeare-css/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
deleted file mode 100644
index 98f58d694680..000000000000
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into css at compile time. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-i18n/Manifest b/dev-haskell/shakespeare-i18n/Manifest
deleted file mode 100644
index 21ff89b9c0a6..000000000000
--- a/dev-haskell/shakespeare-i18n/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shakespeare-i18n-1.1.0.tar.gz 1440 BLAKE2B badf791117105ee280c73d334a4793a8b7e62accc80ae8615b3925458e1af00342452e4d576d50e49c2251ee52fea30dece9747b73e23e51e0df3ed425c5d6bf SHA512 3e6959a32e5c0cf85ca6875f87b7fcbc430df91750904045f29a7b95a2b26398cf1526daa6b33a7c941b2192c8e9238bdfe1673aa8b7dd2b7cb583a2d9fb0063
diff --git a/dev-haskell/shakespeare-i18n/metadata.xml b/dev-haskell/shakespeare-i18n/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/shakespeare-i18n/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
deleted file mode 100644
index 9c89e735416d..000000000000
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A type-based approach to internationalization. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-js/Manifest b/dev-haskell/shakespeare-js/Manifest
deleted file mode 100644
index de439b46cf38..000000000000
--- a/dev-haskell/shakespeare-js/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shakespeare-js-1.3.0.tar.gz 1625 BLAKE2B 4250b58fc0ef3f3052dad4eb46c4aa2309fe62a2a9cce06201b84364801807f303c13745f559decb1e8145d19c36abc626394f00fd506904576805d277a57a8d SHA512 73840c66a7dc287642a81c7f49a89974e68f924a3a57ba6ea85e51457363956e58030c01b64dd8dd5e81eecd25fe99cb4dcd0e0fdb2ccc52e4a257f63a0aeb6a
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
deleted file mode 100644
index a8341b1ee479..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-text/Manifest b/dev-haskell/shakespeare-text/Manifest
deleted file mode 100644
index a1a722d49d9f..000000000000
--- a/dev-haskell/shakespeare-text/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shakespeare-text-1.1.0.tar.gz 1810 BLAKE2B a352a5efde2437233460a7aa3544f2c2f0d6bb6e68a8b3763fa49ece62e922a89cd8ee11baddff846467756014aa2e44df2fd1cee99ca97523226402bc5d1eef SHA512 45dce0a8ef5e0b45466110fdae3ce73fa6fa053d1c68afc0f7aab20726474b34e7ca3ddde6882e40cd2cd8d37ba2e0f7f4064260879c4dbb81ccd2dd5daadb5b
diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
deleted file mode 100644
index fafe698ceb1a..000000000000
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Interpolation with quasi-quotation: put variables strings (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index 0dc5f4d17d60..c85cb1c3d6e7 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1 +1 @@
-DIST shakespeare-2.0.25.tar.gz 65816 BLAKE2B 65bf2313e74de6516fd0fdde91986e9ded0e8cbba46273402f296fc1a824893725c8b618cdfd1c6194d6b49b303c6ee8cbafd42fc3ffc70e7b9d56f7267d6eb3 SHA512 26805c070c712a7bd549a2923f7b39cf9eaf7c9a3451c0c672eeff3b22e4d3f696887f3846e39c73f1c0add6a21becae9e58bb2821c0158298e105e0a1bf8ac2
+DIST shakespeare-2.0.30.tar.gz 71263 BLAKE2B a3ef788611b83d27d0e188cb11b45e54f5e7ce1ff215c3f62d643f5725022b8e7b3f94af7ce35fe5471311b01b9b6ff532fb6fec5ad4059a6d5be31f65f2b122 SHA512 8b278c712f0e914dee2cb2736f6d859e920ffdd3ffbeb2684eb45d3eafced4bf871cd5f960e31b9355d53f913fee29611f82494ec7b26d8711a2b33ef5a0aca0
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index eda9c06ca0a8..937381521944 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -5,17 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-
- Note there is no dependency on haskell-src-extras.
-
- packages that use this: shakespeare-js, shakespeare-css, shakespeare-interpolated, hamlet, and xml-hamlet
- Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
- </longdescription>
- <use>
- <flag name="test-export">Test export.</flag>
- <flag name="test-coffee">Render tests through coffeescript render function.</flag>
- <flag name="test-roy">Render tests through roy render function.</flag>
- </use>
</pkgmetadata>
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild
deleted file mode 100644
index beb62cf019ba..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A toolkit for making compile-time interpolated templates"
-HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test-coffee test-export test-roy"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/blaze-html:=[profile?]
- dev-haskell/blaze-markup:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
- >=dev-haskell/scientific-0.3.0.0:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- dev-haskell/th-lift:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
- dev-haskell/hunit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag test-coffee test_coffee) \
- $(cabal_flag test-export test_export) \
- $(cabal_flag test-roy test_roy)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
new file mode 100644
index 000000000000..68013fe120da
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: test_coffee:test,test_export:test,test_roy:test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A toolkit for making compile-time interpolated templates"
+HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="<dev-haskell/aeson-3:=[profile?]
+ dev-haskell/blaze-html:=[profile?]
+ dev-haskell/blaze-markup:=[profile?]
+ >=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+ >=dev-haskell/scientific-0.3.0.0:=[profile?]
+ dev-haskell/th-lift:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ dev-haskell/hunit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag test test_coffee) \
+ $(cabal_flag test test_export) \
+ $(cabal_flag test test_roy)
+}
diff --git a/dev-haskell/shell-escape/Manifest b/dev-haskell/shell-escape/Manifest
deleted file mode 100644
index c4ad16d27600..000000000000
--- a/dev-haskell/shell-escape/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shell-escape-0.2.0.tar.gz 6066 BLAKE2B 673e524c8914672fe9a5b955503ba66994a19edfbe1d46069c4a18053318fb731ac9e8949b2fee59ca517429f8b7f8631342d0cbea09a73b85d38f32003ecb9c SHA512 b2e8ae93b13619cd6801b0fb85e4783c2472a57f5162fb397d2cf00468290b0ca6189ba6a54b54efa68b2977d25ec02cdcf8d9c49f0d21cd6d6f1a030dd05db4
diff --git a/dev-haskell/shell-escape/metadata.xml b/dev-haskell/shell-escape/metadata.xml
deleted file mode 100644
index cf3e8b6975f1..000000000000
--- a/dev-haskell/shell-escape/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">solidsnack/shell-escape</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild b/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
deleted file mode 100644
index 944d146c75dd..000000000000
--- a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Shell escaping library"
-HOMEPAGE="https://github.com/solidsnack/shell-escape"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.6.0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index 4f1c8ddb5d8b..e2d9257f7cd5 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1 +1,3 @@
+DIST shelly-1.12.1.tar.gz 75543 BLAKE2B db34e1a5e708192458e5d228b4758aa26812a3f547e39981754f8e3bb7af521c3887fde8e1b859a69b82edafc70be9979af30c918232a15e842f4e9894ed54ee SHA512 3917a03a23e61d5618f897f0ee90a4823980239252f260312ca86c7b364459c58749400e50a0f2ab78822c2eb6283891f993d2f31f0048a3cece19d5c565f05f
+DIST shelly-1.9.0-rev3.cabal 5393 BLAKE2B de11c00ff84352212cbc1d0a238c71686feb10fbe503b0eeda3912c50693d756499b75c779d637a2a171cf15b92a518ce51821c46b72d2dc6af78f513b6a3679 SHA512 f7ebde25f2132b0e4658467001b667f9b6239a609120177312fc849ae60c00d1dabea73c4c3596fe034eb318200004b225757ab095a20ebc98a0cdd678d96a97
DIST shelly-1.9.0.tar.gz 73344 BLAKE2B f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc SHA512 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index d7bff541690f..785c05c3d993 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -5,29 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Shelly provides convenient systems programming in Haskell,
- similar in spirit to POSIX shells. Shelly:
-
- * is aimed at convenience and getting things done rather than
- being a demonstration of elegance.
-
- * has detailed and useful error messages
-
- * maintains its own environment, making it thread-safe.
-
- * is modern, using Text and system-filepath/system-fileio
-
- Shelly is originally forked from the Shellish package.
-
- See the shelly-extra package for additional functionality.
-
- An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
- </longdescription>
- <upstream>
- <remote-id type="github">yesodweb/Shelly.hs</remote-id>
- </upstream>
<use>
<flag name="lifted">run the tests against Shelly.Lifted</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">shelly</remote-id>
+ <remote-id type="github">yesodweb/Shelly.hs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/shelly/shelly-1.12.1.ebuild b/dev-haskell/shelly/shelly-1.12.1.ebuild
new file mode 100644
index 000000000000..5cfdf4924b83
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.12.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: build-examples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="shell-like (systems) programming in Haskell"
+HOMEPAGE="https://github.com/gregwebs/Shelly.hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples lifted"
+
+RDEPEND="
+ >=dev-haskell/async-2.2.3:=[profile?]
+ >=dev-haskell/enclosed-exceptions-1.0.1:=[profile?]
+ >=dev-haskell/lifted-async-0.10.2:=[profile?]
+ >=dev-haskell/lifted-base-0.2.3.2:=[profile?]
+ >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/text-1.2.3.1:=[profile?]
+ >=dev-haskell/transformers-base-0.4.5:=[profile?]
+ >=dev-haskell/unix-compat-0.4.1.1:=[profile?] <dev-haskell/unix-compat-0.8:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/hspec-2.2.2
+ dev-haskell/hspec-contrib
+ >=dev-haskell/hunit-1.2.5.2
+ )
+"
+
+example_exes=(
+ "drain"
+ "run-handles"
+ "Color"
+)
+
+src_prepare() {
+ for e in "${example_exes[@]}"; do
+ export CABAL_CHDEPS=(
+ "${CABAL_CHDEPS[@]}"
+ "Executable ${e}"
+ "executable ${PN}-examples-${e}"
+ )
+ done
+
+ haskell-cabal_src_prepare
+}
+
+src_configure() {
+ config_flags=(
+ $(cabal_flag examples build-examples)
+ $(cabal_flag lifted lifted)
+ )
+
+ haskell-cabal_src_configure "${config_flags[@]}"
+}
+
+pkg_postinst() {
+ ghc-package_pkg_postinst
+
+ elog "The following example executables installed with this package have been"
+ elog "renamed to help prevent name collisions:"
+ elog ""
+
+ for e in "${example_exes[@]}"; do
+ elog "${e} -> ${PN}-examples-${e}"
+ done
+}
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
index 9d59c59b5930..e82add5aa2a4 100644
--- a/dev-haskell/shelly/shelly-1.9.0.ebuild
+++ b/dev-haskell/shelly/shelly-1.9.0.ebuild
@@ -1,45 +1,76 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
#hackport: flags: build-examples:examples
+CABAL_HACKAGE_REVISION=3
+
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
+inherit ghc-package haskell-cabal
DESCRIPTION="shell-like (systems) programming in Haskell"
HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples lifted"
+CABAL_CHDEPS=(
+ 'time >= 1.3 && < 1.10' 'time >=1.3'
+)
+
RDEPEND="dev-haskell/async:=[profile?]
dev-haskell/enclosed-exceptions:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?]
dev-haskell/lifted-async:=[profile?]
dev-haskell/lifted-base:=[profile?]
>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/transformers-base:=[profile?]
<dev-haskell/unix-compat-0.6:=[profile?]
- >=dev-lang/ghc-8.0.2:=
+ >=dev-lang/ghc-9.0.2:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
+ >=dev-haskell/cabal-3.4.1.0
test? ( >=dev-haskell/hspec-2.0
dev-haskell/hspec-contrib
>=dev-haskell/hunit-1.2
>=dev-haskell/text-0.11 )
"
+example_exes=(
+ "drain"
+ "run-handles"
+ "Color"
+)
+
+src_prepare() {
+ for e in "${example_exes[@]}"; do
+ export CABAL_CHDEPS+=(
+ "Executable ${e}"
+ "executable ${PN}-examples-${e}"
+ )
+ done
+
+ haskell-cabal_src_prepare
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag examples build-examples) \
$(cabal_flag lifted lifted)
}
+
+pkg_postinst() {
+ ghc-package_pkg_postinst
+
+ elog "The following example executables installed with this package have been"
+ elog "renamed to help prevent name collisions:"
+
+ for e in "${example_exes[@]}"; do
+ elog "${e} -> ${PN}-examples-${e}"
+ done
+}
diff --git a/dev-haskell/should-not-typecheck/Manifest b/dev-haskell/should-not-typecheck/Manifest
new file mode 100644
index 000000000000..751f92de99a5
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/Manifest
@@ -0,0 +1 @@
+DIST should-not-typecheck-2.1.0.tar.gz 5229 BLAKE2B 66d08f52a72dc40ef549fdd724889937506d1836eb60fecd8d55801287504586718e14d91d5be8c0e49e6b382281e3eea32757001ba0f4dc446ef063fd024ec8 SHA512 46ba4435a4408e23dfe6e04f827a7efcfd3c94a4a53a0562061d5cd40c11fcbae7569e695329fe98f9d9ecea1999ac68da6594d2ca60c2efccdac2d6d674d65d
diff --git a/dev-haskell/should-not-typecheck/metadata.xml b/dev-haskell/should-not-typecheck/metadata.xml
new file mode 100644
index 000000000000..3358bf72024c
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <longdescription>
+ For examples and an introduction to the library please take a look at the &lt;https://github.com/CRogers/should-not-typecheck#should-not-typecheck- README&gt; on github.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">CRogers/should-not-typecheck</remote-id>
+ </upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..3830e5599182
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A HUnit/hspec assertion library to verify that an expression does not typecheck"
+HOMEPAGE="https://github.com/CRogers/should-not-typecheck"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hunit-1.2:=[profile?]
+ >=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+ test? ( >=dev-haskell/hspec-2.1
+ >=dev-haskell/hspec-expectations-0.6 )
+"
diff --git a/dev-haskell/silently/Manifest b/dev-haskell/silently/Manifest
index d8bd261ae1cc..0927f9627cf3 100644
--- a/dev-haskell/silently/Manifest
+++ b/dev-haskell/silently/Manifest
@@ -1 +1,2 @@
DIST silently-1.2.5.1.tar.gz 3358 BLAKE2B 2e7927bf663b015a52ef62266c07b30ad66e0bee2122b1a75faf9e13756e3e15bb2a15d16189d75fd9b46749ce0b1ffc66a76cb8e395e5639627356f9dab405c SHA512 1347a1da5082ca015ca609ef313ad04c253d12ab7b08f8f714b4c70282d3c01ba753f278bef4111fd8a0cc25bd3be37908b7e565d99d4b7c2a2fcc019febb8d6
+DIST silently-1.2.5.3.tar.gz 4430 BLAKE2B 1c3ee240e99684b1a83306885e8d567ad75e35158c2c41b0d4c897093e0d2344ec3367b84f2a3ed60efa6ff303d7b030d299acaa472c8811f3a016e65427eef7 SHA512 1b05420e363ec763c08fb3767cde9b8c701a418ccdfba9b19731d87650f180955ae8affb0298d923a24b7354340945f973fdebdba7d91ac7aeb2cd904820afdb
diff --git a/dev-haskell/silently/metadata.xml b/dev-haskell/silently/metadata.xml
index 3f11654fc374..1f043a22f0ca 100644
--- a/dev-haskell/silently/metadata.xml
+++ b/dev-haskell/silently/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">trystan/silently</remote-id>
+ <remote-id type="hackage">silently</remote-id>
+ <remote-id type="github">hspec/silently</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/silently/silently-1.2.5.1.ebuild b/dev-haskell/silently/silently-1.2.5.1.ebuild
index c987e9bc3bea..aada80e79137 100644
--- a/dev-haskell/silently/silently-1.2.5.1.ebuild
+++ b/dev-haskell/silently/silently-1.2.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/silently/silently-1.2.5.3.ebuild b/dev-haskell/silently/silently-1.2.5.3.ebuild
new file mode 100644
index 000000000000..e4021c430b0e
--- /dev/null
+++ b/dev-haskell/silently/silently-1.2.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Prevent or capture writing to stdout and other handles"
+HOMEPAGE="https://github.com/hspec/silently"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ dev-haskell/nanospec
+ dev-haskell/temporary
+ )
+"
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 2cd0af462d7e..018caf020385 100644
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
+++ b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/simple-sendfile/Manifest b/dev-haskell/simple-sendfile/Manifest
index 66dada28c6ec..51b46f059757 100644
--- a/dev-haskell/simple-sendfile/Manifest
+++ b/dev-haskell/simple-sendfile/Manifest
@@ -1 +1,2 @@
DIST simple-sendfile-0.2.28.tar.gz 343120 BLAKE2B fd6a5e083707e113fe4637ee8242b6036f813deec2ad2adf7d9e91338b4d15ef950d35e6cfc69be569601272f8beb12b823e4528d6a9933f3bc04533835f9240 SHA512 9a08d4ba26cd05b1fff3e72bd0846260d4c04921a5ca1f86258c61e51ee5ccf8e14dd2aea0bee44590572feba1832b2562b75b5f71f004c705f02cd0a0f000d1
+DIST simple-sendfile-0.2.30.tar.gz 343470 BLAKE2B ed9ef76782ed310207aa3a04c78b92c11eb3d25e2df934216feeedde29a5963d04b38832b5604e987dc4ca8b83ec653000cb7298761e13e96f477e7fb5767e7d SHA512 ae624939d54bf5ed8aa2c0727a29696730ba6b1d520f28bdc5b42a8e4c4bc03980821639fb8e16702a360dbd0396aea8a997055d22812bef3d22ffaaac53f759
diff --git a/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
new file mode 100644
index 000000000000..0dc669f7e697
--- /dev/null
+++ b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
@@ -0,0 +1,56 @@
+From c16550e29f6c6cbe35e133c347a82821fa67f284 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sun, 18 Jun 2023 21:52:42 +0000
+Subject: [PATCH] Fix build on musl 1.2.4
+
+Remove references to the deprecated LFS64 compatibility symbols, and
+replace them with the normal interfaces. All calls are automatically 64
+bit on musl, and define _FILE_OFFSET_BITS=64 to make sure calls on glibc
+are 64 bits.
+---
+ Network/Sendfile/Linux.hsc | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/Network/Sendfile/Linux.hsc b/Network/Sendfile/Linux.hsc
+index 4f7adab..96bfb04 100644
+--- a/Network/Sendfile/Linux.hsc
++++ b/Network/Sendfile/Linux.hsc
+@@ -1,6 +1,8 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+ {-# LANGUAGE CPP #-}
+
++#define _FILE_OFFSET_BITS 64
++
+ module Network.Sendfile.Linux (
+ sendfile
+ , sendfile'
+@@ -34,9 +36,6 @@ import System.Posix.Types
+ #include <sys/sendfile.h>
+ #include <sys/socket.h>
+
+-isLargeOffset :: Bool
+-isLargeOffset = sizeOf (0 :: COff) == 8
+-
+ isLargeSize :: Bool
+ isLargeSize = sizeOf (0 :: CSize) == 8
+
+@@ -142,15 +141,7 @@ sendfileloop dst src offp len hook = do
+
+ -- Dst Src in order. take care
+ foreign import ccall unsafe "sendfile"
+- c_sendfile32 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-foreign import ccall unsafe "sendfile64"
+- c_sendfile64 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-c_sendfile
+- | isLargeOffset = c_sendfile64
+- | otherwise = c_sendfile32
++ c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+
+ ----------------------------------------------------------------
+
+--
+2.41.0
+
diff --git a/dev-haskell/simple-sendfile/metadata.xml b/dev-haskell/simple-sendfile/metadata.xml
index 615151a0ab7e..382a399478bc 100644
--- a/dev-haskell/simple-sendfile/metadata.xml
+++ b/dev-haskell/simple-sendfile/metadata.xml
@@ -5,11 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Cross platform library for the sendfile system call.
- This library tries to call minimum system calls which
- are the bottleneck of web servers.
- </longdescription>
<use>
<flag name="allow-bsd">Allow use of BSD sendfile (disable on
GNU/kFreeBSD)</flag>
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 79bf38076b5a..cb3de660fcc8 100644
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+allow-bsd"
RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
new file mode 100644
index 000000000000..2e20703f9fe4
--- /dev/null
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cross platform library for the sendfile system call"
+HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+allow-bsd"
+
+RDEPEND="dev-haskell/network:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( dev-haskell/conduit
+ dev-haskell/conduit-extra
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hunit
+ dev-haskell/resourcet )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.30-musl-1.2.4.patch"
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag allow-bsd allow-bsd)
+}
diff --git a/dev-haskell/singleton-bool/Manifest b/dev-haskell/singleton-bool/Manifest
index 29aa5b9a31e8..65e9ad557f19 100644
--- a/dev-haskell/singleton-bool/Manifest
+++ b/dev-haskell/singleton-bool/Manifest
@@ -1 +1,2 @@
DIST singleton-bool-0.1.5.tar.gz 3598 BLAKE2B 3825990751089e403b8056e6f8d39714b19a06dd895e422bc04c7539131d63435ac351971a400310c2ee63ae745203f64d8edbe93487557108d0e9a9ed158c80 SHA512 a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a
+DIST singleton-bool-0.1.7.tar.gz 3974 BLAKE2B 3552910a9a65bd00983e6b21265a03f3683f905dbe3d146df515ece7344ec8b36851bb06f0e5bc96fda74cde8ebdcaef6e01ef571645ecaa522f05debe1088c8 SHA512 b926b35fb82bf3d2f1bc216ce2e15e3a9908b4a39458c39f4b171282498fd6f645c3ef0c5b10c67f2ac93cab76d45be30a8ec2dfa36d52cdb263b25229d89d58
diff --git a/dev-haskell/singleton-bool/metadata.xml b/dev-haskell/singleton-bool/metadata.xml
index 937381521944..f42b2a304541 100644
--- a/dev-haskell/singleton-bool/metadata.xml
+++ b/dev-haskell/singleton-bool/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">singleton-bool</remote-id>
+ <remote-id type="github">phadej/singleton-bool</remote-id>
+ </upstream>
</pkgmetadata>
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 933efdd4c828..898653281d56 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
@@ -25,8 +25,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.16.0
"
-src_prepare() {
- default
- cabal_chdeps \
- 'base >=4.6 && <4.13' 'base >=4.6'
-}
+CABAL_CHDEPS=(
+ 'base >=4.6 && <4.13' 'base >=4.6'
+)
diff --git a/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild b/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild
new file mode 100644
index 000000000000..804009abfd9b
--- /dev/null
+++ b/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type level booleans"
+HOMEPAGE="https://github.com/phadej/singleton-bool#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/boring-0.2.1:=[profile?] <dev-haskell/boring-0.3:=[profile?]
+ >=dev-haskell/dec-0.0.5:=[profile?] <dev-haskell/dec-0.1:=[profile?]
+ >=dev-haskell/some-1.0.4:=[profile?] <dev-haskell/some-1.1:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/size-based/Manifest b/dev-haskell/size-based/Manifest
deleted file mode 100644
index 0d52f56d587a..000000000000
--- a/dev-haskell/size-based/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST size-based-0.1.2.0.tar.gz 10324 BLAKE2B 789cf4603a0539ef3a919c43f64d9613d8473ea9b59c6a4e77a22b07916b01ad773a2c758b54439fab961b4c89891122651a21fb19231cd561a7a2af5f766f74 SHA512 661bcf34fa52253a54c2a0530bc484ef74c687ea98f7de7ff11232ac3be1f653dabb70e641bc5724ee35bdf19b86a20ed0fc9b56a4730c07aaf7a11900a99409
diff --git a/dev-haskell/size-based/metadata.xml b/dev-haskell/size-based/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/size-based/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/size-based/size-based-0.1.2.0.ebuild b/dev-haskell/size-based/size-based-0.1.2.0.ebuild
deleted file mode 100644
index 353eda4a9c94..000000000000
--- a/dev-haskell/size-based/size-based-0.1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Sized functors, for size-based enumerations"
-HOMEPAGE="https://hackage.haskell.org/package/size-based"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?]
- <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
- cabal_chdeps \
- 'template-haskell >=2.5 && <2.15' 'template-haskell >=2.5'
-}
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 515ebcee0a7c..44bd9a6c0975 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -31,4 +31,7 @@
This package includes Skein v1.3. Versions of this package
before 1.0.0 implemented Skein v1.1.
</longdescription>
+ <upstream>
+ <remote-id type="github">meteficha/skein</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
index 89a3273ac90a..a3f1621a6ea0 100644
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ b/dev-haskell/skein/skein-1.0.9.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/Manifest b/dev-haskell/skylighting-core/Manifest
index b05a4bb32a58..7e9136ec80c8 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1,2 +1,2 @@
-DIST skylighting-core-0.10.5.tar.gz 711899 BLAKE2B 5f147c010a462c1ac8ac48c0b6c5502f91dd9e62a6e3e10d822aefcc81768e6b3d9cd34ac933d352ce14ea4d21e81e7e4b413373cfe616fb5a30f72416532d30 SHA512 cde536276f6c9bbae78cafa33016629ba2b78bcba317c88af3dac7cd384ce3028bc5733a644cac72e84810751faada2db51abe3a8c717b8db32a3f625fb9d7ba
-DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
+DIST skylighting-core-0.12.3.1.tar.gz 782536 BLAKE2B 21d908bd6f3584f7b4de91f5b61f06e9e0dffdeeb4f725f73520ae6bdfbdb482995a3453ba44db212e95585f8268aeb8535fb896f78707ab49c362675e605046 SHA512 85d005dc4fa6bf968f29a1721d669a310261052c68dbe889dc053400de751a8cda3a99a9aa7d19b3921fb81ea482637fd650140776d90207b876e639a736ef19
+DIST skylighting-core-0.14.tar.gz 864021 BLAKE2B 324b5f7e429c3f7c9ec01722c3243e811311b4d25fd3360252f84d391e981d31c5b9bfb20d1c26176a37aac0c4e6b345257e6d3135124f49f40ad38c5784e4a0 SHA512 7b1ae0160c656eb38b765b9d545b065aaa07bf02acddbf74bdff42914d74b07e556df7f33e67557870d4582a0f9e871b6f4ffad4cb17082ad91bb64e89569753
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 000000000000..8dce65f4c855
--- /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/metadata.xml b/dev-haskell/skylighting-core/metadata.xml
index 4bf934c17d91..0482b5459a92 100644
--- a/dev-haskell/skylighting-core/metadata.xml
+++ b/dev-haskell/skylighting-core/metadata.xml
@@ -6,20 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="executable">Build the skylighting executable.</flag>
+ <flag name="executable">Build skylighting-extract tool</flag>
</use>
- <longdescription>
- Skylighting is a syntax highlighting library.
- It derives its tokenizers from XML syntax
- definitions used by KDE's KSyntaxHighlighting
- framework, so any syntax supported by that
- framework can be added. An optional command-line
- program is provided.
- Skylighting is intended to be the successor to
- highlighting-kate.
- This package provides the core highlighting
- functionality under a permissive license. It also
- bundles XML parser definitions licensed under the
- GPL.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">skylighting-core</remote-id>
+ <remote-id type="github">jgm/skylighting</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild
deleted file mode 100644
index 72fb1c369e7f..000000000000
--- a/dev-haskell/skylighting-core/skylighting-core-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- >=dev-haskell/ansi-terminal-0.7:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/colour-2.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- dev-libs/libpcre:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/diff
- dev-haskell/pretty-show
- dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- --flag=system-pcre
-}
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
new file mode 100644
index 000000000000..ca6dec5bf5d9
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/colour-2.0:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( dev-haskell/diff
+ dev-haskell/pretty-show
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild
new file mode 100644
index 000000000000..b0dddfad41b1
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/colour-2.0:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-haskell/xml-conduit-1.9.1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/diff
+ dev-haskell/pretty-show
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild
deleted file mode 100644
index f7663f71cac0..000000000000
--- a/dev-haskell/skylighting-core/skylighting-core-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- >=dev-haskell/ansi-terminal-0.7:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/colour-2.0:=[profile?]
- dev-haskell/hxt:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/regex-pcre:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- dev-libs/libpcre:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/diff
- dev-haskell/hunit
- dev-haskell/pretty-show
- dev-haskell/quickcheck
- dev-haskell/random
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- --flag=system-pcre
-}
diff --git a/dev-haskell/skylighting-format-ansi/Manifest b/dev-haskell/skylighting-format-ansi/Manifest
new file mode 100644
index 000000000000..0089f06b478c
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-ansi-0.1.tar.gz 5350 BLAKE2B fa766e78e71880b13bbd81727a1f96f0d9e027c1615a3e5a3868c5a2df1349e4d2e10bb8a5f07740fba7b25b59be7381035cdbefddb9c7a8157c421b9d986c95 SHA512 387af200df34dbd83854ee268a5fa4c157d803b8f766a6da4491b8f19faef88e226027d3906a8c72cab764e53cac12637b1c7ba11b6bbb318aa0ae4dd4910d37
diff --git a/dev-haskell/skylighting-format-ansi/metadata.xml b/dev-haskell/skylighting-format-ansi/metadata.xml
new file mode 100644
index 000000000000..74050c5c598a
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">skylighting-format-ansi</remote-id>
+ <remote-id type="github">jgm/skylighting</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild b/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild
new file mode 100644
index 000000000000..2b886fa847c6
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.7:=[profile?]
+ >=dev-haskell/colour-2.0:=[profile?]
+ dev-haskell/skylighting-core:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting-format-blaze-html/Manifest b/dev-haskell/skylighting-format-blaze-html/Manifest
new file mode 100644
index 000000000000..811a745d658a
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-blaze-html-0.1.1.1.tar.gz 4853 BLAKE2B 686b68bb04bcc923e66a075fbcdb33ab746846c9e330f349cf550405f61f9808177facb25f5c96c4d79b300f18cba99245462b15663513d5cbf518f03de0e9b1 SHA512 0401468113e144890b28c214d28a1bee8bb3f74c67503add09539759f7bdd5860a07d1544965391c5dd68ef1f7e30bcf7880133859a7f6f92792fa0d3ea7c55a
diff --git a/dev-haskell/skylighting-format-blaze-html/metadata.xml b/dev-haskell/skylighting-format-blaze-html/metadata.xml
new file mode 100644
index 000000000000..eada8b70077b
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">skylighting-format-blaze-html</remote-id>
+ <remote-id type="github">jgm/skylighting</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild b/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild
new file mode 100644
index 000000000000..0b60e2137a1b
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HTML formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/skylighting-core:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/skylighting-format-context/Manifest b/dev-haskell/skylighting-format-context/Manifest
new file mode 100644
index 000000000000..1d7ef1411467
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-context-0.1.0.1.tar.gz 3154 BLAKE2B 6606345118dd3daf1deed31e5dc1bd8ea15c579d9a09c73b34e0e527bf0e00455b9fadd1a0dc92def840983300131b7a0bb2c1807fdf3c325a783cdeab33d37c SHA512 b582277924a32af40a96db0f561566b8766ffc622156823567fbec7a0515e33392afef26b8316359edf45beee5bf0da1884ae380a6a9eeb3a8ad0bec3379f3a6
diff --git a/dev-haskell/skylighting-format-context/metadata.xml b/dev-haskell/skylighting-format-context/metadata.xml
new file mode 100644
index 000000000000..118ba6eb46bb
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">skylighting-format-context</remote-id>
+ <remote-id type="github">jgm/skylighting</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild b/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild
new file mode 100644
index 000000000000..2df578868ddf
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ConTeXt formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/skylighting-core:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting-format-latex/Manifest b/dev-haskell/skylighting-format-latex/Manifest
new file mode 100644
index 000000000000..ef68f8a59a3e
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-latex-0.1.tar.gz 3777 BLAKE2B f8e0b8deaa2652ee6423002148ee4c8153d119dec603c71f7217329d27d32c006a0504474ce55ce5e7caf3753091f63d92feac6ac55579cb4d0f1b5f7a3d2a92 SHA512 e73d7ea817e16af8c234c5260bce898ba22932641c7faa5891f902bde39be8f3faa02d2e5185b5f833747bfc57ad70aa9158b3b0c3231e10d795ff6e2be520a7
diff --git a/dev-haskell/skylighting-format-latex/metadata.xml b/dev-haskell/skylighting-format-latex/metadata.xml
new file mode 100644
index 000000000000..bf343dc90530
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">skylighting-format-latex</remote-id>
+ <remote-id type="github">jgm/skylighting</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild b/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild
new file mode 100644
index 000000000000..d76e9b6d6e10
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="LaTeX formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/skylighting-core:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index 53a2dc76d3d4..feed0d11c934 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,2 +1,2 @@
-DIST skylighting-0.10.5.tar.gz 647857 BLAKE2B fb10b9aa65598176113cc4e1c62b25b267f37c2a7a45decc819f8ac5972a653a2c4c16ded4ce155e7ddc8ac87108b969096daa4a7b68cf4d02a5579650c1575a SHA512 fc4fa852e12c6ac16db0de14744f9b079d0c0b0012edbdd2a9737efb7dbe2e36358b4ce713246e6cde4477b865f469e9eb3e1c2536c0a9acff39baa1de3d2d0a
-DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
+DIST skylighting-0.12.3.1.tar.gz 1218260 BLAKE2B 78f26d3477a6327a8e3c99f31ffe3c1d1b57c86730c06f715d8b2db9d267526bf3d0605639679fc38e4faff06e81edc3d2c9d85e7ce3c557b73f47ae8e81b999 SHA512 3eb93400612992d5aed828ebe0c1b76dbfbd7ec9cd0d0d667b524df51968997ffd429bfdbecbaa32a6108903872e119614b16f8aedf00eaf6d9a7b79ccb06c58
+DIST skylighting-0.14.tar.gz 1393626 BLAKE2B 884f990b77d38c71287486ec0c2d652bf408a21878b11cac071053616b78ea759e83cd8f4c54befdffb2d4b32dbd352e2adc5db20bfacb1209866e1992c645b1 SHA512 33d36f7181c0a6b94d3319707d6ea68199239a7699c18c6392e8ae49d97d7249f57f4d42a9fb09fa9df643268aa57b8e42e2204a6a002f8222ef00284dfd25d4
diff --git a/dev-haskell/skylighting/metadata.xml b/dev-haskell/skylighting/metadata.xml
index 05c0818ed2d1..bd25baabc366 100644
--- a/dev-haskell/skylighting/metadata.xml
+++ b/dev-haskell/skylighting/metadata.xml
@@ -6,19 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="executable">Build the skylighting executable.</flag>
+ <flag name="executable">Whether to build the skylighting program</flag>
</use>
- <longdescription>
- Skylighting is a syntax highlighting library with
- support for over one hundred languages. It derives
- its tokenizers from XML syntax definitions used
- by KDE's KSyntaxHighlighting framework, so any
- syntax supported by that framework can be added.
- An optional command-line program is provided.
- Skylighting is intended to be the successor to
- highlighting-kate.
- </longdescription>
<upstream>
+ <remote-id type="hackage">skylighting</remote-id>
<remote-id type="github">jgm/skylighting</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild b/dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild
deleted file mode 100644
index 364760e68655..000000000000
--- a/dev-haskell/skylighting/skylighting-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="~dev-haskell/skylighting-core-0.10.5:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- dev-libs/libpcre:=
- executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
- dev-haskell/pretty-show:=[profile?]
- dev-haskell/text:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bootstrap \
- $(cabal_flag executable executable) \
- --flag=system-pcre
-}
diff --git a/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
new file mode 100644
index 000000000000..57ac6c98fc61
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.12.3.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/pretty-show:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bootstrap \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/skylighting-0.14.ebuild b/dev-haskell/skylighting/skylighting-0.14.ebuild
new file mode 100644
index 000000000000..a7b302f95c3b
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.14:=[profile?]
+ >=dev-haskell/skylighting-format-ansi-0.1:=[profile?] <dev-haskell/skylighting-format-ansi-0.2:=[profile?]
+ >=dev-haskell/skylighting-format-blaze-html-0.1:=[profile?] <dev-haskell/skylighting-format-blaze-html-0.2:=[profile?]
+ >=dev-haskell/skylighting-format-context-0.1:=[profile?] <dev-haskell/skylighting-format-context-0.2:=[profile?]
+ >=dev-haskell/skylighting-format-latex-0.1:=[profile?] <dev-haskell/skylighting-format-latex-0.2:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/pretty-show:=[profile?]
+ dev-haskell/text:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bootstrap \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild b/dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild
deleted file mode 100644
index d14871ce7ca1..000000000000
--- a/dev-haskell/skylighting/skylighting-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="~dev-haskell/skylighting-core-0.8.5:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- dev-libs/libpcre:=
- executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
- dev-haskell/pretty-show:=[profile?]
- dev-haskell/text:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bootstrap \
- $(cabal_flag executable executable) \
- --flag=system-pcre
-}
diff --git a/dev-haskell/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
index 651cb217516b..542c73011ebd 100644
--- a/dev-haskell/smallcheck/Manifest
+++ b/dev-haskell/smallcheck/Manifest
@@ -1 +1,2 @@
DIST smallcheck-1.2.0.tar.gz 19047 BLAKE2B 4ecd56b2e0680b4d4e7f80c1c13b9a3a621cae32ec4a8d0605c57fb2bc4882df5f3df05068caf76644286ccd4345fd49f26a73b81f399ca19d1e2200acf0912f SHA512 97c021f3efd6541de99854cb2e8511d4af17225cbcbe17ddfb2efd011d75bd10114b7c8312532bd1c5516e2980b7ad03feb571ec26b91f7258f43460c7bc39a8
+DIST smallcheck-1.2.1.tar.gz 18932 BLAKE2B df248fb94e06eccc1d95ca168a47ecc7ac2853b889b3e778ee36843e5f76caa14dc90182b228610c7a3a24993bb8464ad2ff80f33aa95725b125d54d7b59f6f2 SHA512 42706fb769423bd7f8c2fe7a52d23b8cb4a22bfaabf43b8c29db2923c6413191158801e43d5597258f42ce2430ec81546d172d90246c9d3cf0f9343694eb5eeb
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
index a79f1b7f78af..97abb8fcef64 100644
--- a/dev-haskell/smallcheck/metadata.xml
+++ b/dev-haskell/smallcheck/metadata.xml
@@ -5,13 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- SmallCheck is similar to QuickCheck (Claessen and Hughes 2000-) but
- instead of testing for a sample of randomly generated values, SmallCheck
- tests properties for all the finitely many values up to some depth,
- progressively increasing the depth used.
- </longdescription>
<upstream>
- <remote-id type="github">feuerbach/smallcheck</remote-id>
+ <remote-id type="github">Bodigrim/smallcheck</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
index b75ac56a998c..af2f2cb6e783 100644
--- a/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
+++ b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.5.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/logict:=[profile?]
diff --git a/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild b/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild
new file mode 100644
index 000000000000..439d74f19d08
--- /dev/null
+++ b/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A property-based testing library"
+HOMEPAGE="https://github.com/Bodigrim/smallcheck"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/logict:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/nats:=[profile?]
+ dev-haskell/semigroups:=[profile?]
+ dev-haskell/void:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
deleted file mode 100644
index e8acb9d91898..000000000000
--- a/dev-haskell/snap-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
deleted file mode 100644
index a31266da8cde..000000000000
--- a/dev-haskell/snap-core/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="portable">No non-haskell unportable code.</flag>
- </use>
- <longdescription>
- Snap is a simple and fast web development framework and server written in
- Haskell. For more information or to download the latest version, you can
- visit the Snap project website at &lt;http://snapframework.com/&gt;.
-
- This library contains the core definitions and types for the Snap framework,
- including:
-
- 1. Primitive types and functions for HTTP (requests, responses, cookies,
- post/query parameters, etc)
-
- 2. Type aliases and helper functions for Iteratee I/O
-
- 3. A monad for programming web handlers called \"Snap\", inspired by
- happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
-
- * Stateful access to the HTTP request and response objects
-
- * Monadic failure (i.e. MonadPlus/Alternative instances) for declining
- to handle requests and chaining handlers together
-
- * Early termination of the computation if you know early what you want
- to return and want to prevent further monadic processing
-
- /Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
- some iteratee utilities are in "Snap.Iteratee".
-
- Higher-level facilities for building web applications (like user/session
- management, component interfaces, data modeling, etc.) are planned but not
- yet implemented, so this release will mostly be of interest for those who:
-
- * need a fast and minimal HTTP API at roughly the same level of abstraction
- as Java servlets, or
-
- * are interested in contributing to the Snap Framework project.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
deleted file mode 100644
index 0d7046af4b4e..000000000000
--- a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-#hackport: flags: +network-uri
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-# Fixed in next release: https://github.com/snapframework/snap-core/commit/49a8090d7834a0ef9b438048e96be36e55b2fbf5
-RESTRICT=test # test relied on headers ordering
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
- >=dev-haskell/io-streams-1.3:=[zlib,profile?] <dev-haskell/io-streams-1.6:=[zlib,profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
- >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
- >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
- >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
- >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
- !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4
- >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
- >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug) \
- --flag=network-uri \
- $(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
deleted file mode 100644
index 9e34c3488e8f..000000000000
--- a/dev-haskell/snap-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
deleted file mode 100644
index c02d9d573bff..000000000000
--- a/dev-haskell/snap-server/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="build-pong">Build a server that just returns "PONG"</flag>
- <flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
- <flag name="portable">no non-haskell unportable code.</flag>
- </use>
- <longdescription>
- Snap is a simple and fast web development framework and server written in
- Haskell. For more information or to download the latest version, you can
- visit the Snap project website at &lt;http://snapframework.com/&gt;.
-
- The Snap HTTP server is a high performance, epoll-enabled, iteratee-based web
- server library written in Haskell. Together with the @snap-core@ library upon
- which it depends, it provides a clean and efficient Haskell programming
- interface to the HTTP protocol.
-
- Higher-level facilities for building web applications (like user/session
- management, component interfaces, data modeling, etc.) are planned but not
- yet implemented, so this release will mostly be of interest for those who:
-
- * need a fast and minimal HTTP API at roughly the same level of abstraction
- as Java servlets, or
-
- * are interested in contributing to the Snap Framework project.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
deleted file mode 100644
index 4cebd1763301..000000000000
--- a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?]
- >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
- >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
- >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.6.2:=
- openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
- >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
- >=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
- >=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
- >=dev-haskell/parallel-3 <dev-haskell/parallel-4
- >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
- >=dev-haskell/random-1.0 <dev-haskell/random-1.2
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
- >=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
- >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag build-pong build-pong) \
- $(cabal_flag debug debug) \
- $(cabal_flag openssl openssl) \
- $(cabal_flag portable portable)
-}
diff --git a/dev-haskell/socks/socks-0.6.1.ebuild b/dev-haskell/socks/socks-0.6.1.ebuild
index 1ca6acd551eb..0b1614ba5f7d 100644
--- a/dev-haskell/socks/socks-0.6.1.ebuild
+++ b/dev-haskell/socks/socks-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/some/Manifest b/dev-haskell/some/Manifest
new file mode 100644
index 000000000000..1a6a770766d0
--- /dev/null
+++ b/dev-haskell/some/Manifest
@@ -0,0 +1 @@
+DIST some-1.0.5.tar.gz 10917 BLAKE2B 3acf2a7fc75466a343f0d6030b7d5357de0a351b64f50556dab65ac618d1c3eaac6f5f2128f1c1a4becf11d45f70bee00f0214f79aa0495f2c309d13381b0bef SHA512 17b316d074c1afb755440c0284bb40e0f2ad9229ff10f991c28259786f97d214d271a05d1b603ccccbaab1e9fe6523091293773d14529bd5622c2f71e30d8763
diff --git a/dev-haskell/some/metadata.xml b/dev-haskell/some/metadata.xml
new file mode 100644
index 000000000000..e9b6d1f84d77
--- /dev/null
+++ b/dev-haskell/some/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="newtype-unsafe">Use implementation using @newtype@ and unsafe @Any@, instead of GADT</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">some</remote-id>
+ <remote-id type="github">haskellari/some</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/some/some-1.0.5.ebuild b/dev-haskell/some/some-1.0.5.ebuild
new file mode 100644
index 000000000000..e5083536c7cc
--- /dev/null
+++ b/dev-haskell/some/some-1.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Existential type: Some"
+HOMEPAGE="https://github.com/haskellari/some"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+newtype-unsafe"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag newtype-unsafe newtype-unsafe)
+}
diff --git a/dev-haskell/sop-core/Manifest b/dev-haskell/sop-core/Manifest
index b0ee8f52ff3f..ad3be3650bb8 100644
--- a/dev-haskell/sop-core/Manifest
+++ b/dev-haskell/sop-core/Manifest
@@ -1 +1 @@
-DIST sop-core-0.5.0.1.tar.gz 28666 BLAKE2B 66e40ecddf994165a37c7aa6d6d06cff3a114b15ca380fadef135df6fd19e3aa31c8602b2e58fa794ce4dce0e10fe8fce17e8d9e1f06dd30f0610aec7e1f32d9 SHA512 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
+DIST sop-core-0.5.0.2.tar.gz 28505 BLAKE2B ec478dd47a6eae08a3b3a462c179fd867e592910dfac1b2d20a5a2f27f565fab15611a3b5a041b89c9284f8499fbafdb75ab1ce63dc7880afd76dbb78e11fc88 SHA512 bf71bc1823c567bc82c3a5a3166cbb4f4826149d66ec0871d11706512ce823b40ce6ce210cc5ba763a423a8d643b1819237e9b7f0950e901d445e05ccd78597b
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
deleted file mode 100644
index bc5901a41bb9..000000000000
--- a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="True Sums of Products"
-HOMEPAGE="https://hackage.haskell.org/package/sop-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
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
new file mode 100644
index 000000000000..62b32628feaa
--- /dev/null
+++ b/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/sop-core"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+ 'base >= 4.9 && < 4.17' 'base >= 4.9'
+)
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index dbb1d74cc5e1..0a9da7763ad1 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1 +1,2 @@
DIST split-0.2.3.4.tar.gz 15942 BLAKE2B a4133badeadcf172901756f23e73490dfc4dce5ac7dda348fc38e4d33c43edb0509262e16b88d5d81e192a5c3d842e3fd3e2c8c135607b2a19efd9d48715d45f SHA512 a60566106a5f285224b0d555d30b2af3315c707012f5c8e9384d4b8216894e6a6263e838b0e367418c4f8bfb5f4f2cc056ca14acb6b27a5ca3446576b057ca15
+DIST split-0.2.3.5.tar.gz 15746 BLAKE2B 2b96d16dd6128447d2f082930973e17d105515610e66ff2f8afbd0e92aa60b9836520240f0ba1d7b030a2e544ef0eba6ace6d87f430601dee270da0a1799082a SHA512 a88ff185d0e3ae4908911b70475831baa01ba6cce74fe187ed47dccb28a06b83ca9ec03fa980b77aced75c38fa1dede5166c839c3bfd7f30585ae9b45157a8b9
diff --git a/dev-haskell/split/metadata.xml b/dev-haskell/split/metadata.xml
index 937381521944..0844e8f6396e 100644
--- a/dev-haskell/split/metadata.xml
+++ b/dev-haskell/split/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">split</remote-id>
+ <remote-id type="github">byorgey/split</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/split/split-0.2.3.4.ebuild b/dev-haskell/split/split-0.2.3.4.ebuild
index 108abc90a696..d220535d29ce 100644
--- a/dev-haskell/split/split-0.2.3.4.ebuild
+++ b/dev-haskell/split/split-0.2.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -24,9 +24,6 @@ DEPEND="${RDEPEND}
test? ( >=dev-haskell/quickcheck-2.4 )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base < 4.15' 'base < 5'
-}
+CABAL_CHDEPS=(
+ 'base < 4.15' 'base < 5'
+)
diff --git a/dev-haskell/split/split-0.2.3.5.ebuild b/dev-haskell/split/split-0.2.3.5.ebuild
new file mode 100644
index 000000000000..53a618932e4d
--- /dev/null
+++ b/dev-haskell/split/split-0.2.3.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists"
+HOMEPAGE="https://hackage.haskell.org/package/split"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.4 )
+"
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
index e5d4f6bcb517..fa1b5e7322e8 100644
--- a/dev-haskell/splitmix/Manifest
+++ b/dev-haskell/splitmix/Manifest
@@ -1 +1,3 @@
-DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
+DIST splitmix-0.1.0.3.tar.gz 20754 BLAKE2B b9eecbdc2f05361aaa852afd8f6b0c6ca220b2d09e0a0d598796636ace0f995c39defb6d84c6c3ed1bba2e3822ef1bf48f2f34d5ac4406031c4ae5b6cf6d0824 SHA512 22a3f0759e1c1150aabde01a77b48087509dfc7ff9614e97e5e06af73f533170993ff2e18101d940e7ddba81b8d6e496795be3851fccfa07b75e9d922f325064
+DIST splitmix-0.1.0.4-rev2.cabal 6537 BLAKE2B ca7d01b9fd1f16d89699e6cd024096bccd39b0ef370726c37b016ce3c3da7db9231e6cea2313d9fc2e91b046e9dd65d24c85139ce598495d055a2e90d98c6dff SHA512 7c23b28ed7af57c7c08c286da9a8de7cb2d4e24f9bea0b36a5c0235e2f8e2e9a25fd23af1792b726780822ae27cc89c0143158693acc5f916106a6ceb40cd2ed
+DIST splitmix-0.1.0.4.tar.gz 22382 BLAKE2B 1a6636790bae725410cb3b7c75cf0b24f1e0669b399248d9236d7f7d22547229f3cb05d61d1b6f66bb4cb9ca15a1c11f1143797b5de5c88e81315aff9309dc55 SHA512 9a5cbe8100d44fadeb8bf009b03b1770d6b86ef0f71d625e3fb909881d599f4122833647c13a78152369e2744327d5c3f8b552fdc6a47d2705891ca6331c268e
diff --git a/dev-haskell/splitmix/metadata.xml b/dev-haskell/splitmix/metadata.xml
index e03ae875fc0c..5dfa6c440d86 100644
--- a/dev-haskell/splitmix/metadata.xml
+++ b/dev-haskell/splitmix/metadata.xml
@@ -7,30 +7,9 @@
</maintainer>
<use>
<flag name="optimised-mixer">Use JavaScript for mix32</flag>
- <flag name="random">Providen RandomGen SMGen instance</flag>
</use>
- <longdescription>
- Pure Haskell implementation of SplitMix described in
-
- Guy L. Steele, Jr., Doug Lea, and Christine H. Flood. 2014.
- Fast splittable pseudorandom number generators. In Proceedings
- of the 2014 ACM International Conference on Object Oriented
- Programming Systems Languages &amp; Applications (OOPSLA '14). ACM,
- New York, NY, USA, 453-472. DOI:
- &lt;https://doi.org/10.1145/2660193.2660195&gt;
-
- The paper describes a new algorithm /SplitMix/ for /splittable/
- pseudorandom number generator that is quite fast: 9 64 bit arithmetic/logical
- operations per 64 bits generated.
-
- /SplitMix/ is tested with two standard statistical test suites (DieHarder and
- TestU01, this implementation only using the former) and it appears to be
- adequate for "everyday" use, such as Monte Carlo algorithms and randomized
- data structures where speed is important.
-
- In particular, it __should not be used for cryptographic or security applications__,
- because generated sequences of pseudorandom values are too predictable
- (the mixing functions are easily inverted, and two successive outputs
- suffice to reconstruct the internal state).
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">splitmix</remote-id>
+ <remote-id type="github">haskellari/splitmix</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/splitmix/splitmix-0.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.0.4.ebuild
deleted file mode 100644
index c658af591847..000000000000
--- a/dev-haskell/splitmix/splitmix-0.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # circular deps: test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast Splittable PRNG"
-HOMEPAGE="https://hackage.haskell.org/package/splitmix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimised-mixer +random"
-
-RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag optimised-mixer optimised-mixer) \
- $(cabal_flag random random)
-}
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
new file mode 100644
index 000000000000..dfc77b48ea85
--- /dev/null
+++ b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast Splittable PRNG"
+HOMEPAGE="https://hackage.haskell.org/package/splitmix"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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
+
+CABAL_CHDEPS=(
+ 'base >=4.3 && <4.16' 'base >=4.3'
+)
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10"
+ # test? ( >=dev-haskell/async-2.2.1 <dev-haskell/async-2.3
+ # >=dev-haskell/base-compat-0.11.1 <dev-haskell/base-compat-0.12
+ # >=dev-haskell/base-compat-batteries-0.10.5 <dev-haskell/base-compat-batteries-0.12
+ # dev-haskell/random
+ # >=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+ # >=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+ # >=dev-haskell/tf-random-0.5 <dev-haskell/tf-random-0.6
+ # >=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.13
+ # || ( ( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
+ # ~dev-haskell/hunit-1.3.1.2 )
+ # || ( ( >=dev-haskell/math-functions-0.3.3.0 <dev-haskell/math-functions-0.4 )
+ # ~dev-haskell/math-functions-0.1.7.0 ) )
+#"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag optimised-mixer optimised-mixer)
+}
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild
new file mode 100644
index 000000000000..48d360d55c5c
--- /dev/null
+++ b/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast Splittable PRNG"
+HOMEPAGE="https://hackage.haskell.org/package/splitmix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="optimised-mixer"
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ >=dev-haskell/async-2.2.1 <dev-haskell/async-2.3
+ >=dev-haskell/base-compat-0.11.1 <dev-haskell/base-compat-0.13
+ >=dev-haskell/base-compat-batteries-0.10.5 <dev-haskell/base-compat-batteries-0.13
+ >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+ >=dev-haskell/math-functions-0.3.3.0 <dev-haskell/math-functions-0.4
+ || ( dev-lang/ghc ( >=dev-haskell/process-1.0.1.5 <dev-haskell/process-1.7 ) )
+ dev-haskell/random
+ >=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/tf-random-0.5 <dev-haskell/tf-random-0.6
+ >=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.13
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag optimised-mixer optimised-mixer)
+}
diff --git a/dev-haskell/stack-bin/Manifest b/dev-haskell/stack-bin/Manifest
deleted file mode 100644
index 9970c37d5aaa..000000000000
--- a/dev-haskell/stack-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stack-2.3.1-linux-x86_64.tar.gz 14478645 BLAKE2B e49a4c47f9a2d03fcf9a8ddfac47ff89a39520799886878a824dd9fa1d636bbcb66bbca1ddb8d1b9b7308e4c828e510c0994fc90f3a44d3d344201d5e0af73ea SHA512 eef99b5a1f7593ca884708a05bcf6f7c3e8a5ade4f71b6a802c961bdc346aa560861762b238d8cd6b3c8b85e45334235ef5eaf97126df5970863dca701d83298
diff --git a/dev-haskell/stack-bin/metadata.xml b/dev-haskell/stack-bin/metadata.xml
deleted file mode 100644
index af5ab2a3c183..000000000000
--- a/dev-haskell/stack-bin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Please see the README.md for usage information, and
- the wiki on Github for more details. Also, note that
- the API for the library is not currently stable, and may
- change significantly, even between minor releases. It is
- currently only intended for use by the executable.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild b/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
deleted file mode 100644
index 525043e12021..000000000000
--- a/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-SRC_URI="https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-x86_64.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- sys-libs/zlib
- dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
- default
-
- mv stack-${PV}-*/doc doc || die
- mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
- dodoc -r doc/*
- dobin stack-bin
- use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
deleted file mode 100644
index 5a39280ee928..000000000000
--- a/dev-haskell/stack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stack-2.3.3.tar.gz 572406 BLAKE2B 4b88614ede72ea3704e3bfad433a7931860c1c098bb65aeabca46d3abc5364ea132b8a7f0f559f1b07463d4b753b5501081841fa388a5d817389d91371214236 SHA512 cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3
diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
deleted file mode 100644
index ca426bb23b02..000000000000
--- a/dev-haskell/stack/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="developer-mode">By default, should extra developer information be output?</flag>
- </use>
- <longdescription>
- Please see the documentation at &lt;https://docs.haskellstack.org&gt;
- for usage information.
-
- If building a 'stack' executable for distribution, please download the
- source code from &lt;https://github.com/commercialhaskell/stack/releases&gt;
- and build it using Stack itself in order to ensure identical behaviour
- to official binaries. This package on Hackage is provided for convenience
- and bootstrapping purposes.
-
- Note that the API for the library is not currently stable, and may
- change significantly, even between minor releases. It is
- currently only intended for use by the executable.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack/stack-2.3.3.ebuild b/dev-haskell/stack/stack-2.3.3.ebuild
deleted file mode 100644
index 3b0a49f834fc..000000000000
--- a/dev-haskell/stack/stack-2.3.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static,-supported-build
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="The Haskell Tool Stack"
-HOMEPAGE="https://haskellstack.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer-mode"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/aeson-1.4.6.0:=[profile?]
- >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?]
- >=dev-haskell/ansi-terminal-0.9.1:=[profile?]
- >=dev-haskell/async-2.2.2:=[profile?]
- >=dev-haskell/attoparsec-0.13.2.3:=[profile?]
- >=dev-haskell/base64-bytestring-1.0.0.3:=[profile?]
- >=dev-haskell/cabal-3.0.0.0:=[profile?]
- >=dev-haskell/casa-client-0.0.1:=[profile?]
- >=dev-haskell/casa-types-0.0.1:=[profile?]
- >=dev-haskell/colour-2.3.5:=[profile?]
- >=dev-haskell/conduit-1.3.1.2:=[profile?]
- >=dev-haskell/conduit-extra-1.3.4:=[profile?]
- >=dev-haskell/cryptonite-0.25:=[profile?]
- >=dev-haskell/cryptonite-conduit-0.2.2:=[profile?]
- >=dev-haskell/echo-0.1.3:=[profile?]
- >=dev-haskell/exceptions-0.10.4:=[profile?]
- >=dev-haskell/extra-1.6.19:=[profile?]
- >=dev-haskell/file-embed-0.0.11.1:=[profile?]
- >=dev-haskell/filelock-0.1.1.5:=[profile?]
- >=dev-haskell/fsnotify-0.3.0.1:=[profile?]
- >=dev-haskell/generic-deriving-1.12.4:=[profile?]
- >=dev-haskell/githash-0.1.3.3:=[profile?]
- >=dev-haskell/hackage-security-0.5.3.0:=[profile?]
- >=dev-haskell/hashable-1.2.7.0:=[profile?]
- >=dev-haskell/hi-file-parser-0.1.0.0:=[profile?]
- >=dev-haskell/hpack-0.33.0:=[profile?]
- >=dev-haskell/http-client-0.6.4:=[profile?]
- >=dev-haskell/http-client-tls-0.3.5.3:=[profile?]
- >=dev-haskell/http-conduit-2.3.7.3:=[profile?]
- >=dev-haskell/http-download-0.2.0.0:=[profile?]
- >=dev-haskell/http-types-0.12.3:=[profile?]
- >=dev-haskell/memory-0.14.18:=[profile?]
- >=dev-haskell/microlens-0.4.10:=[profile?]
- >=dev-haskell/mintty-0.1.2:=[profile?]
- >=dev-haskell/mono-traversable-1.0.15.1:=[profile?]
- >=dev-haskell/mtl-2.2.2:=[profile?]
- >=dev-haskell/mustache-2.3.1:=[profile?]
- >=dev-haskell/neat-interpolation-0.3.2.6:=[profile?]
- >=dev-haskell/network-uri-2.6.2.0:=[profile?]
- >=dev-haskell/open-browser-0.2.1.0:=[profile?]
- >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?]
- >=dev-haskell/optparse-simple-0.1.1.2:=[profile?]
- >=dev-haskell/pantry-0.4:=[profile?] <dev-haskell/pantry-0.5:=[profile?]
- >=dev-haskell/path-0.6.1:=[profile?]
- >=dev-haskell/path-io-1.4.2:=[profile?]
- >=dev-haskell/persistent-2.9.2:=[profile?]
- >=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
- >=dev-haskell/persistent-template-2.6.0:=[profile?]
- >=dev-haskell/primitive-0.6.4.0:=[profile?]
- >=dev-haskell/project-template-0.2.0.1:=[profile?]
- >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?]
- >=dev-haskell/retry-0.8.1.0:=[profile?]
- >=dev-haskell/rio-0.1.14.0:=[profile?]
- >=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?]
- >=dev-haskell/split-0.2.3.3:=[profile?]
- >=dev-haskell/stm-2.5.0.0:=[profile?]
- >=dev-haskell/streaming-commons-0.2.1.2:=[profile?]
- >=dev-haskell/tar-0.5.1.1:=[profile?]
- >=dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/text-1.2.3.1:=[profile?]
- >=dev-haskell/text-metrics-0.3.0:=[profile?]
- >=dev-haskell/th-reify-many-0.1.9:=[profile?]
- >=dev-haskell/tls-1.4.1:=[profile?]
- >=dev-haskell/typed-process-0.2.6.0:=[profile?]
- >=dev-haskell/unicode-transforms-0.3.6:=[profile?]
- >=dev-haskell/unix-compat-0.5.2:=[profile?]
- >=dev-haskell/unliftio-0.2.12:=[profile?]
- >=dev-haskell/unordered-containers-0.2.10.0:=[profile?]
- >=dev-haskell/vector-0.12.1.2:=[profile?]
- >=dev-haskell/yaml-0.11.2.0:=[profile?]
- >=dev-haskell/zip-archive-0.4.1:=[profile?]
- >=dev-haskell/zlib-0.6.2.1:=[profile?]
- >=dev-lang/ghc-8.6.5:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/hspec-2.7.1
- >=dev-haskell/quickcheck-2.13.2
- >=dev-haskell/raw-strings-qq-1.1
- >=dev-haskell/smallcheck-1.1.5 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag developer-mode developer-mode) \
- --flag=-disable-git-info \
- --flag=-hide-dependency-versions \
- --flag=-integration-tests \
- --flag=-static \
- --flag=-supported-build
-}
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index 9fd172367795..072a384fd59e 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -1 +1,2 @@
-DIST StateVar-1.1.1.1.tar.gz 4762 BLAKE2B 17148fe888eaf0fafd73812cd9ca1c1eb6b61c3a555fff63608bdff14845320c433a49ec6680dd756c65dadacb9673ffefb74eabf0d38fd2393d9c601624210d SHA512 4b4d24dee812dafce1b5d08a6a7034edd005f2128012276cb8f43a413597a1303000ab625b3458a287840ea1d331d0659fbfde81bbf83933156870f107c31610
+DIST StateVar-1.2.1.tar.gz 5055 BLAKE2B 45a9e509deec9988debdf906bfcb3f3fcd04fbd42326ea5eb74b697fa761d2d4a696c84deb0d5634aac0a4d57af3ef56cf612b343afb53f00c2eec4b96d53801 SHA512 867e38b309a0cbb5a3aac1183b6388aab6e546cda799b0668f3e9534556df4b73558295a706b2859c1edb20e89dac7bf8c4f04f839d40ede2c36a2ae7eab6259
+DIST statevar-1.2.2.tar.gz 5048 BLAKE2B 937617e283038101ef8dea2ec62ba77af2f34868b99bbb41241fd07a897d51d31238eaae688239cc0b560d39f34873eeed9226e96b09d659350337e8dfd2ce02 SHA512 d4330b43471ed73e2c70e0686575f7987f617ae1c03d9d5b0ea89d5ec55be2470b6d917e4ecc6d52c4d46fc8afbeea16194667815ce0bbecb1f637d7277f86e6
diff --git a/dev-haskell/statevar/metadata.xml b/dev-haskell/statevar/metadata.xml
index 55a9b1c8d820..a03fe8b48850 100644
--- a/dev-haskell/statevar/metadata.xml
+++ b/dev-haskell/statevar/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package contains state variables, which are references in the IO monad,
- like IORefs or parts of the OpenGL state.
- </longdescription>
<upstream>
+ <remote-id type="hackage">StateVar</remote-id>
<remote-id type="github">haskell-opengl/StateVar</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/statevar/statevar-1.1.1.1.ebuild b/dev-haskell/statevar/statevar-1.1.1.1.ebuild
deleted file mode 100644
index ab994a0282bc..000000000000
--- a/dev-haskell/statevar/statevar-1.1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.2.1.ebuild b/dev-haskell/statevar/statevar-1.2.1.ebuild
new file mode 100644
index 000000000000..6bbe236e9dd6
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="StateVar"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="State variables"
+HOMEPAGE="https://github.com/haskell-opengl/StateVar"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.2.2.ebuild b/dev-haskell/statevar/statevar-1.2.2.ebuild
new file mode 100644
index 000000000000..be0ecb11ce35
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_PN="StateVar"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="State variables"
+HOMEPAGE="https://github.com/haskell-opengl/StateVar"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/statistics/Manifest b/dev-haskell/statistics/Manifest
index 09182e1159e1..4c1216e28321 100644
--- a/dev-haskell/statistics/Manifest
+++ b/dev-haskell/statistics/Manifest
@@ -1 +1,2 @@
DIST statistics-0.15.2.0.tar.gz 98424 BLAKE2B 36a1b59e7db9e20ee9960f89794c2222ac8db7fa40f44b166e2d92a501b44d8d5ec06bab96b9e89bb7417852a98890bdf140f3b1a7fb27f0e034490615d84131 SHA512 7afa3e3edb15e02ff59c72601175d25f1a8baeaa1dd8561322e8e26781dbfbfcc03b2ade773269bab027d7399375f01595145fd2e2f252f3e73abc87f9baed41
+DIST statistics-0.16.2.0.tar.gz 107609 BLAKE2B c5a5fe29ec68600ecf5d15855537672432ba09edff26a36387224d1e295cbd6a57a6025b2774f47fd56c9809f4b8b1889bf7aa1240d83eecb4a4d82933ca6223 SHA512 934928e5f8f4f38fe1755a5d16d9a4653401a983d86b2f0fc7f9d4ba90b0b05cf19caec2f4e48874fc7995450a016fa9b45dadc0d6316807fbf19ed75d14c38b
diff --git a/dev-haskell/statistics/metadata.xml b/dev-haskell/statistics/metadata.xml
index 8085f8ca3142..e25f1d14aa33 100644
--- a/dev-haskell/statistics/metadata.xml
+++ b/dev-haskell/statistics/metadata.xml
@@ -5,101 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides a number of common functions and types useful
- in statistics. We focus on high performance, numerical robustness,
- and use of good algorithms. Where possible, we provide
- references to the statistical literature.
-
- The library's facilities can be divided into four broad categories:
-
- * Working with widely used discrete and continuous probability
- distributions. (There are dozens of exotic distributions in use;
- we focus on the most common.)
-
- * Computing with sample data: quantile estimation, kernel density
- estimation, histograms, bootstrap methods, significance testing,
- and autocorrelation analysis.
-
- * Random variate generation under several different distributions.
-
- * Common statistical tests for significant differences between
- samples.
-
- Changes in 0.10.0.0:
-
- * The type classes @Mean@ and @Variance@ are split in two. This is
- required for distributions which do not have finite variance or
- mean.
-
- * The @S.Sample.KernelDensity@ module has been renamed, and
- completely rewritten to be much more robust. The older module
- oversmoothed multi-modal data. (The older module is still
- available under the name @S.Sample.KernelDensity.Simple@).
-
- * Histogram computation is added, in @S.Sample.Histogram@.
-
- * Forward and inverse discrete Fourier and cosine transforms are
- added, in @S.Transform@.
-
- * Root finding is added, in @S.Math.RootFinding@.
-
- * The @complCumulative@ function is added to the @Distribution@
- class in order to accurately assess probalities P(X&gt;x) which are
- used in one-tailed tests.
-
- * A @stdDev@ function is added to the @Variance@ class for
- distributions.
-
- * The constructor @S.Distribution.normalDistr@ now takes standard
- deviation instead of variance as its parameter.
-
- * A bug in @S.Quantile.weightedAvg@ is fixed. It produced a wrong
- answer if a sample contained only one element.
-
- * Bugs in quantile estimations for chi-square and gamma distribution
- are fixed.
-
- * Integer overlow in @mannWhitneyUCriticalValue@ is fixed. It
- produced incorrect critical values for moderately large
- samples. Something around 20 for 32-bit machines and 40 for 64-bit
- ones.
-
- * A bug in @mannWhitneyUSignificant@ is fixed. If either sample was
- larger than 20, it produced a completely incorrect answer.
-
- * One- and two-tailed tests in @S.Tests.NonParametric@ are selected
- with sum types instead of @Bool@.
-
- * Test results returned as enumeration instead of @Bool@.
-
- * Performance improvements for Mann-Whitney U and Wilcoxon tests.
-
- * Module @S.Tests.NonParamtric@ is split into @S.Tests.MannWhitneyU@
- and @S.Tests.WilcoxonT@
-
- * @sortBy@ is added to @S.Function@.
-
- * Mean and variance for gamma distribution are fixed.
-
- * Much faster cumulative probablity functions for Poisson and
- hypergeometric distributions.
-
- * Better density functions for gamma and Poisson distributions.
-
- * Student-T, Fisher-Snedecor F-distributions and Cauchy-Lorentz
- distrbution are added.
-
- * The function @S.Function.create@ is removed. Use @generateM@ from
- the @vector@ package instead.
-
- * Function to perform approximate comparion of doubles is added to
- @S.Function.Comparison@
-
- * Regularized incomplete beta function and its inverse are added to
- @S.Function@.
- </longdescription>
<upstream>
- <remote-id type="github">bos/statistics</remote-id>
+ <remote-id type="hackage">statistics</remote-id>
+ <remote-id type="github">haskell/statistics</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/statistics/statistics-0.15.2.0.ebuild b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
index 3d935d303cd1..5c22ef2c859e 100644
--- a/dev-haskell/statistics/statistics-0.15.2.0.ebuild
+++ b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.3
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
diff --git a/dev-haskell/statistics/statistics-0.16.2.0.ebuild b/dev-haskell/statistics/statistics-0.16.2.0.ebuild
new file mode 100644
index 000000000000..d9f0ecac3978
--- /dev/null
+++ b/dev-haskell/statistics/statistics-0.16.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library of statistical types, data, and functions"
+HOMEPAGE="https://github.com/haskell/statistics"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # likes to fail under a load
+
+RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
+ >=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/data-default-class-0.1.2:=[profile?]
+ >=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?]
+ >=dev-haskell/math-functions-0.3.4.1:=[profile?]
+ >=dev-haskell/mwc-random-0.15.0.0:=[profile?]
+ >=dev-haskell/parallel-3.2.2.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+ >=dev-haskell/primitive-0.3:=[profile?]
+ >=dev-haskell/random-1.2:=[profile?]
+ >=dev-haskell/vector-0.10:=[profile?]
+ >=dev-haskell/vector-algorithms-0.4:=[profile?]
+ >=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
+ dev-haskell/vector-th-unbox:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/erf
+ >=dev-haskell/ieee754-0.7.3
+ >=dev-haskell/quickcheck-2.7.5
+ dev-haskell/tasty
+ dev-haskell/tasty-expected-failure
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
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 e7aaf5b34209..7bf5b2d8bfbe 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/stm-2.4:=[profile?]
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 82dd2a3e7613..23f180d2f8eb 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -1 +1,3 @@
-DIST stm-2.5.0.0.tar.gz 12335 BLAKE2B 4b29efdb620e0528a42a34e0b98e2ba5a7e90f83009e1129f923a77abc427a5f0e3a32255f908d9771406983bbdfab6b9887b031cee7c1a98c99a7d810cccd0d SHA512 64516ff5eba42a469046af51f12cb55afca795c7a897b9ac16c3446d547ad3894d9b80be3716e86291825e8fa91335ee89e9c9c6738c95f3cbd8ee0739236651
+DIST stm-2.5.0.1.tar.gz 15393 BLAKE2B 3992741861945f22fcfa21333f24dc187b099963eb9a9776451d24ebe85ca65b2c141da8dbfc784342c0c3c2b4c2ffac7affc847ce14fa73519bbdad5c8924b7 SHA512 631de1102c405af879ecf7b2fe1affbac80158f04e1d16b9e83ebbdccb915e9472ddb654048bad2bfbd9831e7ab76b6e7e295743abe2a32bf1e5459703b8cc0b
+DIST stm-2.5.0.2-rev1.cabal 2314 BLAKE2B 2d8f9ef6a3cd81d3e993cbddfb17bbcd53704697aea82ff91c1dd70984435b5e7f99c1c9118f295b1f3111eacd34d44085fe26396b297c3d38ad9c6a683458b0 SHA512 f0f64d4476c7cfe5c4893f5b396f2f7e4884f2a7bccd6116868af6ee55591c78ea99ffcdb2b7a3c31bd2ab5d36bc59dfe6fc8e35ea053c4952033446dbe07aaf
+DIST stm-2.5.0.2.tar.gz 15638 BLAKE2B 3a4167ae2a879128446e1e070341090dbe57f25956be587be5d56f51940c497cb6f12001dbe3a40b453e3fe4ccb1f520029efb53d04f46ab1eda93aab443c2fd SHA512 7fb91df2ab931437ad05956f7a06f8032c3f930f00325b6ecac4363da9334008424cd63fb14e8bc2cb6cf9ed3c2da240afef8c2d6e7faa1e3d314a3145092c4e
diff --git a/dev-haskell/stm/metadata.xml b/dev-haskell/stm/metadata.xml
index c7bb0e775ab0..ff92e67e5ed6 100644
--- a/dev-haskell/stm/metadata.xml
+++ b/dev-haskell/stm/metadata.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>haskell@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">stm</remote-id>
+ <remote-id type="github">haskell/stm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/stm/stm-2.5.0.0.ebuild b/dev-haskell/stm/stm-2.5.0.0.ebuild
deleted file mode 100644
index 5a143f915cf1..000000000000
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
new file mode 100644
index 000000000000..8119160c2899
--- /dev/null
+++ b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Software Transactional Memory"
+HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+CABAL_CHDEPS=(
+ 'base >= 4.3 && < 4.15' 'base >= 4.3'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+# 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="8.10.6 9.0.2"
diff --git a/dev-haskell/stm/stm-2.5.0.2-r1.ebuild b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
new file mode 100644
index 000000000000..46353f326a3f
--- /dev/null
+++ b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Software Transactional Memory"
+HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/stmonadtrans/Manifest b/dev-haskell/stmonadtrans/Manifest
deleted file mode 100644
index d755e09c0ec4..000000000000
--- a/dev-haskell/stmonadtrans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST STMonadTrans-0.4.4.tar.gz 6298 BLAKE2B dd24c28605f92626abe90b32f6633c353289d96f84caebd0422e0ee46b9a97f4a656a3a5f10d7e9f04c8d1fbe9f27ea8d7e0965c9525145c9b3b45007b2d623f SHA512 3ab7ff50223f975066cde1227fb23e00263786fa8c5b9d0276fdcc265bb1ac2e5cea97f3fb7fd51aaf25872b126645312c4c622084947dea430d214eac44938b
diff --git a/dev-haskell/stmonadtrans/metadata.xml b/dev-haskell/stmonadtrans/metadata.xml
deleted file mode 100644
index 58be439bbb36..000000000000
--- a/dev-haskell/stmonadtrans/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A monad transformer version of the ST monad
- Warning! This monad transformer should not be used with monads that
- can contain multiple answers, like the list monad. The reason is that
- the will be duplicated across the different answers and this cause
- Bad Things to happen (such as loss of referential transparency). Safe
- monads include the monads State, Reader, Writer, Maybe and
- combinations of their corresponding monad transformers.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild
deleted file mode 100644
index 05b13788f369..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="https://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/tasty-0.11.0.4 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-hunit-0.9.2 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8.4 <dev-haskell/tasty-quickcheck-0.11
- >=dev-haskell/transformers-0.4 <dev-haskell/transformers-0.6 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/store-core/Manifest b/dev-haskell/store-core/Manifest
deleted file mode 100644
index dcfd5ad8664e..000000000000
--- a/dev-haskell/store-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST store-core-0.4.4.3.tar.gz 7785 BLAKE2B e2608a41200476f74087ae20c5dadccfb20d07715207ab7356f6f386846d3ea7acdd7173df6842c9fadf4ccb9a6beaf797f61d89e660bfc4fb3dcc875b751957 SHA512 b425a5e9dadac42868c2180c46bccca36fbab483d168196a23ae975d9b6d27a6965884b69e3b3aa0a47942e910a7a35315085aabc9185602786ac7fc4e705d64
diff --git a/dev-haskell/store-core/metadata.xml b/dev-haskell/store-core/metadata.xml
deleted file mode 100644
index 73bf2e108c0b..000000000000
--- a/dev-haskell/store-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="force-alignment">No description</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/store-core/store-core-0.4.4.3.ebuild b/dev-haskell/store-core/store-core-0.4.4.3.ebuild
deleted file mode 100644
index 80786149abd5..000000000000
--- a/dev-haskell/store-core/store-core-0.4.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast and lightweight binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="force-alignment"
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?]
- >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?]
- >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag force-alignment force-alignment)
-}
diff --git a/dev-haskell/store/Manifest b/dev-haskell/store/Manifest
deleted file mode 100644
index e4b47fad5ba1..000000000000
--- a/dev-haskell/store/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST store-0.7.6.tar.gz 43198 BLAKE2B 9246dabb2222c42096b001db327e60821d8d7142e4f7cc6818b3ef8e8743ea0185ae5fa68beaf02eeb1ec3254d95010625f56714b639730ca29fc4269c1cec2d SHA512 c1bf63b76e300aabce656e06899de9b95fa5a3d9b08be47b6ed640f5ae2a63d5dbb08e8058bb334af6a771a2dc8eeb700bf7162b806481e47e08d22bbb83b674
diff --git a/dev-haskell/store/metadata.xml b/dev-haskell/store/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/store/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/store/store-0.7.6.ebuild b/dev-haskell/store/store-0.7.6.ebuild
deleted file mode 100644
index 515d0443bfc7..000000000000
--- a/dev-haskell/store/store-0.7.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-#hackport: flags: -small-bench,-comparison-bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to build with newer smallcheck
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
- >=dev-haskell/base-orphans-0.4.3:=[profile?]
- >=dev-haskell/base64-bytestring-0.1.1:=[profile?]
- >=dev-haskell/bifunctors-4.0:=[profile?]
- >=dev-haskell/contravariant-1.3:=[profile?]
- >=dev-haskell/cryptohash-0.11.6:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?]
- >=dev-haskell/free-4.11:=[profile?]
- >=dev-haskell/hashable-1.2.3.1:=[profile?]
- >=dev-haskell/hspec-2.1.2:=[profile?]
- >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?]
- >=dev-haskell/lifted-base-0.2.3.3:=[profile?]
- >=dev-haskell/monad-control-0.3.3.0:=[profile?]
- >=dev-haskell/mono-traversable-0.7.0:=[profile?]
- >=dev-haskell/network-2.6.0.2:=[profile?]
- >=dev-haskell/primitive-0.6:=[profile?]
- >=dev-haskell/resourcet-1.1.3.3:=[profile?]
- >=dev-haskell/safe-0.3.8:=[profile?]
- >=dev-haskell/semigroups-0.8:=[profile?]
- >=dev-haskell/smallcheck-1.1.1:=[profile?]
- >=dev-haskell/store-core-0.4:=[profile?] <dev-haskell/store-core-0.5:=[profile?]
- >=dev-haskell/syb-0.4.4:=[profile?]
- >=dev-haskell/text-1.2.0.4:=[profile?]
- >=dev-haskell/th-lift-0.7.1:=[profile?]
- >=dev-haskell/th-lift-instances-0.1.4:=[profile?]
- >=dev-haskell/th-orphans-0.13.2:=[profile?]
- >=dev-haskell/th-reify-many-0.1.6:=[profile?]
- >=dev-haskell/th-utilities-0.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5.1:=[profile?]
- >=dev-haskell/vector-0.10.12.3:=[profile?]
- >=dev-haskell/void-0.5.11:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-# test? ( >=dev-haskell/clock-0.3 )
-# "
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-comparison-bench \
- --flag=-small-bench
-}
diff --git a/dev-haskell/stream/Manifest b/dev-haskell/stream/Manifest
deleted file mode 100644
index 47a1b467b771..000000000000
--- a/dev-haskell/stream/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Stream-0.4.7.2.tar.gz 6543 BLAKE2B 5e399aa6fc8fcdd0616d5349f5919f7b620d33651e12dfe8fbc9f9f3ad2d25021b369e7b0fa8a0d7bde1d68efd0fcc8a2b2f25a82fe49f93526eb6b7ac98329a SHA512 ff0b8c51d11cb4d4ed9d07af272bcf63fc4e4e1b4eaa76dce9c80234ba989c5690c41014e5e9bd3acc9faaea048a899f11d350459fc68d93c67f1e62e1fe6504
diff --git a/dev-haskell/stream/metadata.xml b/dev-haskell/stream/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/stream/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stream/stream-0.4.7.2.ebuild b/dev-haskell/stream/stream-0.4.7.2.ebuild
deleted file mode 100644
index 722b5e401fbf..000000000000
--- a/dev-haskell/stream/stream-0.4.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Stream"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for manipulating infinite lists"
-HOMEPAGE="https://hackage.haskell.org/package/Stream"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lazysmallcheck-0.3:=[profile?]
- >=dev-haskell/quickcheck-2.0:2=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
index fb12aa5b57c0..f4f4a82f11ae 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -1 +1,2 @@
-DIST streaming-commons-0.2.1.2.tar.gz 86776 BLAKE2B 01f4a88fb87055bb315278e0391880025b38765faa27e788d3b184c4942af0b8c26e147639e4413a029ae30e03991d083adf49aac89759b2fe2c058e945acd70 SHA512 7b6f39237f9ac13ca2d8205a43fee17c6edfe6609a1119903f8648aed151ef92779af7a8dfdfb108dea679cd26c83dfb5d21285d51f91dec0ad10debd100b8e7
+DIST streaming-commons-0.2.2.4.tar.gz 84330 BLAKE2B 08b729471b3fdc9c5508ffca0e9ce52f38a33b25855f027ae5924e28387e80b369e8c41a33fae49bbb6d5845985954377c2067d56b26995336faa51cb792f83d SHA512 e552bba766e5b816cbd448d1cec86c5c7593f3f13c6da42c74ebf2c9698be3a3174dd922cf70de1b4940b53e580f396a51cebff6b62db305fb0fb48a5c7658bb
+DIST streaming-commons-0.2.2.5.tar.gz 84415 BLAKE2B 0dfe677b3d07e1d125d6b7cd0d55f4e916323b9f9e86a167eb57cd1d149d33b7a860e315ae271efb8a1ba432b9d7c48434151e9cb806f1f77eb286b81e99a115 SHA512 e2e5f401af9c8eefe37596015f8af42225daaf7f0134add1a375b54e30e5b87212943bfa5da3e2f46953eb6942f3efe753e4565e52eb5ba45fef90743708c89d
diff --git a/dev-haskell/streaming-commons/metadata.xml b/dev-haskell/streaming-commons/metadata.xml
index 2d85b0b0ac8c..93054479d7ec 100644
--- a/dev-haskell/streaming-commons/metadata.xml
+++ b/dev-haskell/streaming-commons/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides low-dependency functionality commonly needed by various streaming data libraries, such as conduit and pipes.
- </longdescription>
<upstream>
+ <remote-id type="hackage">streaming-commons</remote-id>
<remote-id type="github">fpco/streaming-commons</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
deleted file mode 100644
index 37b8e60c8f39..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
- >=dev-haskell/network-2.4.0.0:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/stm:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hspec-1.8
- dev-haskell/quickcheck )
-"
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
new file mode 100644
index 000000000000..985d42f2d53a
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network
+
+RDEPEND="dev-haskell/async:=[profile?]
+ >=dev-haskell/network-2.4.0.0:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/stm:=[profile?]
+ dev-haskell/zlib:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild
new file mode 100644
index 000000000000..a923bb975e81
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/async:=[profile?]
+ >=dev-haskell/network-2.4.0.0:=[profile?]
+ || ( dev-lang/ghc dev-haskell/process[profile?] )
+ dev-haskell/random:=[profile?]
+ dev-haskell/stm:=[profile?]
+ dev-haskell/zlib:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? (
+ >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck
+ )
+"
diff --git a/dev-haskell/strict/Manifest b/dev-haskell/strict/Manifest
index d1633fdbbbfc..f016b51ca97d 100644
--- a/dev-haskell/strict/Manifest
+++ b/dev-haskell/strict/Manifest
@@ -1 +1,3 @@
-DIST strict-0.3.2.tar.gz 3948 BLAKE2B f882834fdd7b6df5c1f7c56e93f895380ff291096feb73b627ba26c7d6f41555ef6a135d7d5fdac19f28c48869f9987bd510530300f968482538c79fe1842286 SHA512 ca27ee2b557669c409c0417b2005ceb612ad95040fd4a798535cdbc83b8b7a51a36bb66bc2e7bff04b5b965313894a51910a274d67a891530ed119c831bcd686
+DIST strict-0.4.0.1.cabal 4187 BLAKE2B 23e7e19b4688a29ee88ee126b7b8d6a7b0176e49bb1ede058690c5ede987f414461a9335a6d5f2f82fc3db46e7c2a62c1773fa6933edd52ed5f09352a2744357 SHA512 f9c98f54d281905ba6f35df31344a4d210a091def005f076f8f613397dc2fb662199f85159a8b513ff1cb28fcc2ccce31449cb51c3cff476232bb43642587621
+DIST strict-0.4.0.1.tar.gz 12488 BLAKE2B f652ffa4778d2ed50917730848d469f4a6a3ed2ba0973ccc929891c59b7edecf6492cce807eb5bbc3188f4d21799193e43f3fb34b6230f4da1860d31315b153f SHA512 e0c37396fa507ad4d03e46ce4a02ec5bacbd7add75ca551433671871d3e7dde0eb0c620182904d1bdeb7b80e1b311a70f36030cbeae63d8776059150fef30235
+DIST strict-0.5.tar.gz 12564 BLAKE2B 66cca7f7abaa8262602b602e11ebbeb3b14bd4b2608596c9a01a47a1bf2b6dd7d6bb99f4d1b7892f24db6c4407137b3f1aa0825a5bd1b1e6180ede0090dfe212 SHA512 dba8bb370aaea6107d9ea5ff8bd69a84212eaf0f6440189906bf6d3581282b88ae56142958ab041d9ecd06efee7c51dde9d6bafa89b95e666bf1d48d1249c3ed
diff --git a/dev-haskell/strict/metadata.xml b/dev-haskell/strict/metadata.xml
index b94985c6c9d9..3227376340a4 100644
--- a/dev-haskell/strict/metadata.xml
+++ b/dev-haskell/strict/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides strict versions of some standard Haskell data
- types (pairs, Maybe and Either). It also contains strict IO
- operations.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">strict</remote-id>
+ <remote-id type="github">haskell-strict/strict</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/strict/strict-0.3.2-r1.ebuild b/dev-haskell/strict/strict-0.3.2-r1.ebuild
deleted file mode 100644
index 501f31bfb9ea..000000000000
--- a/dev-haskell/strict/strict-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Strict data types and String IO"
-HOMEPAGE="http://www.cse.unsw.edu.au/~rl/code/strict.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/strict/strict-0.4.0.1.ebuild b/dev-haskell/strict/strict-0.4.0.1.ebuild
new file mode 100644
index 000000000000..30e32e8d884a
--- /dev/null
+++ b/dev-haskell/strict/strict-0.4.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="4"
+inherit haskell-cabal
+
+DESCRIPTION="Strict data types and String IO"
+HOMEPAGE="https://github.com/haskellari/strict"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=assoc
+}
diff --git a/dev-haskell/strict/strict-0.5.ebuild b/dev-haskell/strict/strict-0.5.ebuild
new file mode 100644
index 000000000000..eebc629b95ad
--- /dev/null
+++ b/dev-haskell/strict/strict-0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: +assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Strict data types and String IO"
+HOMEPAGE="https://github.com/haskell-strict/strict"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/assoc-1.1:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/these-1.2:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=assoc
+}
diff --git a/dev-haskell/string-conversions/Manifest b/dev-haskell/string-conversions/Manifest
new file mode 100644
index 000000000000..bccffadc3185
--- /dev/null
+++ b/dev-haskell/string-conversions/Manifest
@@ -0,0 +1 @@
+DIST string-conversions-0.4.0.1.tar.gz 3759 BLAKE2B d43272aa7c275f34d8735950f922607509e402eeec2b847bd96ddc80e6b4fcbe25885d1a81d2d2aa89f6c8ef4eaf9368c7c9b6caf78d2a4a7c9177b8411fd971 SHA512 8bd015215d1a8a48f01abf95f53bd75f67c83dc48c5b4c4f0731e9da924f99c18e9c6de46fdebdd497f5dc577311db1aa31f5144dfc5b1de539e201b9fc1c9f6
diff --git a/dev-haskell/string-conversions/metadata.xml b/dev-haskell/string-conversions/metadata.xml
new file mode 100644
index 000000000000..f2e697c128ab
--- /dev/null
+++ b/dev-haskell/string-conversions/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <longdescription>
+ Provides a simple type class for converting values
+ of different string types
+ into values of other string types.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">soenkehahn/string-conversions</remote-id>
+ </upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..da01b7b48a6a
--- /dev/null
+++ b/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simplifies dealing with different types for strings"
+HOMEPAGE="https://github.com/soenkehahn/string-conversions#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/hspec
+ dev-haskell/quickcheck
+ dev-haskell/quickcheck-instances )
+"
diff --git a/dev-haskell/string-qq/metadata.xml b/dev-haskell/string-qq/metadata.xml
index 937381521944..9a37700a12e3 100644
--- a/dev-haskell/string-qq/metadata.xml
+++ b/dev-haskell/string-qq/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">string-qq</remote-id>
+ <remote-id type="github">audreyt/string-qq</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild b/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..e91d09d195dc
--- /dev/null
+++ b/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
+HOMEPAGE="https://hackage.haskell.org/package/string-qq"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'text >=1.2 && <1.3' 'text >=1.2'
+)
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
+ >=dev-haskell/text-1.2
+ )
+"
diff --git a/dev-haskell/string-qq/string-qq-0.0.4.ebuild b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
deleted file mode 100644
index baa9933a6b9a..000000000000
--- a/dev-haskell/string-qq/string-qq-0.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
-HOMEPAGE="https://hackage.haskell.org/package/string-qq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
- >=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
-"
diff --git a/dev-haskell/stringable/Manifest b/dev-haskell/stringable/Manifest
deleted file mode 100644
index 82eaa6aff402..000000000000
--- a/dev-haskell/stringable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stringable-0.1.3.tar.gz 2665 BLAKE2B c50780ce134872b3adf8adec6e3d5c80030033431330e5e76db87ae5aa15cd5897b5c7b39d8c9f3f88d138b94ff5f771ab3e1fff53730863e5e267b34891556c SHA512 f55ac3b1ef18ed9f219da7d7146d625e347d4bc6690e0daf1624692765f06950a3ef4b31a47cb519da519413b36baef2fa9074b04809ef81f9fd2aa7e5c9bfe1
diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/stringable/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
deleted file mode 100644
index 7249e98ce996..000000000000
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Stringable type class, in the spirit of Foldable and Traversable"
-HOMEPAGE="https://hackage.haskell.org/package/stringable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?]
- >=dev-haskell/text-0.11.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
index f722c1c89160..9e8de09b67c1 100644
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/stringprep/Manifest b/dev-haskell/stringprep/Manifest
deleted file mode 100644
index 1af7af48a345..000000000000
--- a/dev-haskell/stringprep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stringprep-1.0.0.tar.gz 17166 BLAKE2B 14089c667d95f8e4e91450c9990832855857e1f617f1964688adae28c044e3a5668e686eaabdd64cf7eb5cf4b0522fccd33bd3ccc012afce6fc3a25aa0a0b6e5 SHA512 0b6fc990124ccf12fe9a604b0f27a5b99a3d3a5fab7e938390fa9130ed3713cf4a7a610c1ac3b9e8f6138eb7e06a94c23f6bd9be132d1350607fe5abd010ee33
diff --git a/dev-haskell/stringprep/metadata.xml b/dev-haskell/stringprep/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/stringprep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stringprep/stringprep-1.0.0.ebuild b/dev-haskell/stringprep/stringprep-1.0.0.ebuild
deleted file mode 100644
index c41536b96e89..000000000000
--- a/dev-haskell/stringprep/stringprep-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Implements the \"StringPrep\" algorithm"
-HOMEPAGE="https://hackage.haskell.org/package/stringprep"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
- >=dev-haskell/text-icu-0.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck
- dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/stringsearch/Manifest b/dev-haskell/stringsearch/Manifest
deleted file mode 100644
index e38dd26d8529..000000000000
--- a/dev-haskell/stringsearch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stringsearch-0.3.6.6.tar.gz 39679 BLAKE2B 78302abf1f7eba7c3eff4452b0f0187b43954001d7be868ad952e6fb58b80d84b5e08b369a9721e06708d0b7fca49ee39dc2cca3a31ccf151f0ce8a5a86bd905 SHA512 a642934981318b399a7fcfbf0134d5d02d8d072591bcfed7abc57bf6474b86d6c7bc6cf11f44ace6db579a0297877850fd9049be69b61f4f9964cd72455b14e0
diff --git a/dev-haskell/stringsearch/metadata.xml b/dev-haskell/stringsearch/metadata.xml
deleted file mode 100644
index b62237617d0d..000000000000
--- a/dev-haskell/stringsearch/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides several functions to quickly
- search for substrings in strict or lazy ByteStrings.
- It also provides functions for breaking or splitting
- on substrings and replacing all occurrences of a
- substring (the first in case of overlaps) with another.
- GHC before 6.10 are no longer supported, other compilers
- only if they support BangPatterns. If you need it to
- work with other compilers, send a feature request.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
deleted file mode 100644
index b1dd77849a64..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -base3,+base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://hackage.haskell.org/package/stringsearch"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'containers >= 0.3 && < 0.6' 'containers >= 0.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-base3 \
- --flag=base4
-}
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
deleted file mode 100644
index 87530be8960f..000000000000
--- a/dev-haskell/syb-with-class/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST syb-with-class-0.6.1.13.tar.gz 13225 BLAKE2B a218611f332037968513b3706bc35e903f335477fa490f0c709f085014e833f1969851a74ae0d2a40c6a085c9aec1bbd963a48d4362963d3a89fe8e399a790fc SHA512 40082f8b97ae49929fb2b686a840656fd2a62936ddc4873f3af4bdfe128e213dff509185e412c3c58bd48ec32abcade8ed68dd257d221bb08f9d20433067f371
diff --git a/dev-haskell/syb-with-class/metadata.xml b/dev-haskell/syb-with-class/metadata.xml
deleted file mode 100644
index 5850f318857e..000000000000
--- a/dev-haskell/syb-with-class/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Classes, and Template Haskell code to generate instances, for the
- Scrap Your Boilerplate With Class system.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
deleted file mode 100644
index 7bd577793d35..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index c9b6353cbe65..bb13dfcba431 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -1 +1,2 @@
-DIST syb-0.7.1.tar.gz 39594 BLAKE2B c7304aac08dde400d26bb296b2f9d5c5d148949d8d5469daadd83110d63f1c3865c21fc187494f5fc11f21708717d917f26fee1bca611d2ea4c998dc0fdfa62a SHA512 63a3138f7f824a9bc611b9d025d4e7adc2da8d420d260b66d56190db683a0afac58e4794e94b13d4aa7b423d949e55a1ed0220c99d368973117b5056fd0f4e65
+DIST syb-0.7.2.1.tar.gz 39768 BLAKE2B 347070741b2ad623fb4e1bfa349ddea475c2c846119d5418ad67dc2d8441a7cfdb4d4557efa2fa9ffa229ae83a1e6a8175423259695417a238c34a128b6fcf71 SHA512 6c356af3cc72f29c362b2859292a96b8107dd3241cff79d717f361e517edf478295f477c0f426fb8d0ae0952cd5c7521114cf1cac1f3faf2b0c96d3b8a335e69
+DIST syb-0.7.2.4.tar.gz 41809 BLAKE2B fe495ebd3b7297c4e3b207cca6d8823b0b264d4310e19d661dc5dc537322721e7d57021e3c3207c5a93b9bc74d4c9cb561e1222e1f487faaf816a1fbecf8a02e SHA512 7a29ee78fe23e4f6eac6b85326b0ffaa62337703ed4ebbd464598bace1fac5c7ad180e1ed95561be957bba41adcd2bb8fd36a88e482b789290a171d2b7a59f85
diff --git a/dev-haskell/syb/metadata.xml b/dev-haskell/syb/metadata.xml
index be738f8fa844..303b3bd841dc 100644
--- a/dev-haskell/syb/metadata.xml
+++ b/dev-haskell/syb/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package contains the generics system described in the
- "Scrap Your Boilerplate" papers (see http://www.cs.uu.nl/wiki/GenericProgramming/SYB).
- It defines the 'Data' class of types permitting folding and unfolding
- of constructor applications, instances of this class for primitive
- types, and a variety of traversals.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">syb</remote-id>
+ <remote-id type="github">dreixel/syb</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/syb/syb-0.7.1.ebuild b/dev-haskell/syb/syb-0.7.1.ebuild
deleted file mode 100644
index 38f3f4c8007e..000000000000
--- a/dev-haskell/syb/syb-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/mtl )
-"
diff --git a/dev-haskell/syb/syb-0.7.2.1.ebuild b/dev-haskell/syb/syb-0.7.2.1.ebuild
new file mode 100644
index 000000000000..03f6081203ea
--- /dev/null
+++ b/dev-haskell/syb/syb-0.7.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate"
+HOMEPAGE="https://www.cs.uu.nl/wiki/GenericProgramming/SYB"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/mtl
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/syb/syb-0.7.2.4.ebuild b/dev-haskell/syb/syb-0.7.2.4.ebuild
new file mode 100644
index 000000000000..4908a67d58a4
--- /dev/null
+++ b/dev-haskell/syb/syb-0.7.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate"
+HOMEPAGE="https://github.com/dreixel/syb"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
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 f9549f2fe8ce..164661456996 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,16 +14,20 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
+CABAL_CHDEPS=(
+ 'chell >= 0.4 && < 0.5' 'chell >= 0.4'
+)
+
RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
>=dev-haskell/text-0.7.1:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
+ test? ( >=dev-haskell/chell-0.4
>=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0
>=dev-haskell/transformers-0.2 )
"
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
new file mode 100644
index 000000000000..241a70be2a1b
--- /dev/null
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
+HOMEPAGE="https://github.com/fpco/haskell-filesystem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
deleted file mode 100644
index ac3f5eaa57e8..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/text-0.11.0.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/system-posix-redirect/Manifest b/dev-haskell/system-posix-redirect/Manifest
deleted file mode 100644
index 2ac12aba5b8c..000000000000
--- a/dev-haskell/system-posix-redirect/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST system-posix-redirect-1.1.0.1.tar.gz 3581 BLAKE2B d93a0ec31e8ad900871469e501feccbd0094f5b8be7671f44282e26a7a2a72d7f8b74294af57d13d9658aa1fa6ec0e73e26e6e85d967254dc38ed462599edbdd SHA512 3a41668540ebff5ce706db331bb3c736895bd6a8fc11926884ff3e96622bb047c5b715468f4db81d0ac6acd15144ae9dbb71f087173244e29ba5b2a242f43c95
diff --git a/dev-haskell/system-posix-redirect/metadata.xml b/dev-haskell/system-posix-redirect/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/system-posix-redirect/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
deleted file mode 100644
index dd6cce1fc5e7..000000000000
--- a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A toy module to temporarily redirect a program's stdout"
-HOMEPAGE="https://hackage.haskell.org/package/system-posix-redirect"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index 98b0f5154c41..885373ffc2eb 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -1 +1,3 @@
-DIST tagged-0.8.6.tar.gz 11759 BLAKE2B 6461a8489d782c1d5d49454a662c64a2cd3108ca7c0fcbe598cb8f11c7792736a61855d3c830234e31d8de900b2a191d7529557711d4724c51d38a88a7948637 SHA512 8cec49ea6f54ba84109ec6068cce209321bfa4662d5acdf75e4019087e2890e3056bf13a237cb5caf3fec597b05b710ebbfb74e06b736b7fb2f87941defeb814
+DIST tagged-0.8.6.1-rev3.cabal 2874 BLAKE2B 96959835cc58d33e34cacdfe289a37d0c93db91e8ca72b74f23b82451dc0a4e6a113a1c5bc0a810887ef56d0a140c756c73bd8bf36002ddf5ae58307af084814 SHA512 084047d814fc74bbda9b15a737f498ae182bb498bcae64ae6114a8cfff58e4c238c79b99da30531b4560c9564d4cca08f565aa6929a0b902bad9723f482c8216
+DIST tagged-0.8.6.1.tar.gz 9842 BLAKE2B 6069ea3705dadfec7bc59d81cd9c425e01ad02131e9b6ce4657ad2b59d61a8dc8a420e518ed083a0d8d6b7171e5c233f3a9d96b15045b738c97d4f86fa3887b3 SHA512 289be845821aada538caf3fd0fc85b8ed115c657dc5beb0408816e43cf72153881ad305a982effa572a46e5b1842d2772af44313674cb0a252db8aeb6953f345
+DIST tagged-0.8.7.tar.gz 10082 BLAKE2B f52314aab17206fdf5bad6f334424dde0317f96483509c2da03ee6e823182914be2824350f43e4dd6a7d3e09c34c9d22f00dacba5b2d0f6e2b5a78f204e446fd SHA512 75e8a65a7ebf267a508660e91cb7e265aca3c7b417b4441a01024419f27c0b9614c94a45f0ee58c454492f6e623ccde2d8b9f06cc0100c2f2927efe119fa57ea
diff --git a/dev-haskell/tagged/metadata.xml b/dev-haskell/tagged/metadata.xml
index b1170db29515..af4a3d0086cc 100644
--- a/dev-haskell/tagged/metadata.xml
+++ b/dev-haskell/tagged/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">tagged</remote-id>
<remote-id type="github">ekmett/tagged</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/tagged/tagged-0.8.6.1.ebuild b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
new file mode 100644
index 000000000000..64c32b886599
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +deepseq,+transformers
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=deepseq \
+ --flag=transformers
+}
diff --git a/dev-haskell/tagged/tagged-0.8.6.ebuild b/dev-haskell/tagged/tagged-0.8.6.ebuild
deleted file mode 100644
index 780f35eefe27..000000000000
--- a/dev-haskell/tagged/tagged-0.8.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +deepseq,+transformers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
-HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'template-haskell >= 2.8 && < 2.15' 'template-haskell >= 2.8'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=deepseq \
- --flag=transformers
-}
diff --git a/dev-haskell/tagged/tagged-0.8.7.ebuild b/dev-haskell/tagged/tagged-0.8.7.ebuild
new file mode 100644
index 000000000000..790521347b67
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +deepseq,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=deepseq \
+ --flag=transformers
+}
diff --git a/dev-haskell/tagshare/Manifest b/dev-haskell/tagshare/Manifest
deleted file mode 100644
index c538835f9a77..000000000000
--- a/dev-haskell/tagshare/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagshare-0.0.tar.gz 2127 BLAKE2B f03fa580c08c45fe26f40cea2490f29a76e88f57d0af85c77c955b420476c28ea518e7ff873e9f8074993f103c5326de897b73fe575917c3b1d1877f65742586 SHA512 872592757bba6b21846888aeec1b36cc4f7c9cd602a299bb493763bd1c38d52d84419319a6761f5019e565081aceedc343cc1e52fcf5449a78e709da6164051f
diff --git a/dev-haskell/tagshare/metadata.xml b/dev-haskell/tagshare/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/tagshare/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/tagshare/tagshare-0.0.ebuild b/dev-haskell/tagshare/tagshare-0.0.ebuild
deleted file mode 100644
index f981323a9ca2..000000000000
--- a/dev-haskell/tagshare/tagshare-0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="TagShare - explicit sharing with tags"
-HOMEPAGE="https://hackage.haskell.org/package/tagshare"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
index 7be66e504539..86194d738e59 100644
--- a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
+++ b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/tagstream-conduit/Manifest b/dev-haskell/tagstream-conduit/Manifest
deleted file mode 100644
index 466be5847eae..000000000000
--- a/dev-haskell/tagstream-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagstream-conduit-0.5.6.tar.gz 10258 BLAKE2B 2d484f1d1578dcfcc30ba44c16d473dbc269e8dbd7b294803b4f9372c8df498e28ffa7b49f96d46629f932bf91012c5f2c28d0f6a3ce75f9440a31df03783959 SHA512 bd389b9db3a179b4b58a0e3c0f57953a3eeb4ad216b4f29cd452ce73b76cebf8f77c4510115b5840919d63b7e32fdd0839736e7f522596679a5d7dcadfc003d0
diff --git a/dev-haskell/tagstream-conduit/metadata.xml b/dev-haskell/tagstream-conduit/metadata.xml
deleted file mode 100644
index 1b6eb4ffa60a..000000000000
--- a/dev-haskell/tagstream-conduit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Tag-stream is a library for parsing HTML//XML to a token stream.
- It can parse unstructured and malformed HTML from the web.
- It also provides an Enumeratee which can parse streamline html, which means it consumes constant memory.
- You can start from the `tests/Tests.hs` module to see what it can do.
- </longdescription>
- <upstream>
- <remote-id type="github">yihuang/tagstream-conduit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild
deleted file mode 100644
index 46ce6273b9ec..000000000000
--- a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="streamlined html tag parser"
-HOMEPAGE="https://github.com/yihuang/tagstream-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/conduit-1.2:=[profile?]
- >=dev-haskell/conduit-extra-1.1.0:=[profile?]
- >=dev-haskell/data-default-0.5.0:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/xml-conduit-1.2.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/hunit
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/tar-conduit/Manifest b/dev-haskell/tar-conduit/Manifest
deleted file mode 100644
index 9ee9b6e98f87..000000000000
--- a/dev-haskell/tar-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tar-conduit-0.3.2.tar.gz 44525 BLAKE2B 2e978f73fa78b3254106bdcbd7c2a5d6d6b7d624c717267b5f95cb69497675e64d9367f0dd5ea18575cc9574143baecc9e4f84b29600708b3660fd7d7b15477d SHA512 18efa362953641092ee5b4f65b32a3337af077608487e02421cf6427209592654b3b2d15f9b21835f4596434b65aa9a1f80b9f3408050c09b57f6be5cd2c73f7
diff --git a/dev-haskell/tar-conduit/metadata.xml b/dev-haskell/tar-conduit/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/tar-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild b/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
deleted file mode 100644
index 05f37b9e9fbc..000000000000
--- a/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extract and create tar files using conduit for streaming"
-HOMEPAGE="https://github.com/snoyberg/tar-conduit#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-combinators-1.0.8.1
- >=dev-haskell/conduit-1.3
- dev-haskell/safe-exceptions
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24
- test? ( dev-haskell/conduit-extra
- dev-haskell/hspec
- dev-haskell/quickcheck
- dev-haskell/weigh )
-"
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index e58ad8f4dbde..0ef9757a471c 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1 +1,2 @@
+DIST tar-0.5.1.1-rev6.cabal 5459 BLAKE2B 5d5d32a2273b470406f0c373114108587657d560d1f75b30419af15a32bc2e6af5d210bd478ca2625f75027f0fdab824f9d4436a4815588eb94183d637b4a601 SHA512 53bacac3b92d359faab5b9a2124c6d95e03493063065a44dd4609267e27c055231fdd35ef48e4b0b494ea9bc973132b15c76f78bf86cf1ce189d7755e45d8d3e
DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
index 6b08cc023203..dde923e3418a 100644
--- a/dev-haskell/tar/metadata.xml
+++ b/dev-haskell/tar/metadata.xml
@@ -3,14 +3,10 @@
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library is for working with .tar@ archive files. It
- can read and write a range of common variations of archive
- format including V7, USTAR, POSIX and GNU formats. It provides
- support for packing and unpacking portable archives. This
- makes it suitable for distribution but not backup because
- details like file ownership and exact permissions are not
- preserved.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">tar</remote-id>
+ <remote-id type="github">haskell/tar</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tar/tar-0.5.1.1-r3.ebuild b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
new file mode 100644
index 000000000000..d4debed42063
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Test deps need porting
+
+DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
+HOMEPAGE="https://hackage.haskell.org/package/tar"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+# test? (
+# dev-haskell/bytestring-handle
+# >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+# >=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+# )
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
deleted file mode 100644
index b2fbd1ed1957..000000000000
--- a/dev-haskell/tar/tar-0.5.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating tar files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( dev-haskell/bytestring-handle
- >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4 && < 4.14' 'base >= 4' \
- 'tasty >= 0.10 && <0.12' 'tasty >= 0.10' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
-}
diff --git a/dev-haskell/tasty-ant-xml/Manifest b/dev-haskell/tasty-ant-xml/Manifest
deleted file mode 100644
index 8d2a5bccd71f..000000000000
--- a/dev-haskell/tasty-ant-xml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tasty-ant-xml-1.1.6.tar.gz 4831 BLAKE2B 25ffbfb3a5873d5cda24049d39dc5ad814805b63a7f1cadd2ff5e6eb2ab9ee9aa4997bde49fc0d5949780543a05f0fe1b29946852f436f0c1ccc34c7a1850c59 SHA512 e4a2d665d05acfd4e996a0568ccaacf61db4452e3720701874b1469ff39ef1f9646ab91780633c7c18bdf53bad28e72a63aa2a1cb82cbc879bd3e382fe9099ff
diff --git a/dev-haskell/tasty-ant-xml/metadata.xml b/dev-haskell/tasty-ant-xml/metadata.xml
deleted file mode 100644
index 6e4a3a305480..000000000000
--- a/dev-haskell/tasty-ant-xml/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.
- </longdescription>
- <upstream>
- <remote-id type="github">ocharles/tasty-ant-xml</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild
deleted file mode 100644
index 289f2280ebd9..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
- >=dev-haskell/mtl-2.1.2:=[profile?]
- >=dev-haskell/stm-2.4.2:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?]
- >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
- >=dev-haskell/xml-1.3.13:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/tasty-expected-failure/Manifest b/dev-haskell/tasty-expected-failure/Manifest
index 68cb8ad5cc9f..e2030edfda58 100644
--- a/dev-haskell/tasty-expected-failure/Manifest
+++ b/dev-haskell/tasty-expected-failure/Manifest
@@ -1 +1,2 @@
DIST tasty-expected-failure-0.11.1.2.tar.gz 3781 BLAKE2B 04101b477457747abbf1a90fed80ab8692e3f771f27fae8310c0451839b38efadf1751ae302a1bac0f020e01533030563c45a2c0d75b03f9cda88ee23d1d8e12 SHA512 31f89d64a1f700a2563b291d287f559e023b0b1059cf5ad35eb9a8b2d4a7d90b2ffced828017b3e86d7ece0b125787f7512e9f4745c75d38bbc688e09031aae5
+DIST tasty-expected-failure-0.12.3.tar.gz 6016 BLAKE2B 2e3b61686aa45c0bdcc593e77a6fed358f526aac5e0abd93b6894a6ab64637ec7ed0e0b94cd979ba8cbe4aaa3d41b80eb748c0cb3eccdd5f8e096055acac9c20 SHA512 38a38a6b918355b341ac52fbbd63312fbc44f2071785401dc667bb50b030e8c1963c5eb8f890c36daa0987d2fb4748effa543076429e0c8dea58f2fb0bf29f0c
diff --git a/dev-haskell/tasty-expected-failure/metadata.xml b/dev-haskell/tasty-expected-failure/metadata.xml
index 3a4f55351f26..ba8a08351743 100644
--- a/dev-haskell/tasty-expected-failure/metadata.xml
+++ b/dev-haskell/tasty-expected-failure/metadata.xml
@@ -5,21 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- With the function 'Test.Tasty.ExpectedFailure.expectFail' in the provided module
- "Test.Tasty.ExpectedFailure", you can mark that you expect test cases to fail,
- and not to pass.
-
- This can for example be used for test-driven development: Create the tests,
- mark them with 'Test.Tasty.ExpectedFailure.expectFail', and you can still push
- to the main branch, without your continuous integration branch failing.
-
- Once someone implements the feature or fixes the bug (maybe unknowingly), the
- test suite will tell him so, due to the now unexpectedly passing test, and he
- can remove the 'Test.Tasty.ExpectedFailure.expectFail' marker.
-
- The module also provides 'Test.Tasty.ExpectedFailure.ignoreTest' to avoid
- running a test. Both funtions are implemented via the more general
- 'Test.Tasty.ExpectedFailure.warpTest', which is also provided.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">tasty-expected-failure</remote-id>
+ <remote-id type="github">nomeata/tasty-expected-failure</remote-id>
+ </upstream>
</pkgmetadata>
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 8da7513fe22d..d630f6b17fe1 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
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
inherit haskell-cabal
+RESTRICT="test" # circular dependencies
DESCRIPTION="Mark tasty tests as failure expected"
HOMEPAGE="https://github.com/nomeata/tasty-expected-failure"
@@ -14,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
@@ -25,8 +26,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
-src_prepare() {
- cabal_chdeps \
- 'base >= 4.5 && <4.14' 'base >= 4.5'
- default
-}
+CABAL_CHDEPS=(
+ 'base >= 4.5 && <4.14' 'base >= 4.5'
+)
diff --git a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild
new file mode 100644
index 000000000000..fb62f9a5e2d8
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mark tasty tests as failure expected"
+HOMEPAGE="https://github.com/nomeata/tasty-expected-failure"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/tasty-0.11:=[profile?]
+ <dev-haskell/unbounded-delays-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/hedgehog
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hedgehog
+ dev-haskell/tasty-hunit
+ )
+"
+
+pkg_pretend() {
+ if use test; then
+ ewarn "The \"test\" USE flag for this package creates cycles within the"
+ ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+ ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+ fi
+}
diff --git a/dev-haskell/tasty-golden/Manifest b/dev-haskell/tasty-golden/Manifest
index 3fc798d232db..c17d8d304d02 100644
--- a/dev-haskell/tasty-golden/Manifest
+++ b/dev-haskell/tasty-golden/Manifest
@@ -1 +1,2 @@
DIST tasty-golden-2.3.1.1.tar.gz 7219 BLAKE2B c6160ece4ce5a35d7acc6f390a15fd83c8a13951d5bf243576aca5c65b05b8de9f57ea6227745da57c4527bcbef093dc53c955c547bb5a1c909b195a9ee9ca77 SHA512 b7871d2ddcf7f45e0f1df52982b6370308dd0c48588318985977cb88f93f4b759b1f2bdff44e31ec86f230f04304bcee14286f62c2d2ae01a6105b8a3250e5fb
+DIST tasty-golden-2.3.5.tar.gz 15179 BLAKE2B 43d4749bca69b7be0b6cfa3f0c5e3fcbe503b6cd39912306656ccd80c71c2fd2fccbd0d4c56414a07717781e3a885856211c8b283ef51449286924cdd36d945b SHA512 e98935654b0df84a5bbfe36d772c0895b4bb50a6fcc30d305261c3845f7c8a5ab0c0d2297157809cb61fd230d567dadcd763b953d79d9fadeb8e6edb9af5980f
diff --git a/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch b/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch
new file mode 100644
index 000000000000..bfdb79277ae9
--- /dev/null
+++ b/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch
@@ -0,0 +1,76 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+* There was a slight discrepency between the expected and actual results
+ of the "before-golden" test, likely due to a change in tasty's output.
+
+* The example executable is renamed to tasty-golden-example in the ebuild
+ to prevent possible name collisions.
+
+diff -urN tasty-golden-2.3.5/tests/golden/before-accept.golden tasty-golden-2.3.5-r1/tests/golden/before-accept.golden
+--- tasty-golden-2.3.5/tests/golden/before-accept.golden 2020-02-21 05:21:09.000000000 -0700
++++ tasty-golden-2.3.5-r1/tests/golden/before-accept.golden 2022-11-04 13:15:02.987564783 -0600
+@@ -7,6 +7,7 @@
+ Failing tests
+ goldenVsFile: FAIL
+ Files 'example/golden/fail/goldenVsFile.golden' and 'example/golden/fail/goldenVsFile.actual' differ
++ Use -p '$0=="Tests.Failing tests.goldenVsFile"' to rerun this test only.
+ goldenVsFileDiff: FAIL
+ 1d0
+ < 1
+@@ -35,6 +36,7 @@
+ 169d156
+ <<truncated>
+ Use --accept or increase --size-cutoff to see full output.
++ Use -p '/Failing tests.goldenVsFileDiff/' to rerun this test only.
+ goldenVsString: FAIL
+ Test output was different from 'example/golden/fail/goldenVsString.golden'. It was:
+ 2
+@@ -87,8 +89,9 @@
+ 55
+ 56<truncated>
+ Use --accept or increase --size-cutoff to see full output.
++ Use -p '$0=="Tests.Failing tests.goldenVsString"' to rerun this test only.
+ goldenVsStringDiff: FAIL
+- Test output was different from 'example/golden/fail/goldenVsStringDiff.golden'. Output of ["diff","example/golden/fail/goldenVsStringDiff.golden","/tmp/goldenVsStringDiff.actual"]:
++ Test output was different from 'example/golden/fail/goldenVsStringDiff.golden'. Output of ["diff","example/golden/fail/goldenVsStringDiff.golden","/var/tmp/portage/dev-haskell/tasty-golden-2.3.5/temp/goldenVsStringDiff.actual"]:
+ 1d0
+ < 1
+ 4d2
+@@ -116,5 +119,6 @@
+ 169d156
+ <<truncated>
+ Use --accept or increase --size-cutoff to see full output.
++ Use -p '/Failing tests.goldenVsStringDiff/' to rerun this test only.
+
+ 4 out of 8 tests failed
+diff -urN tasty-golden-2.3.5/tests/test.hs tasty-golden-2.3.5-r1/tests/test.hs
+--- tasty-golden-2.3.5/tests/test.hs 2021-02-24 06:27:55.000000000 -0700
++++ tasty-golden-2.3.5-r1/tests/test.hs 2022-11-04 13:04:13.007572500 -0600
+@@ -89,7 +89,7 @@
+ -- timings.
+ --
+ -- NB: cannot use multiline literals because of CPP.
+- let cmd = shell ("cd " ++ tmp ++ " && example | " ++
++ let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example | " ++
+ "sed -Ee 's/[[:digit:]-]+\\.actual/.actual/g; s/ \\([[:digit:].]+s\\)//' > " ++
+ our</>"tests/golden/before-accept.actual || true")
+ runProcess_ cmd
+@@ -102,7 +102,7 @@
+ (do
+ tmp <- tmpIO
+ our <- getCurrentDirectory
+- let cmd = shell ("cd " ++ tmp ++ " && example --accept | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
++ let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example --accept | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
+ our </>"tests/golden/with-accept.actual")
+ runProcess_ cmd
+ )
+@@ -114,7 +114,7 @@
+ (do
+ tmp <- tmpIO
+ our <- getCurrentDirectory
+- let cmd = shell ("cd " ++ tmp ++ " && example | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
++ let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
+ our</>"tests/golden/after-accept.actual")
+ runProcess_ cmd
+ )
diff --git a/dev-haskell/tasty-golden/metadata.xml b/dev-haskell/tasty-golden/metadata.xml
index d648cf9ea9ee..eeae1e3d3b3f 100644
--- a/dev-haskell/tasty-golden/metadata.xml
+++ b/dev-haskell/tasty-golden/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides support for «golden testing».
- A golden test is an IO action that writes its result to a file.
- To pass the test, this output file should be identical to the corresponding
- 'golden' file, which contains the correct result for the test.
- </longdescription>
<upstream>
- <remote-id type="github">feuerbach/tasty-golden</remote-id>
+ <remote-id type="hackage">tasty-golden</remote-id>
+ <remote-id type="github">UnkindPartition/tasty-golden</remote-id>
</upstream>
</pkgmetadata>
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 657218876502..6d5baa4e0d98 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
+HOMEPAGE="https://github.com/UnkindPartition/tasty-golden"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild
new file mode 100644
index 000000000000..95bcf980ebb6
--- /dev/null
+++ b/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: build-example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Golden tests support for tasty"
+HOMEPAGE="https://github.com/UnkindPartition/tasty-golden"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.5-fix-tests.patch"
+)
+
+CABAL_CHDEPS=(
+ 'executable example' "executable ${PN}-example"
+)
+
+CABAL_TEST_REQUIRED_BINS=(
+ "${PN}-example"
+)
+
+RDEPEND="
+ dev-haskell/async:=[profile?]
+ >=dev-haskell/optparse-applicative-0.3.1:=[profile?]
+ dev-haskell/tagged:=[profile?]
+ >=dev-haskell/tasty-1.3:=[profile?]
+ dev-haskell/temporary:=[profile?]
+ dev-haskell/typed-process:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/tasty-hunit
+ )
+"
+
+src_configure() {
+ if use examples || use test; then
+ local example_flag=build-example
+ else
+ local example_flag=-build-example
+ fi
+
+ haskell-cabal_src_configure \
+ --flag="${example_flag}"
+}
+
+src_install() {
+ local components=(
+ "lib:${PN}"
+ )
+
+ if use examples; then
+ components+=(
+ "exe:${PN}-example"
+ )
+ fi
+
+ haskell-cabal_src_install "${components[@]}"
+}
+
+pkg_postinst() {
+ if use examples; then
+ elog "The example executable installed with this package (normally named 'example')"
+ elog "has been renamed to '${PN}-example' to help prevent name collisions."
+ fi
+
+ haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/tasty-hedgehog/Manifest b/dev-haskell/tasty-hedgehog/Manifest
index dc65e49e6cc3..7d4ce814ef8f 100644
--- a/dev-haskell/tasty-hedgehog/Manifest
+++ b/dev-haskell/tasty-hedgehog/Manifest
@@ -1 +1,2 @@
-DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b
+DIST tasty-hedgehog-1.1.0.0.tar.gz 4610 BLAKE2B c0cd4e99531d8425381e2aebb62a407674226bfe205874a0a512bc65383e237a4bbfdf6be4d65b30893212e09dcf68d42f11e89b349c6db535a359fa845e18aa SHA512 48dda3dda14241f8d8dc77acf61a0fe77887c835ae9de6182c9fe580bb79e98f2480a14c282ff49b1438ffab197812262529e90dcec2af3785713f218490bce2
+DIST tasty-hedgehog-1.4.0.2.tar.gz 5505 BLAKE2B c11950686d4a16825f8773f4f045c6327758c9c04b50889cd423bae88c99cadd9153b07df4e8d0c65ee4e086e1bd0338e79b4604c3a10c789a28cc70476701b4 SHA512 ea995eff179fcecd40c1b346a5c8405090f7a7542848f3d4d591e83bb8d1f9bce51e6fc2f8fd1182b7b5eade0a64e6605ff88b878acf5f79dde2838b0781b760
diff --git a/dev-haskell/tasty-hedgehog/metadata.xml b/dev-haskell/tasty-hedgehog/metadata.xml
index 937381521944..cc1800d54bd1 100644
--- a/dev-haskell/tasty-hedgehog/metadata.xml
+++ b/dev-haskell/tasty-hedgehog/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">tasty-hedgehog</remote-id>
+ <remote-id type="github">qfpl/tasty-hedgehog</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild
deleted file mode 100644
index 00d5c2279d89..000000000000
--- a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integration for tasty and hedgehog"
-HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[profile?]
- >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.8 && <4.14' 'base >= 4.8' \
- 'tasty-expected-failure >= 0.11 && < 0.12' 'tasty-expected-failure >= 0.11' \
- 'hedgehog >= 1.0.2 && < 1.0.3' 'hedgehog >= 1.0.2'
-}
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
new file mode 100644
index 000000000000..7910a47136e5
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integration for tasty and hedgehog"
+HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 )
+"
+
+CABAL_CHDEPS=(
+ 'base >= 4.8 && <4.16' 'base >= 4.8'
+ 'hedgehog >= 1.0.2 && < 1.0.6' 'hedgehog >= 1.0.2'
+)
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild
new file mode 100644
index 000000000000..0c15aa0aa45d
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integration for tasty and hedgehog"
+HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/hedgehog-1.4:=[profile?] <dev-haskell/hedgehog-1.5:=[profile?]
+ >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? (
+ >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13
+ )
+"
diff --git a/dev-haskell/tasty-hslua/Manifest b/dev-haskell/tasty-hslua/Manifest
new file mode 100644
index 000000000000..a134aebad824
--- /dev/null
+++ b/dev-haskell/tasty-hslua/Manifest
@@ -0,0 +1,2 @@
+DIST tasty-hslua-1.0.2.tar.gz 3099 BLAKE2B 712c04ffa8bfb309473c01ea7d01a1dd3483649520c38b78f180792fdedadf6953394dea37e7dcf2468f3e0a0e8ad9bdc16912dec70f765d4fa0a0745e5eac01 SHA512 397a8dce3eef50cac8a770c4b0471f454f62ead5fc8a5a08b9b01d97465016815d8e04730df5e79977393815dfa09bda6e0a6f334d479c17fb93940c0d5f27de
+DIST tasty-hslua-1.1.0.tar.gz 3090 BLAKE2B b5f64c46f78bc8ed7aaf6c080db547f28dd4764360017331e6885648070acd25eec431287ef3c8ba0f462572a6def3dbb00ef33351d43501fe61435d989e72bd SHA512 367a991ae317ba664e27a0685dc576bc555c627dc0ccac43ca52c25c51cb27777ba3230924cbc39edbc18587fbf9ab3f7019bdf9e2dfbbcb9513730523417cb8
diff --git a/dev-haskell/tasty-hslua/metadata.xml b/dev-haskell/tasty-hslua/metadata.xml
new file mode 100644
index 000000000000..61739e68e885
--- /dev/null
+++ b/dev-haskell/tasty-hslua/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">tasty-hslua</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
new file mode 100644
index 000000000000..83c93ad2c72a
--- /dev/null
+++ b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 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"
+inherit haskell-cabal
+
+DESCRIPTION="Tasty helpers to test HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/tasty-hunit-0.9:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild b/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild
new file mode 100644
index 000000000000..c32fc6b2b2c1
--- /dev/null
+++ b/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tasty helpers to test HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/tasty-0.11:=[profile?]
+ >=dev-haskell/tasty-hunit-0.9:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
index 2f76487ecaf7..0a5a9c5fdac1 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1 +1 @@
-DIST tasty-hunit-0.10.0.2.tar.gz 7403 BLAKE2B 04813c3d35635ee296e28e19d76136f59e3d196a8e6a9c4410f6a7ee20996178f4c10aacdf985a73b989914099a86b1b1ab930e21584e714150e041b401e3179 SHA512 82f70cd7813affeb756de89842a77070e688169eb35a386fbc4db36b65d8c960bca7b923294918e10b65281d3265820f9592398550af8af92027960d48562fd0
+DIST tasty-hunit-0.10.0.3.tar.gz 7885 BLAKE2B a8e8af2b1fcf575646620ccb4d822e6cbf688372dacf0686a7c3760ad693f2a7d88f280ef9e43eb9cd757f89d2771368adf567a9390b1a35f9b1db5aae7c5d81 SHA512 29adbf499b8079c12c756e031c3bebffa1c312cf623ff77d4fb2e85d3462ac6e71aa8a13c3e161ef04ad5bbf910c3bb5f4b62bc3825a030b690a90eea812b85a
diff --git a/dev-haskell/tasty-hunit/metadata.xml b/dev-haskell/tasty-hunit/metadata.xml
index 937381521944..d1c3114a5e36 100644
--- a/dev-haskell/tasty-hunit/metadata.xml
+++ b/dev-haskell/tasty-hunit/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">UnkindPartition/tasty</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
deleted file mode 100644
index 0049ea0f53d2..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
- >=dev-haskell/tasty-1.2.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
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
new file mode 100644
index 000000000000..7cc0177c5470
--- /dev/null
+++ b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the Tasty test framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+ >=dev-haskell/tasty-1.2.2:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
index 937381521944..0897747e1fa4 100644
--- a/dev-haskell/tasty-kat/metadata.xml
+++ b/dev-haskell/tasty-kat/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">vincenthz/tasty-kat</remote-id>
+ </upstream>
</pkgmetadata>
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 e7d6236527b9..e1120434146a 100644
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/tasty:=[profile?]
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
index e1fe7ef5b434..47e2ad2ef58d 100644
--- a/dev-haskell/tasty-lua/Manifest
+++ b/dev-haskell/tasty-lua/Manifest
@@ -1 +1,2 @@
-DIST tasty-lua-0.2.3.1.tar.gz 7520 BLAKE2B 61c60b1587fd09b1db6f46066d8037034b9631e17dfd6217375df870acd91ca2558260b4e50146df7968d61ea2772765b806bcd71b6a0b91f727ebe2ccbc5fe2 SHA512 7c97f001ee2659ec48a8810505fc820607be9969151fe082157a33a308617b68be83a792b7ff1da3d492d14490fdc1b71a7d9bda2643be760a78f46fb5e98ad7
+DIST tasty-lua-1.0.2.tar.gz 10413 BLAKE2B 78d09b1c70b53b23264ee5d2b76d32be43e55e3df551792a51626201e405cd25be267cbe2c55dee2c16851877b90c30cbd8bd8b34fd341ce9024ae75e423e5f9 SHA512 0b572e4dbb793c573d28a9e3516926e7f7cba7e962e48de29c24b4da9c2656407cf3a2db21b2db56fa149ef13a70e318f44b3b5de2041863510d31e1bd621857
+DIST tasty-lua-1.1.0.tar.gz 10420 BLAKE2B d771834f6386a93767193998a0136b16cdf84dc07e273265942e3af160560e24d8b1077958c909fa7a9162323f9fb4c42ad52802292b6d8ab17128f060591f01 SHA512 22f002ef8cda5069947f144aaa03d0f17c9edfc3358238de29980244c18cc61058d799d3e156cd40c90e20569c3cae279a3fe264b766e1d179576886404e90fb
diff --git a/dev-haskell/tasty-lua/metadata.xml b/dev-haskell/tasty-lua/metadata.xml
index 937381521944..01584748d5c0 100644
--- a/dev-haskell/tasty-lua/metadata.xml
+++ b/dev-haskell/tasty-lua/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">tasty-lua</remote-id>
+ <remote-id type="github">hslua/hslua</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild b/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
deleted file mode 100644
index d135aac5da0e..000000000000
--- a/dev-haskell/tasty-lua/tasty-lua-0.2.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Write tests in Lua, integrate into tasty"
-HOMEPAGE="https://github.com/hslua/tasty-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
- >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.4:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
new file mode 100644
index 000000000000..e364bb18fefb
--- /dev/null
+++ b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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="Write tests in Lua, integrate into tasty"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+ >=dev-haskell/lua-arbitrary-1.0:=[profile?] <dev-haskell/lua-arbitrary-1.1:=[profile?]
+ >=dev-haskell/quickcheck-2.9:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+ >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
new file mode 100644
index 000000000000..787f5539f844
--- /dev/null
+++ b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Write tests in Lua, integrate into tasty"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+ >=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+ >=dev-haskell/lua-arbitrary-1.0:=[profile?] <dev-haskell/lua-arbitrary-1.1:=[profile?]
+ >=dev-haskell/quickcheck-2.9:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-quickcheck/Manifest b/dev-haskell/tasty-quickcheck/Manifest
index 88ace228fe3e..233c20edb3c6 100644
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ b/dev-haskell/tasty-quickcheck/Manifest
@@ -1 +1,2 @@
DIST tasty-quickcheck-0.10.1.1.tar.gz 5539 BLAKE2B 688675aa15f2790d147d34dbeca8d42e556b8a2d3fe52c7687e149f271a0ddcbb6fb21ac6be4065fdf1b8dcb82aa10a8f533e77da0111c140bb9ef807e48c222 SHA512 13cfcc99eb9988d4842327d96f0e58f5ba6c653d3027a4adb307d4101bc2f7deee0033197b4358a837ace0d03423bdafe2197b029da6a64d8b650ee2f5bd958d
+DIST tasty-quickcheck-0.10.2.tar.gz 5868 BLAKE2B 74a4870c547f716378fee7aae7e628ca69d3364f22cd62710ed0321abcbc2a94f48fe8a0c89e0aab62bf380247422ee5f0cb5fa122ab3e33219981a6e8ce4142 SHA512 78b223fc54428e71b1a8b3afba1128764e61703be4dea95541e0661d2fbe3006b77ef15200577e40bf3bf78a557f66f13a77288c8fe87dc19eb343c9fdff9d89
diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
index 937381521944..e9cd653d1c03 100644
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ b/dev-haskell/tasty-quickcheck/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">tasty-quickcheck</remote-id>
+ <remote-id type="github">UnkindPartition/tasty</remote-id>
+ </upstream>
</pkgmetadata>
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 c5e7fb3b375a..2c998919b3f5 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
@@ -9,16 +9,16 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/optparse-applicative:=[profile?]
- >=dev-haskell/quickcheck-2.10:2=[profile?]
+ >=dev-haskell/quickcheck-2.10:=[profile?]
dev-haskell/random:=[profile?]
dev-haskell/tagged:=[profile?]
>=dev-haskell/tasty-1.0.1:=[profile?]
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
new file mode 100644
index 000000000000..f9bb7b4d7cf9
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck support for the Tasty test framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/optparse-applicative:=[profile?]
+ >=dev-haskell/quickcheck-2.10:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/tagged:=[profile?]
+ >=dev-haskell/tasty-1.0.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/pcre-light
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
index e82bbe57da8e..d9b0274482d1 100644
--- a/dev-haskell/tasty-rerun/Manifest
+++ b/dev-haskell/tasty-rerun/Manifest
@@ -1 +1 @@
-DIST tasty-rerun-1.1.17.tar.gz 6305 BLAKE2B 6e84088c39055f40e64c67d186917d3d9dde5839243584a045a0f4cadc7b7f0e81e3f046ec32e4fa13455f51fa1b287eef51ea60a17f95302caf8fa0f3130d5f SHA512 d65b35acb1b45a78a0bbe568a2118ea6580352a55b921f06974bdf59e363403f1590604e215840be990f5f18a5d8e75abd416e7d3d9b6b9f4c6c16532c31052d
+DIST tasty-rerun-1.1.18.tar.gz 6388 BLAKE2B 795cfa825ae49e5a91e8b25ebb1910092f2927484b52500048740b95c2511981a16bc5202182cd18e8d85676d21a8f956183508be2c9eb1257427c6328fee550 SHA512 82672a8d2f37a56e9867bb6fa2b8c79dc40869262a1853b51067e9cf463aef78c4aa3d69cda32a06c3d226ef18c951789845e57a82cbad880f29d5415a659ced
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild
deleted file mode 100644
index 481cd77335de..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.17.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
- >=dev-haskell/optparse-applicative-0.6:=[profile?]
- >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-haskell/stm-2.4.2:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/tasty-1.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.6 && <4.14' 'base >=4.6' \
- 'tasty >=1.2 && <1.3' 'tasty >=1.2'
-}
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
new file mode 100644
index 000000000000..6396f90026b0
--- /dev/null
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Rerun only tests which failed in a previous test run"
+HOMEPAGE="https://github.com/ocharles/tasty-rerun"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
+ >=dev-haskell/optparse-applicative-0.6:=[profile?]
+ >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
+ >=dev-haskell/stm-2.4.2:=[profile?]
+ >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+CABAL_CHDEPS=(
+ 'base >=4.6 && <4.15' 'base >=4.6'
+)
diff --git a/dev-haskell/tasty-smallcheck/Manifest b/dev-haskell/tasty-smallcheck/Manifest
index c16334bd0682..82d3fb672238 100644
--- a/dev-haskell/tasty-smallcheck/Manifest
+++ b/dev-haskell/tasty-smallcheck/Manifest
@@ -1 +1,2 @@
DIST tasty-smallcheck-0.8.1.tar.gz 2690 BLAKE2B e6ccfca50577edc27da4d8f77041e5eeb80c28574a5d0d9cfa20154e557a9893242456a4875e72d616e70f477bf1b7c6a1911c7d3a863b71e8481ff387815a00 SHA512 26ed0d75559c2da2f4296af6e9b02f8d0a19043b0ef154674eb782703fcd3ad7f4863b7b07dbaae27440078b4b00a9272cd9d5da23089993018e933577be5893
+DIST tasty-smallcheck-0.8.2.tar.gz 3041 BLAKE2B bb13e2253699f1f064276788254671f74b9e193a35ded683ba6cdd2f3f2e4770a8d78825991ad1d20426adb2437f7c120208aed1c77726d7e1c0969748b98c4c SHA512 ff816280315e26d20210f0dcbf55e32780aa9ef455d8d00b146d9daeed6afec5b6593cd8a8dc0b7c0bc7ff77da75f065f9c7253494f2c47150e2b7a6aa29fc6a
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
index 937381521944..d1c3114a5e36 100644
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ b/dev-haskell/tasty-smallcheck/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">UnkindPartition/tasty</remote-id>
+ </upstream>
</pkgmetadata>
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 28abaea31822..17b99b75f742 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild
new file mode 100644
index 000000000000..6d00a7e0f504
--- /dev/null
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="SmallCheck support for the Tasty test framework"
+HOMEPAGE="https://github.com/feuerbach/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/optparse-applicative:=[profile?]
+ >=dev-haskell/smallcheck-1.0:=[profile?]
+ dev-haskell/tagged:=[profile?]
+ >=dev-haskell/tasty-0.8:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
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 c0d54a8cc83a..5fb50fc26a63 100644
--- a/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
+++ b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/haskell-src-exts-1.18.0:=[profile?]
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
index 13870b85d4e9..a5ce647a6428 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -1 +1 @@
-DIST tasty-1.2.3.tar.gz 49148 BLAKE2B 8de7436bca740e55a6592e833326b03f001823c74c8678ae5d38c2c836249a9af08321df6245573e5d060a25e9512c1f601a62978f2b3f22ee846d3cef72a829 SHA512 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472
+DIST tasty-1.4.2.3.tar.gz 58549 BLAKE2B 7e806ef62a455a9bd71782800e0a53b327963ea12e7dff7bc508560457dc84c6b94aa8a8b67524b3ea8b7629d5d78bd63a56790e9bbdb356393f306b271b97a8 SHA512 c5f03406e4a7b0c8ff98de285cc778a7751c535d62bb69da962f78ad4eadaf76a74d3bd2c81b1c7553b5de4a527be964c568a8311929a0dce44389c3fcaf521e
diff --git a/dev-haskell/tasty/metadata.xml b/dev-haskell/tasty/metadata.xml
index 937381521944..aa6c85f01596 100644
--- a/dev-haskell/tasty/metadata.xml
+++ b/dev-haskell/tasty/metadata.xml
@@ -5,4 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <use>
+ <flag name="clock">Depend on the clock package for more accurate time measurement</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">tasty</remote-id>
+ <remote-id type="github">UnkindPartition/tasty</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tasty/tasty-1.2.3.ebuild b/dev-haskell/tasty/tasty-1.2.3.ebuild
deleted file mode 100644
index bfe4addf2901..000000000000
--- a/dev-haskell/tasty/tasty-1.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: clock
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.9:=[profile?]
- >=dev-haskell/async-2.0:=[profile?]
- >=dev-haskell/mtl-2.1.3.1:=[profile?]
- >=dev-haskell/optparse-applicative-0.14:=[profile?]
- >=dev-haskell/stm-2.3:=[profile?]
- >=dev-haskell/tagged-0.5:=[profile?]
- >=dev-haskell/unbounded-delays-0.1:=[profile?]
- dev-haskell/wcwidth:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-haskell/clock-0.4.4.0:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=clock
-}
diff --git a/dev-haskell/tasty/tasty-1.4.2.3.ebuild b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
new file mode 100644
index 000000000000..b53097c063f3
--- /dev/null
+++ b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: +unix
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Modern and extensible testing framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+clock"
+
+RDEPEND="
+ >=dev-haskell/ansi-terminal-0.9:=[profile?]
+ >=dev-haskell/optparse-applicative-0.14:=[profile?]
+ >=dev-haskell/stm-2.3:=[profile?]
+ >=dev-haskell/tagged-0.5:=[profile?]
+ >=dev-haskell/unbounded-delays-0.1:=[profile?]
+ dev-haskell/wcwidth:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ clock? (
+ >=dev-haskell/clock-0.4.4.0:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag clock clock) \
+ --flag=unix
+}
diff --git a/dev-haskell/template-haskell-compat-v0208/Manifest b/dev-haskell/template-haskell-compat-v0208/Manifest
deleted file mode 100644
index 8ea19ea97ebf..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST template-haskell-compat-v0208-0.1.4.tar.gz 2957 BLAKE2B 604a9a64f84661d3babd083782844cd8c4d13138cecbbfabdcb4e933cc11233dc45eda2bb72426271b0bc859ad5babc86e8db6cb5a28d9f30e0f2b0169b4951c SHA512 00bda455148500ae49638ad8eead6516e37ab0fd6a35f5060dec73f4026dd02f0cd2be21dd8f64eadabd4b1bd6894f2bac3735a4dfc60115dfbf37dfe864d62e
diff --git a/dev-haskell/template-haskell-compat-v0208/metadata.xml b/dev-haskell/template-haskell-compat-v0208/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
deleted file mode 100644
index 2b162c42cfc4..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backwards compatibility layer for Template Haskell newer than 2.8"
-HOMEPAGE="https://github.com/nikita-volkov/template-haskell-compat-v0208"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index 937381521944..3c32ab877a53 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">UnkindPartition/temporary</remote-id>
+ </upstream>
</pkgmetadata>
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 b337eba34f42..6c43ae9c9c59 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/feuerbach/temporary"
+HOMEPAGE="https://github.com/UnkindPartition/temporary"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
new file mode 100644
index 000000000000..22832a87777a
--- /dev/null
+++ b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
@@ -0,0 +1,46 @@
+From 7f448b41589fccd3ac883c6fb3865f8dbedcb14d Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 30 Oct 2022 12:45:29 -0600
+Bug: https://github.com/UnkindPartition/temporary/pull/15
+Subject: [PATCH] Add smp flag
+
+This flag will toggle the use of some `ghc-options` in the test suite.
+It is set to `default: True`.
+
+This is needed for tests to run on some GHC builds which do not support
+a threaded runtime.
+
+Reported-by: matoro <https://github.com/matoro>
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ temporary.cabal | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/temporary.cabal b/temporary.cabal
+index 67163d1..ca54604 100644
+--- a/temporary.cabal
++++ b/temporary.cabal
+@@ -15,6 +15,11 @@ source-repository head
+ type: git
+ location: git://github.com/feuerbach/temporary.git
+
++flag smp
++ description: Use flags that depend on GHC supporting a multicore runtime (tests only)
++ manual: True
++ default: True
++
+ Library
+ default-language:
+ Haskell2010
+@@ -37,7 +42,10 @@ test-suite test
+ tests
+ main-is:
+ test.hs
+- ghc-options: -threaded -with-rtsopts=-N2
++ if flag(smp)
++ ghc-options: -threaded -with-rtsopts=-N2
++ else
++ ghc-options: -threaded
+ build-depends:
+ base >= 4.3 && < 5
+ , directory
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index f0239d9fd1c2..5a2f1de5b5d4 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -5,13 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The functions for creating temporary files and directories in the base library are quite limited. The unixutils
- package contains some good ones, but they aren't portable to Windows.
- This library just repackages the Cabal implementations of its own temporary file and folder functions so that
- you can use them without linking against Cabal or depending on it being installed.
- </longdescription>
<upstream>
- <remote-id type="github">batterseapower/temporary</remote-id>
+ <remote-id type="hackage">temporary</remote-id>
+ <remote-id type="github">feuerbach/temporary</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/temporary/temporary-1.3-r1.ebuild b/dev-haskell/temporary/temporary-1.3-r1.ebuild
new file mode 100644
index 000000000000..604644669b27
--- /dev/null
+++ b/dev-haskell/temporary/temporary-1.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Portable temporary file and directory support"
+HOMEPAGE="https://github.com/feuerbach/temporary"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3-smp-flag.patch"
+)
+
+RDEPEND="
+ >=dev-haskell/random-1.1:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? (
+ dev-haskell/base-compat
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ )
+"
+
+src_configure() {
+ if ghc-supports-smp; then
+ local smp_flag=smp
+ else
+ local smp_flag=-smp
+ fi
+
+ haskell-cabal_src_configure \
+ --flag="${smp_flag}"
+}
diff --git a/dev-haskell/temporary/temporary-1.3.ebuild b/dev-haskell/temporary/temporary-1.3.ebuild
index 1557b635b0ea..3bbb3ee7db6b 100644
--- a/dev-haskell/temporary/temporary-1.3.ebuild
+++ b/dev-haskell/temporary/temporary-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/feuerbach/temporary"
+HOMEPAGE="https://github.com/UnkindPartition/temporary"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
deleted file mode 100644
index c42191fdb413..000000000000
--- a/dev-haskell/tensor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tensor-1.1.0.1.tar.gz 3281 BLAKE2B 768bf8ab52c17ef8825f83dfa7a7f2e8854305aa2afcdc0a13aa336b20fb6841c470b637d2b29b2acc988669f2ef13d079a667102be1e2d1d03cb981a078937c SHA512 000086bcf160a1ea0a9a3f1aea39ea87979db97203511549e62c5b5161ae178aab0a1e7e0a091e82e66e319dd86c90e8f07ca473027fe7d363f18bfc584c30f3
diff --git a/dev-haskell/tensor/metadata.xml b/dev-haskell/tensor/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/tensor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/tensor/tensor-1.1.0.1.ebuild b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
deleted file mode 100644
index 67a86ad5bdbe..000000000000
--- a/dev-haskell/tensor/tensor-1.1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Tensor"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tensor data types"
-HOMEPAGE="https://github.com/svenpanne/Tensor"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/terminal-size/Manifest b/dev-haskell/terminal-size/Manifest
index d3a1b1e53b97..5d153d90f850 100644
--- a/dev-haskell/terminal-size/Manifest
+++ b/dev-haskell/terminal-size/Manifest
@@ -1 +1,2 @@
DIST terminal-size-0.3.2.1.tar.gz 4175 BLAKE2B d6a2b54298217dfae26e3fccb5aca6813c23b1bdef5c2e22236b6285222ade53842acd0283e862c86f25f94c1b5ce9f990ad583e0f498b57795d6d59bafdd920 SHA512 1e04705dda8ade9a06f8b369f1033a93ffb94a1b959a556e11f2373b25924adbbab4be0f3e077394e1023e0054044739df13406b69153c1542f4083be82a1584
+DIST terminal-size-0.3.3.tar.gz 4291 BLAKE2B 71c378683772654a6e598a6ff3fcafdc3e8737044c8cb4afa0dd4093e9978854d24bf97fae28d3fc8e585daa5a999a268b428d0e8698ee25fbe87d57224fb8ea SHA512 eff444205905337503e208ae2ce925713c4ebdf1a92bdd915feef2f85a8d936d74c727b01e570aed64c151797b23800220460d520a0df0830b5419ad51d7f310
diff --git a/dev-haskell/terminal-size/metadata.xml b/dev-haskell/terminal-size/metadata.xml
index 937381521944..c97bfab3cc30 100644
--- a/dev-haskell/terminal-size/metadata.xml
+++ b/dev-haskell/terminal-size/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">terminal-size</remote-id>
+ <remote-id type="github">biegunka/terminal-size</remote-id>
+ </upstream>
</pkgmetadata>
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 f525f392145e..6bf55f9285ca 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild
new file mode 100644
index 000000000000..f4e514a61744
--- /dev/null
+++ b/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Get terminal window height and width"
+HOMEPAGE="https://hackage.haskell.org/package/terminal-size"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
deleted file mode 100644
index e8182045027d..000000000000
--- a/dev-haskell/terminfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
diff --git a/dev-haskell/terminfo/metadata.xml b/dev-haskell/terminfo/metadata.xml
deleted file mode 100644
index 5e3928e8e528..000000000000
--- a/dev-haskell/terminfo/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">judah/terminfo</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
deleted file mode 100644
index 7fd6206e537d..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8 and ghc 8.10
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
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 8f1588293af7..ce749f2dee58 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.6.9999
#hackport: flags: +base4
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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?]
@@ -27,12 +27,9 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
-}
+CABAL_CHDEPS=(
+ 'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/test-framework-leancheck/metadata.xml b/dev-haskell/test-framework-leancheck/metadata.xml
index 937381521944..85f1049380c1 100644
--- a/dev-haskell/test-framework-leancheck/metadata.xml
+++ b/dev-haskell/test-framework-leancheck/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">rudymatela/test-framework-leancheck</remote-id>
+ </upstream>
</pkgmetadata>
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 5758334d9ca0..dbbe77a31e06 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
deleted file mode 100644
index 17814ed154f8..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
- >=dev-haskell/quickcheck-2.4:2=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.4 && < 2.13' 'QuickCheck >= 2.4'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=base4
-}
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
new file mode 100644
index 000000000000..3dce34339afa
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
+ >=dev-haskell/quickcheck-2.4:=[profile?]
+ >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+CABAL_CHDEPS=(
+ 'QuickCheck >= 2.4 && < 2.13' 'QuickCheck >= 2.4' \
+ 'random >= 1 && < 1.2' 'random >= 1'
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4
+}
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
index 937381521944..da19a33e5a76 100644
--- a/dev-haskell/test-framework-th/metadata.xml
+++ b/dev-haskell/test-framework-th/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">finnsson/test-generator</remote-id>
+ </upstream>
</pkgmetadata>
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 cc8dadb87ad8..98606fff1283 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 988cc0f0708a..f8cca506a6ce 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1 +1,2 @@
+DIST test-framework-0.8.2.0-rev10.cabal 6551 BLAKE2B ce6ea4314af3636960aa38714641cb79f83ccb3da89e2f95921c7f2e05da1ef3085d5cdeba3eb92c1a57245f38660994ec19478f0ce11489e952a55197debf9d SHA512 bf7a78811a6f7d25df23e79577b58c7af693f9615f631e69524d2bee144d8288f68d89416fc5ad4ae4c576093ea12ed7c8706dc096e6f758ce039f6c103fa184
DIST test-framework-0.8.2.0.tar.gz 21317 BLAKE2B 80065ad3d87188a8310e93b9caaaca73c3176e150b254fe29dd3e08d38f7a7066119b132f6c747a35a87a13764d115fe83b131a023667a3919c0f1c0963c770a SHA512 d8e7ea274819a1b49b9f938df527d22c808f456d25b84f03173ed57dddd39c230fb037a57ce90c38f571801ee38e86bed6826df1c93f184e4a803c72ce5f41e4
diff --git a/dev-haskell/test-framework/metadata.xml b/dev-haskell/test-framework/metadata.xml
index 6d7c2fd39257..f9659d324248 100644
--- a/dev-haskell/test-framework/metadata.xml
+++ b/dev-haskell/test-framework/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
- parallel (but reported in deterministic order, to aid diff interpretation) and filtered and controlled by
- command line options. All of this comes with colored test output, progress reporting and test statistics output.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">test-framework</remote-id>
+ <remote-id type="github">haskell/test-framework</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
deleted file mode 100644
index 6b272d908245..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing modules
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # tests are missing
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
- >=dev-haskell/base-orphans-0.1:=[profile?]
- >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/regex-posix-0.72:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?]
- >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0' \
- 'base-orphans >= 0.1 && < 0.5' 'base-orphans >= 0.1' \
- 'containers >= 0.1 && < 0.6' 'containers >= 0.1' \
- 'semigroups >= 0.18 && < 0.19' 'semigroups >= 0.18' \
- 'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
- 'regex-posix >= 0.72 && < 0.96' 'regex-posix >= 0.72' \
- 'time >= 1.1.2 && < 1.9' 'time >= 1.1.2'
-}
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild
new file mode 100644
index 000000000000..d209613f3de7
--- /dev/null
+++ b/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=10
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # tests are missing
+
+DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
+HOMEPAGE="https://haskell.github.io/test-framework/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-1.1:=[profile?]
+ >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
+ >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/regex-posix-0.72:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
+ >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+# test? (
+# >=dev-haskell/hunit-1.2
+# >=dev-haskell/libxml-0.1.1
+# >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/semigroups-0.18
+# )
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
deleted file mode 100644
index 39256717deba..000000000000
--- a/dev-haskell/testing-feat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testing-feat-1.1.0.0.tar.gz 15291 BLAKE2B e590af9bbe5b5382bdefb4375cff05340e9be2bfa75e7dde895dee7bf1a84e8494f304306a979c8120b98c5fe9899d9ad8d271456e6318b5a78b1381306d4838 SHA512 b6480e990f9b8065d9f5e9fcf0dfeefe7e722830848ed5614cbe11581329f4341eb90547b67c1471d8b2e8b230490040714b1f560456797980c5cec9d0aef6e0
diff --git a/dev-haskell/testing-feat/metadata.xml b/dev-haskell/testing-feat/metadata.xml
deleted file mode 100644
index 93e7d7385362..000000000000
--- a/dev-haskell/testing-feat/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Feat (Functional Enumeration of Abstract Types) provides
- enumerations as functions from natural numbers to values
- (similar to @toEnum@ but for any algebraic data type). This
- can be used for SmallCheck-style systematic testing,
- QuickCheck style random testing, and hybrids of the two.
-
- The enumerators are defined in a very boilerplate manner
- and there is a Template Haskell script for deriving the
- class instance for most types.
- "Test.Feat" contain a subset of the other modules that
- should be sufficient for most test usage. There
- are some small and large example in the tar
- ball.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild b/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild
deleted file mode 100644
index b49fdd83ecf5..000000000000
--- a/dev-haskell/testing-feat/testing-feat-1.1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functional Enumeration of Algebraic Types"
-HOMEPAGE="https://github.com/JonasDuregard/testing-feat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
- <dev-haskell/semigroups-0.19:=[profile?]
- <dev-haskell/size-based-0.2:=[profile?]
- <dev-haskell/testing-type-modifiers-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/testing-type-modifiers/Manifest b/dev-haskell/testing-type-modifiers/Manifest
deleted file mode 100644
index bd6c2430b09c..000000000000
--- a/dev-haskell/testing-type-modifiers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testing-type-modifiers-0.1.0.1.tar.gz 2275 BLAKE2B 664760d4655f7c4ae4fea0b52f1687b81a754ec9d24aa940600279e6b029924b9505b29f24d7dfd07f6100e99b263727186ec8b65bd48b3d953be7554448c50b SHA512 21b76e469f2af199593a90579e9e2f0105444f508a3b244872936c95b28574cb8a782d74244249e4cf045d885b6878d8ae237ccd578c755f7314336137da56b8
diff --git a/dev-haskell/testing-type-modifiers/metadata.xml b/dev-haskell/testing-type-modifiers/metadata.xml
deleted file mode 100644
index 0201345ccba8..000000000000
--- a/dev-haskell/testing-type-modifiers/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Property based testing libraries such as QuickCheck tend to include type modifiers. Most of them
- are used to quantify over subsets of a type. For example a property on non-empty lists:
-
- @ prop_tail_length (NonEmpty xs) = length (tail xs) == length xs - 1 @
-
- This library is intended to supply these modifiers to be used by testing libraries, in an effort to make
- properties more portable between testing frameworks.
-
- For every modifier it also provides an access function that converts to the underlying type, which
- enables point-free style properties as such:
-
- @
- prop_tail_length2 = (&gt; 0) . length . nonEmpty
- @
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild b/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
deleted file mode 100644
index dc256746b820..000000000000
--- a/dev-haskell/testing-type-modifiers/testing-type-modifiers-0.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data type modifiers for property based testing"
-HOMEPAGE="https://hackage.haskell.org/package/testing-type-modifiers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index 8d0499183ceb..111adeb33102 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1 +1,2 @@
-DIST texmath-0.12.2.tar.gz 1807359 BLAKE2B 31da9ba7186eb9140c2fe70ba7011e91c00c290ef4b099197cdfb81ee2b992bae73756973b77d6920cabadef71739eb7208136fd2a589f9b81a6afaa338b296b SHA512 89f3dc5c1042980abf06f1e4d3ca6806922f2094c6d7ec2cc1e4673ac16a7aaf73693c5fa5526eac96d6f9f5c2f894f2341295bacebb7216ef49eb8be7cc0424
+DIST texmath-0.12.5.1.tar.gz 1606982 BLAKE2B a58e033176a6a9ba136590b8403d577c24c84cab983a6ee53ba2ae4564c05b681a31859aa066a3cb5aa3b18b07eaee9266964018abc8c30cc9288df15160d8f4 SHA512 77f3b008b82a8a1946108f8bb948d5d43121bffe2b2e22220cc8eb404884fa4c960bff07d7c8a5c75d5cce53d4039a8e6edd190fc69f5ad4da5b41212751f897
+DIST texmath-0.12.8.3.tar.gz 1480545 BLAKE2B 2a33a82f70b73aebae27c694b9d8e942f3c8ff8a5e0f2ad03ca8d71d2b346ae302c628441174922fca092ebadce8963a4dfdb35b2369fa168ca9eb13e34774bf SHA512 f90639a65a768245323a5b98e8ab3408f7d00bddfc3a1a66ce4cbedd25a7f8cf3555cae6912d60d00784887839f61562072912e3e2143553d377bee09176dace
diff --git a/dev-haskell/texmath/metadata.xml b/dev-haskell/texmath/metadata.xml
index 46826791c1c0..5b65dbf8acd8 100644
--- a/dev-haskell/texmath/metadata.xml
+++ b/dev-haskell/texmath/metadata.xml
@@ -5,24 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The texmathml library provides functions to convert LaTeX
- math formulas to presentation MathML. It supports
- basic LaTeX and AMS extensions, and it can parse and
- apply LaTeX macros.
-
- Use the @test@ flag to install a standalone executable,
- @texmath@, that reads a LaTeX formula from @stdin@ and
- writes MathML to @stdout@.
-
- Use the @cgi@ flag to install a cgi script,
- @texmath-cgi@.
- </longdescription>
<use>
<flag name="executable">Compile test executable.</flag>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+ <flag name="server">Compile webserver.</flag>
</use>
<upstream>
+ <remote-id type="hackage">texmath</remote-id>
<remote-id type="github">jgm/texmath</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/texmath/texmath-0.12.2.ebuild b/dev-haskell/texmath/texmath-0.12.2.ebuild
deleted file mode 100644
index e4edd72795d8..000000000000
--- a/dev-haskell/texmath/texmath-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- >=dev-haskell/parsec-3:=[profile?]
- >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/xml:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- executable? ( dev-haskell/aeson:=[profile?]
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/temporary
- dev-haskell/utf8-string )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.12.5.1.ebuild b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
new file mode 100644
index 000000000000..956d16b67efc
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between math formats"
+HOMEPAGE="https://github.com/jgm/texmath"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable server"
+
+RDEPEND=">=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ dev-haskell/split:=[profile?]
+ >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ dev-haskell/xml:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ executable? ( dev-haskell/aeson:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+ dev-haskell/pretty-show:=[profile?] )
+ !executable? ( server? ( dev-haskell/aeson:=[profile?] ) )
+ server? ( dev-haskell/optparse-applicative:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/servant-server:=[profile?]
+ dev-haskell/wai:=[profile?]
+ dev-haskell/wai-logger:=[profile?]
+ dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tagged
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ !executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=network-uri \
+ $(cabal_flag server server)
+}
diff --git a/dev-haskell/texmath/texmath-0.12.8.3.ebuild b/dev-haskell/texmath/texmath-0.12.8.3.ebuild
new file mode 100644
index 000000000000..1a760eec83bc
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.12.8.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between math formats"
+HOMEPAGE="https://github.com/jgm/texmath"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable server"
+
+RDEPEND=">=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+ >=dev-haskell/parsec-3:=[profile?]
+ dev-haskell/split:=[profile?]
+ >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/typst-symbols-0.1.4:=[profile?] <dev-haskell/typst-symbols-0.1.5:=[profile?]
+ dev-haskell/xml:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ executable? ( dev-haskell/aeson:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+ dev-haskell/pretty-show:=[profile?] )
+ !executable? ( server? ( dev-haskell/aeson:=[profile?] ) )
+ server? ( dev-haskell/optparse-applicative:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/servant-server:=[profile?]
+ dev-haskell/wai:=[profile?]
+ dev-haskell/wai-logger:=[profile?]
+ dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/tagged
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ !executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=network-uri \
+ $(cabal_flag server server)
+}
diff --git a/dev-haskell/text-binary/Manifest b/dev-haskell/text-binary/Manifest
deleted file mode 100644
index ef0eabacf5c9..000000000000
--- a/dev-haskell/text-binary/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-binary-0.2.1.1.tar.gz 1729 BLAKE2B fb69d6b86e18a86ac9b49074e662afe0205e2ea8253ebbefb4c9dbee51ed8126ce7ad1d1f5f8c7ef3c94e1a4778f68750d7889a75a930a20b5733cb0093d58f1 SHA512 eea91648ddc63f2997432abd2cc3d78efa27e3745c199eeccd01114df6a67dae948a16a6f784e09ba380047101fefab802f1812b0833d3e02deb45b6292c34a1
diff --git a/dev-haskell/text-binary/metadata.xml b/dev-haskell/text-binary/metadata.xml
deleted file mode 100644
index 6d1d9024b257..000000000000
--- a/dev-haskell/text-binary/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- A compatibility layer providing Binary instances for strict
- and lazy text types for versions older than 1.2.1 of
- &lt;https://hackage.haskell.org/package/text&gt;.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild b/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
deleted file mode 100644
index 1a65ea80126d..000000000000
--- a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary instances for text types"
-HOMEPAGE="https://github.com/kawu/text-binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/text-conversions/Manifest b/dev-haskell/text-conversions/Manifest
index 245c5eeb144f..5260b1f058b2 100644
--- a/dev-haskell/text-conversions/Manifest
+++ b/dev-haskell/text-conversions/Manifest
@@ -1 +1,2 @@
-DIST text-conversions-0.3.0.tar.gz 5232 BLAKE2B d06232313990941dba2c300703a1b6b9b65c68583b8e8a77d6f8536104e39af2d7fb5529e52fc39b1c554fe50efc5df9fb4397305bf4e763b3fa5425b8b72189 SHA512 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
+DIST text-conversions-0.3.1.1.tar.gz 5258 BLAKE2B 6003575dad1a5b743fad46a1434f83eed22a4d9f2bb99bdf65cc84b7e9929324c7227eb3a9887ac07716da24b1144e65dda01f7c2b5eb1b939f052c5d6b99867 SHA512 b04fff74f2541120718c377ff820a9e882c3e49e3423f581113ebcf02b13c58b3360be82fdd5e7a039da0077219d9ff64d02ef523b1a16fae89cfab0ac86a4ac
+DIST text-conversions-0.3.1.tar.gz 5571 BLAKE2B bf98228ac5c308d306ed12b1ce3cb4c9a7e4bca218b249c8b0e996204d2431e081fa8917428c3ceffa897b9968f6fee3e8c3665b3a651746b339601fb1e06367 SHA512 4c0fe08024a56e326b632a67b945fa869a798b00fa45b56f4f181a0075ed5cd6802edec0f0e38c0f4b5cc4b81c6f6bd98e3382b968cec6ad884d24ee31dbf600
diff --git a/dev-haskell/text-conversions/metadata.xml b/dev-haskell/text-conversions/metadata.xml
index 937381521944..cc111d378977 100644
--- a/dev-haskell/text-conversions/metadata.xml
+++ b/dev-haskell/text-conversions/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">text-conversions</remote-id>
+ <remote-id type="github">cjdev/text-conversions</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
deleted file mode 100644
index c44a2a92df24..000000000000
--- a/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Safe conversions between textual types"
-HOMEPAGE="https://github.com/cjdev/text-conversions#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- dev-haskell/errors:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec
- dev-haskell/hspec-discover )
-"
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild
new file mode 100644
index 000000000000..7ff675e86cf2
--- /dev/null
+++ b/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe conversions between textual types"
+HOMEPAGE="https://github.com/cjdev/text-conversions"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="<dev-haskell/base16-bytestring-2:=[profile?]
+ <dev-haskell/base64-bytestring-2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
new file mode 100644
index 000000000000..22d22e0701a6
--- /dev/null
+++ b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe conversions between textual types"
+HOMEPAGE="https://github.com/cjdev/text-conversions#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/base16-bytestring-2:=[profile?]
+ <dev-haskell/base64-bytestring-2:=[profile?]
+ <dev-haskell/errors-3:=[profile?]
+ <dev-haskell/text-2:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest
index 0df5a1bc5c46..20e70edf5b7f 100644
--- a/dev-haskell/text-icu/Manifest
+++ b/dev-haskell/text-icu/Manifest
@@ -1 +1,2 @@
-DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9
+DIST text-icu-0.7.1.0.tar.gz 52490 BLAKE2B fb66502b0a18d8d2a0f1dcb2240e9c939b04b157acac31b62fbe65a6d5edd6244a4713d712e6b78dc54451b52d3e78d9cd8bc803e7bddb319fa8ed016c162123 SHA512 807a1385b7601edcfa6142a8e107df1b3c2820974218e2bafadb8a42eda3b68a0a16d222d75120b422e5ca9f4cd4f52f39d2b7938a541692ed4d633d5750089a
+DIST text-icu-0.8.0.2.tar.gz 85213 BLAKE2B 68fe194da996b33de5c8ea3b3bb3daec1181a35a1f528328fdcfd38ca89857df2966b38d05b8c0aaf070e081040678a521a6f591c0af36a78b716cb19f4a08f7 SHA512 c70b014200678b19d763347dce021970062cdbee024c93bfd09b084615f1734283d0d6eb17db64901a83e9a293c79ff8fbf7d45e8a67eb812ce5bcc85b72b9e6
diff --git a/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch b/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch
deleted file mode 100644
index 5a29309e7c45..000000000000
--- a/dev-haskell/text-icu/files/text-icu-0.7.0.1-icu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-icu-68 disable TRUE/FALSE by default.
---- a/cbits/text_icu.c
-+++ b/cbits/text_icu.c
-@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest, int32_t destCapacity,
-
- int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2)
- {
-- return u_strCompareIter(iter1, iter2, TRUE);
-+ return u_strCompareIter(iter1, iter2, true);
- }
-
- UBlockCode __hs_ublock_getCode(UChar32 c)
diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
index cf90d36efbec..33f4332f7eab 100644
--- a/dev-haskell/text-icu/metadata.xml
+++ b/dev-haskell/text-icu/metadata.xml
@@ -5,35 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Haskell bindings to the International Components for Unicode (ICU)
- libraries. These libraries provide robust and full-featured Unicode
- services on a wide variety of platforms.
-
- Features include:
-
- * Both pure and impure bindings, to allow for fine control over efficiency
- and ease of use.
-
- * Breaking of strings on character, word, sentence, and line boundaries.
-
- * Access to the Unicode Character Database (UCD) of character metadata.
-
- * String collation functions, for locales where the conventions for
- lexicographic ordering differ from the simple numeric ordering of
- character codes.
-
- * Character set conversion functions, allowing conversion between
- Unicode and over 220 character encodings.
-
- * Unicode normalization. (When implementations keep strings in a
- normalized form, they can be assured that equivalent strings have a
- unique binary representation.)
-
- * Regular expression search and replace.
- </longdescription>
<upstream>
- <remote-id type="github">bos/text-icu</remote-id>
- <remote-id type="bitbucket">bos/text-icu</remote-id>
+ <remote-id type="hackage">text-icu</remote-id>
+ <remote-id type="github">haskell/text-icu</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
deleted file mode 100644
index 88b4ba6c94cb..000000000000
--- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken: test-suite
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ICU library"
-HOMEPAGE="https://github.com/bos/text-icu"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QuickCheck occasionally finds counterexamples
-# and fails to build: Duplicate instance declarations: instance NFData Ordering
-
-PATCHES=("${FILESDIR}"/${PN}-0.7.0.1-icu.patch)
-
-RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
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
new file mode 100644
index 000000000000..3feb5bb77c04
--- /dev/null
+++ b/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the ICU library"
+HOMEPAGE="https://github.com/haskell/text-icu"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # QuickCheck occasionally finds counterexamples
+# and fails to build: Duplicate instance declarations: instance NFData Ordering
+
+RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ dev-libs/icu
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( >=dev-haskell/hunit-1.2
+# >=dev-haskell/quickcheck-2.4
+# dev-haskell/random
+# >=dev-haskell/test-framework-0.4
+# >=dev-haskell/test-framework-hunit-0.2
+# >=dev-haskell/test-framework-quickcheck2-0.2 )
+# "
diff --git a/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild b/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild
new file mode 100644
index 000000000000..502b75b161bb
--- /dev/null
+++ b/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the ICU library"
+HOMEPAGE="https://github.com/haskell/text-icu"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # QuickCheck occasionally finds counterexamples
+# and fails to build: Duplicate instance declarations: instance NFData Ordering
+
+RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ dev-libs/icu
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+# test? ( >=dev-haskell/hunit-1.2
+# >=dev-haskell/quickcheck-2.4
+# dev-haskell/random
+# >=dev-haskell/test-framework-0.4
+# >=dev-haskell/test-framework-hunit-0.2
+# >=dev-haskell/test-framework-quickcheck2-0.2
+# dev-haskell/text )
+# "
diff --git a/dev-haskell/text-metrics/Manifest b/dev-haskell/text-metrics/Manifest
deleted file mode 100644
index 8430ebbfe577..000000000000
--- a/dev-haskell/text-metrics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-metrics-0.3.0.tar.gz 8248 BLAKE2B c700cb94e3b9934c723e6893d90523c5876c64b663dd77a36be963dff2bc5f65d0db30db39177014b062dde1dca0865b893de8324359ca9bcec3340d5ca7e21c SHA512 fa005ad7aeb5fd96ce121c5eab9e83e5826eec288a269f6ce258b3f6aff408c8ca98b8131b6cd14fa8e56f8568eb5a63beb63935335b7c695a3f6e09a979eccf
diff --git a/dev-haskell/text-metrics/metadata.xml b/dev-haskell/text-metrics/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/text-metrics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
deleted file mode 100644
index 17387295656a..000000000000
--- a/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate various string metrics efficiently"
-HOMEPAGE="https://github.com/mrkkrp/text-metrics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # does not pass tests on non-ascii symbols
-
-RDEPEND=">=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
- >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'containers >= 0.5.6.2 && < 0.6' 'containers >= 0.5.6.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev
-}
diff --git a/dev-haskell/text-short/Manifest b/dev-haskell/text-short/Manifest
index e9a005829d2c..ccc44f1f626d 100644
--- a/dev-haskell/text-short/Manifest
+++ b/dev-haskell/text-short/Manifest
@@ -1 +1,2 @@
-DIST text-short-0.1.3.tar.gz 24435 BLAKE2B f0d571f2c84ca47ee2d4f0aef0a98812880f68d9971e73abd40f2b8d27cce50052a67f6f2a5d19d683093fabed490082df72e29bc8e43123b53b388b9962018c SHA512 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428
+DIST text-short-0.1.5-rev2.cabal 3202 BLAKE2B 92985f445d522e0e26e85d86d4bf4ab1d517ea066f062097cc58b276a5d845fbb53e86ae7c97c33de16b0a9f061f9ba4485a151f41f7351771dff044cd761190 SHA512 337e7e557691aaed379658069a1dc50116a247c86133e219a1f4ec0f468f1f6cdde9461365424dfc1900f6676bc15c75c46a241148414512d7da81e766b11662
+DIST text-short-0.1.5.tar.gz 25113 BLAKE2B a3ed468d60d4a351ad86600f5d6e7241ae88b987746fabc8ff79f6e0f0c687a9d5d5e0f4fcabb2fbf7c48ce2e3a37b798e478d6c8239760974e7a55835cab1aa SHA512 32f09a1abc37ddb3f85921d80629355f68b2e68531f14318907e792a8eeb7d4a258bfcf7d45710dcb67f85fadfbad2bb9ffdac27a912aefc4296dc1818585125
diff --git a/dev-haskell/text-short/metadata.xml b/dev-haskell/text-short/metadata.xml
index d3f5190bed94..0573ab12c9a2 100644
--- a/dev-haskell/text-short/metadata.xml
+++ b/dev-haskell/text-short/metadata.xml
@@ -6,11 +6,10 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="asserts">Enable runtime-checks via 'assert'</flag>
+ <flag name="debug">Enable runtime-checks via 'assert'</flag>
</use>
- <longdescription>
- This package provides the 'ShortText' type which is suitable for keeping many short strings in memory. This is similiar to how 'ShortByteString' relates to 'ByteString'.
-
- The main difference between 'Text' and 'ShortText' is that 'ShortText' uses UTF-8 instead of UTF-16 internally and also doesn't support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) 'ShortText' value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">text-short</remote-id>
+ <remote-id type="github">hvr/text-short</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/text-short/text-short-0.1.3.ebuild b/dev-haskell/text-short/text-short-0.1.3.ebuild
deleted file mode 100644
index a6f10f5a7f4d..000000000000
--- a/dev-haskell/text-short/text-short-0.1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Memory-efficient representation of Unicode text strings"
-HOMEPAGE="https://hackage.haskell.org/package/text-short"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="asserts"
-
-RDEPEND=">=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4
- >=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.7 && < 4.13' 'base >= 4.7' \
- 'ghc-prim >= 0.3.1 && < 0.6' 'ghc-prim >= 0.3.1'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag asserts asserts)
-}
diff --git a/dev-haskell/text-short/text-short-0.1.5-r1.ebuild b/dev-haskell/text-short/text-short-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..a91116ad98e5
--- /dev/null
+++ b/dev-haskell/text-short/text-short-0.1.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: asserts:debug
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Memory-efficient representation of Unicode text strings"
+HOMEPAGE="https://hackage.haskell.org/package/text-short"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="
+ >=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/text-1.0 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag debug asserts)
+}
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index bba482616668..5e88ab12a7fa 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1 +1,2 @@
-DIST text-show-3.8.5.tar.gz 95620 BLAKE2B 51c1a5f9b29d60e305b53db1a47bc415f8cec3fa4c29c22d103ffc20dd4585bc8241f471031eaaf798c0df379c589cd4a9622877b7f69cedc5f15c3fa94c9291 SHA512 17e6e4d188280d4545867b31210f9e8e69337996c80b8c4f9fd846e50605acb29ebb2429e72ce76545426741055c4806c20a32b59d47e190a38d0f1ed9405947
+DIST text-show-3.10.4.tar.gz 101876 BLAKE2B a51a0a536dab520c924516171703ebe6a71cfdb22a46b4f4aaccab7f69b78aa3d07c14a2b7226f14ffa89ffff84adcc7abcb1646d3add7f2ff0fa7a494175ea3 SHA512 f74eec545cd2994b3ebde9552e15e8b26c60ff00f6438f0c7bc2d92148a34fa85d41b8c04de0a960d468bc928346a5a8cd676a604f9dd81fc14d2ad5667a9d7f
+DIST text-show-3.9.7.tar.gz 96683 BLAKE2B 402b41fe0ea539fb2bc98f5271dda37605e86751622dda6136bca8b8ec92917b15ab69e606c4b8fbb6e055f1ee14aed2cd5d446be4c6f494662a0ce153075328 SHA512 d32c2c5c9ea833ac2b996ef299bc7fa2736dfb0ccd86117cd964512ccc25af5eda126fc6dee0537d4740bd38fa9a73ea899e1dd73a30bec775f9966f2121a748
diff --git a/dev-haskell/text-show/metadata.xml b/dev-haskell/text-show/metadata.xml
index eca7e7acbe42..4f3fc546038a 100644
--- a/dev-haskell/text-show/metadata.xml
+++ b/dev-haskell/text-show/metadata.xml
@@ -5,43 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- @text-show@ offers a replacement for the @Show@ typeclass intended
- for use with @Text@ instead of @String@s. This package was created
- in the spirit of
- @&lt;http://hackage.haskell.org/package/bytestring-show bytestring-show&gt;@.
-
- At the moment, @text-show@ provides instances for most data
- types in the @&lt;http://hackage.haskell.org/package/array array&gt;@,
- @&lt;http://hackage.haskell.org/package/base base&gt;@,
- @&lt;http://hackage.haskell.org/package/bytestring bytestring&gt;@, and
- @&lt;http://hackage.haskell.org/package/text text&gt;@ packages.
- Therefore, much of the source code for @text-show@ consists of
- borrowed code from those packages in order to ensure that the
- behaviors of @Show@ and @TextShow@ coincide.
-
- For most uses, simply importing "TextShow"
- will suffice:
-
- @
- module Main where
-
- import TextShow
-
- main :: IO ()
- main = printT (Just \"Hello, World!\")
- @
-
- If you desire it, there are also monomorphic versions of the @showb@
- function available in the submodules of "TextShow". See the
- &lt;https://github.com/RyanGlScott/text-show/wiki/Naming-conventions naming conventions&gt;
- page for more information.
-
- Support for automatically deriving @TextShow@ instances can be found
- in the "TextShow.TH" and "TextShow.Generic" modules. If you don't
- know which one to use, use "TextShow.TH".
- </longdescription>
<upstream>
+ <remote-id type="hackage">text-show</remote-id>
<remote-id type="github">RyanGlScott/text-show</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/text-show/text-show-3.10.4.ebuild b/dev-haskell/text-show/text-show-3.10.4.ebuild
new file mode 100644
index 000000000000..c40812157058
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.10.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -developer,-integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+ >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+ dev-haskell/bytestring-builder:=[profile?]
+ >=dev-haskell/generic-deriving-1.14.1:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+ >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+ >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/base-orphans-0.8.5 <dev-haskell/base-orphans-0.10
+ >=dev-haskell/deriving-compat-0.6.5 <dev-haskell/deriving-compat-1
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ >=dev-haskell/quickcheck-2.14.3 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.28 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer \
+ --flag=-integer-gmp
+}
diff --git a/dev-haskell/text-show/text-show-3.8.5.ebuild b/dev-haskell/text-show/text-show-3.8.5.ebuild
deleted file mode 100644
index b455439586ab..000000000000
--- a/dev-haskell/text-show/text-show-3.8.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
- >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
- dev-haskell/bytestring-builder:=[profile?]
- >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
- >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
- >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
- >=dev-lang/ghc-7.8.2:=[gmp]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9
- >=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1
- >=dev-haskell/hspec-2 <dev-haskell/hspec-3
- >=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
- >=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.9 && < 4.14' 'base >= 4.9' \
- 'base >= 4.5 && < 4.14' 'base >= 4.5' \
- 'base >= 4.5 && < 4.9' 'base >= 4.5' \
- 'ghc-boot-th >= 8.0 && < 8.9' 'ghc-boot-th >= 8.0' \
- 'template-haskell >= 2.11 && < 2.16' 'template-haskell >= 2.11' \
- 'template-haskell >= 2.5 && < 2.11' 'template-haskell >= 2.5' \
- 'QuickCheck >= 2.12 && < 2.14' 'QuickCheck >= 2.12'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/text-show/text-show-3.9.7.ebuild b/dev-haskell/text-show/text-show-3.9.7.ebuild
new file mode 100644
index 000000000000..42ba33badfa2
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.9.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer,-integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ dev-haskell/bytestring-builder:=[profile?]
+ >=dev-haskell/generic-deriving-1.14.1:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+ >=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+ >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/base-orphans-0.8.5 <dev-haskell/base-orphans-0.9
+ >=dev-haskell/deriving-compat-0.6 <dev-haskell/deriving-compat-1
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ >=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/quickcheck-instances-0.3.26 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer \
+ --flag=-integer-gmp
+}
diff --git a/dev-haskell/text-stream-decode/Manifest b/dev-haskell/text-stream-decode/Manifest
deleted file mode 100644
index b868effb9484..000000000000
--- a/dev-haskell/text-stream-decode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-stream-decode-0.1.0.5.tar.gz 12335 BLAKE2B 68c52959743e76b167f968817f128ea6e8c7d91ed091a4a19e75e7965b4dfa9d6374b21e8e68d69ccab9db95e7c431bf5736494c3923d24a1d00ea796f7eced4 SHA512 9005cc7013f56809cb0a86fa57aa6bbe97936095d100e35d86ae7e9013e0bbcced3f5522da08f5fe76585fda1e8f55b364a1ad787f9c7c7be30fae6555083a5d
diff --git a/dev-haskell/text-stream-decode/metadata.xml b/dev-haskell/text-stream-decode/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/text-stream-decode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
deleted file mode 100644
index 8470efcdb081..000000000000
--- a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +text11
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming decoding functions for UTF encodings. (deprecated)"
-HOMEPAGE="https://github.com/fpco/text-stream-decode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=text11
-}
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index fd62e9833f57..cbb47e707196 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,3 +1 @@
-DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
-DIST text-1.2.4.1.tar.gz 148905 BLAKE2B 5e3429e3f83a2c12c5482e342fb4a1846538bdf453df23c2144af01d0df3f5a8b831fd76513aea6e303b5a36b38dec185fedf960060264fc49fe917e30964b41 SHA512 4170d9a463cebfbd80b7902e4d71ed1a1f29db96d2cc9045b79908509a633a239edb3b1ff8dac6970074c4d7e91c552e106756d8142709f8fee3a960428c23e7
-DIST text-1.2.4.1_rc1.tar.gz 166148 BLAKE2B c79bbd90c9ccf99668d5a4f0e66b4c75fa7a531d9851355be8a9d859d99578d2e22977ee9514f1743927a8a4fa49d29c252abc39509dd0b6d09bffd96e1f5289 SHA512 27d014d6b870e6cba16ac4a0ac146872d89c363ad1ca786642554bde0cf3ae4876d69ba8dd2655bbdcb88076bf4f5e13b45929ff86cd2bd90d24e607ad7221c6
+DIST text-1.2.5.0.tar.gz 155890 BLAKE2B aaf7206dad552ff98a465914ad8183ec1ccd57e56504496a5b8d11645b0f0fb395dd801c9b6fe32b51ed3902658eb5e5fb92187de668d32801597b4eb904b820 SHA512 dbda65180fc012324fe45467b63e0f53e7e0fa2da3b11875e458ba6bd31d0ee7634121967d2aa6853ed5c907c0661dcc59b8c68fb55edab2923490d8b50722d6
diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml
index b6cbf085cb4f..31b80dba2fcc 100644
--- a/dev-haskell/text/metadata.xml
+++ b/dev-haskell/text/metadata.xml
@@ -5,36 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
-
- An efficient packed, immutable Unicode text type (both strict and
- lazy), with a powerful loop fusion optimization framework.
-
- The 'Text' type represents Unicode character strings, in a time and
- space-efficient manner. This package provides text processing
- capabilities that are optimized for performance critical use, both
- in terms of large data quantities and high speed.
-
- The 'Text' type provides character-encoding, type-safe case
- conversion via whole-string case conversion functions. It also
- provides a range of functions for converting 'Text' values to and from
- 'ByteStrings', using several standard encodings.
-
- Efficient locale-sensitive support for text IO is also supported.
-
- These modules are intended to be imported qualified, to avoid name
- clashes with Prelude functions, e.g.
-
- &gt; import qualified Data.Text as T
-
- To use an extended and very rich family of functions for working
- with Unicode text (including normalization, regular expressions,
- non-standard encodings, text breaking, and locales), see
- the @text-icu@ package:
- &lt;http://hackage.haskell.org/package/text-icu&gt;
-
- </longdescription>
<upstream>
- <remote-id type="github">bos/text</remote-id>
+ <remote-id type="hackage">text</remote-id>
+ <remote-id type="github">haskell/text</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/text/text-1.2.4.0-r1.ebuild b/dev-haskell/text/text-1.2.4.0-r1.ebuild
deleted file mode 100644
index 07ef7a22437d..000000000000
--- a/dev-haskell/text/text-1.2.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-8.8.1:= <dev-lang/ghc-8.10:="
-
-DEPEND="${RDEPEND}
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bytestring-builder \
- --flag=-developer \
- --flag=-integer-simple
-}
diff --git a/dev-haskell/text/text-1.2.4.1.ebuild b/dev-haskell/text/text-1.2.4.1.ebuild
deleted file mode 100644
index e2fd338a0b39..000000000000
--- a/dev-haskell/text/text-1.2.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10.4
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-RDEPEND=">=dev-lang/ghc-8.8:="
-
-DEPEND="${RDEPEND}
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bytestring-builder \
- --flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.4.1_rc1.ebuild b/dev-haskell/text/text-1.2.4.1_rc1.ebuild
deleted file mode 100644
index 6da0fe1d6e7e..000000000000
--- a/dev-haskell/text/text-1.2.4.1_rc1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-MY_PV="$(ver_rs 4 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://github.com/haskell/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10.3
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-RDEPEND=">=dev-lang/ghc-8.10.3:="
-
-DEPEND="${RDEPEND}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bytestring-builder \
- --flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.5.0-r1.ebuild b/dev-haskell/text/text-1.2.5.0-r1.ebuild
new file mode 100644
index 000000000000..12b2e313de16
--- /dev/null
+++ b/dev-haskell/text/text-1.2.5.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -bytestring-builder,-developer,-integer-simple
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # circular deps in test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# break cyclic dependencies:
+RESTRICT=test
+
+RDEPEND="
+ >=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+"
+# test? (
+# >=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/quickcheck-unicode-1.0.1.0
+# dev-haskell/random
+# dev-haskell/tasty
+# dev-haskell/tasty-hunit
+# dev-haskell/tasty-inspection-testing
+# dev-haskell/tasty-quickcheck
+# )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bytestring-builder \
+ --flag=-developer \
+ --flag=-integer-simple
+}
+
+CABAL_CORE_LIB_GHC_PV="9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
index 74fa3f385e70..69ad3707e39e 100644
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ b/dev-haskell/tf-random/tf-random-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/primitive-0.3:=[profile?]
diff --git a/dev-haskell/th-abstraction/Manifest b/dev-haskell/th-abstraction/Manifest
index d27153b169ce..c5ad98e57509 100644
--- a/dev-haskell/th-abstraction/Manifest
+++ b/dev-haskell/th-abstraction/Manifest
@@ -1 +1,3 @@
-DIST th-abstraction-0.3.2.0.tar.gz 35111 BLAKE2B 18fc993256f6d49ec1e7911d152896cb7e62c3397030fdfb8179879d8b98a666f3f2bf73c3783276f92911698da94338cf5cc6b71df3631d9588d3022085a414 SHA512 d03087e52c51f6038d41a35fbfd0c6ab8b890c6d0aa91bc1a42c46f746f60d3c19c41766006977e0ebee4517bab5aab0f0439a2ed2434e5d41a7086eeb3ecea3
+DIST th-abstraction-0.4.3.0.tar.gz 38595 BLAKE2B 62e3a3b34997ae5190fe534138c2632b9de104dbc33f38fca8a762e0a2b89bf359bcb0e4c5e711d5a703f7220b8cf362d11772ad31bb4a04cee3091134356367 SHA512 a474bd042721efb83db5f707537589faa320f0e4ccf6bc839c450ff8d0970d3835003c134fc59f88e692d47264b1717bbd053543623dd40aa591155531a31003
+DIST th-abstraction-0.4.5.0-rev1.cabal 2212 BLAKE2B 1cdb39cf49921404efb6ddda76549fa169a2cdc3b3120480fd61736e6b73284d293f831d661b904a6bafd6372ac65ea0c3fe0299f9f99778a25c689023daa665 SHA512 7aeb8b2fcf10fa7ec7d2073d0713ed428b2faa0593424d5ec2e806efc4a808b4d79a9296b26789a25a032d40b1dd4c0eed251703b8826eb4eff66e7c1d0203ad
+DIST th-abstraction-0.4.5.0.tar.gz 39515 BLAKE2B ac66cb096dd55b1f4ec4b8cfacc4b920a00bef5490a88ddc5cda3c2ff3159ed82e5b5a04c5e13860ecacbc51ab40254832f62dbccd6f932cfbea8372ede3c8ae SHA512 eaea551b54d40bbd6056e6f7b14e662e7302cb016fe082b9715e248e05988197deebe6108e2adcb7709046a8a326e417fddd1899af3f810c2faa444da5cf4a41
diff --git a/dev-haskell/th-abstraction/metadata.xml b/dev-haskell/th-abstraction/metadata.xml
index 89d46a711087..993ce3b7088f 100644
--- a/dev-haskell/th-abstraction/metadata.xml
+++ b/dev-haskell/th-abstraction/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package normalizes variations in the interface for
- inspecting datatype information via Template Haskell
- so that packages and support a single, easier to use
- informational datatype while supporting many versions
- of Template Haskell.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">th-abstraction</remote-id>
+ <remote-id type="github">glguy/th-abstraction</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
deleted file mode 100644
index 3e84fd2704a6..000000000000
--- a/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Nicer interface for reified information about data types"
-HOMEPAGE="https://github.com/glguy/th-abstraction"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
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
new file mode 100644
index 000000000000..c5d50fae96e8
--- /dev/null
+++ b/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Nicer interface for reified information about data types"
+HOMEPAGE="https://github.com/glguy/th-abstraction"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild
new file mode 100644
index 000000000000..0fb793af0eb5
--- /dev/null
+++ b/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Nicer interface for reified information about data types"
+HOMEPAGE="https://github.com/glguy/th-abstraction"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/th-compat/Manifest b/dev-haskell/th-compat/Manifest
new file mode 100644
index 000000000000..817ab6fe7663
--- /dev/null
+++ b/dev-haskell/th-compat/Manifest
@@ -0,0 +1,3 @@
+DIST th-compat-0.1.3.tar.gz 13718 BLAKE2B ff925a0bd1f5a1de8008ce136cdd2c5e49aa6a58543df99d7179edaef65cea7d3ed3265ec5bdc31b5d5c01e65be25ddb1b393732d3b1f62a830a44f8c287554f SHA512 acb64eebf22093568fde29e7e5b78a8bce04d74b96a197a1c1f3383890b876c8d2e0a52206bbbc9708e3bf78a05f48e9bd3ea4929cbf6a7e712a4444917c1269
+DIST th-compat-0.1.4-rev2.cabal 3224 BLAKE2B 004c486fa4039444740af5ed883690ac754a5c9b06dbe54251d8e06990ca2e8e72184460d8a08cbf10140680c867e6b2a72a3bafa221616981e1671b85f7e9c3 SHA512 43540c5886eb07f32c8945d77c11af9132606b753640445ec264c1509339ebaaa958087ebfaa0b3dd1b46fca9f7b938b2846cd9df5ad1742e83dc4e377b469df
+DIST th-compat-0.1.4.tar.gz 14838 BLAKE2B 1c6a18b9199596db0d837804fa0c5d02ce86c8c2b26ccf357a2d68594ebe7ba49fa3162b34c8d54efa6e0e9b5c8d7c26a31c001e634b0a778fb4d7bb7b3342ef SHA512 2c9999343f33b2a74ca2439fdd111d038ae760c427fe1cb2c5778c4debdc49436c259f512a37e2bf4d765b83e925757bb23a48449ba5899586d409d5e15603ed
diff --git a/dev-haskell/th-compat/metadata.xml b/dev-haskell/th-compat/metadata.xml
new file mode 100644
index 000000000000..d21f5e1a8260
--- /dev/null
+++ b/dev-haskell/th-compat/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">th-compat</remote-id>
+ <remote-id type="github">haskell-compat/th-compat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/th-compat/th-compat-0.1.3.ebuild b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
new file mode 100644
index 000000000000..8f0b7a203122
--- /dev/null
+++ b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backward- (and forward-)compatible Quote and Code types"
+HOMEPAGE="https://github.com/haskell-compat/th-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/base-compat-0.6 <dev-haskell/base-compat-0.13
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ >=dev-haskell/mtl-2.1 <dev-haskell/mtl-2.3 )
+"
diff --git a/dev-haskell/th-compat/th-compat-0.1.4.ebuild b/dev-haskell/th-compat/th-compat-0.1.4.ebuild
new file mode 100644
index 000000000000..306e0b5a0863
--- /dev/null
+++ b/dev-haskell/th-compat/th-compat-0.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backward- (and forward-)compatible Quote and Code types"
+HOMEPAGE="https://github.com/haskell-compat/th-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/base-compat-0.6 <dev-haskell/base-compat-0.14
+ >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+ )
+"
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
deleted file mode 100644
index a0140d3feefb..000000000000
--- a/dev-haskell/th-expand-syns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST th-expand-syns-0.4.6.0.tar.gz 8228 BLAKE2B 6f0a0ee73cc7999a2cc42aa4982980851d14e4db8aebd921cc04517505676b24fa5e2b6977ce7b2d73a3e153ffb4f98727503fc5d735e409c0dcb9d4930d4f09 SHA512 93c4516052b2130a189c72fe5ca99e44ffdb4937f6a8afd8c192ba24a7002bd45865992cebf44c5c9d6ddfd9f67a1d7d73633e7521c4a9828a0defee627e89b5
diff --git a/dev-haskell/th-expand-syns/metadata.xml b/dev-haskell/th-expand-syns/metadata.xml
deleted file mode 100644
index dca6a5681ded..000000000000
--- a/dev-haskell/th-expand-syns/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">DanielSchuessler/th-expand-syns</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild
deleted file mode 100644
index 01dd51636b90..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
index 693b33eb267f..af5ed5344418 100644
--- a/dev-haskell/th-lift-instances/Manifest
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -1 +1,2 @@
-DIST th-lift-instances-0.1.14.tar.gz 5712 BLAKE2B 02fd3b2b1073a49c58625237514bd898d0fe7147225b52ba11658d9fea5fc6c6d6f392c92315fe5bbf529c11a263964a2bd3310d7b451452fc548212e44b3bcb SHA512 b0050866a250c7a5f55f47307e6482c49373d1cd09372c38b3c5c58883662f794a0e5210b9ba7e5a60536fd20262aa14cb7e94edf576cc69be5d2b33f21d21be
+DIST th-lift-instances-0.1.19.tar.gz 6113 BLAKE2B 75cfd2a7f8c80fe3cd03e66c8c6fa104f79167de1ed75db9b46e94d27c93c5650be13068c3273fa7d9e401f6017306796acb8806a055a856176be0a88bb0d5ba SHA512 d8a38531a9a61dce426c43807e3764abbe22102e8886d9d23e76d27735bace672e10472b77b27dbe2fbb74bf6e32a5d528d690a608a81d8dce9963721fad6349
+DIST th-lift-instances-0.1.20.tar.gz 6721 BLAKE2B 178c00ffa942787aef063f87e1714f0625e68c9cdb6aad113da04db4113fd39813ed3082bbc6f5db774dd33833602464c73151bb1485d80593427d4347bb33eb SHA512 bb43b13df8fb939a79a3fc1099900fcaa8741eb61b8f5574b7d7b68c220acc0cbb9fa7517b22ad34f006da7a1c25c08d1237309f8f98d79ca4d00dad345b28cb
diff --git a/dev-haskell/th-lift-instances/metadata.xml b/dev-haskell/th-lift-instances/metadata.xml
index 929b58cd63b5..817b6339b275 100644
--- a/dev-haskell/th-lift-instances/metadata.xml
+++ b/dev-haskell/th-lift-instances/metadata.xml
@@ -5,8 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Most data types in haskell platform do not have Lift instances. This package provides orphan instances
- for containers, text, bytestring and vector.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">th-lift-instances</remote-id>
+ <remote-id type="github">bennofs/th-lift-instances</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
deleted file mode 100644
index 6cf4d601a7da..000000000000
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lift instances for template-haskell for common data types"
-HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-haskell/th-lift-0.8:=[profile?]
- >=dev-haskell/vector-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2
- >=dev-haskell/quickcheck-2.6
- >=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 )
-"
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
new file mode 100644
index 000000000000..3decff11a531
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-haskell/th-lift-0.8:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.6 )
+"
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild
new file mode 100644
index 000000000000..e42707a54751
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-lift-0.8:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.6 )
+"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index 928e1f771bb8..788e4fe41faa 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -1 +1,3 @@
-DIST th-lift-0.8.1.tar.gz 13816 BLAKE2B 4e8a8231a77c3b98ab05a9a3ed0c682a09f61558483c832bdcfce42391199a8fd27c092252e130a5bb5d481bd364627254abac87f701ae8dde015ddc545168dd SHA512 21fb31f23aa41ec2c1979b7ad9ce467d9ed555237f7d4236b1400cb00bb7531832b269c1248062fe478876e9f8e4a2968171999a4c8264756ad10aa7e5983fa7
+DIST th-lift-0.8.2-rev2.cabal 2677 BLAKE2B b6fc00a24607b09d9159c44d74abb852b6a0a7223422b8693ecb93390fd92ba2aec3db54311d45331a3ff3b914232387c4bac3fc46ff4b347a13d06cb40127e5 SHA512 6350106296d52acdc64bd2f183e23ee560b4725e831ce0549a26bd8faed80a632fe09b5e358ac4d06765fff222d13543badbe2218c9f5768e6b37ea4ebbf4c25
+DIST th-lift-0.8.2.tar.gz 14385 BLAKE2B 31c02c810a3260450e2efd79e4271d326341cc8a8fae9dc3d0293b4b065978cf9d3e676fb54d003d385d21def498f03014c8065a14c9f90931a2843add8349c0 SHA512 bda1fd661274d911898eb163427a83db81bf5cc6d7cdd2936a84cb314268be2d38c5753727c1e87e83f8edb61e8bbbd0976001f680830b3bc2d4eb96178505ec
+DIST th-lift-0.8.4.tar.gz 14711 BLAKE2B f045220e93221186c43fad301c1c97f16e35c3651f191f5bc710ca2660cd23dfff05f707c4ba0151cb17eb0ee5a39bf2f36d49511553e23f9d9d8915d47b322a SHA512 fe5d47cc5b9c4a6128761d044ad00262e316862888a218279b62b51b87f32398c534ca65407491d210e7d32bea53c77161333b98bcc969e077221f2d9e3c56f7
diff --git a/dev-haskell/th-lift/metadata.xml b/dev-haskell/th-lift/metadata.xml
index f2a6d52fd914..f399f27a117a 100644
--- a/dev-haskell/th-lift/metadata.xml
+++ b/dev-haskell/th-lift/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">mboes/th-lift</remote-id>
+ <remote-id type="hackage">th-lift</remote-id>
+ <remote-id type="github">RyanGlScott/th-lift</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/th-lift/th-lift-0.8.1.ebuild b/dev-haskell/th-lift/th-lift-0.8.1.ebuild
deleted file mode 100644
index 3277d4a608c6..000000000000
--- a/dev-haskell/th-lift/th-lift-0.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
-HOMEPAGE="https://github.com/RyanGlScott/th-lift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/th-lift/th-lift-0.8.2.ebuild b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
new file mode 100644
index 000000000000..ad13c913e8fb
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
+HOMEPAGE="https://github.com/RyanGlScott/th-lift"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/th-lift/th-lift-0.8.4.ebuild b/dev-haskell/th-lift/th-lift-0.8.4.ebuild
new file mode 100644
index 000000000000..37c03e9073f0
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
+HOMEPAGE="https://github.com/RyanGlScott/th-lift"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
deleted file mode 100644
index aa298e5e28e1..000000000000
--- a/dev-haskell/th-orphans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST th-orphans-0.13.10.tar.gz 8680 BLAKE2B fe03bfbd6ca27a9949573cdff3c496088fd6b082c6a334960388b45bc0bce38d2675ca9319c627d4d7b0df831fb497bea2d9dc753c76ce1d967e9f423b3562f6 SHA512 bdf9cc69f57b97772f2ef38dcda61ca352069ac07e45c85efdcabec9dd3a538f33b3d65cfdff77185c737b8050139e232c4ecf677d89fd79aa5b74238b8af651
diff --git a/dev-haskell/th-orphans/metadata.xml b/dev-haskell/th-orphans/metadata.xml
deleted file mode 100644
index f265d998b0c0..000000000000
--- a/dev-haskell/th-orphans/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Orphan instances for TH datatypes. In particular, instances
- for Ord and Lift, as well as a few missing Show / Eq. These
- instances used to live in haskell-src-meta, and that's where
- the version number started.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild
deleted file mode 100644
index c2a10a9d6d76..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.13.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/generic-deriving-1.9:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/th-lift-0.7.1:=[profile?]
- dev-haskell/th-lift-instances:=[profile?]
- >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
deleted file mode 100644
index bea36e3287f8..000000000000
--- a/dev-haskell/th-reify-many/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST th-reify-many-0.1.9.tar.gz 5693 BLAKE2B c70b758a843b3d76982d89564a9cfe5fdc55d97ff05f3622e86b5160e06be22dd8fb870978b8da093ea5642bc1879ff7f5900fca4ff1cffe5f078ac8ec347155 SHA512 6d6f3cb939c172869e88a14ee800aa7760e090df55e0105f41ddc501c0a4bb60d59a66fafd890475fc3074a4fb25d7583570e2cfe32ce69f43c8db9663b0f110
diff --git a/dev-haskell/th-reify-many/metadata.xml b/dev-haskell/th-reify-many/metadata.xml
deleted file mode 100644
index b7024c7eb42a..000000000000
--- a/dev-haskell/th-reify-many/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- @th-reify-many@ provides functions for recursively reifying top
- level declarations. The main intended use case is for enumerating
- the names of datatypes reachable from an initial datatype, and
- passing these names to some function which generates instances.
- </longdescription>
- <upstream>
- <remote-id type="github">mgsloan/th-reify-many</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
deleted file mode 100644
index c1bfcb59111e..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/th-expand-syns:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
deleted file mode 100644
index b501675095e5..000000000000
--- a/dev-haskell/th-utilities/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1 SHA512 b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02
diff --git a/dev-haskell/th-utilities/metadata.xml b/dev-haskell/th-utilities/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/th-utilities/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
deleted file mode 100644
index 9f8403689752..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
- dev-haskell/syb:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/th-orphans:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec
- dev-haskell/vector )
-"
diff --git a/dev-haskell/these/Manifest b/dev-haskell/these/Manifest
new file mode 100644
index 000000000000..3ba4cb56f142
--- /dev/null
+++ b/dev-haskell/these/Manifest
@@ -0,0 +1,3 @@
+DIST these-1.1.1.1.cabal 2748 BLAKE2B 2c35a4da7a8afc378d8eff519493a5fff85bfc780f699cca7441b8afcae9af47e08f2ab0b639f216cf9777ed2b84d87572329d171040b0bc231844ef6f53e6cd SHA512 bfe6df1cdbe0286731e28d0ab3cf354fb55a6be4aa799de6af6ee5a132c383fb889a5828aa2b3645e4f59a5690461c9abc83ccb277a51ef5c4f98b10e6270a53
+DIST these-1.1.1.1.tar.gz 9804 BLAKE2B 1b42aeea439b31a07f9916771a496258c45d343dbebbce7b8d3d50f0b34075cc1b3dc8bfb24d71bda866f3e8ee1d4822b8a8509d84cb277a1c8d253341e5fe51 SHA512 23246164648bf4cb028719e7cb2e5f450ab55558af9e1dc7f0ddec323ca4ce124afbfd3bf367446c2d69ec91abe42daf77e11a26a13f2898275dafbc095637d5
+DIST these-1.2.tar.gz 10606 BLAKE2B 9ced606b96e2b42ed9122bf458f534e521173466b1779aad7392c61b1621ae599191fd6e00b34d622ab0ed313218113edfdc55d3e259d7f76447d549f89c8bd2 SHA512 f05210a9a4023638ed0eba7089466f9fb8475fb30bd61bfeb36ea2f7382ea27eb3103233473087a0384208b34903b04218e64d4482da8cb8010fb7342af53d1a
diff --git a/dev-haskell/these/metadata.xml b/dev-haskell/these/metadata.xml
new file mode 100644
index 000000000000..b8c9395b8440
--- /dev/null
+++ b/dev-haskell/these/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">these</remote-id>
+ <remote-id type="github">haskellari/these</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/these/these-1.1.1.1.ebuild b/dev-haskell/these/these-1.1.1.1.ebuild
new file mode 100644
index 000000000000..437cb4a16833
--- /dev/null
+++ b/dev-haskell/these/these-1.1.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: aeson,assoc,quickcheck,semigroupoids,+assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="5"
+inherit haskell-cabal
+
+DESCRIPTION="An either-or-both data type"
+HOMEPAGE="https://github.com/haskellari/these"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=assoc
+}
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/these/these-1.2.ebuild b/dev-haskell/these/these-1.2.ebuild
new file mode 100644
index 000000000000..e3a8caa81df4
--- /dev/null
+++ b/dev-haskell/these/these-1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: aeson,assoc,quickcheck,semigroupoids,+assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="An either-or-both data type"
+HOMEPAGE="https://github.com/haskellari/these"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/assoc-1.1:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+ >=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=assoc
+}
diff --git a/dev-haskell/threads/Manifest b/dev-haskell/threads/Manifest
deleted file mode 100644
index a8a5fb830dd2..000000000000
--- a/dev-haskell/threads/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST threads-0.5.1.6.tar.gz 7406 BLAKE2B f2676d616f09e571e08a5e53671997483dc05d633444456b4227d28c0433ccd99c5c5117e8122a6ba0f389338b165ffc18a90c51222f199d90b2f2a704ecd7f1 SHA512 d34d97e5614f23afc5d2bb671c3979d779a9d0e29147a8bf25059f35ed562264302a3242224b022388e554177aa34455cb59dc640b2fa19ec452f15afac10525
diff --git a/dev-haskell/threads/metadata.xml b/dev-haskell/threads/metadata.xml
deleted file mode 100644
index b9e0f49e9a65..000000000000
--- a/dev-haskell/threads/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides functions to fork threads and
- wait for their result, whether it's an exception or a
- normal value.
-
- Besides waiting for the termination of a single thread
- this packages also provides functions to wait for a
- group of threads to terminate.
-
- This package is similar to the
- @threadmanager@, @async@ and @spawn@ packages.
- The advantages of this package are:
-
- * Simpler API.
-
- * More efficient in both space and time.
-
- * No space-leak when forking a large number of threads.
-
- * Correct handling of asynchronous exceptions.
-
- * GHC specific functionality like @forkOn@ and @forkIOWithUnmask@.
- </longdescription>
- <upstream>
- <remote-id type="github">basvandijk/threads</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/threads/threads-0.5.1.6.ebuild b/dev-haskell/threads/threads-0.5.1.6.ebuild
deleted file mode 100644
index 2a0d6593702f..000000000000
--- a/dev-haskell/threads/threads-0.5.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fork threads and wait for their result"
-HOMEPAGE="https://github.com/basvandijk/threads"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( >=dev-haskell/concurrent-extra-0.5.1
- >=dev-haskell/hunit-1.2.2
- >=dev-haskell/test-framework-0.2.4
- >=dev-haskell/test-framework-hunit-0.2.4 )
-"
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
deleted file mode 100644
index 84fdcabc8008..000000000000
--- a/dev-haskell/thyme/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST thyme-0.3.5.5.tar.gz 37220 BLAKE2B 16c72f436d8587f5102458a9013f1244e223dd675e610cfb8216d95a2ff01ec1b90bacd23dd50440ac87f6a73e22b2580a0dd4c0da3ca2c336d8e521b31fe23f SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5
diff --git a/dev-haskell/thyme/metadata.xml b/dev-haskell/thyme/metadata.xml
deleted file mode 100644
index 87b62c4192c8..000000000000
--- a/dev-haskell/thyme/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Thyme is a rewrite of the fine @time@ library, with a particular focus
- on performance for applications that make heavy use of timestamps.
-
- See "Data.Thyme" for a full description.
- </longdescription>
- <use>
- <flag name="bug-for-bug">bug-for-bug compatibility with time</flag>
- <flag name="lens">use the full lens package</flag>
- <flag name="show-internal">instance Show of internal representation</flag>
- </use>
- <upstream>
- <remote-id type="github">liyang/thyme</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/thyme/thyme-0.3.5.5.ebuild b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
deleted file mode 100644
index 9232956d3bba..000000000000
--- a/dev-haskell/thyme/thyme-0.3.5.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -werror,-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: need update against QuickCheck-2.11
-inherit haskell-cabal
-
-DESCRIPTION="A faster time library"
-HOMEPAGE="https://github.com/liyang/thyme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bug-for-bug lens show-internal"
-
-RESTRICT=test # optimization-dependent
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?]
- >=dev-haskell/quickcheck-2.4:2=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?]
- >=dev-haskell/vector-space-0.8:=[profile?]
- >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- lens? ( >=dev-haskell/lens-3.9:=[profile?] )
- !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag bug-for-bug bug-for-bug) \
- --flag=-hlint \
- $(cabal_flag lens lens) \
- $(cabal_flag show-internal show-internal) \
- --flag=-werror
-}
diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
index 69bf2d1dd94c..d51aa4809fb5 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1 +1,2 @@
-DIST time-compat-1.9.3.tar.gz 50050 BLAKE2B 9c6f457945a975d88fe1784daf7dbf4a0b96c086cdd05af97a3b0d9d2379777c985b8b73dd592f588d4e09aee2fc987ed4b97efd4d4199841318114b379a8c5d SHA512 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a
+DIST time-compat-1.9.6.1-rev5.cabal 5062 BLAKE2B be9fb65c60bc62b7b92ec552ef691121084b67d05f329f32a6cd9af8f57663e8be7b31510e5a5080db38d711a06a91a9de705fbd8e3ad6697b6451f95ddedb7b SHA512 6ab42c2ad2d53b4bb9e713886508691cfc0f13535524e2cf0311110b8bf991474b6efd030ec74dfda056d154cdbb409cc7caea087645e91d50a96e2a5c07a979
+DIST time-compat-1.9.6.1.tar.gz 59964 BLAKE2B 0a19a9692100d47f14643613539061104fead78056d37ff3aededf3d15ef00e23aa6875b77b56a92138818511b7681197ff55fb8adb6a0d6075c7e02bf0fe397 SHA512 ca0b19aa5e7948fd7d9fbd8ff5e1b0f93a2d8d410d515e7078b40370e7d9fc363c111d53551d57a0320efb0894bcc2210afa8fc04da9f003ded626f53b7e58ea
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 000000000000..918bd488dbc9
--- /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/metadata.xml b/dev-haskell/time-compat/metadata.xml
index 937381521944..9eefe1548660 100644
--- a/dev-haskell/time-compat/metadata.xml
+++ b/dev-haskell/time-compat/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">time-compat</remote-id>
+ <remote-id type="github">haskellari/time-compat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/time-compat/time-compat-1.9.3.ebuild b/dev-haskell/time-compat/time-compat-1.9.3.ebuild
deleted file mode 100644
index f6868dc7dfc5..000000000000
--- a/dev-haskell/time-compat/time-compat-1.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="This packages tries to compat as much of \\'time\\' features as possible"
-HOMEPAGE="https://github.com/phadej/time-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires quickcheck-2.13
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12"
-# test? ( >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.12
-# >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
-# >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
-# >=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3
-# >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
-# >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
-# || ( ( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
-# ( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 ) ) )
-# "
diff --git a/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
new file mode 100644
index 000000000000..927540bc987f
--- /dev/null
+++ b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for time"
+HOMEPAGE="https://github.com/haskellari/time-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/fix-resolution-test.patch" )
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+ >=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.14
+ >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+ >=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ || (
+ ( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
+ ( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
+ )
+ )
+"
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 8307720e0d18..d6a1b5250eb5 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/time-manager/metadata.xml b/dev-haskell/time-manager/metadata.xml
index 937381521944..6b5972c48ca4 100644
--- a/dev-haskell/time-manager/metadata.xml
+++ b/dev-haskell/time-manager/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">yesodweb/wai</remote-id>
+ </upstream>
</pkgmetadata>
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 2748b6dcb382..7effa15e0aa6 100644
--- a/dev-haskell/time-manager/time-manager-0.0.0.ebuild
+++ b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/timeit/metadata.xml b/dev-haskell/timeit/metadata.xml
index 937381521944..afb59c65e1bb 100644
--- a/dev-haskell/timeit/metadata.xml
+++ b/dev-haskell/timeit/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">merijn/timeit</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/timeit/timeit-2.0.ebuild b/dev-haskell/timeit/timeit-2.0.ebuild
index fba159e684ae..92d1f1133f5f 100644
--- a/dev-haskell/timeit/timeit-2.0.ebuild
+++ b/dev-haskell/timeit/timeit-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
index 662558a9f353..22bd93ad911f 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1 +1,2 @@
DIST timezone-olson-0.2.0.tar.gz 11301 BLAKE2B 51782a94097516e40f7f71548bd1f52ed673836a5bd289634f60bc9293534980966680ca689f584d15eeb0acd8a186ce9c8effb39a6c718008b1690d9858681e SHA512 06c73b24b23caa41f3dce472bca384e3ee7ba02a3dd8bc4458bc758bc6aabdeca9be299f16419702e860f38ea213fd62d90e63fc4746dc2015c0e06b15aba6dd
+DIST timezone-olson-0.2.1.tar.gz 11290 BLAKE2B cc352ea26a06b2405278e783a9c961f71418f59805985d976e531ed35f1ee8e72ad064352f5ced0d42b6c3c195adf20c5ff2a40839c83ec6aa1341c7b05f3dc1 SHA512 243ea612a4af206d629ba1f3b3b01b1470e849a5ce50c2c189da246eac6f043ac7fb4f039df94053c7a1da9d2aeb347e510560fd0fa590264a5e3897a8dd1300
diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
index 937381521944..d43bcd578ae6 100644
--- a/dev-haskell/timezone-olson/metadata.xml
+++ b/dev-haskell/timezone-olson/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">timezone-olson</remote-id>
+ <remote-id type="github">ygale/timezone-olson</remote-id>
+ </upstream>
</pkgmetadata>
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 c2f5b93c0c90..45ce3705e5a2 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -14,7 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+ 'time >= 1.6 && < 1.10' 'time >= 1.6'
+)
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-olson/timezone-olson-0.2.1.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild
new file mode 100644
index 000000000000..8db772ad47f6
--- /dev/null
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
+HOMEPAGE="https://projects.haskell.org/time-ng/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
index b617a547f1f3..0c0476aca0e1 100644
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@@ -1 +1,3 @@
+DIST timezone-series-0.1.13-rev1.cabal 1528 BLAKE2B 75c04c5c149cd7fcbc4670ab1f2fadc4091661642c7a411688528da5059df2ef2f3b44450bcb5f3774c8c04bd0522ed37c1c49bff35b66a5ef00c59b8a206b13 SHA512 11a8bd7b3cdd06622118d78767e5df7d4645a201e8b2c0fa7a3d3923852bd1d26c79b685e4e2bf9eb3a2eeadb6b6acde0dc0c8d2124903b52a50a15b33573d7e
+DIST timezone-series-0.1.13.tar.gz 5682 BLAKE2B 284ba6c0c4b17bd2d2d6074afdfef6139b487ed2e9799a40c1f7389c30410f87f0d84f3dee163377ce378dedbb1a91f68416ed1830685e7854126927ba578d90 SHA512 7e98bf1030f9df88d031f8fe28e56f50bd8e5da7615165324b5132a77aecc70da5906e2068afa43a819d711725c4c6cae8f6d17e7803f50b31038eb1634d4992
DIST timezone-series-0.1.9.tar.gz 5812 BLAKE2B d45a62af6ac050406cded2740acb9988a25e38f80637e8dc8d7856786985ffe22a287873f878312faeddb524189a169af5ea6c1109613106dfc70cbba80b8b7a SHA512 9a716223270dfcb0ed39e2dcfb460e3540c0f2444f703c466cbd48ad5664e689aa3f6595f32e59b96fef7891aafabc03c9925367a26c2c043cb6adca2dad7a88
diff --git a/dev-haskell/timezone-series/metadata.xml b/dev-haskell/timezone-series/metadata.xml
index d179825cb7d9..d4b89ac92552 100644
--- a/dev-haskell/timezone-series/metadata.xml
+++ b/dev-haskell/timezone-series/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package endows Data.Time, from the time
- package, with several data types and functions
- for enhanced processing of timezones. For one way
- to create timezone series, see the timezone-olson
- package.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">timezone-series</remote-id>
+ <remote-id type="github">ygale/timezone-series</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild
new file mode 100644
index 000000000000..a4ddec0c2066
--- /dev/null
+++ b/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Enhanced timezone handling for Data.Time"
+HOMEPAGE="https://projects.haskell.org/time-ng/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
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 9b39ac2236a5..e02ae7a01c97 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,9 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
+CABAL_CHDEPS=(
+ 'time (>= 1.1.4 && < 1.9) || (>= 1.9.1 && < 1.10)' 'time >=1.1.4'
+)
+
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
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 aad98f5bbd05..e021ab37a3f3 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.2
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index e066554e23c6..801ee54266fb 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1 +1,2 @@
-DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
+DIST tls-1.5.8.tar.gz 157923 BLAKE2B b6b1259f6950e15fcba584690f59fd66a1a597490cbcb76e7199c48677f0df00e86f27f12e0c02210ba83cac110346aec6e7afb460f7e9721f275d146040cac5 SHA512 81d0046aeb6342c5dcd3827d9315793b68436a4eec7c9bcae50f4b5b5365248c7c874addca77a50a19689f535386330435b5914386306a3f12d699a5fad1107a
+DIST tls-1.8.0.tar.gz 159360 BLAKE2B 7d8a022e0a7f8953e47bf81eb923ad278f0b4350d537d35c2948532f082fe52d299076208083224252a0270698b2e76bc48e8c638edb5d2fe2a49f224e876c86 SHA512 23463ebbe331e02ed3b8d9c5a4e7dccc0b921898709c600e4a0a7b50575029c00ddbdbe6e3a44ffb094059cae377cb388b55be53ab847a1843989359200894b3
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index 6d71914e07ff..bfcf2e4b1016 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -5,25 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Native Haskell TLS and SSL protocol implementation for server and client.
-
- This provides a high-level implementation of a sensitive security protocol,
- eliminating a common set of security issues through the use of the advanced
- type system, high level constructions and common Haskell features.
-
- Currently implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol,
- with only RSA supported for Key Exchange.
-
- Only core protocol available here, have a look at the
- &lt;http://hackage.haskell.org/package/tls-extra/&gt; package for default
- ciphers, compressions and certificates functions.
- </longdescription>
<use>
- <flag name="compat">Accept SSLv2 compatible handshake.</flag>
- <flag name="network">Use the base network library.</flag>
+ <flag name="compat">Accept SSLv2 client hello for beginning SSLv3 / TLS handshake</flag>
+ <flag name="network">Use the base network library</flag>
</use>
<upstream>
- <remote-id type="github">vincenthz/hs-tls</remote-id>
+ <remote-id type="hackage">tls</remote-id>
+ <remote-id type="github">haskell-tls/hs-tls</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
deleted file mode 100644
index e8454a5db2c0..000000000000
--- a/dev-haskell/tls/tls-1.5.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-#hackport: flags: -hans
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
- >=dev-haskell/asn1-types-0.2.0:=[profile?]
- >=dev-haskell/async-2.0:=[profile?]
- >=dev-haskell/cereal-0.5.3:=[profile?]
- >=dev-haskell/cryptonite-0.25:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- dev-haskell/hourglass:=[profile?]
- >=dev-haskell/memory-0.14.6:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/x509-1.7.5:=[profile?]
- >=dev-haskell/x509-store-1.6:=[profile?]
- >=dev-haskell/x509-validation-1.6.5:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag compat compat) \
- --flag=-hans \
- $(cabal_flag network network)
-}
diff --git a/dev-haskell/tls/tls-1.5.8.ebuild b/dev-haskell/tls/tls-1.5.8.ebuild
new file mode 100644
index 000000000000..a237085f3c83
--- /dev/null
+++ b/dev-haskell/tls/tls-1.5.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -hans
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
+HOMEPAGE="https://github.com/vincenthz/hs-tls"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+compat +network"
+
+RDEPEND="dev-haskell/asn1-encoding:=[profile?]
+ >=dev-haskell/asn1-types-0.2.0:=[profile?]
+ >=dev-haskell/async-2.0:=[profile?]
+ >=dev-haskell/cereal-0.5.3:=[profile?]
+ >=dev-haskell/cryptonite-0.27:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ dev-haskell/hourglass:=[profile?]
+ >=dev-haskell/memory-0.14.6:=[profile?]
+ >=dev-haskell/x509-1.7.5:=[profile?]
+ >=dev-haskell/x509-store-1.6:=[profile?]
+ >=dev-haskell/x509-validation-1.6.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag compat compat) \
+ --flag=-hans \
+ $(cabal_flag network network)
+}
diff --git a/dev-haskell/tls/tls-1.8.0.ebuild b/dev-haskell/tls/tls-1.8.0.ebuild
new file mode 100644
index 000000000000..51e08cb1b176
--- /dev/null
+++ b/dev-haskell/tls/tls-1.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -hans
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
+HOMEPAGE="https://github.com/haskell-tls/hs-tls"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+compat +network"
+
+RDEPEND="dev-haskell/asn1-encoding:=[profile?]
+ >=dev-haskell/asn1-types-0.2.0:=[profile?]
+ >=dev-haskell/async-2.0:=[profile?]
+ >=dev-haskell/cereal-0.5.3:=[profile?]
+ dev-haskell/crypton:=[profile?]
+ >=dev-haskell/crypton-x509-1.7.5:=[profile?]
+ >=dev-haskell/crypton-x509-store-1.6:=[profile?]
+ >=dev-haskell/crypton-x509-validation-1.6.5:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/memory-0.14.6:=[profile?]
+ dev-haskell/unix-time:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/hourglass
+ dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag compat compat) \
+ --flag=-hans \
+ $(cabal_flag network network)
+}
diff --git a/dev-haskell/toml-parser/Manifest b/dev-haskell/toml-parser/Manifest
new file mode 100644
index 000000000000..12ea09ab750d
--- /dev/null
+++ b/dev-haskell/toml-parser/Manifest
@@ -0,0 +1 @@
+DIST toml-parser-1.3.0.0.tar.gz 39211 BLAKE2B cb5a1504ddd9ec96039b00da5424b8cd2467336f7d9d9c1874633a8b3bf2a0c87d919d5ab7d6f45284dc4dce3ce98bc1e8b202ae1f8a7afc3df1e54ef2aff398 SHA512 95bed0702a8d00289063782a4387e43a1bbc4096a89311281451a4d88813040869740e8d57fb7de3c317256a7cdd7a53cd75b11dc96d599a7242ab0d14cecce8
diff --git a/dev-haskell/toml-parser/metadata.xml b/dev-haskell/toml-parser/metadata.xml
new file mode 100644
index 000000000000..a6bfd3e5edcf
--- /dev/null
+++ b/dev-haskell/toml-parser/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">toml-parser</remote-id>
+ <remote-id type="github">glguy/toml-parser</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild b/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild
new file mode 100644
index 000000000000..f267f824e12f
--- /dev/null
+++ b/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="TOML 1.0.0 parser"
+HOMEPAGE="https://hackage.haskell.org/package/toml-parser"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # build log: 'ghc: could not execute: markdown-unlit'
+
+RDEPEND=">=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+ >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-3:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/alex-3.2
+ >=dev-haskell/cabal-3.2.0.0
+ >=dev-haskell/happy-1.19
+"
+# test? ( || ( ( >=dev-haskell/hspec-2.10 <dev-haskell/hspec-2.11 )
+# ( >=dev-haskell/hspec-2.11 <dev-haskell/hspec-2.12 ) ) )
+#"
diff --git a/dev-haskell/top/Manifest b/dev-haskell/top/Manifest
deleted file mode 100644
index 1fc7496525c5..000000000000
--- a/dev-haskell/top/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Top-1.7.tar.gz 70721 BLAKE2B 90ddda99ab4dac209712494c28e15e90ffd2996151ab7df0a57fb8162bec09da6b28fd52b36672e081d10fa0b79d25bb2da2fd58d220573cea006d70c61229f0 SHA512 90d5f1042c07101c35bc1722c18667f551fa4d9034e70a4b7466ff25906899053a054f1227fed8d6d534d04fe9a1c2420585143cde44badfe98e08bf9a6225b4
diff --git a/dev-haskell/top/files/top-1.7-ghc-7.10.patch b/dev-haskell/top/files/top-1.7-ghc-7.10.patch
deleted file mode 100644
index 3acbda19e171..000000000000
--- a/dev-haskell/top/files/top-1.7-ghc-7.10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-index 2cc5210..faf4c8c 100644
---- a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-+++ b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- | License : GPL
-diff --git a/src/Top/Monad/Select.hs b/src/Top/Monad/Select.hs
-index e5953cb..72276b4 100644
---- a/src/Top/Monad/Select.hs
-+++ b/src/Top/Monad/Select.hs
-@@ -16,4 +16,6 @@ module Top.Monad.Select
- import Top.Util.Embedding
- import Control.Monad.State
-+import Control.Monad
-+import Control.Applicative
-
- --------------------------------------------------------
-@@ -22,4 +24,11 @@ import Control.Monad.State
- newtype Select t m a = Select (m a)
-
-+instance Monad m => Functor (Select t m) where
-+ fmap = liftM
-+
-+instance Monad m => Applicative (Select t m) where
-+ pure = return
-+ (<*>) = ap -- defined in Control.Monad
-+
- instance Monad m => Monad (Select t m) where
- return a = Select (return a)
-@@ -43,4 +52,11 @@ select = Select
- data SelectFix (t :: (* -> *) -> *) (m :: * -> *) a = SelectFix (m a)
-
-+instance Monad m => Functor (SelectFix t m) where
-+ fmap = liftM
-+
-+instance Monad m => Applicative (SelectFix t m) where
-+ pure = return
-+ (<*>) = ap -- defined in Control.Monad
-+
- instance Monad m => Monad (SelectFix t m) where
- return a = SelectFix (return a)
-diff --git a/src/Top/Monad/StateFix.hs b/src/Top/Monad/StateFix.hs
-index d77919d..bd8fb76 100644
---- a/src/Top/Monad/StateFix.hs
-+++ b/src/Top/Monad/StateFix.hs
-@@ -16,4 +16,6 @@ import Control.Monad.State
- import Control.Monad.Identity
- import Control.Monad.Writer
-+import Control.Monad
-+import Control.Applicative
-
- type StateFix s = StateFixT s Identity
-@@ -21,4 +23,11 @@ type StateFix s = StateFixT s Identity
- data StateFixT s m a = Fix { unFix :: StateT (s (StateFixT s m)) m a }
-
-+instance Monad m => Functor (StateFixT s m) where
-+ fmap = liftM
-+
-+instance Monad m => Applicative (StateFixT s m) where
-+ pure = return
-+ (<*>) = ap -- defined in Control.Monad
-+
- instance Monad m => Monad (StateFixT s m) where
- return = Fix . return
diff --git a/dev-haskell/top/files/top-1.7-ghc84.patch b/dev-haskell/top/files/top-1.7-ghc84.patch
deleted file mode 100644
index 58ed02d3ff2a..000000000000
--- a/dev-haskell/top/files/top-1.7-ghc84.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Top/Solver.hs
-+++ b/src/Top/Solver.hs
-@@ -26,2 +26,3 @@ import Top.Constraint.Information
- import Control.Monad.Writer
-+import qualified Data.Semigroup as S
-
-@@ -170,2 +171,5 @@ evalBasicMonad = runWriter . flip evalStateFixT empty
-
-+instance S.Semigroup LogEntries where
-+ (<>) (LogEntries f) (LogEntries g) = LogEntries (f . g)
-+
- instance Monoid LogEntries where
diff --git a/dev-haskell/top/metadata.xml b/dev-haskell/top/metadata.xml
deleted file mode 100644
index 1a045adcfaaf..000000000000
--- a/dev-haskell/top/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- At its most general, Top is a framework for constructing abstract interpretations
- which focuses on giving good feedback on why an abstract interpretation does not give
- any useful information. In a mathematical notation this is usually made explicit by
- returning the top element of a (complete) lattice. This is also one of the reasons
- for the name of the project.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
deleted file mode 100644
index d6b9761f6b81..000000000000
--- a/dev-haskell/top/top-1.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Top"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Constraint solving framework employed by the Helium Compiler"
-HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- dev-haskell/parsec:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10.1.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc-7.10.patch
- "${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
index f02322ee90d6..2d8bb505711f 100644
--- a/dev-haskell/torrent/torrent-10000.1.1.ebuild
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
index 3ea580c6b734..13068fdfbb39 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1 +1,2 @@
DIST transformers-base-0.4.5.2.tar.gz 2849 BLAKE2B 9e1f1aeb3ced732c4406e4636ded466bd2f26c253d80caf321441505d6ad24912f108d464b6d27b211a6ffc128ff6d85003162a9c4709574645754e97db94461 SHA512 5953d99fee3a02f825c096cf035a5ee825da17e154ca9847ddb215dee54a96a8b28af2b4adb639ef3548ea9aa8a2cb781563c7ffbb399bed5a35c056d03bcbd4
+DIST transformers-base-0.4.6.tar.gz 2902 BLAKE2B b03e7c4b4eaf41f07d2946324f2b062663b22f1ebdd65e9ff21b05d407b6958282ce02e5064e14fe7c53c3896355d8af1f17d5c845bf2bf2f1e0da139953feee SHA512 b056b01bd5b3d882cf08bc9977c518ed6231d7da529cee61f2f52de886da4b8ee57e4505c767f59205a75be755870254f7351358bfc2142170fb3f31f25d66b5
diff --git a/dev-haskell/transformers-base/metadata.xml b/dev-haskell/transformers-base/metadata.xml
index c6b531991d6a..c15107acbaa4 100644
--- a/dev-haskell/transformers-base/metadata.xml
+++ b/dev-haskell/transformers-base/metadata.xml
@@ -9,6 +9,7 @@
<flag name="orphaninstances">Build instances for orphan datatypes.</flag>
</use>
<upstream>
+ <remote-id type="hackage">transformers-base</remote-id>
<remote-id type="github">mvv/transformers-base</remote-id>
</upstream>
</pkgmetadata>
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 be53f8520234..40a6f8b70fbf 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-base/transformers-base-0.4.6.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
new file mode 100644
index 000000000000..da39d1d66a8b
--- /dev/null
+++ b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lift computations from the bottom of a transformer stack"
+HOMEPAGE="https://github.com/mvv/transformers-base"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+orphaninstances"
+
+RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag orphaninstances orphaninstances)
+}
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index 381d35948b36..60185e23f03c 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1 +1,2 @@
DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
+DIST transformers-compat-0.7.2.tar.gz 46485 BLAKE2B a0a26a91219e098f04fff32f2dfb5e860c4e62fc6d5111c9baaf7203ee19a19809a1b812721fcd110edf680be7665112a8e5e11e798f40e1912418f6a52c0b29 SHA512 9bcc4b5aebbc6ec0b05ac8499ec79102e766ae8c2c919343f7d20ebb451fedb3a00647dc0baff5e998dd0b67f1ffbe725a14e0abf299a6b2656c219f8330856e
diff --git a/dev-haskell/transformers-compat/metadata.xml b/dev-haskell/transformers-compat/metadata.xml
index d076eadf9168..c0d56bdf262d 100644
--- a/dev-haskell/transformers-compat/metadata.xml
+++ b/dev-haskell/transformers-compat/metadata.xml
@@ -5,19 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package includes backported versions of types that were added
- to transformers in transformers 0.3 for users who need strict
- transformers 0.2 compatibility to run on old versions of the
- platform, but also need those types.
-
- Those users should be able to just depend on @transformers &gt;= 0.2@
- and @transformers-compat@.
-
- Note: missing methods are not supplied
- but this at least permits the types to be used.
- </longdescription>
<upstream>
+ <remote-id type="hackage">transformers-compat</remote-id>
<remote-id type="github">ekmett/transformers-compat</remote-id>
</upstream>
</pkgmetadata>
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 f547bb95cb47..00d7d6e66cbe 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: -two,+mtl,-generic-deriving
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-compat/transformers-compat-0.7.2.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
new file mode 100644
index 000000000000..36e1b3237168
--- /dev/null
+++ b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -two,+mtl,-generic-deriving
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A small compatibility shim for the transformers library"
+HOMEPAGE="https://github.com/ekmett/transformers-compat/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND="
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-generic-deriving \
+ --flag=mtl \
+ --flag=-two
+}
diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
index a85059913550..3b8937c54cfa 100644
--- a/dev-haskell/transformers/metadata.xml
+++ b/dev-haskell/transformers/metadata.xml
@@ -4,16 +4,4 @@
<maintainer type="project">
<email>haskell@gentoo.org</email>
</maintainer>
- <longdescription>
- Haskell 98 part of a monad transformer library, inspired by the paper
- \"Functional Programming with Overloading and Higher-Order Polymorphism\",
- by Mark P Jones, in /Advanced School of Functional Programming/, 1995
- (&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-
- This part contains the monad transformer class, the concrete monad
- transformers, operations and liftings. It can be used on its own
- in Haskell 98 code, or with the monad classes in the @monads-fd@ or
- @monads-tf@ packages, which automatically lift operations introduced
- by monad transformers through other transformers.
- </longdescription>
</pkgmetadata>
diff --git a/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
new file mode 100644
index 000000000000..c8cfad0471af
--- /dev/null
+++ b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Concrete functor and monad transformers"
+HOMEPAGE="https://hackage.haskell.org/package/transformers"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+"
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
deleted file mode 100644
index df29fa1c9afb..000000000000
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-"
-CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest
index f091af93eab2..002d9d174793 100644
--- a/dev-haskell/tree-diff/Manifest
+++ b/dev-haskell/tree-diff/Manifest
@@ -1 +1,3 @@
-DIST tree-diff-0.1.tar.gz 21644 BLAKE2B 0cd1633970216a994100f852b0982d43b6f1d0dc1b0550e759009250e016d271c5358460ef3999267da597b4e58dd28c3094e0ba4f618ba5990e91740eb63881 SHA512 a4ee703e4b6a18055c7749020863a9571af4620dbb7ea05903693c752e10e3ffa4fee8da0dacc0e4bbf92173e34c9070251881597ca1cd9f7c8ed365e840563c
+DIST tree-diff-0.2.1.1.tar.gz 26042 BLAKE2B c136094949b96069996ae2a68c49ca3476f75909138135a138b1c1f07b833413472d2c497418a8bb6c0c17164e78cf180b548c0d4ab5806269e7348aa86467ba SHA512 07bd947b145ebf894a5f830601529517d003bf4b0ffc9581c8204d710ed8d3941f764376add84ab1757c7d3544e984166115f37c1348a32123d99aea816a0686
+DIST tree-diff-0.3.0.1-rev3.cabal 5422 BLAKE2B 1e0edff3db263a9b1929cc8e9115a8cd226a40327a61c1d1e2f49500da72292d324bc232aa6a2b0499f2c4f995ae02d20e86d2d21d38ae358f53e0fa2a4c3a66 SHA512 a33fcfc3a3a312ac3a3d11c4280e01ccc3664da52fd8f11ef51ae2c5fab86500557d890d7ef0cbd654af30552fa88e3b15d78d7310a18c8c32c9bcacea324187
+DIST tree-diff-0.3.0.1.tar.gz 26603 BLAKE2B 2456836d111e689c5101703a617a384b31eb46f12d9a6ef54e863d9e537345729432f2784f2f33be681e413fd400979cbe81d3fb50e49b0627d2a7edefa7eed3 SHA512 69244dcf5bca996e6c08500cf1841e68fda2a304fb811d788d2dd03e79076496bc12bfb1d3ac3f30c01929bbd617f009e2a78c1a7b23284cd41d1f78d8e6d20e
diff --git a/dev-haskell/tree-diff/metadata.xml b/dev-haskell/tree-diff/metadata.xml
index 58a8a726ff7e..98aeb21bca73 100644
--- a/dev-haskell/tree-diff/metadata.xml
+++ b/dev-haskell/tree-diff/metadata.xml
@@ -5,32 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Common diff algorithm works on list structures:
-
- @
- diff :: Eq a =&gt; [a] -&gt; [a] -&gt; [Edit a]
- @
-
- This package works on trees.
-
- @
- treeDiff :: Eq a =&gt; Tree a -&gt; Tree a -&gt; Edit (EditTree a)
- @
-
- This package also provides a way to diff arbitrary ADTs,
- using @Generics@-derivable helpers.
-
- This package differs from &lt;http://hackage.haskell.org/package/gdiff gdiff&gt;,
- in a two ways: @tree-diff@ doesn't have patch function,
- and the "edit-script" is a tree itself, which is useful for pretty-printing.
-
- @
- &gt;&gt;&gt; prettyEditExpr $ ediff (Foo 42 [True, False] "old") (Foo 42 [False, False, True] "new")
- Foo
- {fooBool = [-True, +False, False, +True],
- fooInt = 42,
- fooString = -"old" +"new"}
- @
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">tree-diff</remote-id>
+ <remote-id type="github">phadej/tree-diff</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/tree-diff/tree-diff-0.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.1.ebuild
deleted file mode 100644
index 36faec98079a..000000000000
--- a/dev-haskell/tree-diff/tree-diff-0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Diffing of (expression) trees"
-HOMEPAGE="https://github.com/phadej/tree-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/ansi-terminal-0.8.1:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
- >=dev-haskell/base-compat-0.9.3:=[profile?]
- >=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
- >=dev-haskell/generic-deriving-1.12.4:=[profile?] <dev-haskell/generic-deriving-1.14:=[profile?]
- >=dev-haskell/generics-sop-0.3.1.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
- >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/memotrie-0.6.8:=[profile?] <dev-haskell/memotrie-0.7:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?]
- >=dev-haskell/quickcheck-2.10.0.1:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
- >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
- >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
- >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
- >=dev-haskell/trifecta-2.0 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'ansi-terminal ^>=0.8.2 || ^>=0.9.1' 'ansi-terminal >=0.8.2' \
- 'base >=4.5 && <4.13' 'base >=4.5' \
- 'time ^>=1.4 || ^>=1.5.0.1 || ^>=1.6.0.1 || ^>=1.8.0.2' 'time >=1.4' \
- 'base-compat ^>=0.10.5' 'base-compat >=0.10.5' \
- 'trifecta ^>=2' 'trifecta >=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
new file mode 100644
index 000000000000..a7aadab49bfa
--- /dev/null
+++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Diffing of (expression) trees"
+HOMEPAGE="https://github.com/haskellari/tree-diff"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+ >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?]
+ >=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/semialign-1.1:=[profile?] <dev-haskell/semialign-1.3:=[profile?]
+ >=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ >=dev-haskell/aeson-1.5.6.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/base-compat
+ >=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+ >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/trifecta-2 <dev-haskell/trifecta-2.2
+ || ( ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 )
+ || ( ( >=dev-haskell/tasty-1.3.1 <dev-haskell/tasty-1.4 )
+ ( >=dev-haskell/tasty-1.4.2 <dev-haskell/tasty-1.5 ) ) ) )
+"
diff --git a/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild b/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
new file mode 100644
index 000000000000..8ea1fdbfe853
--- /dev/null
+++ b/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Diffing of (expression) trees"
+HOMEPAGE="https://github.com/phadej/tree-diff"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+ >=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+ >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?]
+ >=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+ >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ >=dev-haskell/aeson-1.4.6.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+ >=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-1.1:=[profile?]
+ <dev-haskell/base-compat-0.14:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-haskell/semialign-1.2.0.1:=[profile?] <dev-haskell/semialign-1.4:=[profile?]
+ >=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+ >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+ >=dev-haskell/vector-0.12.0.0:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/ansi-terminal
+ dev-haskell/ansi-wl-pprint
+ dev-haskell/base-compat
+ dev-haskell/primitive
+ >=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+ >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
+ >=dev-haskell/trifecta-2 <dev-haskell/trifecta-2.2
+ || ( ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 )
+ || ( ( >=dev-haskell/tasty-1.3.1 <dev-haskell/tasty-1.4 )
+ ( >=dev-haskell/tasty-1.4.2 <dev-haskell/tasty-1.5 ) ) ) )
+"
diff --git a/dev-haskell/trifecta/Manifest b/dev-haskell/trifecta/Manifest
index e2aef0f1696b..44f0dc641c54 100644
--- a/dev-haskell/trifecta/Manifest
+++ b/dev-haskell/trifecta/Manifest
@@ -1 +1,2 @@
-DIST trifecta-2.1.tar.gz 64406 BLAKE2B 31829c010ad48d9c506863138379d4694318235c3cea7f43ee46bdcb22fef4ccd9979990150486813a3b0f6297c34597888cd52e987f0fe8102882a217a85a7d SHA512 0929ee4a3d9a53c211b13a711814b4b6ea488ad40f373befdc7e8a479b2a95c4e97a19381873af54d377ff2af49782677fa2ea892ea69522c242e245debd3a25
+DIST trifecta-2.1.2.tar.gz 60393 BLAKE2B eeaa0fdb855b09f8aaea5ef9b1f4c2b465d8f07bc05ced926bfbbd43c256611336e7153edf7ad57853796d436930cf317fc9433462477ce37f5cc417b45f777d SHA512 33ee39932235d1963b44ce54a59c1b5f193db9f590f30ba272f4e10965582c3602f822328b7e6e98f09ff4d3e14a8e324375353246f3ff0815070a7d94916c2e
+DIST trifecta-2.1.3.tar.gz 60434 BLAKE2B 8b643e167e5e66ece6d38e5966a0d5494075ad6fd6a08d12c31009a2b6a9e62472b26ae9f2ac0190ba8035a9cc3a6992e847816f2c9c1c0e29a4c9cdb11116f7 SHA512 3794d521e3fc384b3e1cf1d2082270722271c1b6e8ed4802e834170c3e5df8236faf7b5eaf211c0b1215860b98fb0407563aeb77e5f052ad74f521f43a767e44
diff --git a/dev-haskell/trifecta/metadata.xml b/dev-haskell/trifecta/metadata.xml
index 937381521944..027d5925d891 100644
--- a/dev-haskell/trifecta/metadata.xml
+++ b/dev-haskell/trifecta/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">trifecta</remote-id>
+ <remote-id type="github">ekmett/trifecta</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/trifecta/trifecta-2.1.2.ebuild b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
new file mode 100644
index 000000000000..584b17c65e6b
--- /dev/null
+++ b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 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 modern parser combinator library with convenient diagnostics"
+HOMEPAGE="https://github.com/ekmett/trifecta/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+ >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
+ >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+ >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/lens-4.14:=[profile?] <dev-haskell/lens-6:=[profile?]
+ >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
+ >=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
+ >=dev-haskell/prettyprinter-ansi-terminal-1.1.2:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
+ >=dev-haskell/profunctors-5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/reducers-3.12.1:=[profile?] <dev-haskell/reducers-4:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/trifecta/trifecta-2.1.3.ebuild b/dev-haskell/trifecta/trifecta-2.1.3.ebuild
new file mode 100644
index 000000000000..49804c89384d
--- /dev/null
+++ b/dev-haskell/trifecta/trifecta-2.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern parser combinator library with convenient diagnostics"
+HOMEPAGE="https://github.com/ekmett/trifecta/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+ >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+ >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
+ >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+ >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+ >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/lens-4.14:=[profile?] <dev-haskell/lens-6:=[profile?]
+ >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
+ >=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
+ >=dev-haskell/prettyprinter-ansi-terminal-1.1.2:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
+ >=dev-haskell/profunctors-5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+ >=dev-haskell/reducers-3.12.1:=[profile?] <dev-haskell/reducers-4:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/trifecta/trifecta-2.1.ebuild b/dev-haskell/trifecta/trifecta-2.1.ebuild
deleted file mode 100644
index f1145445332a..000000000000
--- a/dev-haskell/trifecta/trifecta-2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern parser combinator library with convenient diagnostics"
-HOMEPAGE="https://github.com/ekmett/trifecta/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?]
- >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
- >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?]
- >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
- >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
- >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
- >=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?]
- >=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?]
- >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/type-equality/metadata.xml b/dev-haskell/type-equality/metadata.xml
index 48f5add4683e..1c5ebbe9daa9 100644
--- a/dev-haskell/type-equality/metadata.xml
+++ b/dev-haskell/type-equality/metadata.xml
@@ -15,4 +15,7 @@
producing equality proofs, providing some form of
decidable equality on types.
</longdescription>
+ <upstream>
+ <remote-id type="github">hesselink/type-equality</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/type-equality/type-equality-1.ebuild b/dev-haskell/type-equality/type-equality-1.ebuild
index c59698cbe1e1..b74e820629bd 100644
--- a/dev-haskell/type-equality/type-equality-1.ebuild
+++ b/dev-haskell/type-equality/type-equality-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.3 && <4.14' 'base >=4.3'
-}
+CABAL_CHDEPS=(
+ 'base >=4.3 && <4.14' 'base >=4.3'
+)
diff --git a/dev-haskell/typed-process/Manifest b/dev-haskell/typed-process/Manifest
index cd4d0143b3a0..2a158b0c3a82 100644
--- a/dev-haskell/typed-process/Manifest
+++ b/dev-haskell/typed-process/Manifest
@@ -1 +1,2 @@
+DIST typed-process-0.2.10.1.tar.gz 18264 BLAKE2B eef9769f018bd8702656b6d151fa1148b1991ca9d877b507542327881576dd5297ebac0d8b86d9f305d734e3f07413a7a23f8160752b34d896e2386026347aad SHA512 07ab11cc1554aeaf8980df5fbe105de71282424365be9e26e94b7cbad344d3d0d9d54fc492615e32ec0e6d3064a72c7996be03e7fbb81136df366511d7bd606d
DIST typed-process-0.2.6.0.tar.gz 17363 BLAKE2B 033c1da191fcf10ca36b1215303793d26b3435e7241ee07e4c3389a9892be496779f70ae62b6bbad7f07704866473e16d4f15bfb6f22efa41243cba6ad72e941 SHA512 a40b8db4ef2179273943a3aab0200891bd3dffe584bcd51037ddf9cebae88d4d95292883a745a0c31900c7bf2eebe2c71175fbb86dc470b60660b443f8b1e3e0
diff --git a/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch
new file mode 100644
index 000000000000..fca0ea238d4c
--- /dev/null
+++ b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch
@@ -0,0 +1,62 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/fpco/typed-process/pull/60
+
+This flag will toggle the use of some ghc-options in the typed-process-test
+test suite. It is set to default: True.
+
+This is needed for tests to run on some GHC builds which do not support SMP.
+
+diff -urN typed-process-0.2.10.1/typed-process.cabal typed-process-0.2.10.1-r1/typed-process.cabal
+--- typed-process-0.2.10.1/typed-process.cabal 2022-10-28 09:12:23.834918081 -0600
++++ typed-process-0.2.10.1-r1/typed-process.cabal 2022-10-28 09:12:42.724917857 -0600
+@@ -1,6 +1,6 @@
+ cabal-version: 1.12
+
+--- This file has been generated from package.yaml by hpack version 0.34.4.
++-- This file has been generated from package.yaml by hpack version 0.35.0.
+ --
+ -- see: https://github.com/sol/hpack
+
+@@ -24,6 +24,11 @@
+ type: git
+ location: https://github.com/fpco/typed-process
+
++flag smp
++ description: Use flags that depend on GHC supporting a multicore runtime (tests only)
++ manual: True
++ default: True
++
+ library
+ exposed-modules:
+ System.Process.Typed
+@@ -40,9 +45,9 @@
+ , stm
+ , transformers
+ , unliftio-core
++ default-language: Haskell2010
+ if os(windows)
+ cpp-options: -DWINDOWS
+- default-language: Haskell2010
+
+ test-suite typed-process-test
+ type: exitcode-stdio-1.0
+@@ -52,7 +57,6 @@
+ Paths_typed_process
+ hs-source-dirs:
+ test
+- ghc-options: -threaded -rtsopts -with-rtsopts=-N
+ build-depends:
+ async >=2.0
+ , base >=4.12 && <5
+@@ -66,6 +70,10 @@
+ , typed-process
+ , unliftio-core
+ default-language: Haskell2010
++ if flag(smp)
++ ghc-options: -threaded -rtsopts -with-rtsopts=-N
++ else
++ ghc-options: -threaded
+
+ test-suite typed-process-test-single-threaded
+ type: exitcode-stdio-1.0
diff --git a/dev-haskell/typed-process/metadata.xml b/dev-haskell/typed-process/metadata.xml
index 937381521944..c387243a2d03 100644
--- a/dev-haskell/typed-process/metadata.xml
+++ b/dev-haskell/typed-process/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">typed-process</remote-id>
+ <remote-id type="github">fpco/typed-process</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild
new file mode 100644
index 000000000000..3f70890a31fa
--- /dev/null
+++ b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Run external processes, with strong typing of streams"
+HOMEPAGE="https://github.com/fpco/typed-process"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.10.1-smp-flag.patch"
+)
+
+RDEPEND="
+ >=dev-haskell/async-2.0:=[profile?]
+ dev-haskell/stm:=[profile?]
+ dev-haskell/unliftio-core:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( dev-haskell/base64-bytestring
+ dev-haskell/hspec
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ if ghc-supports-smp; then
+ local smp_flag=smp
+ else
+ local smp_flag=-smp
+ fi
+
+ haskell-cabal_src_configure \
+ --flag="${smp_flag}"
+}
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 c4120a966f73..0a8ace7c48a5 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Run external processes, with strong typing of streams"
-HOMEPAGE="https://haskell-lang.org/library/typed-process"
+HOMEPAGE="https://github.com/fpco/typed-process"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/typst-symbols/Manifest b/dev-haskell/typst-symbols/Manifest
new file mode 100644
index 000000000000..5c88f7f1c628
--- /dev/null
+++ b/dev-haskell/typst-symbols/Manifest
@@ -0,0 +1 @@
+DIST typst-symbols-0.1.4.tar.gz 18688 BLAKE2B ffe4ed61ea5e71747f874622605011fd9d53d3bb4c04de8efb86cfdee970fb88f65e9c03775c49a340d0b146195913219c306b8d958356640692eb63b016fb5f SHA512 917e10b768751b50253f693726b49a27ee2cd8879f654aaac461df9a894d25ecd132a73cc6289a8684cd5dca982b65033757c1538e144413f2ddd3135f90db3e
diff --git a/dev-haskell/typst-symbols/metadata.xml b/dev-haskell/typst-symbols/metadata.xml
new file mode 100644
index 000000000000..f7247eb2f66d
--- /dev/null
+++ b/dev-haskell/typst-symbols/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">typst-symbols</remote-id>
+ <remote-id type="github">jgm/typst-symbols</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild b/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild
new file mode 100644
index 000000000000..94f3ac9714ab
--- /dev/null
+++ b/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Symbol and emoji lookup for typst language"
+HOMEPAGE="https://github.com/jgm/typst-symbols"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/typst/Manifest b/dev-haskell/typst/Manifest
new file mode 100644
index 000000000000..1f2ef09a5710
--- /dev/null
+++ b/dev-haskell/typst/Manifest
@@ -0,0 +1 @@
+DIST typst-0.3.2.0.tar.gz 6421514 BLAKE2B 622f49edd8fb362a07c2a81a59f227c82228bbf09b4708d2dc119deda66cb028838546f826e9729f350cb1ae20399e319b71fcdbd5707951e821b60c76e11a3b SHA512 1bb5dd8158c528d52c2411c3acb2ada2061ce5ef27eb387135e61140232815b15f5d3aaee3264ef3a11a09d8f4d10dfd3d246836f77d018ee0fcce8d37d3ccd5
diff --git a/dev-haskell/typst/metadata.xml b/dev-haskell/typst/metadata.xml
new file mode 100644
index 000000000000..faf481d753d0
--- /dev/null
+++ b/dev-haskell/typst/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="executable">Compile executable to be used in testing and development.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">typst</remote-id>
+ <remote-id type="github">jgm/typst-hs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/typst/typst-0.3.2.0.ebuild b/dev-haskell/typst/typst-0.3.2.0.ebuild
new file mode 100644
index 000000000000..8ac27b1ee400
--- /dev/null
+++ b/dev-haskell/typst/typst-0.3.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and evaluating typst syntax"
+HOMEPAGE="https://hackage.haskell.org/package/typst"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RESTRICT=test # one test case fails
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/cassava:=[profile?]
+ dev-haskell/digits:=[profile?]
+ dev-haskell/ordered-containers:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/regex-tdfa:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-haskell/toml-parser-1.3.0.0:=[profile?] <dev-haskell/toml-parser-1.4:=[profile?]
+ >=dev-haskell/typst-symbols-0.1.4:=[profile?] <dev-haskell/typst-symbols-0.1.5:=[profile?]
+ dev-haskell/vector:=[profile?]
+ dev-haskell/xml-conduit:=[profile?]
+ dev-haskell/yaml:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ executable? ( dev-haskell/pretty-show:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-golden
+ !executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
index 5215d47c606c..c5907e424d62 100644
--- a/dev-haskell/unbounded-delays/Manifest
+++ b/dev-haskell/unbounded-delays/Manifest
@@ -1 +1,2 @@
DIST unbounded-delays-0.1.1.0.tar.gz 4166 BLAKE2B 158b05e35afd4c2b8f33caeea748466ee8cb6348f4505649c442f76777b41326128b84b8b7559e06d031c1486886e99e95bf69ac7e80eb16ec1c17cc5b5354e3 SHA512 70e26055abe40b38e20bc5dadc3ae32b699613698d0fc36bbd519fe011128fbdda7e963a69f25375b4e8a26b2ebfa2cdd4496d9d045e9f19672224654e5e7948
+DIST unbounded-delays-0.1.1.1.tar.gz 4114 BLAKE2B 97ffa71675906f9eef6ae297369f9668273ffcb4cc8d9d7efb43b152b5abbeae888ca67e1f77568636feeb3eb4d1bd8549a1446a4f56c7db5ef5570a43da7c57 SHA512 7439c8976498bd84e966b7e08e8d868d65debe3ffc7fd77dc6de345258b4532f2203415abf9530fdaa5feba0bfdc1031303b343502d1f3dc401058125babd41b
diff --git a/dev-haskell/unbounded-delays/metadata.xml b/dev-haskell/unbounded-delays/metadata.xml
index cb2204836918..4bcd2e1d33cd 100644
--- a/dev-haskell/unbounded-delays/metadata.xml
+++ b/dev-haskell/unbounded-delays/metadata.xml
@@ -5,12 +5,6 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The @threadDelay@ and @timeout@ functions from the @base@ library
- use the bounded @Int@ type for specifying the delay or timeout
- period. This packages provides alternatives which use the
- unbounded @Integer@ type.
- </longdescription>
<upstream>
<remote-id type="github">basvandijk/unbounded-delays</remote-id>
</upstream>
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 d05c2abc58ab..8862c17a68b9 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild
new file mode 100644
index 000000000000..5a8fc9f85dd2
--- /dev/null
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unbounded thread delays and timeouts"
+HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/unexceptionalio/Manifest b/dev-haskell/unexceptionalio/Manifest
deleted file mode 100644
index 384a2a0c5038..000000000000
--- a/dev-haskell/unexceptionalio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unexceptionalio-0.5.1.tar.gz 5635 BLAKE2B 4a4190a32a306dd8406639d24e9cad2abbd93ad9e59d3ce2dc4c370386915bc366ff42ce3d6179f02a9d0523702fb283af07b6182cedf0c9106195e54d17fb76 SHA512 62c42e5c683cd05505971602fe4e64a50b5949d9540acefd8d4d66ec0bf57075cdb8e35e99f7e7c4b4fdf589b2af47aa31c0cd62d518b4ded5fc5f9f382008ba
diff --git a/dev-haskell/unexceptionalio/metadata.xml b/dev-haskell/unexceptionalio/metadata.xml
deleted file mode 100644
index 39217c354c01..000000000000
--- a/dev-haskell/unexceptionalio/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- When you've caught all the exceptions that can be handled safely,
- this is what you're left with.
-
- It is intended that you use qualified imports with this library.
-
- &gt; import UnexceptionalIO (UIO)
- &gt; import qualified UnexceptionalIO as UIO
- </longdescription>
- <upstream>
- <remote-id type="github">singpolyma/unexceptionalio</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild b/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild
deleted file mode 100644
index 9c43479777a8..000000000000
--- a/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IO without any non-error, synchronous exceptions"
-HOMEPAGE="https://github.com/singpolyma/unexceptionalio"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/unicode-collation/Manifest b/dev-haskell/unicode-collation/Manifest
new file mode 100644
index 000000000000..e5b667df1be1
--- /dev/null
+++ b/dev-haskell/unicode-collation/Manifest
@@ -0,0 +1,2 @@
+DIST unicode-collation-0.1.3.3.tar.gz 2056081 BLAKE2B 1b5d58b852ff457b4c794d6e8c87c0539a5987240c2cdb8329fbb00b792be1105c194b55a10b5abd9c59eac7262194065d460a18e994edd2d7f71f535acb4f41 SHA512 bbb8fb3d52fa4906ddb92fb605f49b4c726cfcffd1f950c8a78bc495594a2e7d85fa78e2009da850f0218fce09a57f829ce0f3d6a6000b9b6484754f8c8260e8
+DIST unicode-collation-0.1.3.4.tar.gz 2056084 BLAKE2B e960e740aacd61dfde76fd1ea6da0e50319f91a5b9ea97d3ab95514bf13fd35957ed1b9d3883b980e488d1ef19fce2efda83aad68bc9cd83c5de9d6f3c23519f SHA512 88017dd6d8a96b4248fe993385bad8a5fbe134bdaab05b1f8956bc53c8abba927e22233eed6e3a1760c5cee928a9b2fc74bdb5c0c2c7be7e98bda0049852aec0
diff --git a/dev-haskell/unicode-collation/metadata.xml b/dev-haskell/unicode-collation/metadata.xml
new file mode 100644
index 000000000000..dc3a9336a589
--- /dev/null
+++ b/dev-haskell/unicode-collation/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="doctests">Run doctests as part of test suite.
+Use with: @--write-ghc-environment-files=always@.</flag>
+ <flag name="executable">Build the unicode-collate executable.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">unicode-collation</remote-id>
+ <remote-id type="github">jgm/unicode-collation</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
new file mode 100644
index 000000000000..dcaaa9e2cc75
--- /dev/null
+++ b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doctests executable"
+
+RDEPEND="dev-haskell/th-lift-instances:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ >=dev-haskell/unicode-transforms-0.3.7.1
+ doctests? ( >=dev-haskell/doctest-0.8 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag doctests doctests) \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild b/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild
new file mode 100644
index 000000000000..de116d72f284
--- /dev/null
+++ b/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+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"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ >=dev-haskell/unicode-transforms-0.3.7.1
+ doctests? ( >=dev-haskell/doctest-0.8 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag doctests doctests) \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/unicode-data/Manifest b/dev-haskell/unicode-data/Manifest
new file mode 100644
index 000000000000..05be6db93b57
--- /dev/null
+++ b/dev-haskell/unicode-data/Manifest
@@ -0,0 +1,4 @@
+DIST unicode-data-0.3.0.cabal 5123 BLAKE2B 9166d0496d890a880d364aae56d48a0d1b6c474a708a8c59754f196f75d07278e8b27d8d0f1f68a6fdab475f039c4b7fa7ca35434efdeb891b016003ef4abb17 SHA512 45ca93bef8197394f5a04528169f269417a915ae550fd8c531826ae85707939666689a2fc33b954ce4cc053330f062fc123ffeae408790f9613181c14db1da05
+DIST unicode-data-0.3.0.tar.gz 142487 BLAKE2B 0e1dbe384957adb0ff53482fe65578a10d6753c3ab14e6e5aa5da60f5891fbe10ce4bd024f76ae5f213b53baef24c1ccf97a4a2cbd79de1595336db23fda64fc SHA512 6e96f9b93f8a37c8e17f6b20fbe5339fdfeeb75a9d0c6311b03e0bdc9a4a6aa87db6adbe2c3d7d4e7671635df1b32c5325d37815f48ae03ab3b27190a293896b
+DIST unicode-data-0.4.0.1-rev1.cabal 5624 BLAKE2B 3a094a77e3f60442b2cf0f3bb7945faee8b8115fa45dc313761b73e1700d3e55449f461efeddf41d7525d15432c496005c36091da6e7ba0e9340cca1558433cd SHA512 8c287812edbfa470fc610b765dba5e7600f6f3b0c0b5f748271226b946c25a9fb2e2a5564a55a126268fdaf447460334f0265987ea42b41dec348862c311659e
+DIST unicode-data-0.4.0.1.tar.gz 187381 BLAKE2B f59193571e7c6b0243c8df468f13f501a1114318af8cb7816b10aacbb4a1b0dc736c1ac763156c0c833eb17b85272bb15f147d4cd97254cfee3e16889743c9fb SHA512 ddbe70ccdb628673aa9276af3a59aa02c8038b3655fcf0bbf3b4d3db4bb92629d256512bb1ede2486f77138cda0a6595bbcd8e82f1dc57385c6a7b5e0edfae48
diff --git a/dev-haskell/unicode-data/metadata.xml b/dev-haskell/unicode-data/metadata.xml
new file mode 100644
index 000000000000..59edf12d1b34
--- /dev/null
+++ b/dev-haskell/unicode-data/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">unicode-data</remote-id>
+ <remote-id type="github">composewell/unicode-data</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
new file mode 100644
index 000000000000..68e08acbb48b
--- /dev/null
+++ b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 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="Access Unicode character database"
+HOMEPAGE="https://github.com/composewell/unicode-data"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-2.10 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild b/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild
new file mode 100644
index 000000000000..c88802e6efc9
--- /dev/null
+++ b/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Access Unicode Character Database (UCD)"
+HOMEPAGE="https://github.com/composewell/unicode-data"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-2.11 )
+"
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index 8cbf1ddcbe1f..b4f9361f82a0 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1 +1,3 @@
DIST unicode-transforms-0.3.7.1.tar.gz 717790 BLAKE2B aabdd2496ad686d203aa0d8f9c4d043e35c448b1cb83546858e487a6f0e6f05f2cd6467be8c0bedf1bac7fc0d45a711b7faa438c433b5a144ad2e7c3dc20df97 SHA512 a4e39b943bcea6c86ebb8df7253a39ecf2a7bf5a083d0cf2ee1e5720af4afe47111330a787353a5728793d02739448debae2fd73fe6ba2d0eb94cbbb4bfef30f
+DIST unicode-transforms-0.4.0.1-rev3.cabal 5923 BLAKE2B 40f63c4dbaa5f1b8a46b12ec4b07e766d394bc9b0b05ea441e8bd4d22c925e0299bed922f635a01b194d7f4b750ca0059dfca55c196655869a2ae8c025c76a70 SHA512 8f9b8cf6fe3a76a1940174cbb443e15bc63cf26cdce6e6eb0ef6d523d2dc99a65c708a48c7a90feac2b529c17c7a5ab2e2813f9fe603ab52581c5f8b353fb701
+DIST unicode-transforms-0.4.0.1.tar.gz 648836 BLAKE2B 46193776ed2e2f4cc20fe6304a4cf837b47d847d86869437efb4ffbbc06bec5d5b376ef4080676afdbb06c09b6d49dee10fc95f0597545ae4b531d56c42abacd SHA512 3d1347209d2b50fefac1b8bef3a4a82ab8e5f2addc361a338399225e37c933c1e5495f7a7c658c052d818dcc4bee20b48aa37c351fbfdaa926d98ae80f9dab14
diff --git a/dev-haskell/unicode-transforms/metadata.xml b/dev-haskell/unicode-transforms/metadata.xml
index 937381521944..bd8630850590 100644
--- a/dev-haskell/unicode-transforms/metadata.xml
+++ b/dev-haskell/unicode-transforms/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">composewell/unicode-transforms</remote-id>
+ </upstream>
</pkgmetadata>
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
new file mode 100644
index 000000000000..9da59741991d
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev,-has-icu,-has-llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/composewell/unicode-transforms"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
+ >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+ >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
+"
+
+CABAL_CHDEPS=(
+ 'ghc-prim >= 0.2 && < 0.7' 'ghc-prim >= 0.2'
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev \
+ --flag=-has-icu \
+ --flag=-has-llvm
+}
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild
deleted file mode 100644
index 0d7f1350cb9a..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/composewell/unicode-transforms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
- >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
- >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
- >=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-dev \
- --flag=-has-icu \
- --flag=-has-llvm
-}
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild
new file mode 100644
index 000000000000..03b1d914b2d3
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2
+#hackport: flags: -dev,-has-icu,-has-llvm,-bench-show,-gauge
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/composewell/unicode-transforms"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/unicode-data-0.2:=[profile?] <dev-haskell/unicode-data-0.5:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+ >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/split-0.2 <dev-haskell/split-0.3 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-dev \
+ --flag=-has-icu \
+ --flag=-has-llvm \
+ --flag=-bench-show \
+ --flag=-gauge
+}
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
index cb5afe6aa775..96b032dc9b91 100644
--- a/dev-haskell/uniplate/Manifest
+++ b/dev-haskell/uniplate/Manifest
@@ -1 +1 @@
-DIST uniplate-1.6.12.tar.gz 30055 BLAKE2B 557c3eeb14c0b292d4e0325a711babec39a76829822aee07e38ee49f7a4c3f82e72e6231c00fad1c7831864a7df4a9e12b3e913b60fe0e227d651d39c73300af SHA512 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
+DIST uniplate-1.6.13.tar.gz 29787 BLAKE2B 345b5c523469ccc4d98ebdf7498fbdfe9ae183af46c4cc1e1fcdc0782d6dd31d40f53e5ee04d652beb048c62c0d0241d6336eefd87cbfc10d4c0d7bb647b29ad SHA512 8cab820d40b318c7483319de4174bdbd3637e1c93f42bc6b796c6a8a1fa93331c0a2ff3b7c77f6a2ec0509fb48bb922ef732c7d79e8e6bcf7987bde949459310
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index 937381521944..94d28760eb56 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">ndmitchell/uniplate</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
deleted file mode 100644
index fd0d4337b90d..000000000000
--- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +separate_syb,+typeable_fingerprint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Help writing simple, concise and fast generic operations"
-HOMEPAGE="http://community.haskell.org/~ndm/uniplate/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?]
- dev-haskell/syb:=[profile?]
- >=dev-haskell/unordered-containers-0.2.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=separate_syb \
- --flag=typeable_fingerprint
-}
diff --git a/dev-haskell/uniplate/uniplate-1.6.13.ebuild b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
new file mode 100644
index 000000000000..dadfbb044a10
--- /dev/null
+++ b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +separate_syb,+typeable_fingerprint
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Help writing simple, concise and fast generic operations"
+HOMEPAGE="https://github.com/ndmitchell/uniplate#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?]
+ dev-haskell/syb:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=separate_syb \
+ --flag=typeable_fingerprint
+}
diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest
deleted file mode 100644
index a2b1a2b03278..000000000000
--- a/dev-haskell/uniqueid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uniqueid-0.1.1.tar.gz 2779 BLAKE2B 73ad9af177f20575caaefb12261d58801a391bfcbaa6b8ef1596538fd7536ec8b6aa35997277a39454250bc779c4c6174b1b3e7853bad5cc21d9ed72764ce517 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68
diff --git a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch b/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
deleted file mode 100644
index a48815ecda0e..000000000000
--- a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Data/Unique/Id.hs b/Data/Unique/Id.hs
-index f41127e..56853d9 100644
---- a/Data/Unique/Id.hs
-+++ b/Data/Unique/Id.hs
-@@ -14,7 +14,7 @@ module Data.Unique.Id (
- ) where
-
- import GHC.Exts
--import GHC.IOBase ( unsafeDupableInterleaveIO )
-+import GHC.IO ( unsafeDupableInterleaveIO )
-
- import Data.IORef
- import System.IO.Unsafe ( unsafePerformIO )
-@@ -55,15 +55,15 @@ splitIdSupplyL ids = ids1 : splitIdSupplyL ids2
- idFromSupply :: IdSupply -> Id
- idFromSupply (IdSupply n _ _) = Id (I# n)
-
--instance Eq Id where Id (I# x) == Id (I# y) = x ==# y
-+instance Eq Id where Id (I# x) == Id (I# y) = isTrue# (x ==# y)
-
- instance Ord Id
- where
-- Id (I# x) < Id (I# y) = x <# y
-- Id (I# x) <= Id (I# y) = x <=# y
-+ Id (I# x) < Id (I# y) = isTrue# (x <# y)
-+ Id (I# x) <= Id (I# y) = isTrue# (x <=# y)
-
- compare (Id (I# x)) (Id (I# y)) =
-- if x ==# y then EQ else if x <# y then LT else GT
-+ if isTrue# (x ==# y) then EQ else if isTrue# (x <# y) then LT else GT
-
- instance Show Id
- where
-diff --git a/uniqueid.cabal b/uniqueid.cabal
-index 8099520..83aaa39 100644
---- a/uniqueid.cabal
-+++ b/uniqueid.cabal
-@@ -18,7 +18,7 @@ Build-Type: Simple
- Stability: experimental
-
- Library
-- Build-Depends: base >= 3 && < 5
-+ Build-Depends: base >= 3 && < 5, ghc-prim
- Exposed-Modules: Data.Unique.Id
- Extensions: MagicHash
- Ghc-Options: -Wall
diff --git a/dev-haskell/uniqueid/metadata.xml b/dev-haskell/uniqueid/metadata.xml
deleted file mode 100644
index 5e894ac2443c..000000000000
--- a/dev-haskell/uniqueid/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package provides splittable supplies of unique
- identifiers. The implementation mimics (only) essential
- parts of the code that is used internally in GHC for
- the same purpose. After improvements of the value-supply
- package it is now deprecated.
- </longdescription>
- <upstream>
- <remote-id type="github">sebfisch/uniqueid</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
deleted file mode 100644
index e229c4991267..000000000000
--- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Splittable Unique Identifier Supply"
-HOMEPAGE="https://github.com/sebfisch/uniqueid/wikis"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index a9ae93104360..a8d26b41146f 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -1 +1,2 @@
DIST unix-compat-0.5.2.tar.gz 13281 BLAKE2B 617e916badf79b76959ffcd542ad6fa1f1ea04c0bc741faace7614bc9e0fcae0cc34dabb06197fa8686dee26b0d890ee95d3f6e5f6258e543424a9d99498a0cf SHA512 0a0a98e03edb7c6ab4401a022c3e90f7598b24930cb22ba04711c3f57b8f87990c6669d5cda07196b61d36cb6e0fa8b281822fa99b199c3b78cfccd0bc3f70be
+DIST unix-compat-0.7.tar.gz 15210 BLAKE2B ccf771b729d98f29900dc79bd2e832c44ae06e3153eafadcd6aaff9fcb46cd74d78bc414988ef355e16d0d20ed11d5b82a3828c9c295b4d004b56ae4fefb3804 SHA512 2cac851106148a61c6c94742f6bf4862ce3409defd6b5478791ebabe538b53b4da35bdf552eed685117f72adcff2f16a920791705c734a7149d13184cf2ff549
diff --git a/dev-haskell/unix-compat/metadata.xml b/dev-haskell/unix-compat/metadata.xml
index ee9c185ae638..312d969e96a6 100644
--- a/dev-haskell/unix-compat/metadata.xml
+++ b/dev-haskell/unix-compat/metadata.xml
@@ -5,16 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides portable implementations of parts
- of the unix package. This package re-exports the unix
- package when available. When it isn't available,
- portable implementations are used.
- </longdescription>
<use>
<flag name="old-time">build against old-time package</flag>
</use>
<upstream>
- <remote-id type="github">jystic/unix-compat</remote-id>
+ <remote-id type="hackage">unix-compat</remote-id>
+ <remote-id type="github">haskell-pkg-janitors/unix-compat</remote-id>
</upstream>
</pkgmetadata>
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 4d2b34731609..18822313fae8 100644
--- a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="old-time"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-compat/unix-compat-0.7.ebuild b/dev-haskell/unix-compat/unix-compat-0.7.ebuild
new file mode 100644
index 000000000000..ce0ef908850d
--- /dev/null
+++ b/dev-haskell/unix-compat/unix-compat-0.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable POSIX-compatibility layer"
+HOMEPAGE="https://github.com/haskell-pkg-janitors/unix-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="old-time"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/extra
+ dev-haskell/hspec
+ dev-haskell/hunit
+ dev-haskell/monad-parallel
+ dev-haskell/temporary )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag old-time old-time)
+}
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index 8fd76ae6ef16..242d20534710 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1 +1,2 @@
+DIST unix-time-0.4.10.tar.gz 52393 BLAKE2B 61966c1008006e64d7959d8c4ffbd99f482910c6276347d835ba24e6b28e4486d88f6af71f1fcdc33d0b6670814cc2e6f0860872a0613deb2c723aa0c9df318c SHA512 3f3a155cb17cafab450f5e2c31bddf328367c9e882174492c6d5b3db84a742fc3b1ed613e92f825df284ce9b6fa62fb2f2f506ef864280b80eb4dfd035f8c6ca
DIST unix-time-0.4.7.tar.gz 52235 BLAKE2B ec885f79c7f2be3766528dca640e59709aa984f70523714614414f921a7c7808feed274b44bc33cf23d4acee49dc0d8e4e30e9016a372850dfa1695abf81f7d2 SHA512 a9e5b77cb9c93b9a20687406aaeeaff5277d05b95ee9d874f3e0292eca83574b2e842785e0a88f71be3e91610db228c68b5cec885c4b3ea15fc6ec1bb861c072
diff --git a/dev-haskell/unix-time/metadata.xml b/dev-haskell/unix-time/metadata.xml
index 937381521944..73c121fe55bd 100644
--- a/dev-haskell/unix-time/metadata.xml
+++ b/dev-haskell/unix-time/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">unix-time</remote-id>
+ <remote-id type="github">kazu-yamamoto/unix-time</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/unix-time/unix-time-0.4.10.ebuild b/dev-haskell/unix-time/unix-time-0.4.10.ebuild
new file mode 100644
index 000000000000..23dc8a11e0a8
--- /dev/null
+++ b/dev-haskell/unix-time/unix-time-0.4.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unix time parser/formatter and utilities"
+HOMEPAGE="https://hackage.haskell.org/package/unix-time"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/old-time:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-2.6
+ dev-haskell/old-locale
+ dev-haskell/quickcheck )
+"
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 d5efb0ce3590..92ec06076d90 100644
--- a/dev-haskell/unix-time/unix-time-0.4.7.ebuild
+++ b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RESTRICT=test # QuickCheck finds counterxamples:
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
deleted file mode 100644
index c03e42305fef..000000000000
--- a/dev-haskell/unixutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Unixutils-1.54.2.tar.gz 12299 BLAKE2B a31f3cc3657ef3a5fc02dec19720e876ac3df0a7fb4f559cce849099ff887bb8b5dd7df35cf7077d42d1ba1c18448945ccc343cfd89e12dddcc110c9ccc8aedb SHA512 7d8e652ed6d7a19082ae5fb4ca4e05f808fc7d6599b7a41652743dfbd53f0ebd3333168ea76e480127b554bbaab7466ed8ac6c066edd6651fe9f54e69ea4f5df
diff --git a/dev-haskell/unixutils/metadata.xml b/dev-haskell/unixutils/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/unixutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild b/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
deleted file mode 100644
index 648a5f9271ec..000000000000
--- a/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Unixutils"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
-HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/process-extras-0.3:=[profile?]
- dev-haskell/puremd5:=[profile?]
- dev-haskell/regex-tdfa:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-8.4.3:=
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
diff --git a/dev-haskell/unliftio-core/Manifest b/dev-haskell/unliftio-core/Manifest
index dafac5b5da19..e5ef2b39bdb4 100644
--- a/dev-haskell/unliftio-core/Manifest
+++ b/dev-haskell/unliftio-core/Manifest
@@ -1 +1,3 @@
DIST unliftio-core-0.1.2.0.tar.gz 3631 BLAKE2B 26829fb8d218fd1b73f1bc86b1d673cedef8894345a37c428d73875c0e1c4a47a7107c0a7d9818ee03e6abd75c7da5cd7afdf4c2be02845ff78527c80eb86351 SHA512 5bd46d40be031b398b3238a5170f45641861a30c8cf20ca5a202b47367f00bb52e7391a53301edd47f8d688c713c06ebfdc51b1528518e28f8e8d6ad619e10eb
+DIST unliftio-core-0.2.1.0-rev2.cabal 1004 BLAKE2B 9c71dbc173591ce86f6d09febec1f6d0ccc7d9cdb41b75ff969e5d28b52f880f2cdd10aea8c65ee79cfc92927e7876cfad5611d23af90aefb028f8255c0fa85e SHA512 e4ff0617b6f113b2281d689a2dab9cba67e8cba18c4fdecb3e881db5a52cdcdd939b715017cd440535408f9ae56e00c9230aa067bbbc4fe200382ebf6ef80295
+DIST unliftio-core-0.2.1.0.tar.gz 3865 BLAKE2B 8ee7595c0fe23dd287e4b75eb29909f777ea5798db777d574b928cc34227e1f8bc63f92c9404956d81afef9336c7d555dee4f18a785058b06ba195815a47c284 SHA512 dfc32895bc4410f017d86570c574fc9fbcf68434e4dc240904034c6e932051ee8015fba6a972ea8f0dc47ea5afb0d234208d5c66c21d40710b8bc469578cf976
diff --git a/dev-haskell/unliftio-core/metadata.xml b/dev-haskell/unliftio-core/metadata.xml
index 937381521944..8392ff4eed81 100644
--- a/dev-haskell/unliftio-core/metadata.xml
+++ b/dev-haskell/unliftio-core/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">unliftio-core</remote-id>
+ <remote-id type="github">fpco/unliftio</remote-id>
+ </upstream>
</pkgmetadata>
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 54bd3721dca0..6ae836ac1998 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.8.2:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.5 && <4.12' 'base >=4.5'
-}
+CABAL_CHDEPS=(
+ 'base >=4.5 && <4.12' 'base >=4.5'
+)
diff --git a/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild b/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild
new file mode 100644
index 000000000000..7e12209996d8
--- /dev/null
+++ b/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/unliftio/Manifest b/dev-haskell/unliftio/Manifest
index 855bad213f2a..f138ee3ddeb0 100644
--- a/dev-haskell/unliftio/Manifest
+++ b/dev-haskell/unliftio/Manifest
@@ -1 +1,2 @@
-DIST unliftio-0.2.12.1.tar.gz 53520 BLAKE2B a8f1e044400a5cc49af3db66fe3e79f8441b2a742e11493eddb59bedba94a196591ef914c5ab1cf998f337751fcc931c92e20efc62ef7989d460072cb44abb96 SHA512 fb2814860cd2b59ae1a17dfb5892198666b59b737264e46e303909a9f5ce2377f92e70ab7d666fc7f927b9cad6593659dd2bb2168478021927b184e54ae4b44d
+DIST unliftio-0.2.18.tar.gz 56344 BLAKE2B 7e1ae3356ceef94bd50f9dc14c30ee980834cfecfb17ac36233a2e8da7d8564f8671c77b848726ebae5cfc5d81c9c65d6847015956298e2d9bb1aad9479303bd SHA512 baa90de754474bcd7e2116f4f2a5c98192f2cc62368895eda5995b528c193d07225f1f1409b0f24ce24f7ea396237563b2ff8182636b53618d4048d558d1a8fd
+DIST unliftio-0.2.23.0.tar.gz 57461 BLAKE2B 1dc1094e78a25940e0d978dcd723752e00d8f8bb5e8a3c0710fb5d59814c1cf67350f20b6e682644113ba993d9782eff63bfab507830adcebabfc707c8006dfc SHA512 24c06ab66c88a4f6d23376178d484da4a815f77f81b47ec4120b32a45f9d09ca1f4ee89c9ad35a538482aaf68a64155c129f4aef985960869b2dd7387693c449
diff --git a/dev-haskell/unliftio/metadata.xml b/dev-haskell/unliftio/metadata.xml
index 937381521944..1f69a776f334 100644
--- a/dev-haskell/unliftio/metadata.xml
+++ b/dev-haskell/unliftio/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">unliftio</remote-id>
+ <remote-id type="github">fpco/unliftio</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild b/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
deleted file mode 100644
index 73a601914874..000000000000
--- a/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
-HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
- >=dev-haskell/stm-2.4.3:=[profile?]
- >=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/hspec
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unliftio/unliftio-0.2.18.ebuild b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
new file mode 100644
index 000000000000..3ec95dacdb6a
--- /dev/null
+++ b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
+ >=dev-haskell/stm-2.4.3:=[profile?]
+ >=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec
+ dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild b/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild
new file mode 100644
index 000000000000..2adc79694a80
--- /dev/null
+++ b/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >dev-haskell/async-2.1.1:=[profile?]
+ dev-haskell/safe-exceptions:=[profile?]
+ >=dev-haskell/stm-2.5:=[profile?]
+ >=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/hspec
+ dev-haskell/quickcheck
+ )
+"
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index e2ee9600b7b5..268e704aecbf 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1 +1,3 @@
-DIST unordered-containers-0.2.12.0.tar.gz 53070 BLAKE2B 54bc9779382d4b83d6d6e1c352326f79da69ad75ec27a125ee3bf2cd784c8ffc3ed733fd3db285ff1c0dffce94653ec0bef4694eeefdce682f1c6abf7c828581 SHA512 516f45494c598e33301df08d2877fae2484b6574cb554def35ab3ef31e29424a140115be81b88cd7aa7a8c7fe7a77354a7379c62a65aa00cd8c5c674ee1dd00f
+DIST unordered-containers-0.2.17.0.tar.gz 54110 BLAKE2B 089317f81ce422b1ad54b20bf6c4724a13db855b34e6b4c634e36ed7e897927d2390559f32e8b1f1c38b206c0e8802e066d1f20b3b0a9c3c69a23a01ca993a1b SHA512 e0705e0ad9ec03ad192a8e4047aa5c8a1da6268075be28f423d3f3e7d330084ec02d8499b9f5ee8686c4dd36c67758822d58484155f3ce2cfd210e5bb1a3bb8b
+DIST unordered-containers-0.2.19.1-rev2.cabal 3822 BLAKE2B 57d1cd8fb19b60fc65ec2d89dae387fb9f3475f381507f78142724db810fdb72c706a41740f1e6ce2354dc7536d2dd020d65ef617765f87a9c4e10d9f4ae0ffd SHA512 83afdd11895a1bda7403efae0ff812befe88e26ee90b7098442946d257307bf6fd1eb977dc9b95fa69e24497318ceeb2afd3dfec8d3c0ce87e03a8ad2d5a2a25
+DIST unordered-containers-0.2.19.1.tar.gz 58030 BLAKE2B 52164edda0a384ec9286a5e931f0abb563fe10afc80dff604497d9f78f08ba334243fd0d4603c346d3d1af251e7a74c3962d2cd2592134544ecf79d856bf2236 SHA512 2ea49766210fcec1f8f8bd99c2bb296c4ffcb7ab00317b7663436b6ab0037f9b78cfa22631a1e2bc1f34b6c9b08614aa0ca98c5256ab18258645bfd72351b712
diff --git a/dev-haskell/unordered-containers/metadata.xml b/dev-haskell/unordered-containers/metadata.xml
index a84ebc1e2a38..8bc8285ce7a3 100644
--- a/dev-haskell/unordered-containers/metadata.xml
+++ b/dev-haskell/unordered-containers/metadata.xml
@@ -5,15 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Efficient hashing-based container types. The containers have been
- optimized for performance critical use, both in terms of large data
- quantities and high speed.
-
- The declared cost of each operation is either worst-case or
- amortized, but remains valid even if structures are shared.
- </longdescription>
<upstream>
- <remote-id type="github">tibbe/unordered-containers</remote-id>
+ <remote-id type="hackage">unordered-containers</remote-id>
+ <remote-id type="github">haskell-unordered-containers/unordered-containers</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
deleted file mode 100644
index 37b3a71fc575..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-"
-# test? ( dev-haskell/chasingbottoms
-# dev-haskell/hunit
-# >=dev-haskell/quickcheck-2.4.0.1
-# dev-haskell/random
-# >=dev-haskell/test-framework-0.3.3
-# dev-haskell/test-framework-hunit
-# >=dev-haskell/test-framework-quickcheck2-0.2.9 )
-# "
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug)
-}
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
new file mode 100644
index 000000000000..09edb2d53b06
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -debug
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Circular dependencies
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( dev-haskell/chasingbottoms
+# dev-haskell/hunit
+# >=dev-haskell/quickcheck-2.4.0.1
+# dev-haskell/random
+# >=dev-haskell/tasty-1.4.0.3
+# >=dev-haskell/tasty-hunit-0.10.0.3
+# >=dev-haskell/tasty-quickcheck-0.10.1.2 )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-debug
+}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild
new file mode 100644
index 000000000000..c750b2627d64
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -debug
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? (
+ dev-haskell/chasingbottoms
+ dev-haskell/hunit
+ >=dev-haskell/nothunks-0.1.3
+ >=dev-haskell/quickcheck-2.4.0.1
+ dev-haskell/random
+ >=dev-haskell/tasty-1.4.0.3
+ >=dev-haskell/tasty-hunit-0.10.0.3
+ >=dev-haskell/tasty-quickcheck-0.10.1.2
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-debug
+}
diff --git a/dev-haskell/uri-bytestring-aeson/Manifest b/dev-haskell/uri-bytestring-aeson/Manifest
deleted file mode 100644
index 54fed325d21a..000000000000
--- a/dev-haskell/uri-bytestring-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-bytestring-aeson-0.1.0.7.tar.gz 2034 BLAKE2B 192e5a077083ff1b8fa6ec85d2352d15ab613067949f41526f6828715311504ed650bef7729b359b2ac99fc0e3f76d6a16f5fe7a5fb75a0277f0ef05da996d04 SHA512 8327273af53e2d1124aa741b8a216c308c98435c2e74c46897dfec9a043dcfe7e7deec88cdf865da07e703ac8c57557439e3c4106479aec54f9b39a6fd4c5b2c
diff --git a/dev-haskell/uri-bytestring-aeson/metadata.xml b/dev-haskell/uri-bytestring-aeson/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/uri-bytestring-aeson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild b/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
deleted file mode 100644
index ccad9643a5ed..000000000000
--- a/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Aeson instances for URI Bytestring"
-HOMEPAGE="https://github.com/reactormonk/uri-bytestring-aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?]
- >=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest
deleted file mode 100644
index 5b7bf06fcfd6..000000000000
--- a/dev-haskell/uri-bytestring/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-bytestring-0.3.3.0.tar.gz 22994 BLAKE2B 1dbe396e48773b93a3f1aae0bb84c1d525e0b5ff5831dade79c709ee215e79c1e7834296680341dc074953e249af3472e5b1504526854a28750ef5aee6acd50e SHA512 29be8a04bc95e5d86cb3f1c042e0acfec3970af7d9424c8e3218e143b2b9d783d1e7585597ba588928bd843b4d7f02dbb7f3ad862f39c60e4baa6c262faa9669
diff --git a/dev-haskell/uri-bytestring/metadata.xml b/dev-haskell/uri-bytestring/metadata.xml
deleted file mode 100644
index 3e6a324405b4..000000000000
--- a/dev-haskell/uri-bytestring/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- uri-bytestring aims to be an RFC3986 compliant URI parser that uses efficient ByteStrings for parsing and representing the URI data.
- </longdescription>
- <upstream>
- <remote-id type="github">Soostone/uri-bytestring</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild
deleted file mode 100644
index a0ef989d8d67..000000000000
--- a/dev-haskell/uri-bytestring/uri-bytestring-0.3.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell URI parsing as ByteStrings"
-HOMEPAGE="https://github.com/Soostone/uri-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.1.0:=[profile?]
- >=dev-haskell/blaze-builder-0.3.0.0:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
- >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
- >=dev-haskell/th-lift-0.7.5:=[profile?] <dev-haskell/th-lift-0.9:=[profile?]
- >=dev-haskell/th-lift-instances-0.1.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/base-compat-0.7.0
- dev-haskell/hedgehog
- dev-haskell/hunit
- dev-haskell/safe
- dev-haskell/tasty
- dev-haskell/tasty-hedgehog
- dev-haskell/tasty-hunit )
-"
-
-# th-lift only required for <dev-lang/ghc-8
-src_prepare() {
- default
-
- cabal_chdeps \
- 'th-lift >= 0.7.5 && < 0.8' 'th-lift >= 0.7.5'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-lib-werror
-}
diff --git a/dev-haskell/uri-encode/Manifest b/dev-haskell/uri-encode/Manifest
deleted file mode 100644
index e94cba5250ed..000000000000
--- a/dev-haskell/uri-encode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-encode-1.5.0.5.tar.gz 3447 BLAKE2B cdd8449651a28dfcdd21d0745d928b340aa9d6c13c8ce1b9c9da7d13cc51670df8d35b65f9c82b46649566f67014441f1b8e124b70469a1d2e654551d1726a03 SHA512 1ad0fb5144b93dce50ffaf99a84ba2fe8c05508866fb374d62b75c4a32b58f3c97d7ec30257eec29973ad15fde4e902286e86a41ee36e62b00e00d941e181885
diff --git a/dev-haskell/uri-encode/metadata.xml b/dev-haskell/uri-encode/metadata.xml
deleted file mode 100644
index 49aa4f882db6..000000000000
--- a/dev-haskell/uri-encode/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- <flag name="tools">Build executables.</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild b/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
deleted file mode 100644
index f60e438e74d9..000000000000
--- a/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode aware uri-encoding"
-HOMEPAGE="https://hackage.haskell.org/package/uri-encode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri tools"
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag tools tools)
-}
diff --git a/dev-haskell/uri/Manifest b/dev-haskell/uri/Manifest
deleted file mode 100644
index 3f7ca5a48c16..000000000000
--- a/dev-haskell/uri/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-0.1.6.4.tar.gz 5343 BLAKE2B b2c55a9d8313bafad3e2fa74ddb350ebbb548f59b1174d741f6120724994ec1cf164bcbc0c42492b8ff1c844f36b6c9c4fa3bd4d7f82c976574691c5ec9a3634 SHA512 0daa5e03fa7a3b767b4c523bd334017116432898d04c2b3250e1335ac217ed0f9b915785b200f6eb73127d349954b50dae6b5f979a5ba9f39d4d1ae2589c2a07
diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/uri/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/uri/uri-0.1.6.4.ebuild b/dev-haskell/uri/uri-0.1.6.4.ebuild
deleted file mode 100644
index 1b307db132a2..000000000000
--- a/dev-haskell/uri/uri-0.1.6.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for working with URIs"
-HOMEPAGE="https://hackage.haskell.org/package/uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/url/Manifest b/dev-haskell/url/Manifest
deleted file mode 100644
index 107b1cf3d992..000000000000
--- a/dev-haskell/url/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST url-2.1.3.tar.gz 4180 BLAKE2B 53dd6a8343cc394ea91b94d62d4dfcf0e8b5268c86058c8daf7a1de58e280eabea7fdb04a4b777bd853b5b35848df36aa67af5b1ae50ccc7a9b1149af41c33ce SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8
diff --git a/dev-haskell/url/metadata.xml b/dev-haskell/url/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/url/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/url/url-2.1.3-r1.ebuild b/dev-haskell/url/url-2.1.3-r1.ebuild
deleted file mode 100644
index 4cba613ce057..000000000000
--- a/dev-haskell/url/url-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for working with URLs"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Url"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.3.4:=[profile?]
- <dev-haskell/utf8-string-2:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
index 2fff44a6a992..673638967f46 100644
--- a/dev-haskell/utf8-light/Manifest
+++ b/dev-haskell/utf8-light/Manifest
@@ -1 +1,2 @@
DIST utf8-light-0.4.2.tar.gz 5821 BLAKE2B 50f9ed9201458c90306200538e583f9a696f99aac394851da430dd69263789dccf9c4b188319bdbfeaec3542eccbbe7f4b336028953d513973b98718a4a22c18 SHA512 83777117a24a4c456134c0591e59ec010cbb938a5ddac8fc68b8204c7999aa2a36ab158b14e5b7bded1ca9cc4596f448b0e7aa5d194081130d7aef623d7c6bc0
+DIST utf8-light-0.4.4.0.tar.gz 7398 BLAKE2B 0aad5a2cc1e01fed73c6511dcde0f9d2cf25f229060cbddf7743d9d27d85d32a4028ef794e967d76f44d7df62acd618d9935ccb1f6cf9c7d8b98ed2166a1c6e7 SHA512 750ffdc68d7545ade1718361a693438cc3368003eeafb325912a48183e64b8131c219edb9cc56f5f582bd1f745152ff7d409bf0ade4fd7e542669c2d24977976
diff --git a/dev-haskell/utf8-light/metadata.xml b/dev-haskell/utf8-light/metadata.xml
index 937381521944..71e7df66a6ab 100644
--- a/dev-haskell/utf8-light/metadata.xml
+++ b/dev-haskell/utf8-light/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">utf8-light</remote-id>
+ <remote-id type="gitlab">fffaaa/utf8-light</remote-id>
+ </upstream>
</pkgmetadata>
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 9a0c0ad3fbe8..a664ac352d08 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild
new file mode 100644
index 000000000000..cc2b9d05c9f9
--- /dev/null
+++ b/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight UTF8 handling"
+HOMEPAGE="https://hackage.haskell.org/package/utf8-light"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-2.3 <dev-haskell/hspec-2.11
+ )
+"
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index 75c25b57229d..485b24aab2a8 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1 +1,2 @@
DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
+DIST utf8-string-1.0.2.tar.gz 10726 BLAKE2B 7790f2c3023944399d1110c90bf4b6ba5bf82db17f02d4b622343f559f2a88e96e590f306cfcb64baa27f5c63b86effbbb87b85ffc28b8d577355ac14b4fae37 SHA512 b20b61e942a77848d12f9105f88790b3f02e3e2835b87e0ce1900b5ea1e97c4b055003603e435415e7fbbc9586f9c6ca2402f86cf5d2b7b6ced2ddcae3968d24
diff --git a/dev-haskell/utf8-string/metadata.xml b/dev-haskell/utf8-string/metadata.xml
index 09deccffd296..08117f68631e 100644
--- a/dev-haskell/utf8-string/metadata.xml
+++ b/dev-haskell/utf8-string/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">glguy/utf8-string</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">glguy/utf8-string</remote-id>
+ </upstream>
</pkgmetadata>
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 fb5e89962dca..e0339d789d6d 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.9' 'base >= 4.3'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.3 && < 4.9' 'base >= 4.3'
+)
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
new file mode 100644
index 000000000000..41aad999e11e
--- /dev/null
+++ b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for reading and writing UTF8 Strings"
+HOMEPAGE="https://github.com/glguy/utf8-string/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 )
+"
diff --git a/dev-haskell/uuagc-cabal/Manifest b/dev-haskell/uuagc-cabal/Manifest
deleted file mode 100644
index 462049302b7a..000000000000
--- a/dev-haskell/uuagc-cabal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uuagc-cabal-1.2.0.0.tar.gz 15067 BLAKE2B 95951f1547d753c45ceafdfc7649bacc2cb069759342b7567da0fcacd868c635c4573f20f3cdba529bd4954514f865a4989fc0489dace118a0fd27c269f8e543 SHA512 7c5276b210ee24665ef76180e0e11a8535de2fdc65b15bd2c9e52923486736474e53cfb0350aa644776a1ba551100119cd4da6fb9a1da39b1953f04467c5bbf1
diff --git a/dev-haskell/uuagc-cabal/metadata.xml b/dev-haskell/uuagc-cabal/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/uuagc-cabal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.ebuild b/dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.ebuild
deleted file mode 100644
index d0fe4cf79d30..000000000000
--- a/dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cabal plugin for UUAGC"
-HOMEPAGE="https://github.com/UU-ComputerScience/uuagc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-2:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- >=dev-haskell/uulib-0.9.14:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest
deleted file mode 100644
index 73c4c764cb16..000000000000
--- a/dev-haskell/uuagc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uuagc-0.9.53.1.tar.gz 790766 BLAKE2B be50fcddc36599eae725034a8353d2a6617b5e79f6b7ce5afdff9b1ce9188d4a68509803aacb445feb1e54c9208ca8e58a3c3897d5189ba382248f2977eac9a5 SHA512 f751420d6d597b843775c2b5c49dfb4f3a2953d56204a2c36bab641ee45960628612e1d4f067880ef6c028d32959346dc0e1afe56fd4826a2af56b4e8e054476
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
deleted file mode 100644
index 935d33733987..000000000000
--- a/dev-haskell/uuagc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="loag">Use MiniSat as external SAT-solver to schedule all Linear Ordered AGs</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc/uuagc-0.9.53.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.53.1.ebuild
deleted file mode 100644
index 5421f5bd39d5..000000000000
--- a/dev-haskell/uuagc/uuagc-0.9.53.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -bootstrap_external
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attribute Grammar System of Universiteit Utrecht"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="loag"
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.11.1:=[profile?]
- >=dev-haskell/mtl-1.1.1.1:=[profile?]
- >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?]
- >=dev-haskell/uulib-0.9.14:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- loag? ( dev-haskell/minisat:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bootstrap_external \
- $(cabal_flag loag with-loag)
-}
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index 8f3d853d196f..b20cc31e995e 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1 +1,2 @@
-DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
+DIST uuid-types-1.0.5-rev4.cabal 2636 BLAKE2B f435203ae4c48a0f9cabae2df90a8624fbaa8ef0d382dee1be8f2dcd226732053c16f8214ac3337922eb25133ae30e69e7f6ecd57994d225ea17c5269d7d3efb SHA512 1a612a9304d8d206ce79f1db86bb492914562f6d0464668599a4bc66ccf07eb66984fcd6518afd5b0bf0685904db04f587e40a75b610901799b316370db3a6d9
+DIST uuid-types-1.0.5.tar.gz 11922 BLAKE2B 82da240f63c255be7c64ddaa6b6f49e022446afbf814b6cd3f9607fd43c0bf33e5d92b0586477384d46b4906f15b17f72564227ad090da54c03b1c21608f5fcc SHA512 0e0821a426120ab63d991a6cd39ded65a89472751ada4d5fb5e4f12177d8e797ede3b6b74d6817ce260d6334adeb42de31b0073389f58a27a06ec8ea4a574ef6
diff --git a/dev-haskell/uuid-types/metadata.xml b/dev-haskell/uuid-types/metadata.xml
index 2723af291b6f..d9d345a26409 100644
--- a/dev-haskell/uuid-types/metadata.xml
+++ b/dev-haskell/uuid-types/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library contains type definitions for Universally Unique Identifiers
- and basic conversion functions.
- See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
- </longdescription>
<upstream>
- <remote-id type="github">aslatter/uuid</remote-id>
+ <remote-id type="hackage">uuid-types</remote-id>
+ <remote-id type="github">haskell-hvr/uuid</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
deleted file mode 100644
index 8df1fd9cf77c..000000000000
--- a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type definitions for Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
- >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4' \
- 'HUnit >=1.2 && < 1.4' 'HUnit >=1.2' \
- 'tasty >= 0.10 && < 0.12' 'tasty >= 0.10' \
- 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
- 'random >= 1.0.1 && < 1.2' 'random >= 1.0.1'
-}
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..5f189b66a425
--- /dev/null
+++ b/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type definitions for Universally Unique Identifiers"
+HOMEPAGE="https://github.com/haskell-hvr/uuid"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+ ( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/ghc-byteorder-4.11 <dev-haskell/ghc-byteorder-4.12
+ >=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+ )
+"
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
index 61e13c8f4bc8..df4bff53385b 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -1 +1,2 @@
-DIST uuid-1.3.13.tar.gz 8926 BLAKE2B d7b4850eb921467677534d33475dccb90b2e74a4f73137eb8e9a45573a337d4152b19f052dea584bb0b6ab862dcdf764106c4e35efa1e8ae3ecec41becc75a4e SHA512 e888e6350a32c6496b0b57384797925c78ab1c4dc674d296972981fa81338b4705d21a96960a63771aa5b9a785efd507ecaad195767dba7847fcab5ca7f3f923
+DIST uuid-1.3.15-rev2.cabal 2642 BLAKE2B db44dabaa7962207d089fb79db6781e4387fb1958366e938125ec95d79125fc277fe1167a0aab2d133441c95a70953cee5ab30b4a1811bfd5c6733f178239ed5 SHA512 cb8a0aa11945375d175de2c48c710ef0f423d38fa4960ef91050e04038a402b38f532e25d5f56ecd715513dbb05da25922744ffde51edd8bb99b55985c9342be
+DIST uuid-1.3.15.tar.gz 8815 BLAKE2B fec665690dc6fe05e9b7083700ca5ba2723d9bbd7cdc7f8770359d26b9b4b32572e15b686bc4589a3bed2cd25caa02cbea96270ea2e373941451aa6f315df401 SHA512 acb5c17b809bee5ce2f1591f3382a7c3a57e9d20a47d8f47be717b0e7fbfd803603810ebaaf88597bcf98dff698f4807dc7d8122a0d7d36785a47e0e065fb59e
diff --git a/dev-haskell/uuid/metadata.xml b/dev-haskell/uuid/metadata.xml
index 69b916ffe552..5626c2e65497 100644
--- a/dev-haskell/uuid/metadata.xml
+++ b/dev-haskell/uuid/metadata.xml
@@ -5,12 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library is useful for creating, comparing, parsing and
- printing Universally Unique Identifiers.
- See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
- </longdescription>
<upstream>
- <remote-id type="github">aslatter/uuid</remote-id>
+ <remote-id type="hackage">uuid</remote-id>
+ <remote-id type="github">haskell-hvr/uuid</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/uuid/uuid-1.3.13-r1.ebuild b/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
deleted file mode 100644
index 7cbae091b544..000000000000
--- a/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/hvr/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?]
- >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?]
- >=dev-haskell/entropy-0.3.7:=[profile?]
- >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
- >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
- >=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/tasty-0.10
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'QuickCheck >= 2.4 && < 2.10' 'QuickCheck >= 2.4' \
- 'time >= 1.1 && < 1.8' 'time >= 1.1' \
- 'tasty >= 0.10 && < 0.12' 'tasty >= 0.10' \
- 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' \
- 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
- 'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2' \
- 'entropy >= 0.3.7 && < 0.4' 'entropy >= 0.3.7'
-}
diff --git a/dev-haskell/uuid/uuid-1.3.15-r1.ebuild b/dev-haskell/uuid/uuid-1.3.15-r1.ebuild
new file mode 100644
index 000000000000..679ee0de762c
--- /dev/null
+++ b/dev-haskell/uuid/uuid-1.3.15-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
+HOMEPAGE="https://github.com/haskell-hvr/uuid"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12
+ >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12
+ >=dev-haskell/entropy-0.3.7:=[profile?] <dev-haskell/entropy-0.5
+ =dev-haskell/network-info-0.2*:=[profile?]
+ >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3
+ =dev-haskell/uuid-types-1.0.5*:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+ =dev-haskell/text-2.0*
+ )
+ dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+ =dev-haskell/tasty-hunit-0.10*
+ =dev-haskell/tasty-quickcheck-0.10*
+ )
+"
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
deleted file mode 100644
index 99f6d0271fd9..000000000000
--- a/dev-haskell/uulib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uulib-0.9.24.tar.gz 45362 BLAKE2B ea9b2854ef75cdc4f0555ca275b18089d40121940ed2b0eff5b86489b608e916b6cc568c425faca98e77cfdc89bae4f9d95ec64639c4117c405eebf669360e17 SHA512 7c5feadbeb6a67a7d7b0ed1a15dbbe50e8f4b05534aa9602bfc91feef9ee0e9239ef6fe879a8fec881902692a8c30daa8fdaab5503a6e15f97b26fcf31de8223
diff --git a/dev-haskell/uulib/metadata.xml b/dev-haskell/uulib/metadata.xml
deleted file mode 100644
index 1f77e2e6222a..000000000000
--- a/dev-haskell/uulib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">UU-ComputerScience/uulib</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uulib/uulib-0.9.24.ebuild b/dev-haskell/uulib/uulib-0.9.24.ebuild
deleted file mode 100644
index 43daedca893e..000000000000
--- a/dev-haskell/uulib/uulib-0.9.24.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/validity/Manifest b/dev-haskell/validity/Manifest
deleted file mode 100644
index 74889abb809a..000000000000
--- a/dev-haskell/validity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST validity-0.9.0.3.tar.gz 8015 BLAKE2B a14f2dfb2a716251bf7e65548fad61d3525685c2b5065e4b4f74c9fcabe39f4b588a0e5d422abf9b3c734a0be528a59fd660833dcd65e1e0dd06283a0db95552 SHA512 f60faa65677f4a306a289d2985cd1827c3b2fbac18f25802f37af89bb8e0e9dfa23bebff6c2da4eda7824b94e9d26e5bcde55a3756b4e25b86f14ac0aee8446e
diff --git a/dev-haskell/validity/metadata.xml b/dev-haskell/validity/metadata.xml
deleted file mode 100644
index 3053202a0e12..000000000000
--- a/dev-haskell/validity/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Note: There are companion instance packages for this library:
-
- * &lt;https://hackage.haskell.org/package/validity-text validity-text&gt;
-
- * &lt;https://hackage.haskell.org/package/validity-containers validity-containers&gt;
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/validity/validity-0.9.0.3.ebuild b/dev-haskell/validity/validity-0.9.0.3.ebuild
deleted file mode 100644
index 7d670251814d..000000000000
--- a/dev-haskell/validity/validity-0.9.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validity typeclass"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index e764f9db5af1..b94e26dcb4b4 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1 +1,2 @@
-DIST vault-0.3.1.4.tar.gz 5375 BLAKE2B 6ba8dc1132d9e188cbfd65e5c1246df18399d08b614bf32f162e2aa4127bf324af6856198c7e32a8f6bbc6dce9f5c8b2cc393f3b3b3869d0731fd7de45a3a52c SHA512 70bebabce76b5e56b3d5cd4f95590ecef7a41f4de7f943932713fbb3eb17ac4d615a25b6503773a532b36649cf4a7b595be3b4222a15ca7d0756b2bee8aa0792
+DIST vault-0.3.1.5-rev3.cabal 2366 BLAKE2B 2492299c833115d75b4b9f9285ad371bc9c46616fa08189dcbea40bf0dbc3f397c9e402c97469d45d0d792a860cb7174649d8a188aa0e398cb5fc8d5718e2d7c SHA512 d572fadb89ee20a6740d3a2773f27153b45a11931e0f6335ebc29f47799decd52f0486dca20216d6856bd9d4baf682260fa3f9614209fe3d39facae32e1d820b
+DIST vault-0.3.1.5.tar.gz 5431 BLAKE2B e102b85b99e6c28e0df1ff535c0bc9c61b01ec8c616107fa6298247f4d7f54e82e26eee7614b616d66cdefb21141a67cfcdf8d15743a59abf94ece0ac692f143 SHA512 f268d192f53594d5be39db807982073591e9bb830411813d6904e5ad1bf10d16eb5f89d9a39b764f92e6e196aeaabeac1b75cd07a70c59a42ce842835758e409
diff --git a/dev-haskell/vault/metadata.xml b/dev-haskell/vault/metadata.xml
index 77c6a81afe29..afac3eaf0d55 100644
--- a/dev-haskell/vault/metadata.xml
+++ b/dev-haskell/vault/metadata.xml
@@ -5,15 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A /vault/ is a typed, persistent store for values of arbitrary types.
- It's like having first-class access to the storage space behind IORefs.
-
- The data structure is analogous to a bank vault,
- where you can access different bank boxes with different keys;
- hence the name.
- </longdescription>
<upstream>
+ <remote-id type="hackage">vault</remote-id>
<remote-id type="github">HeinrichApfelmus/vault</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/vault/vault-0.3.1.4.ebuild b/dev-haskell/vault/vault-0.3.1.4.ebuild
deleted file mode 100644
index 48f582ae33e1..000000000000
--- a/dev-haskell/vault/vault-0.3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=useghc
-}
diff --git a/dev-haskell/vault/vault-0.3.1.5-r2.ebuild b/dev-haskell/vault/vault-0.3.1.5-r2.ebuild
new file mode 100644
index 000000000000..819d85b66e1e
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.1.5-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION=3
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=useghc
+}
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index eb43644ef7e5..a0704f6820b1 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1 +1,3 @@
-DIST vector-algorithms-0.8.0.3.tar.gz 26559 BLAKE2B 7541d141967faf4bc1b33dcd23f283e1a6868f0b51e784918c1516a46c38ba3e9205045c87679738d89c48fee3ee2e61286eab59cc66ec8cfc18f1a4b977c634 SHA512 45311e19a1e5c9994e7d666b73445d11946f60915df3d2f385a435538d1b6b0929b56a960f83c5df1b2df883566e7f8e6fdd5be4e075364d7daecd6dbec780e5
+DIST vector-algorithms-0.8.0.4.tar.gz 26681 BLAKE2B fde5a8a9663e5e94e340f4edb1c1d17a47e7b561013982b5bf7711fe595913280476de629470ec9a049a6bd277587b1dc5390ec9e6dd0d7da87eb7f48ab891c8 SHA512 da5f52493c7f68df0a2c718724dcac9be758b09b14c8fa913aa328ee4c1286893fb239882018202d0fcd56709364ccddf3d620ff3b886d830102ef52a0868d42
+DIST vector-algorithms-0.9.0.1-rev1.cabal 3670 BLAKE2B ebb640235c30c3689dc4abe7e5978b435f6f3adb481b595f6ea8d3e702902fc815a07a7cf3569e1a7f82e25a9553bc0432a9897e39626a0813987bbc6947bffb SHA512 1cd195b4ea8c8245d832107c8fb3a58998b461a3973affce983ba802e300d05e8b45c58836d5623073cd4395c196a0d43f1c9648e834cb0d7c4aebf9e97409fd
+DIST vector-algorithms-0.9.0.1.tar.gz 29149 BLAKE2B 4d1e713845c311ca6eea96ad6f42ee53e4fc115b5abe77fd582c5904e3fe8c6c6006a5f4adb0353919931b8f9c99aed812128bca36362e9571d4848ac00a7af6 SHA512 007a0aeac87ca6596cae0f67e8ab5cd3ac4120df940dd221745d86c6500fa1e732d6096248ba613472c57825283cae6a2d67d2d2a5a652496f9ad17c91f9b620
diff --git a/dev-haskell/vector-algorithms/metadata.xml b/dev-haskell/vector-algorithms/metadata.xml
index 440975499a71..7d5210abf463 100644
--- a/dev-haskell/vector-algorithms/metadata.xml
+++ b/dev-haskell/vector-algorithms/metadata.xml
@@ -6,10 +6,14 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="bench">Build a benchmarking program.</flag>
- <flag name="boundschecks">Enable bounds checking.</flag>
+ <flag name="bench">Build a benchmarking program to test vector-algorithms performance</flag>
+ <flag name="boundschecks">Enable bounds checking</flag>
<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty.</flag>
- <flag name="properties">Enable quickcheck tests.</flag>
+ <flag name="properties">Enable the quickcheck tests</flag>
<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty.</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">vector-algorithms</remote-id>
+ <remote-id type="github">erikd/vector-algorithms</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
deleted file mode 100644
index a1fcf35bd7ab..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="https://github.com/erikd/vector-algorithms/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
- >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.9.2
- test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag bench bench) \
- $(cabal_flag boundschecks boundschecks) \
- $(cabal_flag internalchecks internalchecks) \
- --flag=-llvm \
- $(cabal_flag properties properties) \
- $(cabal_flag unsafechecks unsafechecks)
-}
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
new file mode 100644
index 000000000000..511e4de77a01
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="https://github.com/erikd/vector-algorithms/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+ >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bench bench) \
+ $(cabal_flag boundschecks boundschecks) \
+ $(cabal_flag internalchecks internalchecks) \
+ --flag=-llvm \
+ $(cabal_flag properties properties) \
+ $(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild
new file mode 100644
index 000000000000..1bb09c174af8
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -llvm
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="https://github.com/erikd/vector-algorithms/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
+
+RDEPEND=">=dev-haskell/bitvec-1.0:=[profile?] <dev-haskell/bitvec-1.2:=[profile?]
+ >=dev-haskell/primitive-0.6.2.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+
+# bug 916191
+RDEPEND+="
+ || (
+ dev-haskell/bitvec[gmp]
+ dev-lang/ghc[gmp]
+ )
+"
+
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bench bench) \
+ $(cabal_flag boundschecks boundschecks) \
+ $(cabal_flag internalchecks internalchecks) \
+ --flag=-llvm \
+ $(cabal_flag properties properties) \
+ $(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-binary-instances/Manifest b/dev-haskell/vector-binary-instances/Manifest
index 268c649131e3..e69c08aae130 100644
--- a/dev-haskell/vector-binary-instances/Manifest
+++ b/dev-haskell/vector-binary-instances/Manifest
@@ -1 +1,3 @@
DIST vector-binary-instances-0.2.5.1.tar.gz 4067 BLAKE2B 4c4bc50e10be05d0a063cd417198c52e5f79e94547b69eac5d87d26762e62e92dbcb9dfc3209a4d105ca6e3ae772a918de1b983856beeb9117c5c9fdae467b21 SHA512 a16202b8ca3f88df82c27b37511087008579296363c73fe09ab19b00dee0fbaf98699b79b08d7e7410fcd062c03f2c5d1560f6b1c9ebf1ab8290596a35758be0
+DIST vector-binary-instances-0.2.5.2-rev5.cabal 2728 BLAKE2B 33fa3b860a5f5ff2e9a6b2cfa9a3d58fe9715a7973c95ac745ac2e33993d3d7555f77a16a924e201b8214edab5d060348bbf4acbe19341f4466512dba788cd0e SHA512 28f94e3192c498d24a91ebcdc8e8e54fdbfa6d0b0d7d39a325874c986b311939a7f4f888796fd669acab758f64e7742073518cf66a89b5714822bee1d372dc91
+DIST vector-binary-instances-0.2.5.2.tar.gz 4028 BLAKE2B 45e222d9ef3be00af5e40062092ff78526ce7837125880f18ba3359cbba2d5046d13ac81ef3409d4d81a990df60013d732b6f4f85ea2e65e1c806035899e8033 SHA512 885dff7f6508113c355bb125c3949fd722ea5c6e834beb3083e1e6cc16f84bba1b8fd44cd41990af79f095a18fd282dd1ccd94ccf586c5ca08e54b0454575d03
diff --git a/dev-haskell/vector-binary-instances/metadata.xml b/dev-haskell/vector-binary-instances/metadata.xml
index e795bb3ebf6a..58610ac88ae7 100644
--- a/dev-haskell/vector-binary-instances/metadata.xml
+++ b/dev-haskell/vector-binary-instances/metadata.xml
@@ -5,27 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Instances for Binary for the types defined in the vector package,
- making it easy to serialize vectors to and from disk. We use the
- generic interface to vectors, so all vector types are supported.
- Specific instances are provided for unboxed, boxed and storable
- vectors.
-
- To serialize a vector:
-
- &gt; *Data.Vector.Binary&gt; let v = Data.Vector.fromList [1..10]
- &gt; *Data.Vector.Binary&gt; v
- &gt; fromList [1,2,3,4,5,6,7,8,9,10] :: Data.Vector.Vector
- &gt; *Data.Vector.Binary&gt; encode v
- &gt; Chunk "\NUL\NUL\NUL\NUL\NUL...\NUL\NUL\NUL\t\NUL\NUL\NUL\NUL\n" Empty
-
- Which you can in turn compress before writing to disk:
-
- &gt; compress . encode $ v
- &gt; Chunk "\US\139\b\NUL\NUL\N...\229\240,\254:\NUL\NUL\NUL" Empty
- </longdescription>
<upstream>
- <remote-id type="github">bos/vector-binary-instances</remote-id>
+ <remote-id type="hackage">vector-binary-instances</remote-id>
+ <remote-id type="github">haskell/vector-binary-instances</remote-id>
</upstream>
</pkgmetadata>
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 b0d4d4dbe607..9c187d288c83 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.5.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
@@ -26,9 +26,6 @@ DEPEND="${RDEPEND}
dev-haskell/tasty-quickcheck )
"
-src_prepare() {
- default
-
- cabal_chdeps \
+CABAL_CHDEPS=(
'base > 3 && < 4.13' 'base > 3'
-}
+)
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild
new file mode 100644
index 000000000000..9bf1ecccbee9
--- /dev/null
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Instances of Data.Binary for vector"
+HOMEPAGE="https://github.com/haskell/vector-binary-instances"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/vector-builder/Manifest b/dev-haskell/vector-builder/Manifest
deleted file mode 100644
index fdf9e0514f40..000000000000
--- a/dev-haskell/vector-builder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vector-builder-0.3.8.tar.gz 5045 BLAKE2B 1e599a0e50102c50cd6057cf892d97f9dad7468b0e49500743bf422b8a9e085d062b9b4e13ae9bb68d3c59e6bb549e77a962fdaed91d5a3e3e5d74b8ec45a6b7 SHA512 e7ca1b6ba35aa76e16ad485cfd5e326c2b257339d2aadc57b7ce2a5ec3d5790fec99e5546ea18351cd9cbf31e7ec99c737461950acd355f62be27b53edb2be17
diff --git a/dev-haskell/vector-builder/metadata.xml b/dev-haskell/vector-builder/metadata.xml
deleted file mode 100644
index f63fd8a2495e..000000000000
--- a/dev-haskell/vector-builder/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- An API for efficient and convenient construction of vectors.
- It provides the composable `Builder` abstraction, which has instances of the `Monoid` and `Semigroup` classes.
-
- [Usage]
-
- First you use the `Builder` abstraction to specify the structure of the vector.
- Then you execute the builder to actually produce the vector.
-
- [Example]
-
- The following code shows how you can efficiently concatenate different datastructures into a single immutable vector:
-
- &gt;
- &gt;import qualified Data.Vector as A
- &gt;import qualified VectorBuilder.Builder as B
- &gt;import qualified VectorBuilder.Vector as C
- &gt;
- &gt;
- &gt;myVector :: A.Vector a -&gt; [a] -&gt; a -&gt; A.Vector a
- &gt;myVector vector list element =
- &gt; C.build builder
- &gt; where
- &gt; builder =
- &gt; B.vector vector &lt;&gt;
- &gt; foldMap B.singleton list &lt;&gt;
- &gt; B.singleton element
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild b/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
deleted file mode 100644
index 5c2ac8cc49f5..000000000000
--- a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Vector builder"
-HOMEPAGE="https://github.com/nikita-volkov/vector-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14
- >=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3
- >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4
- <dev-haskell/rerebase-2
- >=dev-haskell/tasty-0.12 <dev-haskell/tasty-2
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
deleted file mode 100644
index d1ce00466956..000000000000
--- a/dev-haskell/vector-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vector-instances-3.4.tar.gz 5276 BLAKE2B ca68a6cb0a4b9aeab81409e757d7d5d5a18c53ed826668fa75725b52e374d4047ee096d392557c9c316aaa9740c307165d0aa5658542edb8827be5ddf9a883cc SHA512 67ffd6b941909bda1b6f26c8c7579fc495267425461f15f20bbaecf22b67d3dbf4ee88eb2ac76232f47917c26558eb325fedfe8ffc97368bbe1ad90fb427a7b1
diff --git a/dev-haskell/vector-instances/metadata.xml b/dev-haskell/vector-instances/metadata.xml
deleted file mode 100644
index b8ad6fabb315..000000000000
--- a/dev-haskell/vector-instances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="hashable">use <pkg>dev-haskell/hashable</pkg></flag>
- </use>
- <upstream>
- <remote-id type="github">ekmett/vector-instances</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vector-instances/vector-instances-3.4.ebuild b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
deleted file mode 100644
index f2d499f3dec6..000000000000
--- a/dev-haskell/vector-instances/vector-instances-3.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan Instances for 'Data.Vector'"
-HOMEPAGE="https://github.com/ekmett/vector-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
- >=dev-haskell/keys-3:=[profile?]
- >=dev-haskell/pointed-3:=[profile?]
- >=dev-haskell/semigroupoids-3:=[profile?]
- >=dev-haskell/semigroups-0.8.3.1:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/vector-space/Manifest b/dev-haskell/vector-space/Manifest
deleted file mode 100644
index f24333fd26d8..000000000000
--- a/dev-haskell/vector-space/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vector-space-0.16.tar.gz 16049 BLAKE2B e8851c515f774176c3589d6aa2ccef3d22c6957fa8c93dbb858da3e74785624fb5e5aaea4ba0bd9a3a3a55f74a801d5c51a8cb5e99b954ff9c7cd7a5a8c9001f SHA512 d79bc2e76a26653d5361a319265e52d8dea6273d10060a61215162490109a37b17261f897a6472bc7f16fc1f5566423c9a8ead6469fe10e366f982ab3d0ef2f5
diff --git a/dev-haskell/vector-space/metadata.xml b/dev-haskell/vector-space/metadata.xml
deleted file mode 100644
index 0bceb94241f3..000000000000
--- a/dev-haskell/vector-space/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- /vector-space/ provides classes and generic operations for vector
- spaces and affine spaces. It also defines a type of infinite towers
- of generalized derivatives. A generalized derivative is a linear
- transformation rather than one of the common concrete representations
- (scalars, vectors, matrices, ...).
-
- /Warning/: this package depends on type families working fairly well,
- and requires ghc version at least 6.9.
-
- Project wiki page: &lt;http://haskell.org/haskellwiki/vector-space&gt;
-
- &amp;#169; 2008-2012 by Conal Elliott; BSD3 license.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-space/vector-space-0.16.ebuild b/dev-haskell/vector-space/vector-space-0.16.ebuild
deleted file mode 100644
index c92770e4bb49..000000000000
--- a/dev-haskell/vector-space/vector-space-0.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Vector & affine spaces, linear maps, and derivatives"
-HOMEPAGE="https://hackage.haskell.org/package/vector-space"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/boolean-0.1.0:=[profile?]
- >=dev-haskell/memotrie-0.5:=[profile?]
- >=dev-haskell/numinstances-1.0:=[profile?]
- >=dev-haskell/semigroups-0.16:=[profile?]
- >=dev-haskell/void-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index b44ba5a7bb6f..2a47db129c81 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1 +1,3 @@
DIST vector-th-unbox-0.2.1.7.tar.gz 4771 BLAKE2B 72d25981c2dd42bce7028d94a1805ad9a836cfbdce9dfb8bdbfe2f1aa26f4180ea8fc02b3323eccaa11c53065659ddc25063460b737831cc565ae08cecc914d4 SHA512 fa65c32eace3ad93f0df69830eca0334519bbdbb2bbdc511db6e6abffe48c78870fef131dc34451873775a037634a87f0cd0d06dc1c4bc9404af2a86d7593ae1
+DIST vector-th-unbox-0.2.2-rev4.cabal 1565 BLAKE2B cd49e8c28667981719bb811a0367e47c1a8953be340abc5e9ebb608520e09c292d3e4bffa5059a22d0362778b63d7a77bc78d552f22571ae27c24f726bd095e4 SHA512 c6bf6404e44d0c128a36106916810eb5f21c93cd40593fa3717028c4f36165a3ff33320d853759ad35e3f7665dba57458dc7004d14cce30cd129ef1ee7fc9414
+DIST vector-th-unbox-0.2.2.tar.gz 4864 BLAKE2B 6c7cabc49af5f06332802c41f37ca92a7fc8df48c288cceaee786aaf38b8f19f5576ccac3e86dd04a62431d42c5d1e0bd2269a5b5bf4e6558a2a76810dcba7f1 SHA512 55af4bcced3a39464aca6dca95a8148498a698d9402a583b916aa178d58d3895cc609525416de53c0a39566b892c7b09296fc442db7851a19d071142cce72a46
diff --git a/dev-haskell/vector-th-unbox/metadata.xml b/dev-haskell/vector-th-unbox/metadata.xml
index d3891236a6d7..e088f89cce76 100644
--- a/dev-haskell/vector-th-unbox/metadata.xml
+++ b/dev-haskell/vector-th-unbox/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A Template Haskell deriver for unboxed vectors, given a pair of coercion
- functions to and from some existing type with an Unbox instance.
-
- Refer to "Data.Vector.Unboxed.Deriving" for documentation and examples.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">vector-th-unbox</remote-id>
+ <remote-id type="github">tsurucapital/vector-th-unbox</remote-id>
+ </upstream>
</pkgmetadata>
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 85c71811009a..766e7a1673d6 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,21 +14,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
test? ( dev-haskell/data-default )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.14' 'base >= 4.5' \
- 'template-haskell >= 2.5 && <2.16' 'template-haskell >= 2.5'
-}
+CABAL_CHDEPS=(
+ 'base >= 4.5 && < 4.14' 'base >= 4.5'
+ 'template-haskell >= 2.5 && <2.16' 'template-haskell >= 2.5'
+)
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild
new file mode 100644
index 000000000000..130f998cd233
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
+HOMEPAGE="https://github.com/tsurucapital/vector-th-unbox"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 908cbe6f2ec2..6cc95a4e6de1 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1 +1,3 @@
-DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
+DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843
+DIST vector-0.12.3.1-rev4.cabal 8218 BLAKE2B df9e13b1d98377d6506225e3da5a1834c51d3e5244945a6d02a9267b077a5b1d276410130d7c2860b8d49b23f4d6d63dfbd168b497d9ad439240aed19dd8213f SHA512 86088ff4f20b2cc214a703b7ea665baf6d1e9b218f931c6880d6d1291f0dd8e2804863a251a8bf11e82d2f0026d55dcba06f937f8c8909dc8988bc60874374aa
+DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
new file mode 100644
index 000000000000..72f56dcb64de
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
@@ -0,0 +1,86 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1231
+
+doctest pulls in the out-of-scope packages if they are installed on the
+system. The best workaround is to use migrate to cabal-doctest.
+
+diff -urN vector-0.12.3.1/Setup.hs vector-0.12.3.1-r1/Setup.hs
+--- vector-0.12.3.1/Setup.hs 2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/Setup.hs 2022-03-22 22:12:57.107142731 -0600
+@@ -1,3 +1,6 @@
+-import Distribution.Simple
+-main = defaultMain
++module Main (main) where
+
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "vector-doctest"
+diff -urN vector-0.12.3.1/tests/doctests.hs vector-0.12.3.1-r1/tests/doctests.hs
+--- vector-0.12.3.1/tests/doctests.hs 2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/tests/doctests.hs 2022-03-22 22:14:54.557142788 -0600
+@@ -1,4 +1,30 @@
+ import Test.DocTest (doctest)
++import GHC.IO.Encoding (setLocaleEncoding)
++import System.Directory (getCurrentDirectory, makeAbsolute)
++import System.FilePath.Posix ((</>))
++import System.IO (utf8)
++import Build_doctests (pkgs)
+
+ main :: IO ()
+-main = doctest ["-Iinclude", "-Iinternal", "Data"]
++main = do
++ setLocaleEncoding utf8
++ pwd <- getCurrentDirectory
++ prefix <- makeAbsolute pwd
++
++ let customFlags =
++ [ "-package-env=-"
++ , "-hide-all-packages"
++ , "-no-user-package-db"
++ , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
++ ]
++
++ let origFlags =
++ [ "-Iinclude"
++ , "-Iinternal"
++ ]
++
++ let modules =
++ [ "Data"
++ ]
++
++ doctest $ customFlags ++ pkgs ++ origFlags ++ modules
+diff -urN vector-0.12.3.1/vector.cabal vector-0.12.3.1-r1/vector.cabal
+--- vector-0.12.3.1/vector.cabal 2022-03-22 22:09:55.787142644 -0600
++++ vector-0.12.3.1-r1/vector.cabal 2022-03-22 22:12:23.547142715 -0600
+@@ -49,7 +49,7 @@
+
+
+ Cabal-Version: >=1.10
+-Build-Type: Simple
++Build-Type: Custom
+
+ Extra-Source-Files:
+ changelog.md
+@@ -99,6 +99,11 @@
+ Default: False
+ Manual: True
+
++custom-setup
++ setup-depends:
++ base
++ , Cabal
++ , cabal-doctest
+
+ Library
+ Default-Language: Haskell2010
+@@ -288,4 +293,6 @@
+ base -any
+ , doctest >=0.15 && <0.19
+ , primitive >= 0.6.4.0 && < 0.8
+- , vector -any
++ , directory
++ , filepath
++ , base-compat
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch
new file mode 100644
index 000000000000..1a04dd89c7f0
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch
@@ -0,0 +1,27 @@
+From eb479f24b766425dd522ba01e0c298fc814c788d Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sat, 4 Mar 2023 14:46:07 -0700
+Subject: [PATCH] Disable doctests
+
+Doctests are not working on ghc-9.2
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ vector.cabal | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vector.cabal b/vector.cabal
+index cea122a..c738a35 100644
+--- a/vector.cabal
++++ b/vector.cabal
+@@ -274,6 +274,7 @@ test-suite vector-tests-O2
+ Ghc-Options: -Wno-redundant-constraints
+
+ test-suite vector-doctest
++ buildable: False
+ type: exitcode-stdio-1.0
+ main-is: doctests.hs
+ hs-source-dirs: tests
+--
+2.39.2
+
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch
new file mode 100644
index 000000000000..8a8db580f225
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch
@@ -0,0 +1,42 @@
+From df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c Mon Sep 17 00:00:00 2001
+From: Bodigrim <andrew.lelechenko@gmail.com>
+Date: Sun, 4 Jun 2023 17:55:28 +0100
+Bug: https://github.com/haskell/vector/pull/461
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Subject: [PATCH] Fix instance TestData Float/Double
+
+---
+ vector/tests/Utilities.hs | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/vector/tests/Utilities.hs b/vector/tests/Utilities.hs
+index 24799554..ae19d425 100644
+--- a/tests/Utilities.hs
++++ b/tests/Utilities.hs
+@@ -121,10 +121,24 @@ instance TestData ty where { \
+ id_TestData(())
+ id_TestData(Bool)
+ id_TestData(Int)
+-id_TestData(Float)
+-id_TestData(Double)
+ id_TestData(Ordering)
+
++instance TestData Float where
++ type Model Float = Float
++ model = id
++ unmodel = id
++
++ type EqTest Float = Property
++ equal x y = property (x == y || (isNaN x && isNaN y))
++
++instance TestData Double where
++ type Model Double = Double
++ model = id
++ unmodel = id
++
++ type EqTest Double = Property
++ equal x y = property (x == y || (isNaN x && isNaN y))
++
+ bimapEither :: (a -> b) -> (c -> d) -> Either a c -> Either b d
+ bimapEither f _ (Left a) = Left (f a)
+ bimapEither _ g (Right c) = Right (g c)
diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml
index f17879fb0804..d7ad3155bea8 100644
--- a/dev-haskell/vector/metadata.xml
+++ b/dev-haskell/vector/metadata.xml
@@ -5,71 +5,15 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- An efficient implementation of Int-indexed arrays (both mutable
- and immutable), with a powerful loop optimisation framework .
-
- It is structured as follows:
-
- ["Data.Vector"] Boxed vectors of arbitrary types.
-
- ["Data.Vector.Unboxed"] Unboxed vectors with an adaptive
- representation based on data type families.
-
- ["Data.Vector.Storable"] Unboxed vectors of 'Storable' types.
-
- ["Data.Vector.Primitive"] Unboxed vectors of primitive types as
- defined by the @primitive@ package. "Data.Vector.Unboxed" is more
- flexible at no performance cost.
-
- ["Data.Vector.Generic"] Generic interface to the vector types.
-
- Each module has a @Safe@ version with is marked as @Trustworthy@
- (see &lt;http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell&gt;).
-
- There is also a (draft) tutorial on common uses of vector.
-
- * &lt;http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial&gt;
-
- Please use the project trac to submit bug reports and feature
- requests.
-
- * &lt;http://trac.haskell.org/vector&gt;
-
- Changes in version 0.9
-
- * 'MonadPlus' instance for boxed vectors
-
- * Export more @construct@ and @constructN@ from @Safe@ modules
-
- * Require @primitive-0.4.0.1@
-
- Changes in version 0.8
-
- * New functions: @constructN@, @constructrN@
-
- * Support for GHC 7.2 array copying primitives
-
- * New fixity for @(!)@
-
- * Safe Haskell support (contributed by David Terei)
-
- * 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and
- 'Traversable' instances for boxed vectors
- (/WARNING: they tend to be slow and are only provided for completeness/)
-
- * 'Show' instances for immutable vectors follow containers conventions
-
- * 'Read' instances for all immutable vector types
-
- * Performance improvements
- </longdescription>
<use>
<flag name="boundschecks">Enable bounds checking</flag>
- <flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty</flag>
- <flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty</flag>
+ <flag name="internalchecks">Enable internal consistency checks at the cost of a
+significant performance penalty</flag>
+ <flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a
+significant performance penalty</flag>
</use>
<upstream>
+ <remote-id type="hackage">vector</remote-id>
<remote-id type="github">haskell/vector</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/vector/vector-0.12.1.2.ebuild b/dev-haskell/vector/vector-0.12.1.2.ebuild
deleted file mode 100644
index d03f43378f3f..000000000000
--- a/dev-haskell/vector/vector-0.12.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -wall
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT="test" # test-suite is too memory intensive
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10"
-# test? ( >=dev-haskell/base-orphans-0.6
-# dev-haskell/hunit
-# >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
-# dev-haskell/random
-# dev-haskell/tasty
-# dev-haskell/tasty-hunit
-# dev-haskell/tasty-quickcheck
-# >=dev-haskell/transformers-0.2.0.0 )
-# "
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag boundschecks boundschecks) \
- $(cabal_flag internalchecks internalchecks) \
- $(cabal_flag unsafechecks unsafechecks) \
- --flag=-wall
-}
diff --git a/dev-haskell/vector/vector-0.12.3.1-r1.ebuild b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild
new file mode 100644
index 000000000000..23f7fd1c6530
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: -wall
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.12.3.1-disable-doctests.patch"
+ "${FILESDIR}/${PN}-0.12.3.1-fix-testdata-float.patch"
+)
+
+RDEPEND="
+ >=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/base-orphans-0.6
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15
+ dev-haskell/random
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag boundschecks boundschecks) \
+ $(cabal_flag internalchecks internalchecks) \
+ $(cabal_flag unsafechecks unsafechecks) \
+ --flag=-wall
+}
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
new file mode 100644
index 000000000000..76e5a4178141
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -wall
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.12.3.1-cabal-doctest.patch"
+ "${FILESDIR}/${PN}-0.12.3.1-fix-testdata-float.patch"
+
+)
+
+RDEPEND=">=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+
+# doctests do not work on >=ghc-9.2
+RDEPEND+="
+ test? (
+ <dev-lang/ghc-9.1
+ )
+"
+
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ dev-haskell/cabal-doctest
+ test? ( >=dev-haskell/base-orphans-0.6
+ dev-haskell/base-compat
+ >=dev-haskell/doctest-0.15
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15
+ dev-haskell/random
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+CABAL_CHDEPS=(
+ 'doctest >=0.15 && <0.19' 'doctest >=0.15'
+)
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag boundschecks boundschecks) \
+ $(cabal_flag internalchecks internalchecks) \
+ $(cabal_flag unsafechecks unsafechecks) \
+ --flag=-wall
+}
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/void/void-0.7.3.ebuild b/dev-haskell/void/void-0.7.3.ebuild
index dd7ae273a1d5..f7b4e5f0b776 100644
--- a/dev-haskell/void/void-0.7.3.ebuild
+++ b/dev-haskell/void/void-0.7.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 d29aea060d12..d0cd4c75f305 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="print"
RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
@@ -44,12 +44,9 @@ DEPEND="${RDEPEND}
dev-haskell/temporary )
"
-src_prepare() {
- default
-
- cabal_chdeps \
- 'wai-extra >= 3.0 && < 3.1' 'wai-extra >= 3.0'
-}
+CABAL_CHDEPS=(
+ 'wai-extra >= 3.0 && < 3.1' 'wai-extra >= 3.0'
+)
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/wai-conduit/Manifest b/dev-haskell/wai-conduit/Manifest
deleted file mode 100644
index 22a3bd89e7d2..000000000000
--- a/dev-haskell/wai-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wai-conduit-3.0.0.4.tar.gz 2151 BLAKE2B 58cfa6e727cb2461c9d8978b61391d4dc5ddf01a64c1719e2ae71cf3cefb9768ab64c389d8772fb80159fbc34c5ff5d31a00d5d2519a6b74cb3a1eb022c44305 SHA512 49f1a2b53912a899b4cf427a72ab7c34994fd86810e5345233de34a611c71b970ff09e8fa33c93803950c2991a7c22c9b0b6d277fc9aca64bb599af60415ae70
diff --git a/dev-haskell/wai-conduit/metadata.xml b/dev-haskell/wai-conduit/metadata.xml
deleted file mode 100644
index cf588be70e21..000000000000
--- a/dev-haskell/wai-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Since version 3.0.0, WAI has no built-in streaming data abstraction.
- This library provides similar functionality to what existed in WAI 2.x.
- </longdescription>
- <upstream>
- <remote-id type="github">yesodweb/wai</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.4.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.4.ebuild
deleted file mode 100644
index b81a100250f6..000000000000
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="conduit wrappers for WAI"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
- dev-haskell/http-types:=[profile?]
- >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/wai-cors/Manifest b/dev-haskell/wai-cors/Manifest
new file mode 100644
index 000000000000..f352da37f051
--- /dev/null
+++ b/dev-haskell/wai-cors/Manifest
@@ -0,0 +1 @@
+DIST wai-cors-0.2.7.tar.gz 16248 BLAKE2B 636eb9bb17224608924f8f9d33db7f74b62e243b7d591d81a1c93e63e30173408fcf8fa3828bb8919446e818815d8172a51ddf370375710364f3a478c2c85e20 SHA512 77a9e3cb457136a05c2b104ac331af17d70edf8d985689c962d3e6cc0981c6752eff59ef18301c0ba98c6d4256909c44afe50bedb0f3dd741b6879564516cea7
diff --git a/dev-haskell/wai-cors/metadata.xml b/dev-haskell/wai-cors/metadata.xml
new file mode 100644
index 000000000000..044b4adb95d8
--- /dev/null
+++ b/dev-haskell/wai-cors/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">wai-cors</remote-id>
+ <remote-id type="github">larskuhtz/wai-cors</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild b/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild
new file mode 100644
index 000000000000..9b040f1530e2
--- /dev/null
+++ b/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="CORS for WAI"
+HOMEPAGE="https://github.com/larskuhtz/wai-cors"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # one test fails
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
+ >=dev-haskell/base-unicode-symbols-0.2.2.3:=[profile?]
+ >=dev-haskell/case-insensitive-1.0.0.1:=[profile?]
+ >=dev-haskell/http-types-0.8.0:=[profile?]
+ >=dev-haskell/wai-3.0:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( >=dev-haskell/network-2.6
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/text-1.2
+ >=dev-haskell/wai-extra-3.0
+ >=dev-haskell/wai-websockets-3.0.1
+ >=dev-haskell/warp-3.0
+ >=dev-haskell/websockets-0.10 )
+"
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 83fc723e2f31..79eb4a7df3e5 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -1 +1,3 @@
+DIST wai-extra-3.1.13.0-rev1.cabal 8287 BLAKE2B 71844b39699651c434a2566f1231d99142639aaf9cb12b02ac2e854c4bcb0098d08d3c8bbd03bf6658fc03b0cef6a21f702921bf05950f481acccb96eff2220d SHA512 57e9d7ccfc243651a91ba4d8254384bd9108132b255b8676c1eb1cf8e0a0eebda6a66bbc0393bbd85ecdf5e5a2e17f39106fb7067fc5be8e8b4e73409fdf106e
+DIST wai-extra-3.1.13.0.tar.gz 82251 BLAKE2B 30919e421f1e0f0e827bd73b50e11c9aee9714d7c582faa70b69f160c278552b19a7024aaf97f80ffa7bf442118b7a31cb46d92fa2ecef356b66bc399ecf2191 SHA512 ec94ad7fe318543c83dc20586bab04e9cb5cc9a3a96c4392acb1abd22f7a232a703f05051c9580836ad3758875751f02ef53bdc3c450e7d262ba8575761380b8
DIST wai-extra-3.1.4.1.tar.gz 67063 BLAKE2B d75f1425cf4c75596adb65c152c954a6005b085f3a290d7dea279a4417d85e359f6948fc8282cee63f2057b4dfe3e33b7a364667544c925582024e4255e71462 SHA512 c33b513bd6e627361007f285167235535ac4065e7198749c14d05cfcd89c5017b54896064c64ffdda9875d6363b684b9beed4098fdbefaba1058045ba3245af5
diff --git a/dev-haskell/wai-extra/metadata.xml b/dev-haskell/wai-extra/metadata.xml
index 6b5972c48ca4..b23b10b74f9b 100644
--- a/dev-haskell/wai-extra/metadata.xml
+++ b/dev-haskell/wai-extra/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">wai-extra</remote-id>
<remote-id type="github">yesodweb/wai</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild
new file mode 100644
index 000000000000..82a7ff2c92f9
--- /dev/null
+++ b/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: build-example:examples
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Provides some basic WAI handlers and middleware"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+CABAL_CHDEPS=(
+ 'executable example' "executable ${PN}-example"
+)
+
+RDEPEND="
+ dev-haskell/aeson:=[profile?]
+ >=dev-haskell/ansi-terminal-0.4:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ dev-haskell/call-stack:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/cookie:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/fast-logger-2.4.5:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?]
+ dev-haskell/hunit:=[profile?]
+ >=dev-haskell/iproute-1.7.8:=[profile?]
+ >=dev-haskell/network-2.6.1.0:=[profile?]
+ >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ >=dev-haskell/streaming-commons-0.2:=[profile?]
+ dev-haskell/vault:=[profile?]
+ >=dev-haskell/wai-3.2.2.1:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/wai-logger-2.3.7:=[profile?]
+ >=dev-haskell/warp-3.3.22:=[profile?]
+ dev-haskell/word8:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? (
+ >=dev-haskell/hspec-1.3
+ dev-haskell/temporary
+ dev-haskell/zlib
+ )
+"
+BDEPEND="
+ test? (
+ dev-haskell/hspec-discover
+ )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples build-example)
+}
+
+pkg_postinst() {
+ if use examples; then
+ elog "The example executable installed with this package (normally named"
+ elog "'example') has been renamed to '${PN}-example' to help prevent name"
+ elog "collisions."
+ fi
+
+ haskell-cabal_pkg_postinst
+}
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 c923228ad142..385804a5b649 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
#hackport: flags: build-example:examples
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="examples"
RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
index 1f4f5b2e475e..17690723ee3c 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -1 +1,2 @@
DIST wai-logger-2.3.6.tar.gz 5823 BLAKE2B a08fde37085151e267b8abb21653021e4de773f5e85606b98900ea5fa33eca680f37dffebe7b416d95abc8ee925110274809de6dabc1be169226835256dcb091 SHA512 0c16120c342321cd686ab7cf9fa7df503a426b0c3d145c16e566013e0df44ef565d9890726d780c1fb73a49507f49bbf5fb886ff4bdccbd19a19b4c00626532e
+DIST wai-logger-2.4.0.tar.gz 5925 BLAKE2B e9446ab7cf81d5ce24b33922bb32e2fdf1c43ebc4cd8ff6bf8acb853060d98a2e2afc1d1b465dc120eb9ed59d7bee94ded657a57ce0ea6e820018fa79dccef22 SHA512 8d09b7fa7688601396f994513772884ac7f73a0b934f73420e3d200ae4e906450bbef14746d43dc484ce8d9181f8171dfb8d3496d17c0d81ba7c27eee39a90d4
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 c3feb21d3d6a..9d031ad12216 100644
--- a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1
@@ -14,9 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
+GHC_BOOTSTRAP_PACKAGES=(
+ cabal-doctest
+)
+
RESTRICT=test # does not specify full dependencies
RDEPEND="dev-haskell/byteorder:=[profile?]
diff --git a/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild b/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild
new file mode 100644
index 000000000000..be8556efbdf3
--- /dev/null
+++ b/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 logging system for WAI"
+HOMEPAGE="https://hackage.haskell.org/package/wai-logger"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # does not specify full dependencies
+
+RDEPEND="dev-haskell/byteorder:=[profile?]
+ >=dev-haskell/fast-logger-3:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ dev-haskell/network:=[profile?]
+ >=dev-haskell/wai-2.0.0:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-doctest-1.0.6 <dev-haskell/cabal-doctest-1.1"
+# test? ( >=dev-haskell/doctest-0.10.1 )
+#"
diff --git a/dev-haskell/wai-test/Manifest b/dev-haskell/wai-test/Manifest
deleted file mode 100644
index 702bdd410593..000000000000
--- a/dev-haskell/wai-test/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wai-test-3.0.0.tar.gz 1227 BLAKE2B 4a99ab99810cff2d3b2fbdc7c36acc239d1ab8d15ffe5d4d9d8c953c01de2daca63279a6f36f2850740f8f945f8e7edc6d756a6516acfc686c45a35d9af8c400 SHA512 2c7f8788f3a51f94b02a2d79b7ad40c0f92f3756163b1e4c0981e92c3364c822b6a1cbf2b7129fd6974a745774f2dbffe1a6097e362d183bc2e30dd62125666f
diff --git a/dev-haskell/wai-test/metadata.xml b/dev-haskell/wai-test/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/wai-test/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/wai-test/wai-test-3.0.0.ebuild b/dev-haskell/wai-test/wai-test-3.0.0.ebuild
deleted file mode 100644
index ac41acae63a8..000000000000
--- a/dev-haskell/wai-test/wai-test-3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/wai-3.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/wai-websockets/Manifest b/dev-haskell/wai-websockets/Manifest
new file mode 100644
index 000000000000..7977d725540e
--- /dev/null
+++ b/dev-haskell/wai-websockets/Manifest
@@ -0,0 +1 @@
+DIST wai-websockets-3.0.1.2.tar.gz 7051 BLAKE2B 0c39cd9917e1c340413e48737e4fd5ada23056189a6aad9de1aaf551f12b45b9544b99b54bbf078ccf88aea816f025c3508e07212ca05a2e9a2d779fd1edeee9 SHA512 c3415d1a36ca2f063fb1ae0ff7d3d9d271d8ff2c6099a754baed45f1c36f24cf1fa346e8e6403499cbeb329bcdf89326a9ed95f8e60111b4a879f5e51967ecc0
diff --git a/dev-haskell/wai-websockets/metadata.xml b/dev-haskell/wai-websockets/metadata.xml
new file mode 100644
index 000000000000..3d76fcca496a
--- /dev/null
+++ b/dev-haskell/wai-websockets/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">wai-websockets</remote-id>
+ <remote-id type="github">yesodweb/wai</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild b/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild
new file mode 100644
index 000000000000..5c63f00f4c2f
--- /dev/null
+++ b/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Provide a bridge between WAI and the websockets package"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+examples"
+
+RDEPEND=">=dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/http-types:=[profile?]
+ >=dev-haskell/network-2.2.1.5:=[profile?]
+ >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/websockets-0.9:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+ examples? ( dev-haskell/file-embed:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/wai-app-static:=[profile?]
+ dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples example)
+}
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
index 14cdfb9c8215..b36e88e0b1ec 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -1 +1 @@
-DIST wai-3.2.2.1.tar.gz 10221 BLAKE2B 5822bae6d3f0326206da9b14646654af135690ca134d48b5f8b7eb6acd39652d829c8d4daa5afc80926b2409cf9fe1d498ef2b727cd8baae7c1f266178a39861 SHA512 72c92389d3faff234003f835206ff6eae3f8e3d885d7519706f8b78df3cb1c92121c5de7e8272436aed22ade8440baaefb14d50a10f2f233badadf16d1b5e431
+DIST wai-3.2.3.tar.gz 11619 BLAKE2B 3ef7328a252a21d23d885ac3ea36b6a25bf06c0678e2a8627337aeebb325314e64c7e3415b3f4143139d9c20d910809cdbaaaaf6e15757a5eceb4c5fe0c3e98b SHA512 1851da58310c45a809ec1cd3efd760e45bee814e41526a9f3404ea55e2428e92ff1563785b3118e8c605d5edaacd70670d21b5e5b300ce477f16b159c33a2040
diff --git a/dev-haskell/wai/wai-3.2.2.1.ebuild b/dev-haskell/wai/wai-3.2.2.1.ebuild
deleted file mode 100644
index 7639458078ae..000000000000
--- a/dev-haskell/wai/wai-3.2.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/network-2.2.1.5:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.2.3.ebuild b/dev-haskell/wai/wai-3.2.3.ebuild
new file mode 100644
index 000000000000..f1d85bd25006
--- /dev/null
+++ b/dev-haskell/wai/wai-3.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web Application Interface"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
+ >=dev-haskell/network-2.2.1.5:=[profile?]
+ >=dev-haskell/text-0.7:=[profile?]
+ >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/warp-tls/Manifest b/dev-haskell/warp-tls/Manifest
index 25024dbb9396..e8d9ec5a6c8d 100644
--- a/dev-haskell/warp-tls/Manifest
+++ b/dev-haskell/warp-tls/Manifest
@@ -1 +1,2 @@
DIST warp-tls-3.2.12.tar.gz 8200 BLAKE2B 71380d62ef1ec401140d308499dc7aad8e6fae1d3e51cc64285f5e740c1ed9fc30f9f096f1a40977e5f5252da49646632c9dfb21090f8d7924b6ab29e619082e SHA512 c1fa08c710bbbb88e914bcb7e978fa0fedcff9900351cf8f2b59bbba8b35e56b605ba3bd36d6162459397f38a0cdcedd5e48472f3d7d1b1357d0b0c3c2fa75ba
+DIST warp-tls-3.4.1.tar.gz 8941 BLAKE2B 0aa9548001acb32845af0d18c127fddb27f63d5324092b8aac4bff1a9eb52c48adb9163530d64a5982f7ea0b8941612b3942b0e98cdfdfa24e9fdea757b6b5bd SHA512 433dfd946a50bb56f6d0a7cd0bb6b95c1745f7ba8c58c9d766064f9c7d81b8f6aad25dc5dd25b75b45b0e97716ed546b3a46d5d21052415f126de034fe48404e
diff --git a/dev-haskell/warp-tls/metadata.xml b/dev-haskell/warp-tls/metadata.xml
index 6b5972c48ca4..4c8395816b5c 100644
--- a/dev-haskell/warp-tls/metadata.xml
+++ b/dev-haskell/warp-tls/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">warp-tls</remote-id>
<remote-id type="github">yesodweb/wai</remote-id>
</upstream>
</pkgmetadata>
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 1bd16536432e..85c88e83d767 100644
--- a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
+++ b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.4.9999
#hackport: flags: +tls_1_1_3
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
diff --git a/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild b/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild
new file mode 100644
index 000000000000..f3b41384b4b8
--- /dev/null
+++ b/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +tls_1_1_3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
+ >=dev-haskell/network-2.2.1:=[profile?]
+ >=dev-haskell/recv-0.1.0:=[profile?] <dev-haskell/recv-0.2.0:=[profile?]
+ dev-haskell/streaming-commons:=[profile?]
+ >=dev-haskell/tls-1.7:=[profile?]
+ >=dev-haskell/tls-session-manager-0.0.4:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ >=dev-haskell/warp-3.3.23:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=tls_1_1_3
+}
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index 1a02783b51c7..95d18997e935 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1 +1,2 @@
-DIST warp-3.3.13.tar.gz 64719 BLAKE2B f9430b22fed524cfa8b90ec3ead31f8c86c74a5b5b967503dcc682a31da8880814856f37c4612d16a873ecdb6faf21dbca1af28c1e1f22942fa258c3b828c326 SHA512 ac37e1f274d26b2c846429960074d27010c0864efd87da6d79f03e3f833aca3269176bb99301ab8cb59c4476ff12bae35b26e0fe602e7b0e2cad2837592e07b1
+DIST warp-3.3.21.tar.gz 66529 BLAKE2B e8de94a4695c42a7620c1afa1a38225f6c26fc454235e941e34b65929a733e160781d895335d0ab48c4d7db25aa650d50e1d84a3ef83daf62b22f409c2045d48 SHA512 7f181669d9f10f88d14f8f1dc3acb6c08f41c8f4565f371f7fe4b89b3fde411a0190e50f003b07a239ba25ea71dbafaa16cb9e77effbe574bec929ea29646f37
+DIST warp-3.3.28.tar.gz 65625 BLAKE2B b054d03b66cdcf67a990dd9c1f8ba822e416da3f7e5d6dfa9afbf9ecc8f154e5bba2013beadf616174a629c90c1203f3205d88763dfa6644f7085f1b3c48f587 SHA512 5f3a73f611342545d010ba770614b7012c31a335fe4d209a4f7f3d466b440901a58b0f3f477da10b95bb739dbd30afffa1ced66828039159844eb476c845648e
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index e7c2731d2b2e..153f3ad7acc9 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -5,14 +5,12 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
- </longdescription>
<use>
- <flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD).</flag>
- <flag name="warp-debug">Add additional debuging information</flag>
+ <flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD)</flag>
+ <flag name="x509">Adds a dependency on the x509 library to enable getting TLS client certificates.</flag>
</use>
<upstream>
+ <remote-id type="hackage">warp</remote-id>
<remote-id type="github">yesodweb/wai</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/warp/warp-3.3.13.ebuild b/dev-haskell/warp/warp-3.3.13.ebuild
deleted file mode 100644
index f9433e28e4b5..000000000000
--- a/dev-haskell/warp/warp-3.3.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
- >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
- <dev-haskell/bsb-http-chunked-0.1:=[profile?]
- >=dev-haskell/case-insensitive-0.2:=[profile?]
- dev-haskell/hashable:=[profile?]
- dev-haskell/http-date:=[profile?]
- >=dev-haskell/http-types-0.12:=[profile?]
- >=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?]
- >=dev-haskell/iproute-1.3.1:=[profile?]
- >=dev-haskell/network-2.3:=[profile?]
- dev-haskell/semigroups:=[profile?]
- >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
- >=dev-haskell/stm-2.3:=[profile?]
- >=dev-haskell/streaming-commons-0.1.10:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/time-manager:=[profile?]
- >=dev-haskell/unix-compat-0.2:=[profile?]
- >=dev-haskell/vault-0.3:=[profile?]
- >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
- dev-haskell/word8:=[profile?]
- dev-haskell/x509:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/http-client
- dev-haskell/hunit
- >=dev-haskell/lifted-base-0.1
- dev-haskell/quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag allow-sendfilefd allow-sendfilefd) \
- --flag=-network-bytestring \
- $(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.3.21.ebuild b/dev-haskell/warp/warp-3.3.21.ebuild
new file mode 100644
index 000000000000..6049eb0072a6
--- /dev/null
+++ b/dev-haskell/warp/warp-3.3.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -network-bytestring
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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?]
+ <dev-haskell/bsb-http-chunked-0.1:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/hashable:=[profile?]
+ dev-haskell/http-date:=[profile?]
+ >=dev-haskell/http-types-0.12:=[profile?]
+ >=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?]
+ >=dev-haskell/iproute-1.3.1:=[profile?]
+ >=dev-haskell/network-2.3:=[profile?]
+ >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
+ >=dev-haskell/stm-2.3:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.10:=[profile?]
+ dev-haskell/time-manager:=[profile?]
+ >=dev-haskell/unix-compat-0.2:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-haskell/vault-0.3:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ dev-haskell/word8:=[profile?]
+ >=dev-lang/ghc-8.6.3:=
+ x509? ( dev-haskell/x509:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( dev-haskell/async
+ >=dev-haskell/hspec-1.3
+ dev-haskell/http-client
+ dev-haskell/hunit
+ dev-haskell/quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag allow-sendfilefd allow-sendfilefd) \
+ --flag=-network-bytestring \
+ $(cabal_flag debug warp-debug) \
+ $(cabal_flag x509 x509)
+}
diff --git a/dev-haskell/warp/warp-3.3.28.ebuild b/dev-haskell/warp/warp-3.3.28.ebuild
new file mode 100644
index 000000000000..4e2a9921d4e2
--- /dev/null
+++ b/dev-haskell/warp/warp-3.3.28.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +allow-sendfilefd,-network-bytestring,warp-debug:debug
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug +x509"
+
+RDEPEND=">=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
+ <dev-haskell/bsb-http-chunked-0.1:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/hashable:=[profile?]
+ dev-haskell/http-date:=[profile?]
+ >=dev-haskell/http-types-0.12:=[profile?]
+ >=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-5:=[profile?]
+ >=dev-haskell/iproute-1.3.1:=[profile?]
+ >=dev-haskell/network-2.3:=[profile?]
+ >=dev-haskell/recv-0.1.0:=[profile?] <dev-haskell/recv-0.2.0:=[profile?]
+ >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.10:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/time-manager:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-haskell/vault-0.3:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+ dev-haskell/word8:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ x509? ( dev-haskell/crypton-x509:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( >=dev-haskell/hspec-1.3
+ dev-haskell/http-client
+ dev-haskell/quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=allow-sendfilefd \
+ --flag=-network-bytestring \
+ $(cabal_flag debug warp-debug) \
+ $(cabal_flag x509 x509)
+}
diff --git a/dev-haskell/wavy/Manifest b/dev-haskell/wavy/Manifest
deleted file mode 100644
index ea0dbf630fed..000000000000
--- a/dev-haskell/wavy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wavy-0.1.0.0.tar.gz 25100 BLAKE2B 5c4926c22b0a874b84a02fdff9218aa78f78a97dd736ae1243e99bfe368c8d136dc463346c3905e794b70deaeba5dab7223a54fa43304d67234cb16f0bd489e2 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
deleted file mode 100644
index 88db75b995c2..000000000000
--- a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Sound/Wav/Binary.hs b/Sound/Wav/Binary.hs
-index d2c539c..11883a3 100644
---- a/Sound/Wav/Binary.hs
-+++ b/Sound/Wav/Binary.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- -- | This module provides helper binary functions to get integer values from binary streams and put
-@@ -8,2 +9,3 @@ import Data.Int
-
-+#if ! MIN_VERSION_binary(0,8,0)
- getInt8 :: Get Int8
-@@ -31 +33,2 @@ putInt64le :: Int64 -> Put
- putInt64le = putWord64le . fromIntegral
-+#endif
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch
deleted file mode 100644
index 5d5fdee9bd24..000000000000
--- a/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Sound/Wav/ChannelData.hs
-+++ b/Sound/Wav/ChannelData.hs
-@@ -111,7 +111,7 @@ wordPutter 1 = putInt8 . zeroStable (0 :: Int8)
- wordPutter 2 = putInt16le . zeroStable (0 :: Int16)
- wordPutter 3 = putInt32le . zeroStable (0 :: Int32)
- wordPutter 4 = putInt64le
--wordPutter x = \_ -> fail $ "The is no word putter for byte size " ++ show x
-+wordPutter x = \_ -> error $ "The is no word putter for byte size " ++ show x
-
- wordGetter :: (Num a, Show a, Eq a) => a -> Get Int64
- wordGetter 1 = fmap zeroStable64 getInt8
diff --git a/dev-haskell/wavy/metadata.xml b/dev-haskell/wavy/metadata.xml
deleted file mode 100644
index 879b76e489e6..000000000000
--- a/dev-haskell/wavy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- Wavy was designed to be a fast and efficient method of extracting and writing PCM
- data to and from WAV files. It is here to help you make fast use of Audio
- data in your Haskell programs and thus encourage many more audio projects in Haskell.
- </longdescription>
- <upstream>
- <remote-id type="bitbucket">robertmassaioli/wavy</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild
deleted file mode 100644
index 248dff9d5a3b..000000000000
--- a/dev-haskell/wavy/wavy-0.1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Process WAVE files in Haskell"
-HOMEPAGE="https://bitbucket.org/robertmassaioli/wavy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/pretty-show:=[profile?]
- >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?]
- >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-binary-0.8.patch
- "${FILESDIR}"/${P}-ghc-8.8.patch
-)
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'vector ==0.10.*' 'vector >= 0.10' \
- 'filepath ==1.3.*' 'filepath >= 1.3' \
- 'binary ==0.7.*' 'binary >= 0.7' \
- 'containers ==0.4.*' 'containers >= 0.4'
-}
diff --git a/dev-haskell/wcwidth/metadata.xml b/dev-haskell/wcwidth/metadata.xml
index 1143fe547af4..1cf9efce533a 100644
--- a/dev-haskell/wcwidth/metadata.xml
+++ b/dev-haskell/wcwidth/metadata.xml
@@ -15,4 +15,7 @@
the widths assigned by it. The command line tool can compile a width table
to Haskell code that assigns widths to the Char type.
</longdescription>
+ <upstream>
+ <remote-id type="github">solidsnack/wcwidth</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
index e46cf9838bb3..56e8e6ff4977 100644
--- a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+++ b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="cli"
RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6.0
"
-PATCHES=( ${FILESDIR}/${P}-fix-build-failure.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-build-failure.patch )
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/websockets/Manifest b/dev-haskell/websockets/Manifest
new file mode 100644
index 000000000000..09bcee8af898
--- /dev/null
+++ b/dev-haskell/websockets/Manifest
@@ -0,0 +1,2 @@
+DIST websockets-0.12.7.3-rev2.cabal 8237 BLAKE2B 2280cc2e730cb5ea9c0501740f6c7b80134bc51344a520ee1890e98482806eb231c3fd3b74b478b46214ed7437bcf29e4f9ee6068d4222dfdc02f15efa14dd13 SHA512 61c66dbade090e0b5da39a780d343213ae8f9a896b22b9d7d981805df736bd3545c0cc901fed29adb72facf22f383834795c9ba3ed02967a369b08a80a843abc
+DIST websockets-0.12.7.3.tar.gz 40077 BLAKE2B cd80eecd52ae3aa8ab67be7eb87d297ecd7b286d893962dfa2b6a1e2f07ac2a1573549b18a3e9bce956e041bdcf4b0eae79d045f31ffe12e27c041748cf31c6f SHA512 9eb9147ff7b545c6e3e859055ff0ca51c16d7e2f0e8603279409b3e74db7ec858c33e586d8f40e3059ac8acf96d8c7502e1b5fe298d3d7fa4cad507e13a2b300
diff --git a/dev-haskell/alex-tools/metadata.xml b/dev-haskell/websockets/metadata.xml
index 937381521944..937381521944 100644
--- a/dev-haskell/alex-tools/metadata.xml
+++ b/dev-haskell/websockets/metadata.xml
diff --git a/dev-haskell/websockets/websockets-0.12.7.3.ebuild b/dev-haskell/websockets/websockets-0.12.7.3.ebuild
new file mode 100644
index 000000000000..d5f719c02f2d
--- /dev/null
+++ b/dev-haskell/websockets/websockets-0.12.7.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: example:examples
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A sensible and clean way to write WebSocket-capable servers in Haskell"
+HOMEPAGE="https://jaspervdj.be/websockets"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ <dev-haskell/bytestring-builder-0.11:=[profile?]
+ >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/clock-0.8:=[profile?] <dev-haskell/clock-0.9:=[profile?]
+ >=dev-haskell/entropy-0.2.1:=[profile?] <dev-haskell/entropy-0.5:=[profile?]
+ >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/sha-1.5:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+ >=dev-haskell/streaming-commons-0.1:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+ >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+ >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+ >=dev-haskell/test-framework-quickcheck2-0.2 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples example)
+}
diff --git a/dev-haskell/weigh/Manifest b/dev-haskell/weigh/Manifest
deleted file mode 100644
index 500589e15085..000000000000
--- a/dev-haskell/weigh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST weigh-0.0.16.tar.gz 9070 BLAKE2B 9d21313445541701460267fc605056bebe17cd409a733a05c306602129f8850ded4b9688c52084f35cbfb9105e397779d9127c04a74556796a0091b413d1d16b SHA512 a7889b891f8099e23922f37c9a770c94c8bfd6e7e7740786ba1595c0c153dcd60a320d79647952a1a1275a1cf06e2a2aed9ee0ce60e34583a91d186e246f9470
diff --git a/dev-haskell/weigh/metadata.xml b/dev-haskell/weigh/metadata.xml
deleted file mode 100644
index 99523fb51972..000000000000
--- a/dev-haskell/weigh/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fpco/weigh</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/weigh/weigh-0.0.16.ebuild b/dev-haskell/weigh/weigh-0.0.16.ebuild
deleted file mode 100644
index 138620c790cc..000000000000
--- a/dev-haskell/weigh/weigh-0.0.16.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -weigh-maps
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Measure allocations of a Haskell functions/values"
-HOMEPAGE="https://github.com/fpco/weigh#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- dev-haskell/split:=[profile?]
- dev-haskell/temporary:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- >=dev-lang/ghc-8.2.1:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-weigh-maps
-}
diff --git a/dev-haskell/with-location/Manifest b/dev-haskell/with-location/Manifest
deleted file mode 100644
index fa9c219d4262..000000000000
--- a/dev-haskell/with-location/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST with-location-0.1.0.tar.gz 2029 BLAKE2B 0d76733cff25a2dc3603ddad7b0806d43e2007017f73ec8773f6d00db0f7830eb2a30e324a5044654b7537bb9a43d453dbe50fd1ee89668fbbc465a5a27f90ee SHA512 1b8bdecd02d4acaa8b21e2cd6acdee573ac29b909c9a6f0d88a56adcd7433d551db5c1fadbc3e72c78378d74a614594d8d2ad08899fd63ecc57c65d0c37b28b9
diff --git a/dev-haskell/with-location/metadata.xml b/dev-haskell/with-location/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/with-location/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/with-location/with-location-0.1.0.ebuild b/dev-haskell/with-location/with-location-0.1.0.ebuild
deleted file mode 100644
index 392cd60b3e2c..000000000000
--- a/dev-haskell/with-location/with-location-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use ImplicitParams-based source locations in a backward compatible way"
-HOMEPAGE="https://github.com/sol/with-location#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/witherable/Manifest b/dev-haskell/witherable/Manifest
new file mode 100644
index 000000000000..90832bc1f809
--- /dev/null
+++ b/dev-haskell/witherable/Manifest
@@ -0,0 +1,2 @@
+DIST witherable-0.4.2-rev4.cabal 2342 BLAKE2B c33bfbe39c7a7a17ebfd156a30155cadc50f8ae6c852caef3f8c3853fd75d0cef24c6cb86270f8b8860790bb17f0fad41d995786a44bbf9d34b35369f34d9027 SHA512 a2170aa691bb07dd39da3d09192836a30d4d2dbf3e499bf19112369deedc64b946baaa890d5cbd2aaa964cd40b3bc2f491a4b19404d2d592d883ec814d867927
+DIST witherable-0.4.2.tar.gz 11876 BLAKE2B 58294fc66aa0e60cbb3a75b73ddc89ed3bb64ba62c2a462028afdfe0a86c219cb80db8a008c6abd9c5688fb684c05f2156dd51c796efd586a1a2f72a30ca7e7e SHA512 14ad590e24b93fc25f16fecaf71d6f9f891a903dd76e052d9f6c21b464f0d28df4f019d33ac36086341a6c5bd20833d7b0c2d19543460d1530899c0c25cea852
diff --git a/dev-haskell/witherable/metadata.xml b/dev-haskell/witherable/metadata.xml
new file mode 100644
index 000000000000..1db55be5ffc8
--- /dev/null
+++ b/dev-haskell/witherable/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="hackage">witherable</remote-id>
+ <remote-id type="github">fumieval/witherable</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/witherable/witherable-0.4.2-r1.ebuild b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..6fb6284e0924
--- /dev/null
+++ b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="filterable traversable"
+HOMEPAGE="https://github.com/fumieval/witherable"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+ >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+ >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+ >=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+ >=dev-haskell/unordered-containers-0.2.12.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/vector-0.12.2.0:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/quickcheck-2.14.2
+ dev-haskell/quickcheck-instances
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck
+ )
+"
diff --git a/dev-haskell/wl-pprint-annotated/Manifest b/dev-haskell/wl-pprint-annotated/Manifest
index edd0c46ff4ac..cdc3c9d43ff2 100644
--- a/dev-haskell/wl-pprint-annotated/Manifest
+++ b/dev-haskell/wl-pprint-annotated/Manifest
@@ -1 +1,2 @@
+DIST wl-pprint-annotated-0.1.0.1-rev1.cabal 2296 BLAKE2B 1b239089245dbc936763b0dcdc2f4afe1c90e7d8d3f80a823e1868ad6e4ea988395f20de015e55cc7db642f34f58ec4446bf4b8a697eeeb22c3a0efe8be2cf36 SHA512 0f79b2c436ddbf8deeb6aae9fe65d08b11030be1435df81cee292e1ec6cdda9d05461a9000984f1f7e89b9338aaa399e43687eeee8904602f4e4718013eb9a6e
DIST wl-pprint-annotated-0.1.0.1.tar.gz 15458 BLAKE2B 8699ca505a0c72790d70890ec290bbb602d259015554a6260d52445574d8e0f86c9d4e4a05bba155f59730595073d0613cda00fcecbf142c97afc0375eaedcf2 SHA512 45f1881254f8b20d9992a477a36a7408d2df8d94f99c71d72d75cd04aee3831966886c94b6e6a68791acda24aec8c4a339d052b9a188af8c2ca24e74da1e9596
diff --git a/dev-haskell/wl-pprint-annotated/metadata.xml b/dev-haskell/wl-pprint-annotated/metadata.xml
index 937381521944..85a1cbd157fb 100644
--- a/dev-haskell/wl-pprint-annotated/metadata.xml
+++ b/dev-haskell/wl-pprint-annotated/metadata.xml
@@ -5,4 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">wl-pprint-annotated</remote-id>
+ <remote-id type="github">minad/wl-pprint-annotated</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5e40ec179b12
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pretty printer with annotation support"
+HOMEPAGE="https://github.com/minad/wl-pprint-annotated#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2.1
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
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
deleted file mode 100644
index bdf98a62075a..000000000000
--- a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Wadler/Leijen pretty printer with annotations and slightly modernized API"
-HOMEPAGE="https://github.com/minad/wl-pprint-annotated#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/wl-pprint-text/Manifest b/dev-haskell/wl-pprint-text/Manifest
deleted file mode 100644
index dc64a1439077..000000000000
--- a/dev-haskell/wl-pprint-text/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wl-pprint-text-1.2.0.1.tar.gz 16766 BLAKE2B af6666833956c37e62f36c0d6ea3174c830146855fa3a29265716bfe3c356269666c257e0b9e0ecf71752a2bc76d47284a0e4b2a0f8443e19de073f335a06804 SHA512 944ad7ead8eb062a3fdf71a90872a14d7c4e021d5237cd6aac19f1e882dc62e14cfdca114a8011b7b76faed10cf5fd76b120336adb4c10f6506fa06672e922f0
diff --git a/dev-haskell/wl-pprint-text/metadata.xml b/dev-haskell/wl-pprint-text/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/wl-pprint-text/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
deleted file mode 100644
index 963ea60ea5dc..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
- >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint/Manifest b/dev-haskell/wl-pprint/Manifest
deleted file mode 100644
index a7b57851c838..000000000000
--- a/dev-haskell/wl-pprint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wl-pprint-1.2.1.tar.gz 9959 BLAKE2B 03192e4e28f6a30661f156006f2cfad91f857b0c99d19fc5c00083de278a9b7a77e5bd60bf677f555b570965c9ea476b6d0cbcfb7daf67e55f8574aa6562d35a SHA512 84a3646b9039455b24c3dd4a4bbb2fc69ffa1fa3ead4d0574dc90da1a28064590a28c147135a0568700550c42e4ff83b04b0280564f0ed19acbfcb9d0400c2a3
diff --git a/dev-haskell/wl-pprint/metadata.xml b/dev-haskell/wl-pprint/metadata.xml
deleted file mode 100644
index bcfd38c3e566..000000000000
--- a/dev-haskell/wl-pprint/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This is a pretty printing library based on Wadler's paper "A Prettier
- Printer". See the haddocks for full info. This version allows the
- library user to declare overlapping instances of the 'Pretty' class.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
deleted file mode 100644
index 00076cdf5e6f..000000000000
--- a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/word8/word8-0.1.3.ebuild b/dev-haskell/word8/word8-0.1.3.ebuild
index 01a305a55559..3bc1f3e8d5cb 100644
--- a/dev-haskell/word8/word8-0.1.3.ebuild
+++ b/dev-haskell/word8/word8-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/wreq/Manifest b/dev-haskell/wreq/Manifest
deleted file mode 100644
index 8a75bfc17d78..000000000000
--- a/dev-haskell/wreq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wreq-0.5.3.2.tar.gz 57521 BLAKE2B 2265e7f8abe371371d079f735d61917c0efa5b78e2d3e8965e3b720a94e89b3a7ae05824f54d6fe765c643ed81f506b12694355b0bf1d7b4c2e9198d08c2317c SHA512 5a2c62b973758cb8ce2bf20504e328090896fa25e7ee1f77b472d7cf5156e08b6d85bf4341ff45e44db1724070fcf3c0f21037fa0a79211a1767024328f7c779
diff --git a/dev-haskell/wreq/metadata.xml b/dev-haskell/wreq/metadata.xml
deleted file mode 100644
index 4bbbdcaa2edb..000000000000
--- a/dev-haskell/wreq/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
-
- A web client library that is designed for ease of use.
-
- Tutorial: &lt;http://www.serpentine.com/wreq/tutorial.html&gt;
-
- Features include:
-
- * Simple but powerful `lens`-based API
-
- * A solid test suite, and built on reliable libraries like
- http-client and lens
-
- * Session handling includes connection keep-alive and pooling, and
- cookie persistence
-
- * Automatic response body decompression
-
- * Powerful multipart form and file upload handling
-
- * Support for JSON requests and responses, including navigation of
- schema-less responses
-
- * Basic and OAuth2 bearer authentication
-
- * Early TLS support via the tls package
- </longdescription>
- <use>
- <flag name="aws">Enable AWS tests</flag>
- <flag name="httpbin">Install client</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/wreq/wreq-0.5.3.2.ebuild b/dev-haskell/wreq/wreq-0.5.3.2.ebuild
deleted file mode 100644
index 62ccd4251442..000000000000
--- a/dev-haskell/wreq/wreq-0.5.3.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-#hackport: flags: -developer,+doctest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An easy-to-use HTTP client library"
-HOMEPAGE="http://www.serpentine.com/wreq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="aws httpbin"
-
-RESTRICT=test # needs network
-
-RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
- >=dev-haskell/attoparsec-0.11.1.0:=[profile?]
- >=dev-haskell/authenticate-oauth-1.5:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- >=dev-haskell/exceptions-0.5:=[profile?]
- dev-haskell/hashable:=[profile?]
- >=dev-haskell/http-client-0.6:=[profile?]
- >=dev-haskell/http-client-tls-0.3.3:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?]
- >=dev-haskell/lens-4.5:=[profile?]
- dev-haskell/lens-aeson:=[profile?]
- dev-haskell/memory:=[profile?]
- dev-haskell/mime-types:=[profile?]
- >=dev-haskell/psqueues-0.2:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/time-locale-compat:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-7.10.1:=
- httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/snap-core-1.0.0.0:=[profile?]
- >=dev-haskell/snap-server-0.9.4.4:=[profile?]
- dev-haskell/unix-compat:=[profile?]
- dev-haskell/uuid:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1
- test? ( dev-haskell/doctest
- dev-haskell/hunit
- dev-haskell/network-info
- >=dev-haskell/quickcheck-2.7
- dev-haskell/temporary
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- dev-haskell/vector
- !httpbin? ( >=dev-haskell/aeson-pretty-0.8.0
- dev-haskell/base64-bytestring
- >=dev-haskell/snap-core-1.0.0.0
- >=dev-haskell/snap-server-0.9.4.4
- dev-haskell/unix-compat
- dev-haskell/uuid ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag aws aws) \
- --flag=-developer \
- --flag=doctest \
- $(cabal_flag httpbin httpbin)
-}
diff --git a/dev-haskell/wx/Manifest b/dev-haskell/wx/Manifest
deleted file mode 100644
index f615726132a3..000000000000
--- a/dev-haskell/wx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wx-0.92.3.0.tar.gz 50940 BLAKE2B fd74eb5119c0e6324f2c8af2d6b9d69a21f06d4d45b31e426606f7350c0f5cea98fb7f5e89fa94017340bb8aa4806a9982f70e505b146bd5cee95114836c3e20 SHA512 904eedeb4c518e9b07076124aa46588c0ac78fc68a34491a535540242fade37239f0a2f692efeeb6d396d6d724e0fe2fd257580ad7d78f2d3f4c204d4dd01293
diff --git a/dev-haskell/wx/metadata.xml b/dev-haskell/wx/metadata.xml
deleted file mode 100644
index 5bbdc3476dbf..000000000000
--- a/dev-haskell/wx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- wxHaskell is a portable and native GUI library for Haskell. It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X. This version works with wxWidgets 2.8 only.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wx/wx-0.92.3.0-r1.ebuild b/dev-haskell/wx/wx-0.92.3.0-r1.ebuild
deleted file mode 100644
index 248029702ded..000000000000
--- a/dev-haskell/wx/wx-0.92.3.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.9999
-
-WX_GTK_VER="3.0-gtk3"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A portable and native GUI library for Haskell built on top of wxWidgets"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
- >=dev-haskell/wxcore-0.92:${WX_GTK_VER}=[profile?]
- >=dev-lang/ghc-7.6.1:=
- !!dev-haskell/wx:3.0
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
deleted file mode 100644
index b82eb1f350de..000000000000
--- a/dev-haskell/wxc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2 SHA512 60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
deleted file mode 100644
index 86d523b362f1..000000000000
--- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -22,2 +22,3 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
- import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)
-+import qualified Distribution.Simple.Utils as DSU
- import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
-@@ -81,3 +82,9 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level
- -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status)
-+#if MIN_VERSION_Cabal(2,2,0)
-+rawShellSystemStdInOut v f as = do
-+ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
-+ return (so, se, c)
-+#else
- rawShellSystemStdInOut v f as = rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing False
-+#endif
-
-@@ -438,3 +445,7 @@ deMsysPaths bi = do
- let cor ph = do
-+#if MIN_VERSION_Cabal(2,2,0)
-+ (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
-+#else
- (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False
-+#endif
- unless (c == ExitSuccess) (putStrLn ("Error: failed to convert MSYS path to native path \n" ++ e) >> exitFailure)
-@@ -504,3 +515,7 @@ sharedLibName ver basename =
- where
-+#if MIN_VERSION_Cabal(2,2,0)
-+ full_ver = (concat . intersperse "." . map show . versionNumbers) ver
-+#else
- full_ver = (concat . intersperse "." . map show . versionBranch) ver
-+#endif
-
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
deleted file mode 100644
index 096e971de4b7..000000000000
--- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -81,7 +81,12 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level
- -> FilePath -- Path to command
- -> [String] -- Command arguments
- -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status)
--#if MIN_VERSION_Cabal(2,2,0)
-+
-+#if MIN_VERSION_Cabal(3,2,0)
-+rawShellSystemStdInOut v f as = do
-+ (so, se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
-+ return (so, se, c)
-+#elif MIN_VERSION_Cabal(2,2,0)
- rawShellSystemStdInOut v f as = do
- (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
- return (so, se, c)
-@@ -444,7 +449,9 @@ deMsysPaths bi = do
- if b
- then do
- let cor ph = do
--#if MIN_VERSION_Cabal(2,2,0)
-+#if MIN_VERSION_Cabal(3,2,0)
-+ (r, e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
-+#elif MIN_VERSION_Cabal(2,2,0)
- (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
- #else
- (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False
diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
deleted file mode 100644
index 5d474098987d..000000000000
--- a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -19,7 +19,8 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
- , InstallFlags, installVerbosity
- , fromFlag, fromFlagOrDefault, copyDest
- )
--import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)
-+import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut)
-+import System.Exit (die)
- import qualified Distribution.Simple.Utils as DSU
- import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
- import Distribution.Verbosity (Verbosity, normal, verbose)
diff --git a/dev-haskell/wxc/metadata.xml b/dev-haskell/wxc/metadata.xml
deleted file mode 100644
index d1c7487009d9..000000000000
--- a/dev-haskell/wxc/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- wxHaskell is a portable and native GUI library for Haskell. It is
- built on top of wxWidgets, a comprehensive C++ library that is
- portable across all major GUI platforms, including GTK, Windows,
- X11, and MacOS X. This version works with wxWidgets 2.9 only.
- Distributed under the WXWINDOWS LIBRARY LICENSE. Please see
- LICENSE file, but note that this is essentially LGPL with an
- exception allowing binary distribution of proprietary software.
- This is the same license as wxWidgets itself uses.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild b/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
deleted file mode 100644
index d9c666dfccae..000000000000
--- a/dev-haskell/wxc/wxc-0.92.3.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.9999
-
-WX_GTK_VER="3.0-gtk3"
-
-CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
-inherit haskell-cabal multilib wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND=">dev-haskell/split-0:=[profile?]
- >=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
- x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
- >=dev-lang/ghc-7.6.1:=
- !!dev-haskell/wxc:3.0
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.23
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.2.patch
-)
-
-src_prepare() {
- default
-
- setup-wxwidgets
-
- sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
- -i "${S}/Setup.hs" || die "Could not specify wx-config in Setup.hs"
-}
-
-src_configure() {
- local cgcc=()
- for i in ${CXXFLAGS}
- do
- cgcc+=( --gcc-option="${i}" )
- done
- # Trying to specify the LDFLAGS in --ld-option does not work, as ld does
- # not understand ld options prefixed with -Wl,
- # The linker that is used to link the libwxc.so shared library is hard coded
- # in Setup.hs. So the --with-ld would not change the linker used when
- # linking libwxc.so. --with-ld="gcc" does not help, as then cabal passes
- # ld options like -x to gcc which then returns a non-zero exit status, then
- # cabal ignores all the --ld-option parameters.
- # So I place all the LDFLAGS in --gcc-option parameters. They are ignored
- # when building .o files.
- local cld=()
- for i in ${LDFLAGS}
- do
- cld+=( --gcc-option="${i}" )
- done
- cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
deleted file mode 100644
index c63b6baa75ac..000000000000
--- a/dev-haskell/wxcore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wxcore-0.92.3.0.tar.gz 400300 BLAKE2B ce7ea6e2ec71935001d0b1fd347d5aa57de5d9f7cab9cf9fa87879c8dfd6291e76811899aeaccf8c227d54e6b0499ea5420dabac84014cbbf6373f8dd8a60f0f SHA512 199eb8afa9b568637c8d1fb2ab8b98a73d4ea9f03df088a855a88f17728997ed1044fb7c1c69d732530d7b24ae312e8dfc3f6ffc0396765d583531524d10a442
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
deleted file mode 100644
index 6c7c2c7e9ce5..000000000000
--- a/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
-+++ b/src/haskell/Graphics/UI/WXCore/WxcTypes.hs
-@@ -125 +125 @@ import Data.Ix
--import Foreign.C
-+import Foreign.C hiding (CBool)
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
deleted file mode 100644
index b93da91f7f43..000000000000
--- a/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -7,7 +7,7 @@ import Data.List (foldl', intersperse, intercalate, nub, lookup, isPrefixOf, isI
- import Data.Maybe (fromJust)
- import Distribution.PackageDescription hiding (includeDirs)
- import qualified Distribution.PackageDescription as PD (includeDirs)
--import Distribution.InstalledPackageInfo(installedPackageId, sourcePackageId, includeDirs)
-+import Distribution.InstalledPackageInfo({-installedPackageId,-} sourcePackageId, includeDirs)
- import Distribution.Simple
- import Distribution.Simple.LocalBuildInfo (LocalBuildInfo, localPkgDescr, installedPkgs, withPrograms, buildDir)
- import Distribution.Simple.PackageIndex(SearchResult (..), searchByName, allPackages )
diff --git a/dev-haskell/wxcore/metadata.xml b/dev-haskell/wxcore/metadata.xml
deleted file mode 100644
index 8c89e4ce4678..000000000000
--- a/dev-haskell/wxcore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- wxHaskell is a portable and native GUI library for Haskell. It is
- built on top of wxWidgets, a comprehensive C++ library that is
- portable across all major GUI platforms, including GTK, Windows,
- X11, and MacOS X. This version works with wxWidgets 2.8 only.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild b/dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild
deleted file mode 100644
index 6ec00209026f..000000000000
--- a/dev-haskell/wxcore/wxcore-0.92.3.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.9999
-
-WX_GTK_VER="3.0-gtk3"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal wxwidgets
-
-DESCRIPTION="wxHaskell core"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND="dev-haskell/parsec:=[profile?]
- dev-haskell/stm:=[profile?]
- >=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?,gstreamer?]
- >=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
- >=dev-lang/ghc-7.4.1:=
- x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
- !!dev-haskell/wxcore:3.0
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.23
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.92.2.0-ghc-8.4.patch
- "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
-)
-
-src_prepare() {
- default
-
- sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
- -i "${S}/Setup.hs" \
- || die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
-
- cabal_chdeps\
- 'containers >= 0.2 && < 0.6' 'containers >=0.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=splitbase
-}
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
deleted file mode 100644
index e2f97519f07b..000000000000
--- a/dev-haskell/wxdirect/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wxdirect-0.92.3.0.tar.gz 30586 BLAKE2B cb174838000a39b0067338297adb7c1e0b96bd524297950f5d3ede244ec914d2a1b3c717669b5af53f29b55266473c7042b7c90990b70c6177e85fc11d76bc34 SHA512 02dfd9496f1a36480c82a4cf03e3a0ded0a45ede984b70e923b2289323f9c4561b7c0a2ab2db34ee2021b7b5fe62c25ea4a8b61bcbbe3414f821dacb14190f8b
diff --git a/dev-haskell/wxdirect/metadata.xml b/dev-haskell/wxdirect/metadata.xml
deleted file mode 100644
index 9c2cb789a152..000000000000
--- a/dev-haskell/wxdirect/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- wxHaskell is a portable and native GUI library for Haskell. It is built on
- top of wxWidgets, a comprehensive C++ library that is portable across all
- major GUI platforms, including GTK, Windows, X11, and MacOS X. This version
- works with wxWidgets 2.8 only.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild
deleted file mode 100644
index 0e8ca99f46db..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.9999
-
-WX_GTK_VER="3.0-gtk3"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
- dev-haskell/strict:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- !!dev-haskell/wxdirect:3.0
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'process >= 1.1 && < 1.5' 'process >= 1.1'\
- 'base >= 3 && < 4' 'base >=3'\
- 'containers >= 0.1 && < 0.3' 'containers >=0.1'
-
- sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
- -i "${S}/${PN}.cabal" \
- || die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-
- # embed ${CHOST}-cpp instead of "cpp" to support sys-devel/gcc-config[-native-symlinks]
- # Ideally it should also obey CPP variable
- sed -e 's/"cpp"/"'${CHOST}-cpp'"/g' \
- -i src/ParseC.hs || die
-}
diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index fff53ad6af68..0c742bb66dd8 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1 +1 @@
-DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6 SHA512 8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
+DIST x11-xft-0.3.4.tar.gz 6648 BLAKE2B c83d8cc4c8a01b923342a1dd1dab007f9bfb3d6c9040edc2b48f48f903189e8ceb09ad233492150ec50bf37c2944e2350ac728e2ef61afc9516cad75f3323c24 SHA512 cd7c10bbe21f096814ebbf1015f4492ee60e73032bbb114f8fa5684e46f96239814f6986d44955642509c06b790112a38194661754e23c874dfe9446b0c13eef
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
deleted file mode 100644
index 22e82ae5438a..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/package/X11-xft"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
- >=dev-haskell/x11-1.2.1:=[profile?]
- >=dev-lang/ghc-6.10.4:=
- x11-libs/libXft"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-0
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
new file mode 100644
index 000000000000..80d5a221a7af
--- /dev/null
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -pedantic
+CABAL_PN="X11-xft"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the Xft and some Xrender parts"
+HOMEPAGE="https://hackage.haskell.org/package/X11-xft"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
+ >=dev-haskell/x11-1.2.1:=[xinerama,profile?]
+ >=dev-lang/ghc-8.4.3:=
+ x11-libs/libXft
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="virtual/pkgconfig
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-pedantic
+}
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index a3548cf32d93..3fb40abbdb7f 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1 +1 @@
-DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41
+DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4
diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
deleted file mode 100644
index 69bc33c0d21e..000000000000
--- a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index a52b5e84e878..0a2f75a68429 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -5,10 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A Haskell binding to the X11 graphics library. The binding is a direct
- translation of the C binding; for documentation of these calls, refer
- to \"The Xlib Programming Manual\", available online at
- &lt;http://tronche.com/gui/x/xlib/&gt;.
- </longdescription>
+ <upstream>
+ <remote-id type="github">xmonad/X11</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/x11/x11-1.10.2.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild
new file mode 100644
index 000000000000..289b9c9d7a5c
--- /dev/null
+++ b/dev-haskell/x11/x11-1.10.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -pedantic
+CABAL_PN="X11"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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
+RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXScrnSaver
+ xinerama? ( x11-libs/libXinerama )
+
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-pedantic \
+ --configure-option=$(use_with xinerama)
+}
diff --git a/dev-haskell/x11/x11-1.9.2.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild
deleted file mode 100644
index 9c2823eba68f..000000000000
--- a/dev-haskell/x11/x11-1.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXScrnSaver
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --configure-option=$(use_with xinerama)
-}
diff --git a/dev-haskell/x509-store/Manifest b/dev-haskell/x509-store/Manifest
index cdc76da92328..33e1adca7f37 100644
--- a/dev-haskell/x509-store/Manifest
+++ b/dev-haskell/x509-store/Manifest
@@ -1 +1,2 @@
DIST x509-store-1.6.7.tar.gz 12689 BLAKE2B 13e879b6a46e662de0660c5a2257881e50487d2667180030dca0dcf33a60718c75aa6413daa5b874622eaf9612e6cad7009ecd84d2d517bb5769beb4eafe4ec7 SHA512 7b0b792a988aed50995523c3f6a3bb0da08cb8963ad834afbeef8bc53e4bb3d7d11af757a999f7b5c81ef073bac10a4003fba7486abd9343a48770bfc954167e
+DIST x509-store-1.6.9.tar.gz 12734 BLAKE2B f7b7ca1dcba3f2a08cc4f887da074604ac855f0a381a5e87a9283d864e18e7c9e436def2dff58c55d73eaf9e19e4d15a3e5f4d3980585b1cfbe2a992b1a8d688 SHA512 10d0f4a4cb88852d8fd79676908e712ecc19a1b54cae9245f976eea1382abc03392e7fa593973180e6cfd9eb3c1de7133cf738a7c8b3a86d02278d2777d3af96
diff --git a/dev-haskell/x509-store/metadata.xml b/dev-haskell/x509-store/metadata.xml
index adbae2cc1fad..cfceea26acb5 100644
--- a/dev-haskell/x509-store/metadata.xml
+++ b/dev-haskell/x509-store/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">x509-store</remote-id>
<remote-id type="github">vincenthz/hs-certificate</remote-id>
</upstream>
</pkgmetadata>
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 6bd29f8a9c29..475d7787ec32 100644
--- a/dev-haskell/x509-store/x509-store-1.6.7.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-store/x509-store-1.6.9.ebuild b/dev-haskell/x509-store/x509-store-1.6.9.ebuild
new file mode 100644
index 000000000000..a65b9e8098fb
--- /dev/null
+++ b/dev-haskell/x509-store/x509-store-1.6.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 collection accessing and storing methods"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ dev-haskell/cryptonite:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+ >=dev-haskell/x509-1.7.2:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509-system/Manifest b/dev-haskell/x509-system/Manifest
index eb1c23dd93d1..7e306acd4515 100644
--- a/dev-haskell/x509-system/Manifest
+++ b/dev-haskell/x509-system/Manifest
@@ -1 +1,2 @@
DIST x509-system-1.6.6.tar.gz 3419 BLAKE2B 12de162cfc29ddc0f0e5649e0531609bda73f0b0cb305e03015e037f7cb5cef7e4c9a2fa202396673f81e28084e6c4c52cd588cc1050e7bbd4cbe1116b916722 SHA512 110f8e9566ab1cd9491f1bc9cb11ee950c34308af026e71b9f8e60beac09b0e062e1e3a0177d67b04aab824c54476b800b965bf616fe84ba0181991371c9c220
+DIST x509-system-1.6.7.tar.gz 3438 BLAKE2B 74ba3138c21ea81a03deeb2c3b691238704ad8c275eeefc792ba4a79f0953fcea3466861df7f90f03d5e3435fa7fd4da3c342c5a3fbfa73c946929ad71c755c8 SHA512 8414d8f6d0e704419ccdd6832522480022bb15ac225b6bd9cf5f2d8fffb7f979d414bcb5c465f4d73d9eef40210ef9aa5da51aea9eed2ce245d2b44daf2c415e
diff --git a/dev-haskell/x509-system/metadata.xml b/dev-haskell/x509-system/metadata.xml
index adbae2cc1fad..436de7f6d64b 100644
--- a/dev-haskell/x509-system/metadata.xml
+++ b/dev-haskell/x509-system/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">x509-system</remote-id>
<remote-id type="github">vincenthz/hs-certificate</remote-id>
</upstream>
</pkgmetadata>
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 b91c8b118676..d97c4bacd6aa 100644
--- a/dev-haskell/x509-system/x509-system-1.6.6.ebuild
+++ b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/x509-system/x509-system-1.6.7.ebuild b/dev-haskell/x509-system/x509-system-1.6.7.ebuild
new file mode 100644
index 000000000000..20c0a3d95752
--- /dev/null
+++ b/dev-haskell/x509-system/x509-system-1.6.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+ || ( dev-lang/ghc dev-haskell/process[profile?] )
+ >=dev-haskell/x509-1.6:=[profile?]
+ >=dev-haskell/x509-store-1.6.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/x509-validation/Manifest b/dev-haskell/x509-validation/Manifest
index 460cb6197362..a9740d87824f 100644
--- a/dev-haskell/x509-validation/Manifest
+++ b/dev-haskell/x509-validation/Manifest
@@ -1 +1,2 @@
DIST x509-validation-1.6.11.tar.gz 19752 BLAKE2B bc9a113db4c7cc5bdcf161e39efc0858b3d08f08e8304c4f3eda5ae051d5670e1c681bf6cc9edc7244838a1fbda2f9217ffccc0cb2c00ab6732a0214932a3a74 SHA512 5c156b7018afabedac0c2ee6192c536cf09eacdaf9265490a7f4a7d336077dc198a07f16bf58f3fec04a1350f0a8b3c050380673612cf5695c9e7b5a73a4ebf4
+DIST x509-validation-1.6.12.tar.gz 19733 BLAKE2B 04e4a9e4030612410ffb756800a035b0f7907833bc76bad56cbeb7ee5cc829701af73e47a01c60230069b1f8d66681e70a2acb6c57822785f45ec73f65422c3e SHA512 0f9a18e422063bbd6d4db46380e8557efab8a2f5d64957325577ea9ca9ac9b1310e4bd7cba51e0d0902c094107ded6d33931ddd56c032b2203b5268bd848098e
diff --git a/dev-haskell/x509-validation/metadata.xml b/dev-haskell/x509-validation/metadata.xml
index adbae2cc1fad..bfdf7015dd36 100644
--- a/dev-haskell/x509-validation/metadata.xml
+++ b/dev-haskell/x509-validation/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
+ <remote-id type="hackage">x509-validation</remote-id>
<remote-id type="github">vincenthz/hs-certificate</remote-id>
</upstream>
</pkgmetadata>
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 6ac65f9ab9ac..84d79a128fe6 100644
--- a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
+++ b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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-validation/x509-validation-1.6.12.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.12.ebuild
new file mode 100644
index 000000000000..439d4d8797db
--- /dev/null
+++ b/dev-haskell/x509-validation/x509-validation-1.6.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 Certificate and CRL validation"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ >=dev-haskell/cryptonite-0.24:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?]
+ >=dev-haskell/x509-1.7.5:=[profile?]
+ >=dev-haskell/x509-store-1.6:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509/Manifest b/dev-haskell/x509/Manifest
index 8a2ca3acc5fa..bf28bcfeb484 100644
--- a/dev-haskell/x509/Manifest
+++ b/dev-haskell/x509/Manifest
@@ -1 +1,2 @@
DIST x509-1.7.5.tar.gz 21457 BLAKE2B 4bc51e63826de27050e254d3f51b8f346a175bfe825c4555095fecb03c1f586827a0d64865ea78b9a579aec38f671f8adf56a2d432b16ff6be8f988544bd8cfc SHA512 e1caa84944294ca412b18269eef19f1b511f0e317b25431102b8b757ce266ab4ec48f805d4d251ff46a85f3b20ef368b176d8b93a92456fc9b8885a85695c537
+DIST x509-1.7.7.tar.gz 21707 BLAKE2B 01849ecc3c47e1dde4bd2950e7fc1ee3baa59e8472e3581de26cefd32b65acf6479d230fafa3613bd8a6370673974dbd5b6594fc804be60fabf87ce9d532ac3c SHA512 36f7f703e3bd2e0f2780091901f0558fd49c568c565cabb4a638a7428e212e882aaf8e1ec0de9b1cf97296858293418d7030a4d4fe9eddb5b07656d6ee84eea6
diff --git a/dev-haskell/x509/metadata.xml b/dev-haskell/x509/metadata.xml
index adbae2cc1fad..5c5e731516f8 100644
--- a/dev-haskell/x509/metadata.xml
+++ b/dev-haskell/x509/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Haskell</name>
</maintainer>
<upstream>
- <remote-id type="github">vincenthz/hs-certificate</remote-id>
+ <remote-id type="github">haskell-tls/hs-certificate</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/x509/x509-1.7.5.ebuild b/dev-haskell/x509/x509-1.7.5.ebuild
index de60ccc68a27..ffd9271be036 100644
--- a/dev-haskell/x509/x509-1.7.5.ebuild
+++ b/dev-haskell/x509/x509-1.7.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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.7.ebuild b/dev-haskell/x509/x509-1.7.7.ebuild
new file mode 100644
index 000000000000..5bca509cfeea
--- /dev/null
+++ b/dev-haskell/x509/x509-1.7.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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="X509 reader and writer"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+ >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
+ >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+ >=dev-haskell/cryptonite-0.24:=[profile?]
+ dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/pem-0.1:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
deleted file mode 100644
index a8abb4975f2b..000000000000
--- a/dev-haskell/xhtml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
diff --git a/dev-haskell/xhtml/metadata.xml b/dev-haskell/xhtml/metadata.xml
deleted file mode 100644
index c19d47bf166b..000000000000
--- a/dev-haskell/xhtml/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">haskell/xhtml</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
deleted file mode 100644
index 984aa1b8eac1..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.4.2:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index 63dda6f8ccdc..4a24062d5610 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -1 +1,2 @@
DIST xml-conduit-1.9.1.1.tar.gz 42901 BLAKE2B 2dacf27f6373827b779492130b837d3b5bc7adce599820b310cebedc8b1cf525ef300c5d6e65acafb5579a6f0922a47c749fbd8c49bbb623950d08dff63079c0 SHA512 4d75960eb400a4ac8cb13bb70f59b554659fa2a6165906f73097a2bc564505a1efa78e72b121d9ed0fd8b424ff25cd1d8368e6c1f2b6ffa4b0aa36f584727687
+DIST xml-conduit-1.9.1.3.tar.gz 44653 BLAKE2B 0796cd3b4c5daa7210027b0e17eb0870dbceeaa08d60672a5bd104a1e831c98f8fe5eba3f870f0d83ae508327daabe25fd6b87fcc644bcfdf1452af939d18687 SHA512 e864ce8c8785c11d81743b6cfaab91d863c728e7f3a955d9d5ce603bd36754dad2c7066fd60270ca2a39239cb314536b4bfc02f836d53a251c842741c4909324
diff --git a/dev-haskell/xml-conduit/metadata.xml b/dev-haskell/xml-conduit/metadata.xml
index d838ed84f839..c8b5a6780961 100644
--- a/dev-haskell/xml-conduit/metadata.xml
+++ b/dev-haskell/xml-conduit/metadata.xml
@@ -5,22 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This package provides parsing and rendering functions for XML. It is based on the datatypes found in the xml-types package. This package is broken up into the following modules:
-
- * Text.XML: DOM-based parsing and rendering. This is the most commonly used module.
-
- * Text.XML.Cursor: A wrapper around "Text.XML" which allows bidirectional traversing of the DOM, similar to XPath. (Note: Text.XML.Cursor.Generic is the same concept, but will work with any node representation.)
-
- * Text.XML.Unresolved: A slight modification to "Text.XML" which does not require all entities to be resolved at parsing. The datatypes are slightly more complicated here, and therefore this module is only recommended when you need to deal directly with raw entities.
-
- * Text.XML.Stream.Parse: Streaming parser, including some streaming parser combinators.
-
- * Text.XML.Stream.Render: Streaming renderer.
-
- Additionally, the xml-hamlet package &lt;http://hackage.haskell.org/package/xml-hamlet&gt; provides a more convenient syntax for creating XML documents. For a more thorough tutorial on this library, please see &lt;http://www.yesodweb.com/book/xml-enumerator&gt;.
- </longdescription>
<upstream>
+ <remote-id type="hackage">xml-conduit</remote-id>
<remote-id type="github">snoyberg/xml</remote-id>
</upstream>
</pkgmetadata>
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 b644b8d8cf08..d1f0621b99b4 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.7.9999
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?]
@@ -35,3 +35,5 @@ DEPEND="${RDEPEND}
>=dev-haskell/hspec-1.3
dev-haskell/hunit )
"
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild
new file mode 100644
index 000000000000..78a0351adb9c
--- /dev/null
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES+=" rebuild-after-doc-workaround"
+inherit haskell-cabal
+
+DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
+HOMEPAGE="https://github.com/snoyberg/xml"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.5:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ >=dev-haskell/text-0.7:=[profile?]
+ >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-4
+ >=dev-haskell/cabal-doctest-1.0.9 <dev-haskell/cabal-doctest-1.1
+ test? ( >=dev-haskell/doctest-0.8
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hunit )
+"
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
index f62e8331dfeb..b793a482818f 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1 +1,2 @@
DIST xml-hamlet-0.5.0.1.tar.gz 9270 BLAKE2B 49b713f45d16451d40d7afa46d045eafc208a56b3299f778950c89daa68c2678a2fb01c9e18d9645e00f3e2173bd1bc62bdd03a9b91b15d2f2d627977cb501fa SHA512 273dbb637c6e37fcc3b180448ccee0dce8996319d653cc3833fef302a297e8fdc805958b4ebc6e015cbfb2ae8b60a8325108b9d6dcaab052b460ff27a404de39
+DIST xml-hamlet-0.5.0.2.tar.gz 9328 BLAKE2B 5a5e4c1a1bd59dbb13d2fa605777cf4b8d9e47b7cbeaa14e65a2e0c59994f083db45320d709556d006e43940d30373d1905bd5166656f0899acda112a6629828 SHA512 3a186ec01dbf5f84b294d5dcf01f595826bbf26d6eb84f41bfa8341a4756a6aeb48f7fd7d1bd4398b74c421ed18a0f5908a49864cca7348d54b50b92cbe93007
diff --git a/dev-haskell/xml-hamlet/metadata.xml b/dev-haskell/xml-hamlet/metadata.xml
index 937381521944..3ddd5748f682 100644
--- a/dev-haskell/xml-hamlet/metadata.xml
+++ b/dev-haskell/xml-hamlet/metadata.xml
@@ -5,4 +5,7 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">xml-hamlet</remote-id>
+ </upstream>
</pkgmetadata>
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 fc840ae50acd..61623426f704 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.1.9999
@@ -14,14 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
>=dev-haskell/text-0.10:=[profile?]
>=dev-haskell/xml-conduit-1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild
new file mode 100644
index 000000000000..b6342e412fba
--- /dev/null
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hamlet-style quasiquoter for XML content"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
+ >=dev-haskell/text-0.10:=[profile?]
+ >=dev-haskell/xml-conduit-1.0:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hunit
+ )
+"
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 c8f623ac9335..1ee1851422d7 100644
--- a/dev-haskell/xml-types/xml-types-0.3.8.ebuild
+++ b/dev-haskell/xml-types/xml-types-0.3.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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 f94585564f07..cfa38045b2c4 100644
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ b/dev-haskell/xml/xml-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.4.4.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
deleted file mode 100644
index 9e5f177331f5..000000000000
--- a/dev-haskell/xmlgen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmlgen-0.6.2.2.tar.gz 9640 BLAKE2B eb83a9548e436905e6332cac8dc658611ab6a319aabb2aae35ce60876e556c5f275799214804f5b031b5520b2b000142563645d5e3fc424f5dd775850c00115d SHA512 af86121d9417309fd27dc10c99878d5bd95c98d15ec4fc6cf29877fdd214046c0a60fc43eb7eb7fe99017553e31d615168ccbc41dc8cb915826f867e1e225b9c
diff --git a/dev-haskell/xmlgen/metadata.xml b/dev-haskell/xmlgen/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/xmlgen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
deleted file mode 100644
index 1fda86e941e9..000000000000
--- a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs a port to quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="Fast XML generation library"
-HOMEPAGE="https://hackage.haskell.org/package/xmlgen"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # Cases: 8 Tried: 0 Errors: 0 Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
- >=dev-haskell/mtl-2.0:=[profile?]
- >=dev-haskell/text-0.10:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
index da3250d11aa4..ca500737c927 100644
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@@ -1 +1,2 @@
DIST xss-sanitize-0.3.6.tar.gz 11655 BLAKE2B b1d438a6bfa587aa9eb62031fb2c1c53cc48bbadc26b6f64ce717d20d5ab9e282ed657ce5109e0501de393a8609ba99fb9e73966220dc358b222f69301ab5661 SHA512 8d038d807b7fa01a65f4b73d135c87ab75385f4c91ce174b332cd5fd1dc1ebdec26b0c5713cf3f68c27351e19e099815d1b530af3ecb7e4c45e71fec4ae12b4c
+DIST xss-sanitize-0.3.7.2.tar.gz 12002 BLAKE2B 960c3bcbdb44eee95c02e9f52b416fa283712acd1d400f1add5d9649d445e1283cc8ab73ffd797b1a331db7bbc562dbc0443db7e930fd43ad2799899db464f67 SHA512 affd74f2df2e31eb12348fd51890028cce76c3c5f905e5d10979a98dd3a325f522758b3bd7cdcdc5ab08c212468eac3326c40f62ac71e92cf4029c9c94d6dd2a
diff --git a/dev-haskell/xss-sanitize/metadata.xml b/dev-haskell/xss-sanitize/metadata.xml
index 7adbbfcd9222..cd6528164118 100644
--- a/dev-haskell/xss-sanitize/metadata.xml
+++ b/dev-haskell/xss-sanitize/metadata.xml
@@ -5,10 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent XSS attacks. see README.md &lt;https://github.com/yesodweb/haskell-xss-sanitize&gt; for more details
- </longdescription>
<upstream>
+ <remote-id type="hackage">xss-sanitize</remote-id>
<remote-id type="github">yesodweb/haskell-xss-sanitize</remote-id>
</upstream>
</pkgmetadata>
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 abdeaf6c8c5a..8d6d1c4e7596 100644
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/xss-sanitize/xss-sanitize-0.3.7.2.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild
new file mode 100644
index 000000000000..b099d090cb66
--- /dev/null
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
+HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize#readme"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+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?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+ >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2.1:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-1.3
+ >=dev-haskell/hunit-1.2
+ )
+"
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 5fa0fd4d46b2..ab07d5605989 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1 +1,2 @@
-DIST yaml-0.11.5.0.tar.gz 30049 BLAKE2B 96e7d8b39ac392ac927a61991a2c645dd564e36a7676984193e447ad591bddedb9029136aa6f71c65a0665a05516f907a0151b85d7e7f22169d7d5ddc98e6c5d SHA512 a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b
+DIST yaml-0.11.11.2.tar.gz 31926 BLAKE2B 3c8fb1973a8d8e03fa626122862c124fd6cf8b0f5ffbcc2c6d9566fcca84fb1428857c916b5f072de13dc9198fbfec8bf2c8b3b69836eb351c24fe42cb496420 SHA512 419b5fb86d96d2e7adda5b0091d9d32eb2a5c964d32ca9d72e83feb14aef738e5029f43d1760a91ae83c47aebd8d2211e255dfdf28e95c64be3fbb2380cfaf60
+DIST yaml-0.11.8.0.tar.gz 31674 BLAKE2B a4c508eecb4e5b931e6832ceee0bd694fc6879cc6c3482a48e44c1b865207e3525c52cd51a9e2ec74a9ef98e1537f8d559151da80c0ef07351ace1665e5b5f09 SHA512 f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 2eae49bd2eae..71b8b45b1435 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -5,18 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides support for parsing and emitting Yaml documents.
-
- This package includes the full libyaml C library version 0.1.12 by Kirill
- Simonov (&lt;http://pyyaml.org/wiki/LibYAML&gt;) in the package so you
- don't need to worry about any non-Haskell dependencies.
- </longdescription>
<use>
- <flag name="no-examples">don't build the examples</flag>
- <flag name="no-exe">don't install the yaml2json executable</flag>
+ <flag name="executable">Install the yaml2json and json2yaml executables</flag>
</use>
<upstream>
+ <remote-id type="hackage">yaml</remote-id>
<remote-id type="github">snoyberg/yaml</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-haskell/yaml/yaml-0.11.11.2.ebuild b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
new file mode 100644
index 000000000000..9eb42d269c67
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples executable"
+
+CABAL_CHDEPS=(
+ 'executable examples' 'executable haskell-yaml-examples'
+)
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+ >=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+ >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+ >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+ executable? ( dev-haskell/optparse-applicative:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/base-compat
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hunit
+ dev-haskell/mockery
+ dev-haskell/temporary
+ !examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+src_configure() {
+ local examples_flag="no-examples"
+ use examples && examples_flag="-no-examples"
+
+ local exe_flag="no-exe"
+ use executable && exe_flag="-no-exe"
+
+ haskell-cabal_src_configure \
+ --flag="${examples_flag}" \
+ --flag="${exe_flag}"
+}
+
+pkg_postinst() {
+ if use examples; then
+ elog "The executable installed with this package (normally named 'examples')"
+ elog "has been renamed to 'haskell-yaml-examples' to help prevent name collisions."
+ fi
+
+ haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/yaml/yaml-0.11.5.0.ebuild b/dev-haskell/yaml/yaml-0.11.5.0.ebuild
deleted file mode 100644
index 675db69e8dac..000000000000
--- a/dev-haskell/yaml/yaml-0.11.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples +no-exe"
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
- >=dev-haskell/attoparsec-0.11.3.0:=[profile?]
- >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
- >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.2:=
- !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
- test? ( dev-haskell/base-compat
- >=dev-haskell/hspec-1.3
- dev-haskell/hunit
- dev-haskell/mockery
- dev-haskell/temporary
- no-examples? ( dev-haskell/raw-strings-qq ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag no-examples no-examples) \
- $(cabal_flag no-exe no-exe)
-}
diff --git a/dev-haskell/yaml/yaml-0.11.8.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
new file mode 100644
index 000000000000..a3f0fb87e619
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 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="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples executable"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+ >=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+ >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+ >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+ >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+ executable? ( dev-haskell/optparse-applicative:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/base-compat
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hunit
+ dev-haskell/mockery
+ dev-haskell/temporary
+ !examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+CABAL_CHBINS=(
+ 'examples' 'haskell-yaml-examples'
+)
+
+src_configure() {
+ local examples_flag="no-examples"
+ use examples && examples_flag="-no-examples"
+
+ local exe_flag="no-exe"
+ use executable && exe_flag="-no-exe"
+
+ haskell-cabal_src_configure \
+ --flag="${examples_flag}" \
+ --flag="${exe_flag}"
+}
diff --git a/dev-haskell/yesod-auth-hashdb/Manifest b/dev-haskell/yesod-auth-hashdb/Manifest
deleted file mode 100644
index 4059abe74f89..000000000000
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yesod-auth-hashdb-1.7.1.2.tar.gz 15751 BLAKE2B cff24e8957a68539c168466f77433fee064aa76b8426e9c1023ff704c990d0b774341c113bae066b30bbcb01e1c1199f8c6dcd9431e574838c67863a63f791a5 SHA512 417c5113530b6960f30e5209f0188c5367361acfbea2eb60a6d30a9facb5a3be6d8547dfa504da4f7a7585d8c848adbaafa0a28ffea6930f9954071e6e2647e2
diff --git a/dev-haskell/yesod-auth-hashdb/metadata.xml b/dev-haskell/yesod-auth-hashdb/metadata.xml
deleted file mode 100644
index f114d7d6fbc4..000000000000
--- a/dev-haskell/yesod-auth-hashdb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <longdescription>
- This package is the Yesod.Auth.HashDB plugin, originally included in yesod-auth, but now modified to be more secure and placed in a separate package.
- </longdescription>
- <upstream>
- <remote-id type="github">paul-rouse/yesod-auth-hashdb</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
deleted file mode 100644
index 0903427866fc..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- >=dev-haskell/yesod-auth-1.4.18:=[profile?] <dev-haskell/yesod-auth-1.7:=[profile?]
- >=dev-haskell/yesod-core-1.4.19:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
- >=dev-haskell/yesod-persistent-1.2:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/basic-prelude
- >=dev-haskell/hspec-2.0.0
- dev-haskell/http-conduit
- dev-haskell/http-types
- dev-haskell/monad-logger
- dev-haskell/network-uri
- dev-haskell/persistent-sqlite
- dev-haskell/resourcet
- dev-haskell/unordered-containers
- dev-haskell/wai-extra
- dev-haskell/yesod
- >=dev-haskell/yesod-test-1.5.0.1
- >=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 )
-"
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
deleted file mode 100644
index c081573d6acf..000000000000
--- a/dev-haskell/yesod-auth/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST yesod-auth-1.6.10.3.tar.gz 53373 BLAKE2B 7bde89851609099b6a8760d218706f37dd22c48ac750fc0f1bfbdd1db5c253ce5c7868eee94459320033712a27decfa59e4c158024daaf622c3d21e72e209ca3 SHA512 82b490db8424d6e340c4c19b9760e07c78a7906540dada160afd8f3de43f6767f04968753b0c218f0c53c8ddf4ff0ed33f458a770100edd8ab6c7582016662a2
-DIST yesod-auth-1.6.9.tar.gz 52717 BLAKE2B 0b84d830effe84ecf5f4a5bdbaed31eb746b7af32ba39c753e0c40cf9d4a1bb4efb4fc7b4a25620acd69853ae878ff0c0937a1cd9c68c2ce06dba4d0b90ff67f SHA512 071f5c3b01f70d4cf7f9516d97bdf352a6fc20f9191c6a46bccacf84f7e245e8076ff1881fa6e64c3929d300a0361b5ed1bf67c670544e2c2eca07b8aa3e24c0
diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
deleted file mode 100644
index 8071ed182364..000000000000
--- a/dev-haskell/yesod-auth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <use>
- <flag name="network-uri">Get Network.URI from the network-uri package</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.6.10.3.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.6.10.3.ebuild
deleted file mode 100644
index cb40fc4a8dcf..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.6.10.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: +network-uri
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/authenticate-1.3.4:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/email-validate-1.0:=[profile?]
- dev-haskell/file-embed:=[profile?]
- >=dev-haskell/http-client-0.5:=[profile?]
- dev-haskell/http-client-tls:=[profile?]
- >=dev-haskell/http-conduit-2.1:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?]
- >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
- >=dev-haskell/persistent-2.8:=[profile?]
- >=dev-haskell/random-1.0.0.2:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/shakespeare:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-haskell/wai-1.4:=[profile?]
- >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?]
- >=dev-haskell/yesod-persistent-1.6:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=network-uri
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
deleted file mode 100644
index 82f6215423ad..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/authenticate-1.3.4:=[profile?]
- dev-haskell/base16-bytestring:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- dev-haskell/cryptonite:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/email-validate-1.0:=[profile?]
- dev-haskell/file-embed:=[profile?]
- >=dev-haskell/http-client-0.5:=[profile?]
- dev-haskell/http-client-tls:=[profile?]
- >=dev-haskell/http-conduit-2.1:=[profile?]
- dev-haskell/http-types:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
- >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
- >=dev-haskell/random-1.0.0.2:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/shakespeare:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- dev-haskell/unliftio:=[profile?]
- dev-haskell/unliftio-core:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-haskell/wai-1.4:=[profile?]
- >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
- >=dev-haskell/yesod-persistent-1.6:=[profile?]
- >=dev-lang/ghc-8.2.1:=
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 5702a1c1f6ff..76f6b17bb8c3 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1 +1,2 @@
-DIST yesod-core-1.6.18.8.tar.gz 100016 BLAKE2B 117535cc875be850011b357ebf3bb89e6d854870cefe26e20001e70b93247d85a3bd190e2f889626819f8bc80211b2c64b5d8dac7e9606229ed07c03d8926c2e SHA512 1774281bf8de190995360bcf461adc46b65bac5fa2200aada0b511f73b3bc7bab8365fa4737b4de4723481f7b76c0cb440d68b118c15c46e3d455ea9126bffa7
+DIST yesod-core-1.6.23.1.tar.gz 103119 BLAKE2B a15ee64ddc5da8f531690b8d6b661af618754a44e3e3511f15af69d82a53ce6d7886a4b55243d611727c2618446a145469db27b9ba122a32bd538d8cf6abdf80 SHA512 edbdf46c2a04a7286d46030212dcbb2c7f0e0e8b62e87682ae8ed4468796d15544990fb43d56a801fcfbf4dde740bc09cfa192ec21c3d5aeb72b92a5ed0cb173
+DIST yesod-core-1.6.24.2.tar.gz 104045 BLAKE2B fa18b345d97bf791275efca6a3e92f5c82fd1651391211669a2919d9a1b1ef896db5ca3fee80ae7d65a0f540a08e7eeca90ec25b524095fce5b480a02daf6bc7 SHA512 d75431871d3b38b78ca220a602ac44894c1142345588707591bacb9590ca98d4706285377d91e78e61e84050b55b2c96c0a308c4d84d2779d5fccb318f451ef3
diff --git a/dev-haskell/yesod-core/metadata.xml b/dev-haskell/yesod-core/metadata.xml
index 3f36fda0e30c..9e6066177c58 100644
--- a/dev-haskell/yesod-core/metadata.xml
+++ b/dev-haskell/yesod-core/metadata.xml
@@ -5,9 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
-
- The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, tutorials and information on some of the supporting packages, like Hamlet and Persistent.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">yesod-core</remote-id>
+ <remote-id type="github">yesodweb/yesod</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
deleted file mode 100644
index 8398bc10dcff..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
- dev-haskell/auto-update:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- >=dev-haskell/blaze-markup-0.7.1:=[profile?]
- >=dev-haskell/case-insensitive-0.2:=[profile?]
- >=dev-haskell/cereal-0.3:=[profile?]
- >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/conduit-extra:=[profile?]
- >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
- >=dev-haskell/fast-logger-2.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
- >=dev-haskell/primitive-0.6:=[profile?]
- >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
- >=dev-haskell/resourcet-1.2:=[profile?]
- >=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-haskell/text-0.7:=[profile?]
- dev-haskell/unix-compat:=[profile?]
- dev-haskell/unliftio:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/wai-3.2:=[profile?]
- >=dev-haskell/wai-extra-3.0.7:=[profile?]
- >=dev-haskell/wai-logger-0.2:=[profile?]
- >=dev-haskell/warp-3.0.2:=[profile?]
- dev-haskell/word8:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/async
- >=dev-haskell/hspec-1.3
- dev-haskell/hspec-expectations
- dev-haskell/hunit
- dev-haskell/network
- dev-haskell/streaming-commons )
-"
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
new file mode 100644
index 000000000000..18130695bf22
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ dev-haskell/auto-update:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.7.1:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ >=dev-haskell/cereal-0.3:=[profile?]
+ >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?]
+ dev-haskell/conduit-extra:=[profile?]
+ >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+ dev-haskell/entropy:=[profile?]
+ >=dev-haskell/fast-logger-2.2:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+ >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+ >=dev-haskell/primitive-0.6:=[profile?]
+ >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?]
+ >=dev-haskell/shakespeare-2.0:=[profile?]
+ dev-haskell/unix-compat:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?]
+ >=dev-haskell/wai-extra-3.0.7:=[profile?]
+ >=dev-haskell/wai-logger-0.2:=[profile?]
+ >=dev-haskell/warp-3.0.2:=[profile?]
+ dev-haskell/word8:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/async
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hspec-expectations
+ dev-haskell/hunit
+ dev-haskell/network
+ dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild
new file mode 100644
index 000000000000..4b9c5e3ecdc0
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ dev-haskell/auto-update:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.7.1:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ >=dev-haskell/cereal-0.3:=[profile?]
+ >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?]
+ dev-haskell/conduit-extra:=[profile?]
+ >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+ dev-haskell/entropy:=[profile?]
+ >=dev-haskell/fast-logger-2.2:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+ >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+ >=dev-haskell/primitive-0.6:=[profile?]
+ >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/resourcet-1.2:=[profile?]
+ >=dev-haskell/shakespeare-2.0:=[profile?]
+ >=dev-haskell/text-0.7:=[profile?]
+ dev-haskell/unix-compat:=[profile?]
+ dev-haskell/unliftio:=[profile?]
+ >=dev-haskell/unordered-containers-0.2:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+ >=dev-haskell/wai-3.2:=[profile?]
+ >=dev-haskell/wai-extra-3.0.7:=[profile?]
+ >=dev-haskell/wai-logger-0.2:=[profile?]
+ >=dev-haskell/warp-3.0.2:=[profile?]
+ dev-haskell/word8:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/async
+ >=dev-haskell/hspec-1.3
+ dev-haskell/hspec-expectations
+ dev-haskell/hunit
+ dev-haskell/network
+ dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-default/Manifest b/dev-haskell/yesod-default/Manifest
deleted file mode 100644
index e6264653bb38..000000000000
--- a/dev-haskell/yesod-default/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yesod-default-1.2.0.tar.gz 1397 BLAKE2B 9ec72760a47bc5ad36da19ae2e1f42bbf758d0ddb45c5c1e9450600296c26d402ca91719cadbac5ac0a82ec912f8d54b695964dd86e19b9151c380350a3290ab SHA512 35952255a12d7f661bca1312c31a2516fcce64046018e58f10811dd2c7439c2f4faaac622946e6ec64153972fd33d0c00f575f3cba196d99658c4d46c0d1e18d
diff --git a/dev-haskell/yesod-default/metadata.xml b/dev-haskell/yesod-default/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/yesod-default/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
deleted file mode 100644
index 73953d021950..000000000000
--- a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default config and main functions for your yesod application (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
index 7d436b76b924..813539bb2d01 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1 +1,2 @@
-DIST yesod-form-1.6.7.tar.gz 33673 BLAKE2B 0675fc4bdb5e5ae9b7a7556378c14d4c8a8ff85ae055f3f8989667a6de209e8f1a318bd69148e81ba6cf121c5f0ac18fb20bcccfa6bd85d31ce164a30ba6282d SHA512 a23c2cb67ed0a87afde9e9e903aa789f8fd9c071893a1bebd0ff9dc3dec6e8e03dd08a4a7ef6ef2d438fbf62597ea0181a038bd7bb5631199c9be83d2a8aef0c
+DIST yesod-form-1.7.0.tar.gz 34435 BLAKE2B 86b299931316eaece475ee741357acf8e61797bd00cdbdaf9298a1ac6967b735915f0169eb12559ef7296466f61fd20a6624c62c08a5ef148566925659da1e05 SHA512 dc5373c62e78d79e570171c608fa2e9cfb2092a859b81a881ab69a406c357cc9eeff0ff04d0c08f8cc29cf66ef488ce6b96195d26b9c6dff879a1fea96eff013
+DIST yesod-form-1.7.4.tar.gz 35498 BLAKE2B 71812b32c44b21cd36045b821a6602551b09ec57be4c9e378c303b5e68fe7165950b623c013ee6ea3d35c0c33b8fd285fb138d480678245be1404921c753cb09 SHA512 8233cc85d7fd6f6e2d815fd38d3d0d2ebd1c7c11249ee3708dace0934e961319cf4d7063e8982b9f7bd329c3d110bade8013dfe987d6cbdecfc6c15e87abb982
diff --git a/dev-haskell/yesod-form/metadata.xml b/dev-haskell/yesod-form/metadata.xml
index 062519021e82..a8a9666053c5 100644
--- a/dev-haskell/yesod-form/metadata.xml
+++ b/dev-haskell/yesod-form/metadata.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-<use>
- <flag name="network-uri">Get Network.URI from the network-uri package</flag>
-</use>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="network-uri">Get Network.URI from the network-uri package</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">yesod-form</remote-id>
+ <remote-id type="github">yesodweb/yesod</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild b/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
deleted file mode 100644
index 112ad117bb73..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?]
- dev-haskell/byteable:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/email-validate-1.0:=[profile?]
- dev-haskell/persistent:=[profile?]
- dev-haskell/resourcet:=[profile?]
- dev-haskell/semigroups:=[profile?]
- >=dev-haskell/shakespeare-2.0:=[profile?]
- >=dev-haskell/text-0.9:=[profile?]
- >=dev-haskell/wai-1.3:=[profile?]
- >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
- >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
new file mode 100644
index 000000000000..8b19fef258e0
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="https://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.5.1:=[profile?]
+ dev-haskell/byteable:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ >=dev-haskell/email-validate-1.0:=[profile?]
+ dev-haskell/persistent:=[profile?]
+ dev-haskell/resourcet:=[profile?]
+ >=dev-haskell/shakespeare-2.0:=[profile?]
+ >=dev-haskell/text-0.9:=[profile?]
+ >=dev-haskell/wai-1.3:=[profile?]
+ >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+ >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+ >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild
new file mode 100644
index 000000000000..f40f5131eed9
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ >=dev-haskell/blaze-markup-0.5.1:=[profile?]
+ dev-haskell/byteable:=[profile?]
+ dev-haskell/data-default:=[profile?]
+ >=dev-haskell/email-validate-1.0:=[profile?]
+ dev-haskell/persistent:=[profile?]
+ dev-haskell/resourcet:=[profile?]
+ >=dev-haskell/shakespeare-2.0:=[profile?]
+ >=dev-haskell/wai-1.3:=[profile?]
+ >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+ >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+ >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+ network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-json/Manifest b/dev-haskell/yesod-json/Manifest
deleted file mode 100644
index b80f067f39d5..000000000000
--- a/dev-haskell/yesod-json/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yesod-json-1.2.0.tar.gz 1373 BLAKE2B d1e7d69aa98685fd6a77274a52302b9aa9b7614a1363f272209620ebd4f267062c4c7d5964c4f48a4d5a87571f02616a0b3bdbd834916f4821d271fa6257bd68 SHA512 9fa3eb964e5a543d4f38293245a8ef7f585c5ead94dd0fbc028fca5c954401eafb11e3d18a60a12baa82d3cedce871271b8320d65996f0b00021804c00da0dbb
diff --git a/dev-haskell/yesod-json/metadata.xml b/dev-haskell/yesod-json/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/yesod-json/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild b/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
deleted file mode 100644
index 18b5c96957cc..000000000000
--- a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate content for Yesod using the aeson package. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
- >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/yesod-persistent/Manifest b/dev-haskell/yesod-persistent/Manifest
index b156f46219e5..a97e826911ec 100644
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@@ -1 +1 @@
-DIST yesod-persistent-1.6.0.4.tar.gz 5319 BLAKE2B ed8afa4ceaad8dabd62e5da4d11d7aef3f2f8c97277de6df99380be8650ca3c0481aba2f62204b8d94f9bc5769e260c1576dd9fe5608626bd6018d1e965389ca SHA512 a52d85b025397ae04641346107124a5570765356bc7209f0391646b93b3c8954219c73d717c98d108d552800eeb2122531f98abd2b0e2109aee59c7d9825f70d
+DIST yesod-persistent-1.6.0.8.tar.gz 5612 BLAKE2B c3eae29c88a3093d0ef0f254888943f284be22c6b1face4ebffe63f8964e1681c23ef054eac7b3ad2cb1a04d382c1388e042e11ebe54474321ce51783b6f0c78 SHA512 2e356cd3f1ffac1ad7390cdaff436c4179190e8f160fe8a8e798678498e67ea34ba087207df750453bc237e827f7c2748c86a2419240079c5a7012cef5381340
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
deleted file mode 100644
index 3dbf87b9cdca..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
- dev-haskell/conduit:=[profile?]
- >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
- >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.9:=[profile?]
- dev-haskell/resource-pool:=[profile?]
- >=dev-haskell/resourcet-0.4.5:=[profile?]
- >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hspec
- >=dev-haskell/persistent-sqlite-2.8
- dev-haskell/text
- dev-haskell/wai-extra )
-"
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
new file mode 100644
index 000000000000..446aea1bf314
--- /dev/null
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Some helpers for using Persistent from Yesod"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+ dev-haskell/conduit:=[profile?]
+ >=dev-haskell/persistent-2.8:=[profile?]
+ >=dev-haskell/persistent-template-2.1:=[profile?]
+ dev-haskell/resource-pool:=[profile?]
+ >=dev-haskell/resourcet-0.4.5:=[profile?]
+ >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec
+ >=dev-haskell/persistent-sqlite-2.8
+ dev-haskell/wai-extra )
+"
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 d02fc54423dc..c1fe349dc778 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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index fcd6d48b93f8..f6bd5a81d064 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1 +1,2 @@
DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
+DIST yesod-test-1.6.14.tar.gz 28627 BLAKE2B c27e2825f07be19be645d1d1085e89e89988b21bdb7f9ef90fcebaae82626dad410a96365435223ac2cd25d156f3cdbe1c35f61b378023aa4175152c68802a3e SHA512 63c3f168f70e8ef1a9ba409a3052bab6c21aed8cb38df3c3ae68d553f74f1ec213db2120d9f985363d167726c161a24bc4a4e4ebd21a5f00b11259e931c0321e
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 60de493bb0df..d2e130181352 100644
--- a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.6.9999
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild
new file mode 100644
index 000000000000..b7c7cb5f1ac7
--- /dev/null
+++ b/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 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="integration testing for WAI/Yesod Applications"
+HOMEPAGE="https://www.yesodweb.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/attoparsec-0.10:=[profile?]
+ dev-haskell/blaze-builder:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/blaze-markup:=[profile?]
+ >=dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/conduit:=[profile?]
+ dev-haskell/cookie:=[profile?]
+ >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+ >=dev-haskell/html-conduit-0.1:=[profile?]
+ >=dev-haskell/http-types-0.7:=[profile?]
+ >=dev-haskell/hunit-1.2:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/network-2.2:=[profile?]
+ >=dev-haskell/pretty-show-1.6:=[profile?]
+ >=dev-haskell/wai-3.0:=[profile?]
+ dev-haskell/wai-extra:=[profile?]
+ >=dev-haskell/xml-conduit-1.0:=[profile?]
+ >=dev-haskell/xml-types-0.3:=[profile?]
+ >=dev-haskell/yesod-core-1.6.17:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( dev-haskell/hspec
+ dev-haskell/unliftio
+ dev-haskell/unliftio-core
+ >=dev-haskell/yesod-form-1.6 )
+"
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index 1046bb622873..9abeb00e8c87 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1 +1,2 @@
-DIST yesod-1.6.1.0.tar.gz 9794 BLAKE2B b0306995ca93646d4ed1eb58356c706b1a4fb773cbcf3dd7649405484af1f077f7f22c9d1792d9fb34aca11dc357dd7d527bbc5e5d6f60d24baa0b3797f60255 SHA512 712eed39b64f515cb949186ddb950133cc2daccde6d4a9b0115809e5f4726a957b2809ee785b348971c617b3d173bcd40776b065f5bf1d68b79af12905ada77a
+DIST yesod-1.6.2.1.tar.gz 9940 BLAKE2B 7234b550bc54dac8e46deac3d66b0ccb89af184520e9a25d218317dc4c735a7b4fde32ad1ce7325e3d222b551262ea57c36fb0af7cb478489afda499310b28f6 SHA512 ef61044b329b0c6e122bc5ca0203735264f6cb85a4fe728819146b390a8b813a56cad7bd2ef928eb3b3f1ed4618b7f41e856c0f97be1030e50510a14820fd866
+DIST yesod-1.6.2.tar.gz 9927 BLAKE2B 551b6a659180536dae72cea4a342f7451eb005cb79bd06cb5af38e41052956c40b93e2368da307ccdcc8bb5e0ea718ae89e7fd858b3273d8823787a333f11da1 SHA512 7c7a3e191ce91ac4070179bdfdae89c60e91c702d9141bb90fcb7095d175727a3f0648221ea151b6e1f5c37a236f55c37aaf963c526e4ced572c19bd6fb0b3a8
diff --git a/dev-haskell/yesod/metadata.xml b/dev-haskell/yesod/metadata.xml
index 7fbdc75a47c4..a9e13b5f8156 100644
--- a/dev-haskell/yesod/metadata.xml
+++ b/dev-haskell/yesod/metadata.xml
@@ -5,11 +5,8 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
-
- Yesod also focuses on developer productivity. Yesod integrates well with tools for all your basic web development (wai, persistent, and shakespeare/hamlet)
-
- The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, including on the supporting packages mentioned above.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">yesod</remote-id>
+ <remote-id type="github">yesodweb/yesod</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/yesod/yesod-1.6.1.0.ebuild b/dev-haskell/yesod/yesod-1.6.1.0.ebuild
deleted file mode 100644
index ed99f1cbd950..000000000000
--- a/dev-haskell/yesod/yesod-1.6.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/conduit-1.3:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- dev-haskell/fast-logger:=[profile?]
- dev-haskell/file-embed:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- dev-haskell/shakespeare:=[profile?]
- dev-haskell/streaming-commons:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
- >=dev-haskell/wai-1.3:=[profile?]
- >=dev-haskell/wai-extra-1.3:=[profile?]
- dev-haskell/wai-logger:=[profile?]
- >=dev-haskell/warp-1.3:=[profile?]
- >=dev-haskell/yaml-0.8.17:=[profile?]
- >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
- >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
- >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
- >=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/yesod/yesod-1.6.2.1.ebuild b/dev-haskell/yesod/yesod-1.6.2.1.ebuild
new file mode 100644
index 000000000000..e0052e1cac93
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.6.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ dev-haskell/fast-logger:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ dev-haskell/monad-logger:=[profile?]
+ dev-haskell/shakespeare:=[profile?]
+ dev-haskell/streaming-commons:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-haskell/wai-1.3:=[profile?]
+ >=dev-haskell/wai-extra-1.3:=[profile?]
+ dev-haskell/wai-logger:=[profile?]
+ >=dev-haskell/warp-1.3:=[profile?]
+ >=dev-haskell/yaml-0.8.17:=[profile?]
+ >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+ >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?]
+ >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/yesod/yesod-1.6.2.ebuild b/dev-haskell/yesod/yesod-1.6.2.ebuild
new file mode 100644
index 000000000000..d3bfeaf4fe5d
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/conduit-1.3:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ dev-haskell/fast-logger:=[profile?]
+ dev-haskell/file-embed:=[profile?]
+ dev-haskell/monad-logger:=[profile?]
+ dev-haskell/shakespeare:=[profile?]
+ dev-haskell/streaming-commons:=[profile?]
+ dev-haskell/unordered-containers:=[profile?]
+ >=dev-haskell/wai-1.3:=[profile?]
+ >=dev-haskell/wai-extra-1.3:=[profile?]
+ dev-haskell/wai-logger:=[profile?]
+ >=dev-haskell/warp-1.3:=[profile?]
+ >=dev-haskell/yaml-0.8.17:=[profile?]
+ >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+ >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?]
+ >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 12632788186e..651235f2acbc 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1 +1,2 @@
DIST zip-archive-0.4.1.tar.gz 20967 BLAKE2B 0e1276aa9dabf70a36041c5acb6d83a571d067bdb40a8be30b35a2943ec28da92225d8f586101bfa87602186025fd5c61347bf8855216ce2a0101e9ff70a81b4 SHA512 216555bd73a46da5061291c2c071e9c71239bd5ae253ac06ee80ade65bb1871366cc8e4dffbad983c5b6a7f4b0cb2a1439dfa5971db3e183124fa90442a73f0c
+DIST zip-archive-0.4.3.tar.gz 22161 BLAKE2B 8d9a31e1eddb204250b168038809f3ab28af0df6071b67d2f4bec732512516b2aafc7a0e6b11fe886126dbeb5c925d4c3fcfaa649eb65fea4183707b32e02307 SHA512 b98791a22d0dc4b499653bbd88254cff86108bd3a13b59a107cc54e36dc0702c2934eb4b497cbc6239235a45b3486006e52d27faa5af589a124443f8938670ad
diff --git a/dev-haskell/zip-archive/metadata.xml b/dev-haskell/zip-archive/metadata.xml
index e40a68476ea6..ac3f59923966 100644
--- a/dev-haskell/zip-archive/metadata.xml
+++ b/dev-haskell/zip-archive/metadata.xml
@@ -5,14 +5,11 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The zip-archive library provides functions for creating, modifying,
- and extracting files from zip archives.
- </longdescription>
<use>
<flag name="executable">Build the Zip executable.</flag>
</use>
<upstream>
+ <remote-id type="hackage">zip-archive</remote-id>
<remote-id type="github">jgm/zip-archive</remote-id>
</upstream>
</pkgmetadata>
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 8774d5580de2..49838c4fe498 100644
--- a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# ebuild generated by hackport 0.6.2
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="executable"
RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
diff --git a/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild
new file mode 100644
index 000000000000..7bca7c23d822
--- /dev/null
+++ b/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for creating and modifying zip archives"
+HOMEPAGE="https://github.com/jgm/zip-archive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ dev-haskell/zlib:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? ( dev-haskell/hunit
+ dev-haskell/temporary )
+"
+# non-haskell depend
+DEPEND="${DEPEND}
+ test? ( app-arch/zip )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/zlib-bindings/Manifest b/dev-haskell/zlib-bindings/Manifest
deleted file mode 100644
index b5e4c19d1046..000000000000
--- a/dev-haskell/zlib-bindings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlib-bindings-0.1.1.5.tar.gz 54770 BLAKE2B df5ed0474ed29c47720b4d94bd8dee49afeec36e9ecafe6639324bbd0ff2c0ef8d52996c54b3ad09aaf3a1b84ee8898bdcddc91705e33847e3e9e1d6cbb4af42 SHA512 1ce7a21f462ce5fb1c6ae0ccd40b6f59eb95772b46fa8f5cb3b94f76d55189b7c020dfd97cb18afe21cd826d1a511d9d02909c4376b165c2f574ec881f7de299
diff --git a/dev-haskell/zlib-bindings/metadata.xml b/dev-haskell/zlib-bindings/metadata.xml
deleted file mode 100644
index 7b7f2b444c25..000000000000
--- a/dev-haskell/zlib-bindings/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">snoyberg/zlib-bindings</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
deleted file mode 100644
index 847e306bd483..000000000000
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level bindings to the zlib package. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/zlib-bindings"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.3
- >=dev-haskell/quickcheck-2.3 )
-"
diff --git a/dev-haskell/zlib-conduit/Manifest b/dev-haskell/zlib-conduit/Manifest
deleted file mode 100644
index 98709767f1f6..000000000000
--- a/dev-haskell/zlib-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlib-conduit-1.1.0.tar.gz 2024 BLAKE2B e7b8bcf5515cb25b2152c29db4a4f04d2050db8c999386428eaa913e296d34f6c07c136d2ff16962462b699fed20b35160ad51f079659d27b87a61bbb31c640a SHA512 5d19fa0e144b8e124486465c00b984f2e16f51e8ef0bc246fafd64b173e7dcef5b12f8cb431bb6071e4dab4a8c8f62606d47feb2cac2e36c1894216a9c8a32d9
diff --git a/dev-haskell/zlib-conduit/metadata.xml b/dev-haskell/zlib-conduit/metadata.xml
deleted file mode 100644
index ed3c0820e087..000000000000
--- a/dev-haskell/zlib-conduit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
- <upstream>
- <remote-id type="github">snoyberg/conduit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
deleted file mode 100644
index d5459ed411f9..000000000000
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming compression/decompression via conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/zlib-enum/Manifest b/dev-haskell/zlib-enum/Manifest
deleted file mode 100644
index 64b848965108..000000000000
--- a/dev-haskell/zlib-enum/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlib-enum-0.2.3.1.tar.gz 4652 BLAKE2B a0148de59f5beac8dac5239228f8d2855249b613af2bebd6fae52f194fc17f4b0d517567267bfb6d5973e67b56e947a18e4f4904f504e33f0803bb66619fad50 SHA512 e68c72ab44922fa2df3b2bc718f65ce313be24742e2edfcbb97cb12f7963e9448aa68ba2e64ef08369b07f641773f4688a787615f76dd183982089ef7fe68a8c
diff --git a/dev-haskell/zlib-enum/metadata.xml b/dev-haskell/zlib-enum/metadata.xml
deleted file mode 100644
index 937381521944..000000000000
--- a/dev-haskell/zlib-enum/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>haskell@gentoo.org</email>
- <name>Gentoo Haskell</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
deleted file mode 100644
index fa38a9d13005..000000000000
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumerator interface for zlib compression"
-HOMEPAGE="https://github.com/maltem/zlib-enum"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
- >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'transformers >= 0.2 && < 0.5' 'transformers >= 0.2' \
- 'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-test
-}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 973018aebad3..739845850ae8 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1 +1,4 @@
-DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
+DIST zlib-0.6.2.3-rev1.cabal 5329 BLAKE2B fd3f11e91ea754c34b79be5a194ee05a2d411a4b5c25612840b4f7d729e000218f2065fa57ff8b09c3c2b0b583c1e25de5f90b569d7858a74775da12a1ac090a SHA512 cd09ebae641001cb69d861f4111e7b5ab6a2d51457e39e35cd36d2d30dafae5c788a27bd987665748569e20b13fa80e0784d1fa3b4110cc643031ea32ac20903
+DIST zlib-0.6.2.3.tar.gz 149186 BLAKE2B 5665c6a076c0efdb6074ca72e3723ddeb4a7d851abf06450ccb8a4ee6179c3e45be63c3c620d02787b088a6c18723ba2d5a77c525d59dc4ab9bbe1770e79517b SHA512 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a
+DIST zlib-0.6.3.0-rev2.cabal 5367 BLAKE2B 4fb30c7af39286710ee5925f6e211c69c90b75f17c99f527e62ca4f9b0271544e22cdb4973f35c45524f81ca4401623effcb85830ada0aa5d11880db6d4742d6 SHA512 9f2851974abc0da417afdb914f4ce3d72c5945d23a39685174f40f2224ba5001a94ae9761cf44b2961a8fa135f28c689bcf913267a2b086e73fa353e9dc22672
+DIST zlib-0.6.3.0.tar.gz 369595 BLAKE2B 3a3ecb4ef2cce3332be22a1137b89c3ff27a600326fbc4c53610a588bcfe79f2c3b6916ad68705b7d397c0cc53aaf958a19eccd39edfb66e07b3cfae701d8890 SHA512 95daae13c5d5458fd7c610ce4cc686dc7af477364c4dcf3d31abede84f6e4b4e70ea255f7ded586d46d9bb6298d19c93b8856eec16c6002265ed076e52bf9a21
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index 7db31073ae41..f4c9b1ea85a4 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -6,19 +6,14 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="bundled-c-zlib">Use the bundled zlib C sources. Requires pkg-config to be False. For windows, this is the default.</flag>
- <flag name="non-blocking-ffi">The (de)compression calls can sometimes take a long time, which prevents other Haskell threads running. Enabling this flag avoids this unfairness, but with greater overall cost.</flag>
+ <flag name="bundled-c-zlib">Use the bundled zlib C sources. Requires pkg-config to be False.
+For windows, this is the default.</flag>
+ <flag name="non-blocking-ffi">The (de)compression calls can sometimes take a long time, which
+prevents other Haskell threads running. Enabling this flag
+avoids this unfairness, but with greater overall cost.</flag>
</use>
- <longdescription>
- This package provides a pure interface for compressing and
- decompressing streams of data represented as lazy
- 'ByteString's. It uses the
- &lt;https://en.wikipedia.org/wiki/Zlib zlib C library&gt;
- so it has high performance. It supports the \"zlib\",
- \"gzip\" and \"raw\" compression formats.
-
- It provides a convenient high level API suitable for most
- tasks and for the few cases where more control is needed it
- provides access to the full zlib feature set.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">zlib</remote-id>
+ <remote-id type="github">haskell/zlib</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/zlib/zlib-0.6.2.2.ebuild b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
deleted file mode 100644
index 9a74ff0657ef..000000000000
--- a/dev-haskell/zlib/zlib-0.6.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
-IUSE="bundled-c-zlib non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- virtual/pkgconfig
- test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
- >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag bundled-c-zlib bundled-c-zlib) \
- $(cabal_flag non-blocking-ffi non-blocking-ffi) \
- --flag=pkg-config
-}
diff --git a/dev-haskell/zlib/zlib-0.6.2.3.ebuild b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
new file mode 100644
index 000000000000..fb6a06ff8e42
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +pkg-config
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compression and decompression in the gzip and zlib formats"
+HOMEPAGE="https://hackage.haskell.org/package/zlib"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="bundled-c-zlib non-blocking-ffi"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ virtual/pkgconfig
+ test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bundled-c-zlib bundled-c-zlib) \
+ $(cabal_flag non-blocking-ffi non-blocking-ffi) \
+ --flag=pkg-config
+}
diff --git a/dev-haskell/zlib/zlib-0.6.3.0.ebuild b/dev-haskell/zlib/zlib-0.6.3.0.ebuild
new file mode 100644
index 000000000000..ecdefa14223d
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +pkg-config
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compression and decompression in the gzip and zlib formats"
+HOMEPAGE="https://hackage.haskell.org/package/zlib"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="bundled-c-zlib non-blocking-ffi"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ virtual/pkgconfig
+ test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+ >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag bundled-c-zlib bundled-c-zlib) \
+ $(cabal_flag non-blocking-ffi non-blocking-ffi) \
+ --flag=pkg-config
+}