diff options
Diffstat (limited to 'dev-haskell')
952 files changed, 7920 insertions, 7467 deletions
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 index f7d8def802a..3830a9eb91d 100644 --- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild +++ b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild index 74ca8d523de..78fe651e108 100644 --- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild +++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 26e5aa08e9c..43a2a5dfcd9 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/adjunctions/adjunctions-4.4.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.ebuild index d8a25e50800..f72a90aac2b 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest index 54c6ad89ebf..e4f872ed34d 100644 --- a/dev-haskell/aeson-diff/Manifest +++ b/dev-haskell/aeson-diff/Manifest @@ -1 +1 @@ -DIST aeson-diff-1.1.0.8.tar.gz 16521 BLAKE2B fb72ea03dc4b35791f151f22c4fab3f9cafecd604c520137c79af5e4c71772399516d0120bd01e2335fbf7747525babedf5603e5e8d3ba244a9907c81c9f1ea8 SHA512 5a5f703dec592c0cfd825eb1899006350649c52bf810ff1aaaf4134ebfbc11f5fbe9e7f158a8c3a21dbef4902b1f9e94148bc116e27418b2b786f6d31c7561fb +DIST aeson-diff-1.1.0.13.tar.gz 17172 BLAKE2B 0135fd65b4bc1efbe11d8c86144e8f0b030f649c6519685d6ba01387cfd64026ea53300c31598104645d82e02ff136da0b7a2cec0f2afb7fa3a8c6bd25af4088 SHA512 78ae5da41f4962871bc3dd0a2cc79abf4964e639eb7cdb5b5cb65f5a4dfabeddd9c3fc9fe4446f2ae1b3dde1fe888091205540a852da451e76743efee07febe2 diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild new file mode 100644 index 00000000000..7fba9e5d45b --- /dev/null +++ b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 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="Extract and apply patches to JSON documents" +HOMEPAGE="https://github.com/ysangkok/aeson-diff" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" + +# 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-2.0.3:=[profile?] + dev-haskell/edit-distance-vector:=[profile?] + dev-haskell/optparse-applicative:=[profile?] + dev-haskell/scientific:=[profile?] + dev-haskell/vector:=[profile?] + dev-haskell/yaml:=[profile?] + >=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-4 + >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 + test? ( >=dev-haskell/doctest-0.18.2 + dev-haskell/glob + dev-haskell/quickcheck ) +" 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 d44881aa49b..00000000000 --- 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-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest index 6463e1c0e00..a279351c9f2 100644 --- a/dev-haskell/aeson-pretty/Manifest +++ b/dev-haskell/aeson-pretty/Manifest @@ -1 +1,2 @@ -DIST aeson-pretty-0.8.8.tar.gz 5600 BLAKE2B cac5605b17405868ea373806021e9ba2b3bd3bcb864e97067d4086289a53c2118922e318fb966172a0c0cf0df900e577698afdcea1291464151fc0a01f359dde SHA512 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779 +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.8.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild deleted file mode 100644 index 9e23eefb7e8..00000000000 --- 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 00000000000..fe8d70eb003 --- /dev/null +++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 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 ~ppc64 ~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/Manifest b/dev-haskell/aeson/Manifest index efb710cb2fb..22093d5f45a 100644 --- a/dev-haskell/aeson/Manifest +++ b/dev-haskell/aeson/Manifest @@ -1 +1,2 @@ -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 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 cbb99b44a85..00000000000 --- 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 00000000000..c07766dcf74 --- /dev/null +++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.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 ~ppc64 ~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:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] + >=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] + >=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.3:=[profile?] + >=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?] + >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] + >=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?] + >=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?] + >=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?] + >=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] + >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] + >=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] + >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?] + >=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?] + >=dev-lang/ghc-8.4.3:= +" +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/metadata.xml b/dev-haskell/aeson/metadata.xml index 8d64f5709b5..ce851fc4067 100644 --- a/dev-haskell/aeson/metadata.xml +++ b/dev-haskell/aeson/metadata.xml @@ -5,70 +5,8 @@ <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: - <https://github.com/mailrank/aeson#readme> - - 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> </pkgmetadata> diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest index 350fc71f355..dcdb4731bb9 100644 --- a/dev-haskell/alex/Manifest +++ b/dev-haskell/alex/Manifest @@ -1 +1 @@ -DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9 +DIST alex-3.2.7.1.tar.gz 108229 BLAKE2B 1c1c3488c6e0f559003de5edc1250afdd09098eb4da3414d8c461d03ee5f08b94f80e6f6d32366f6d8d0563a068ee8b2a1c9cb7b78bbbf0a1dcf3767ea448ffd SHA512 f8ff12de874b905449fdda0d704f9e4ac30fa3e60e965f82d7bb2d6e3974cf926f85134d32878c48faf0ec4a002ea7240cf6696e1cbcad25a0eebb9d1850cc07 diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild index 3592bc74fd4..9e128bbf90b 100644 --- a/dev-haskell/alex/alex-3.2.5.ebuild +++ b/dev-haskell/alex/alex-3.2.7.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 #hackport: flags: +small_base CABAL_FEATURES="test-suite" @@ -15,12 +15,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="doc" -RDEPEND=">=dev-lang/ghc-7.4.1:=" +RDEPEND=">=dev-lang/ghc-8.4.3:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=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 ) @@ -34,6 +35,7 @@ src_prepare() { eautoreconf fi } + src_configure() { # make sure we don't accidentally use those # installed in system 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 98a4b995a5e..cd7ecd2ee4f 100644 --- a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild +++ b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="example" RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?] diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml index 496367aa108..ba5b44f0dc4 100644 --- a/dev-haskell/ansi-terminal/metadata.xml +++ b/dev-haskell/ansi-terminal/metadata.xml @@ -13,6 +13,6 @@ <flag name="example">Build the example application.</flag> </use> <upstream> - <remote-id type="github">feuerbach/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 49f62e483b5..c7d7aa67143 100644 --- a/dev-haskell/ansi-wl-pprint/Manifest +++ b/dev-haskell/ansi-wl-pprint/Manifest @@ -1 +1,2 @@ -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 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 ca01de330e4..00000000000 --- 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 00000000000..dcebf67d8c3 --- /dev/null +++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 +#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 ~ppc64 ~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/metadata.xml b/dev-haskell/ansi-wl-pprint/metadata.xml index 316d5c90c5c..d1af4cd455a 100644 --- a/dev-haskell/ansi-wl-pprint/metadata.xml +++ b/dev-haskell/ansi-wl-pprint/metadata.xml @@ -8,9 +8,6 @@ <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> </upstream> diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild index eda1f178082..65dfbab6c09 100644 --- a/dev-haskell/appar/appar-0.1.8.ebuild +++ b/dev-haskell/appar/appar-0.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild index 6157709240c..b88d2540cc4 100644 --- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild +++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 82d27ddeea9..12b397b0ccc 100644 --- a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild +++ b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] diff --git a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild index e1e050ef0dd..04582946186 100644 --- a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild +++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/hourglass:=[profile?] diff --git a/dev-haskell/assoc/Manifest b/dev-haskell/assoc/Manifest new file mode 100644 index 00000000000..879db362a7f --- /dev/null +++ b/dev-haskell/assoc/Manifest @@ -0,0 +1 @@ +DIST assoc-1.0.2.tar.gz 3047 BLAKE2B 07f409ce555ac5f041d83db94829638e00ec50175499d42263f19570bc9f58788522ba4edc058450e90912b75aa21f7bfbdcd054cd5025a4aa0cb88b74020c9d SHA512 20fd0056dcc2dff9504e090be5c2ef27692a795133620e60b9382cfdfbaf26d1019617acf48f0f762e22d699068bc4dbd35a714177ce3a36761c0065708b9168 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 00000000000..893d78d4b5d --- /dev/null +++ b/dev-haskell/assoc/assoc-1.0.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 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="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 ~ppc64 ~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 +" + +src_prepare() { + default + cabal_chdeps \ + 'base >=4.3 && <4.15' 'base >=4.3' + eapply_user +} diff --git a/dev-haskell/assoc/metadata.xml b/dev-haskell/assoc/metadata.xml new file mode 100644 index 00000000000..93738152194 --- /dev/null +++ b/dev-haskell/assoc/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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/async/Manifest b/dev-haskell/async/Manifest index c12ebc6df2a..985278d315c 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.cabal 3095 BLAKE2B cb0491c2fa792c794308485031c8cb876b596f37f06bc53eb824eb09d83f539d315b1e5a49478fef5282609ab755c22442051684dda79e94dc02bca7cb2c5824 SHA512 a19d1ce77902377fe6afc24c10002ef539d21fb402cf245e0816a67086c2a13b0b2e7b984e054a6b846f2acbcbd0fd942819e381e8ff29ba995757cbf8d8aa8f +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.4.ebuild index 56eecdbe0d4..8d3cd7b0109 100644 --- a/dev-haskell/async/async-2.2.2.ebuild +++ b/dev-haskell/async/async-2.2.4.ebuild @@ -1,39 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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.7.1.1.9999 #hackport: flags: -bench CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +CABAL_HACKAGE_REVISION="1" 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" +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] +RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10 + >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) " +BDEPEND="app-text/dos2unix" src_prepare() { - default + # pull revised cabal from upstream + cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die + + # Convert to unix line endings + dos2unix "${S}/${PN}.cabal" || die - cabal_chdeps \ - 'base >= 4.3 && < 4.14' 'base >= 4.3' + # Apply patches *after* pulling the revised cabal + default } src_configure() { diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest index 58a9046fbf9..f6726618f84 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.4.ebuild index 1c12a46173f..d3c750c107e 100644 --- a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild +++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.1 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -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 ~ppc64 ~x86" IUSE="debug" RDEPEND="dev-haskell/primitive:=[profile?] diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml index 6bed7c28c7b..29001c3441a 100644 --- a/dev-haskell/atomic-primops/metadata.xml +++ b/dev-haskell/atomic-primops/metadata.xml @@ -5,17 +5,21 @@ <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'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 "Tickets". - Also, this library uses the "foreign primop" capability of GHC to + Also, this library uses the "foreign primop" 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> - </upstream> </pkgmetadata> diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest index 0e4a91f5164..4c111e96611 100644 --- a/dev-haskell/attoparsec-iso8601/Manifest +++ b/dev-haskell/attoparsec-iso8601/Manifest @@ -1 +1 @@ -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 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 e7b5c6dd129..00000000000 --- 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 00000000000..743a43c3210 --- /dev/null +++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 +#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 ~ppc64 ~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/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml index 8ca0c559926..93738152194 100644 --- a/dev-haskell/attoparsec-iso8601/metadata.xml +++ b/dev-haskell/attoparsec-iso8601/metadata.xml @@ -5,8 +5,4 @@ <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> </pkgmetadata> diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest index d9917fc007b..356b98b135f 100644 --- a/dev-haskell/attoparsec/Manifest +++ b/dev-haskell/attoparsec/Manifest @@ -1 +1 @@ -DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194 +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 20e44cf82d4..00000000000 --- 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.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild new file mode 100644 index 00000000000..bc2f7907a12 --- /dev/null +++ b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 +#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 ~ppc64 ~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/auto-update/auto-update-0.1.6.ebuild b/dev-haskell/auto-update/auto-update-0.1.6.ebuild index 576e43979d7..a3687587b1b 100644 --- a/dev-haskell/auto-update/auto-update-0.1.6.ebuild +++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest index f7b3eacc87c..ab0739bb050 100644 --- a/dev-haskell/aws/Manifest +++ b/dev-haskell/aws/Manifest @@ -1 +1,2 @@ +DIST aws-0.22-rev3.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd diff --git a/dev-haskell/aws/aws-0.22-r1.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild index d5a5b18362a..fa12e302fc1 100644 --- a/dev-haskell/aws/aws-0.22-r1.ebuild +++ b/dev-haskell/aws/aws-0.22-r5.ebuild @@ -1,28 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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: networkbsd:network-3 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +# 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" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+network-3 examples" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="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?] +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?] @@ -31,49 +33,34 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[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/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/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:= + >=dev-lang/ghc-8.10.1:= 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 ) ) + >=dev-haskell/cabal-3.2.0.0 " +PATCHES=( "${FILESDIR}"/${P}-aeson-2.patch ) + src_configure() { haskell-cabal_src_configure \ $(cabal_flag examples examples) \ - $(cabal_flag network-3 networkbsd) + --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 00000000000..25d5966ed0a --- /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 83ba450bb8b..cc08513f82e 100644 --- a/dev-haskell/aws/metadata.xml +++ b/dev-haskell/aws/metadata.xml @@ -5,9 +5,6 @@ <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 <https://github.com/aristidb/aws/blob/master/README.org>. </longdescription> diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest index 43b7be06991..d265d88032c 100644 --- a/dev-haskell/base-compat-batteries/Manifest +++ b/dev-haskell/base-compat-batteries/Manifest @@ -1 +1,2 @@ -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 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 44b59da090b..00000000000 --- 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 00000000000..0d77a1bc3b9 --- /dev/null +++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +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 ~ppc64 ~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/Manifest b/dev-haskell/base-compat/Manifest index 82ca1dd1f01..7af7b764c31 100644 --- a/dev-haskell/base-compat/Manifest +++ b/dev-haskell/base-compat/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.12.1.ebuild index 792d6215c9b..78b0c0cf45b 100644 --- a/dev-haskell/base-compat/base-compat-0.11.1.ebuild +++ b/dev-haskell/base-compat/base-compat-0.12.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.4 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -14,11 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-lang/ghc-7.4.1:= +RDEPEND=">=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest index 11b16201f2d..0837c357bcc 100644 --- a/dev-haskell/base-orphans/Manifest +++ b/dev-haskell/base-orphans/Manifest @@ -1 +1 @@ -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 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 3edd14593a7..00000000000 --- 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 00000000000..18591d19b3d --- /dev/null +++ b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 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="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 ~ppc64 ~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-prelude/base-prelude-1.3.ebuild b/dev-haskell/base-prelude/base-prelude-1.3.ebuild index 68bd3c865ce..95d505e05ae 100644 --- a/dev-haskell/base-prelude/base-prelude-1.3.ebuild +++ b/dev-haskell/base-prelude/base-prelude-1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.6.1:= 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 e05e533222a..ac23cf641a1 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml index 1989ef029c5..6bc8bd630d1 100644 --- a/dev-haskell/base16-bytestring/metadata.xml +++ b/dev-haskell/base16-bytestring/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Haskell</name> </maintainer> <upstream> - <remote-id type="github">bos/base16-bytestring</remote-id> + <remote-id type="github">haskell/base16-bytestring</remote-id> </upstream> </pkgmetadata> 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 458d52682fa..41cfd5338c5 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml index 25fcbe922d4..d24d1887079 100644 --- a/dev-haskell/base64-bytestring/metadata.xml +++ b/dev-haskell/base64-bytestring/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Haskell</name> </maintainer> <upstream> - <remote-id type="github">bos/base64-bytestring</remote-id> + <remote-id type="github">haskell/base64-bytestring</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/basement/Manifest b/dev-haskell/basement/Manifest index 3ed82f269c4..e61da8576bb 100644 --- a/dev-haskell/basement/Manifest +++ b/dev-haskell/basement/Manifest @@ -1 +1 @@ -DIST basement-0.0.11.tar.gz 134032 BLAKE2B 52d9d674841d048b53011589c7a87c7cd7e45655db3c7bc2c99574b8a49bace33f20abf7d4614cf3106e2b87cb67340e5d2f76416889038c2e081c1f62f46bdb SHA512 2396e692fcaa080418eb90c38148dbb2465490ffaa5e35d141573d32729794dffb444bdddd55082878520a22629cfead5fdc1ac98f1d369600cc3165b64730d5 +DIST basement-0.0.12.tar.gz 134142 BLAKE2B cf0ff62bdd69cdcb075b5e63e9d60e7033ac85007101cd8c1d38776cbd1b60b336606e502a91ab8fb7275273f9fa3eae7344f0e47aa269bada2649c7be07caad SHA512 4515fbecfb8280cfd669313d236a5e3b4ef45ba3fd3da8626073fa3a44a889370c48c582ea633eac5df4a5e716c495cf827deb9239274fbdb63a14d19f9682fb diff --git a/dev-haskell/basement/basement-0.0.11.ebuild b/dev-haskell/basement/basement-0.0.12.ebuild index ea25452e60f..f19d946f4ab 100644 --- a/dev-haskell/basement/basement-0.0.11.ebuild +++ b/dev-haskell/basement/basement-0.0.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.1.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -14,11 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-lang/ghc-8.0.1:= +RDEPEND=">=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild index e2d92b95935..c131540ddf1 100644 --- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild +++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/parsec:=[profile?] diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest index aa1e6df9308..d04e12bfde9 100644 --- a/dev-haskell/bifunctors/Manifest +++ b/dev-haskell/bifunctors/Manifest @@ -1 +1 @@ -DIST bifunctors-5.5.6.tar.gz 44721 BLAKE2B 9f0d588ad514b60ac6ac5fc1f5e1c265b111330e008d57340baee4011e6aadbdaa9a7d24b480cd7d568f57e61214821129ce8785a5731763a08306a2c8151b5a SHA512 d78471bdf9c83c77d49825321984964e165c77ee4f02f8c4232ce272246057b0064b68553f8d70a11a930fc771dc55a2991ff63d6d7af89bb749f23737ba6a5b +DIST bifunctors-5.5.11.tar.gz 46003 BLAKE2B 82572e6c162ab105fdce6c3cd7e44da16db232c2233e4d2e3551001a20a2bff0bb4e41fabebc974290749275621a9b0abe3925156090cb960b95e8cbcf43150d SHA512 09f66d1a086a72a822e804521c2258acb16fd5a4a29c3758b97987f27a271f58e3dd4103518b31b3bdf44465c87fe5573a0bba168ba109287ca3370b8ab491a1 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 00000000000..8f266bcb81f --- /dev/null +++ b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 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="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 ~ppc64 ~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 0e03032f6a2..00000000000 --- 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/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest index 6f777e43dcd..92069fcd87f 100644 --- a/dev-haskell/binary-orphans/Manifest +++ b/dev-haskell/binary-orphans/Manifest @@ -1 +1,2 @@ -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 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 7003eae643b..00000000000 --- 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 00000000000..5c7b1efe0f9 --- /dev/null +++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 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 ~ppc64 ~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/Manifest b/dev-haskell/binary/Manifest index acf2a3a4768..46480c712b5 100644 --- a/dev-haskell/binary/Manifest +++ b/dev-haskell/binary/Manifest @@ -1 +1,2 @@ DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff +DIST binary-0.8.8.0.tar.gz 57327 BLAKE2B c105f4bf92ec52df51d3c7bda1aae99b3d40727aa4d3c1397431b2b727a934e62ee1f9ab7ed45b3502b17bd7a9a61f95a2a66690e40ae25b177fc8c79c462ae5 SHA512 9e4b116a2661d7970dbcf5ec3432ce88514380cab145358c3368a2dca35a16ab9d1f0d09ce2eb853a456764215744195d593629fb08e29b627345e3ae913592f diff --git a/dev-haskell/binary/binary-0.8.8.0.ebuild b/dev-haskell/binary/binary-0.8.8.0.ebuild new file mode 100644 index 00000000000..dae0bfaf318 --- /dev/null +++ b/dev-haskell/binary/binary-0.8.8.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 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" # 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.10 +KEYWORDS="~amd64 ~ppc64 ~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.10.5-r1 PM:8.10.6 PM:8.10.7 PM:9.0.1-r1 PM:9.0.2 PM:9999" diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest index fc4677add16..235245fe565 100644 --- a/dev-haskell/blaze-builder/Manifest +++ b/dev-haskell/blaze-builder/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild index 7393389c427..0ccb697a77f 100644 --- a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild +++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -# ebuild generated by hackport 0.5.5.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,16 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -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:= +RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework 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-r1.ebuild index 3a7fb9dbead..c8af250e98c 100644 --- a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild +++ b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,12 +9,12 @@ 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" +HOMEPAGE="https://jaspervdj.be/blaze/" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] @@ -25,8 +25,15 @@ RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder- 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/quickcheck-2.4 >=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 ) " + +src_prepare() { + default + + cabal_chdeps \ + 'QuickCheck >= 2.4 && < 2.14' 'QuickCheck >= 2.4' +} diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest index bc9ebb22132..402d8d35f3b 100644 --- a/dev-haskell/blaze-markup/Manifest +++ b/dev-haskell/blaze-markup/Manifest @@ -1 +1 @@ -DIST blaze-markup-0.8.2.4.tar.gz 14518 BLAKE2B 43f07bdfeac60e60b55a7a0f8a1bf3c1386597b09511a6df2139246b05d10bc66899ffad7eefbd97cc1c981e7dcc8f7e345ec41675293599f22e1d3849ecd5d9 SHA512 e75fe4162f165975febced4d54460c64a4a4d1ec1db963fcda7d1c1e2cc2c24f8eb565ba0170524aa28da3b3cc1d8057d036a1ab963052436dd550189d5cd263 +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.8.ebuild index 522cbb17b49..91d6deacf54 100644 --- a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild +++ b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.4.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,25 +14,17 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=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/tasty-1.0 <dev-haskell/tasty-1.3 + >=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 ) " - -src_prepare() { - default - - cabal_chdeps \ - 'base >= 4 && < 4.14' 'base >= 4' -} diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild index 746d11fb076..885194de24d 100644 --- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild +++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild index f0ec776e152..e98fd6bba2e 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.10.1:= diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild index baf7a77b5f2..5dc32ecfc4e 100644 --- a/dev-haskell/byteable/byteable-0.1.1.ebuild +++ b/dev-haskell/byteable/byteable-0.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild index fae9f941b8f..8f0331f66fc 100644 --- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild +++ b/dev-haskell/byteorder/byteorder-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild index 47fc91ec63d..ee409198f5f 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest index 17502636930..db05140ba15 100644 --- a/dev-haskell/c2hs/Manifest +++ b/dev-haskell/c2hs/Manifest @@ -1,2 +1 @@ -DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6 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 99e58a64012..00000000000 --- 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/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest index aeb6d5f7b02..2a4548ed9cc 100644 --- a/dev-haskell/cabal-doctest/Manifest +++ b/dev-haskell/cabal-doctest/Manifest @@ -1 +1 @@ -DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71 +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 97eb27900f0..00000000000 --- 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.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild new file mode 100644 index 00000000000..819eeb2a8bf --- /dev/null +++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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 ~ppc64 ~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-install/Manifest b/dev-haskell/cabal-install/Manifest index b3ad860dcea..1e6e6e55552 100644 --- a/dev-haskell/cabal-install/Manifest +++ b/dev-haskell/cabal-install/Manifest @@ -1 +1 @@ -DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062 +DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild index 085a26c438f..51030cf0b8d 100644 --- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild +++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +# ebuild generated by hackport 0.7.9999 +#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions -# ebuild generated by hackport 0.6.5.9999 -# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree CABAL_FEATURES="" -inherit haskell-cabal +inherit haskell-cabal ghc-package DESCRIPTION="The command-line interface for Cabal and Hackage" HOMEPAGE="https://www.haskell.org/cabal/" @@ -14,49 +15,49 @@ 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" +#keep in sync with ghc-9.0.2 +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="debug +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-0.2:= - >=dev-haskell/cabal-3.2:= <dev-haskell/cabal-3.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/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/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:= + >=dev-haskell/hashable-1.0:= + >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= - >=dev-haskell/network-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/random-1.2:= <dev-haskell/random-1.3:= + >=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:= + >=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= - >=dev-lang/ghc-7.10.1:= + >=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-1.22.2.0 + >=dev-haskell/cabal-2.2.0.1 " -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 + cabal_chdeps \ + 'base >= 4.8 && < 4.15' 'base >= 4.8' \ + 'hashable >= 1.0 && < 1.4' 'hashable >=1.0' \ + 'HTTP >= 4000.1.5 && < 4000.4' 'HTTP >= 4000.1.5 && < 4000.5' + # no chance to link to -threaded on ppc64, alpha and others # who use UNREG, not only ARM if ! ghc-supports-threaded-runtime; then @@ -67,8 +68,11 @@ src_prepare() { src_configure() { haskell-cabal_src_configure \ - --flags=-debug-conflict-sets \ - --flags=-debug-expensive-assertions \ - --flags=-debug-tracetree \ - $(cabal_flag native-dns native-dns) + $(cabal_flag debug 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-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 fa98278a277..00000000000 --- 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 6e16048a9b7..1e8264cabe1 100644 --- a/dev-haskell/cabal-install/metadata.xml +++ b/dev-haskell/cabal-install/metadata.xml @@ -5,12 +5,8 @@ <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) & [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups</flag> </use> </pkgmetadata> diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index 850a1e04ed8..7d6fc904f33 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1 +1,2 @@ DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598 +DIST Cabal-3.4.1.0.tar.gz 836938 BLAKE2B b185d2beb91a0317b392c6f32ea47a574b8037b23f5131334bca1282359218ab94aa406be737e0fbb15458e7dfa2cba2b22f7776d42c20aeed2b87598cda0e2d SHA512 93233007b70487c76b8ceb9e475ebff0cae4c86a4694820ee505ee83d9049147d60c32c9aea5c4802faf5273adaaae66db299c1ee722aed64c716ac7a3b3aa90 diff --git a/dev-haskell/cabal/cabal-3.4.1.0.ebuild b/dev-haskell/cabal/cabal-3.4.1.0.ebuild new file mode 100644 index 00000000000..ed14fea8213 --- /dev/null +++ b/dev-haskell/cabal/cabal-3.4.1.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.9999 +#hackport: flags: -bundled-binary-generic + +CABAL_PN="Cabal" + +CABAL_FEATURES="lib profile haddock hoogle hscolour" # drop tests due to circular deps +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/" +SRC_URI="https://hackage.haskell.org/package/${CABAL_PN}/${CABAL_PN}-${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +#keep in sync with ghc-9.0.2 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +RESTRICT=test # circular deps: cabal -> quickcheck -> cabal + +RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] + >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] + >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] + >=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${CABAL_PN}-${PV}" + +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:9.0.2 PM:9999" diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml index 93738152194..ac62fa13389 100644 --- a/dev-haskell/cabal/metadata.xml +++ b/dev-haskell/cabal/metadata.xml @@ -5,4 +5,7 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> + <upstream> + <remote-id type="github">haskell/cabal</remote-id> + </upstream> </pkgmetadata> 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 174a94c5d10..00000000000 --- 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/call-stack/Manifest b/dev-haskell/call-stack/Manifest index 8788e1aa46a..b50d8e79bf5 100644 --- a/dev-haskell/call-stack/Manifest +++ b/dev-haskell/call-stack/Manifest @@ -1,2 +1 @@ -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 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 b3441e33b82..00000000000 --- 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 2b08e6ab8f7..8ebd0ddfcc1 100644 --- a/dev-haskell/call-stack/call-stack-0.3.0.ebuild +++ b/dev-haskell/call-stack/call-stack-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-8.4.3:= diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild index 7f06b349052..e3c4620e1dc 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,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest index 0255ca432c3..a321117df93 100644 --- a/dev-haskell/cassava/Manifest +++ b/dev-haskell/cassava/Manifest @@ -1 +1,2 @@ +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 diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild index 73aa92acc46..2e18d8474b4 100644 --- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild +++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild @@ -1,48 +1,54 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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.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" +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -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?] +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/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:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=dev-haskell/cabal-2.2.0.1 test? ( <dev-haskell/hunit-1.7 - >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 + >=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() { - default + # pull revised cabal from upstream + cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die - cabal_chdeps \ - 'base >= 4.5 && < 4.14' 'base >= 4.5' + # Convert to unix line endings + dos2unix "${CABAL_FILE}" || die + + # Apply patches *after* pulling the revised cabal + default } diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild index c39d43d2bc9..fe4020e989d 100644 --- a/dev-haskell/cereal/cereal-0.5.8.1.ebuild +++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] diff --git a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild index 61e7899d265..0e23e6a2e5a 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] 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 index 6d2416322a9..5777bebfaf8 100644 --- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild +++ b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="debug" +PATCHES=( "${FILESDIR}/bd458b66e1b28c249628e282ff42e8468646c557.patch" ) + 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?] diff --git a/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch new file mode 100644 index 00000000000..25b2b732f5d --- /dev/null +++ b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch @@ -0,0 +1,281 @@ +From bd458b66e1b28c249628e282ff42e8468646c557 Mon Sep 17 00:00:00 2001 +From: Ryan Scott <ryan.gl.scott@gmail.com> +Date: Mon, 24 Feb 2020 10:22:38 -0500 +Subject: [PATCH] Import unsafeCoerce# from GHC.Exts, not GHC.Prim + +`atomic-primops` and `chaselev-deque` fail to build on GHC HEAD +(8.11) since `unsafeCoerce#` can no longer be imported from +`GHC.Prim` (see +https://gitlab.haskell.org/ghc/ghc/commit/74ad75e87317196c600dfabc61aee1b87d95c214). +Luckily, `GHC.Exts` provides a backwards-compatible way to import +`unsafeCoerce#`, so we can simply import it from there instead. + +diff --git a/CHANGELOG.md a/CHANGELOG.md +new file mode 100644 +index 0000000..c0a4b4b +--- /dev/null ++++ a/CHANGELOG.md +@@ -0,0 +1,25 @@ ++## next [????.??.??] ++* Allow building with `base-4.15`. ++ ++## 0.5.0.4 ++* bugfix ++ ++## 0.5.0.3 ++* minor bump to change abstract-deque dep. ++ ++## 0.5.0.2 ++* bump to go along with MAJOR bugfix in atomic-primops 0.5.0.2 ++ ++## 0.4 ++* bump to go along with atomic-primops 0.4 ++ ++## 0.3 ++* bump to go along with atomic-primops 0.3 ++ ++## 0.1.3 ++* small release to fix version deps before atomic-primops api change ++ ++## 0.1.2 ++ ++## 0.1.1 ++* bump for fixing bugs! First release candidate. +diff --git a/Data/Concurrent/Deque/ChaseLev.hs a/Data/Concurrent/Deque/ChaseLev.hs +index 7ec2ff0..baf0843 100644 +--- a/Data/Concurrent/Deque/ChaseLev.hs ++++ a/Data/Concurrent/Deque/ChaseLev.hs +@@ -39,8 +39,7 @@ import Data.Atomics.Counter + import System.IO.Unsafe (unsafePerformIO) + import Text.Printf (printf) + import System.Mem.StableName (makeStableName, hashStableName) +-import GHC.Exts (Int(I#)) +-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#) ++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#) + + -------------------------------------------------------------------------------- + -- Instances +diff --git a/Data/Concurrent/Deque/ChaseLevUnboxed.hs a/Data/Concurrent/Deque/ChaseLevUnboxed.hs +index 2817f7a..e1d2fe5 100644 +--- a/Data/Concurrent/Deque/ChaseLevUnboxed.hs ++++ a/Data/Concurrent/Deque/ChaseLevUnboxed.hs +@@ -3,7 +3,7 @@ + -- TEMPORARY: An experiment in duplicating ChaseLev.hs to support unboxed queue contents. + + -- | Chase-Lev work stealing Deques +--- ++-- + -- 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&rep=rep1&type=pdf +@@ -15,7 +15,7 @@ module Data.Concurrent.Deque.ChaseLevUnboxed + -- The convention here is to directly provide the concrete + -- operations as well as providing the class instances. + ChaseLevDeque(), newQ, nullQ, pushL, tryPopL, tryPopR, +- approxSize, ++ approxSize, + dbgInspectCLD + ) + where +@@ -41,14 +41,13 @@ import Data.Atomics.Counter + import System.IO.Unsafe (unsafePerformIO) + import Text.Printf (printf) + import System.Mem.StableName (makeStableName, hashStableName) +-import GHC.Exts (Int(I#)) +-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#) ++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#) + + -------------------------------------------------------------------------------- + -- Instances + + {- +-instance PC.DequeClass ChaseLevDeque where ++instance PC.DequeClass ChaseLevDeque where + newQ = newQ + nullQ = nullQ + pushL = pushL +@@ -57,7 +56,7 @@ instance PC.DequeClass ChaseLevDeque where + leftThreadSafe _ = False + rightThreadSafe _ = True + +-instance PC.PopL ChaseLevDeque where ++instance PC.PopL ChaseLevDeque where + tryPopL = tryPopL + -} + +@@ -93,7 +92,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do + | isInfixOf "uninitialised element" (show e) -> return "<uninit>" + | otherwise -> return$ "<"++ show e ++">" + Right val' -> return (show val') +- ++ + + + -------------------------------------------------------------------------------- +@@ -108,7 +107,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do + {-# INLINE slc #-} + #ifndef DEBUGCL + dbg = False +-nu a = MV.unsafeNew a ++nu a = MV.unsafeNew a + rd a b = MV.unsafeRead a b + wr a b c = MV.unsafeWrite a b c + slc a b c = MV.unsafeSlice a b c +@@ -116,13 +115,13 @@ cpy a b = MV.unsafeCopy a b + #else + #warning "Activating DEBUGCL!" + dbg = True +-nu a = MV.new a ++nu a = MV.new a + rd a b = MV.read a b + wr a b c = MV.write a b c + slc a b c = MV.slice a b c + cpy a b = MV.copy a b + -- Temp, debugging: Our own bounds checking, better error: +--- wr v i x = ++-- wr v i x = + -- if i >= MV.length v + -- then error (printf "ERROR: Out of bounds of top of vector index %d, vec length %d\n" i (MV.length v)) + -- else MV.write v i x +@@ -131,8 +130,8 @@ cpy a b = MV.copy a b + + #ifdef DEBUGCL + -- This simply localizes exceptions better: +-tryit msg action = Control.Exception.catch action +- (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e ++tryit msg action = Control.Exception.catch action ++ (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e + throw (e::SomeException)) + #else + {-# INLINE tryit #-} +@@ -145,9 +144,9 @@ tryit msg action = action + + -- TODO: make a "grow" that uses memcpy. + growCirc :: V.Unbox a => Int -> Int -> MV.IOVector a -> IO (MV.IOVector a) +-growCirc !strt !end !oldarr = do ++growCirc !strt !end !oldarr = do + -- let len = MV.length oldarr +- -- strtmod = strt`mod` len ++ -- strtmod = strt`mod` len + -- endmod = end `mod` len + -- newarr <- nu (len + len) + -- if endmod < strtmod then do +@@ -165,7 +164,7 @@ growCirc !strt !end !oldarr = do + -- return newarr + ---------------------------------------- + -- Easier version first: +- ---------------------------------------- ++ ---------------------------------------- + let len = MV.length oldarr + elems = end - strt + when dbg $ putStrLn$ "Grow to size "++show (len+len)++", copying over "++show elems +@@ -176,8 +175,8 @@ growCirc !strt !end !oldarr = do + ++" had only initialized "++show elems++" elems: " + ++show(strt`mod`(len+len),end`mod`(len+len)))) + -- Strictly matches what's in the paper: +- for_ strt end $ \ind -> do +- x <- getCirc oldarr ind ++ for_ strt end $ \ind -> do ++ x <- getCirc oldarr ind + evaluate x + putCirc newarr ind x + return $! newarr +@@ -206,7 +205,7 @@ copyOffset !from !to !iFrom !iTo !len = + newQ :: V.Unbox elt => IO (ChaseLevDeque elt) + newQ = do + -- Arbitrary Knob: We start as size 32 and double from there: +- v <- MV.new 32 ++ v <- MV.new 32 + r1 <- newCounter 0 + r2 <- newCounter 0 + r3 <- newIORef v +@@ -217,8 +216,8 @@ nullQ :: ChaseLevDeque elt -> IO Bool + nullQ CLD{top,bottom} = do + -- This should get a LOWER bound on size at some point in logic time, right? + b <- readCounter bottom +- t <- readCounter top +- let size = b - t ++ t <- readCounter top ++ let size = b - t + return $! size <= 0 + + {-# INLINE approxSize #-} +@@ -226,7 +225,7 @@ nullQ CLD{top,bottom} = do + approxSize :: ChaseLevDeque elt -> IO Int + approxSize CLD{top,bottom} = do + b <- readCounter bottom +- t <- readCounter top ++ t <- readCounter top + return $! b - t + + {-# INLINE pushL #-} +@@ -237,12 +236,12 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do + b <- readCounter bottom + t <- readCounter top + arr <- readIORef activeArr +- let len = MV.length arr ++ let len = MV.length arr + size = b - t + + -- when (dbg && size < 0) $ error$ "pushL: INVARIANT BREAKAGE - bottom, top: "++ show (b,t) + +- arr' <- if (size >= len - 1) then do ++ arr' <- if (size >= len - 1) then do + arr' <- growCirc t b arr -- Double in size, don't change b/t. + -- Only a single thread will do this!: + writeIORef activeArr arr' +@@ -268,7 +267,7 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do + tryPopR :: V.Unbox elt => ChaseLevDeque elt -> IO (Maybe elt) + tryPopR CLD{top,bottom,activeArr} = tryit "tryPopR" $ do + -- NB. these loads must be ordered, otherwise there is a race +- -- between steal and pop. ++ -- between steal and pop. + tt <- readCounterForCAS top + loadLoadBarrier + b <- readCounter bottom +@@ -277,14 +276,14 @@ tryPopR CLD{top,bottom,activeArr} = tryit "tryPopR" $ do + + let t = peekCTicket tt + size = b - t +- if size <= 0 then ++ if size <= 0 then + return Nothing +- else do ++ else do + obj <- getCirc arr t + (b,_) <- casCounter top tt (t+1) +- if b then ++ if b then + return $! Just obj +- else ++ else + return Nothing -- Someone beat us, abort + + {-# INLINE tryPopL #-} +@@ -298,14 +297,14 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do + -- very important that the following read of q->top does not occur + -- before the earlier write to q->bottom. + storeLoadBarrier +- ++ + tt <- readCounterForCAS top + -- when (dbg && b < t) $ error$ "tryPopL: INVARIANT BREAKAGE - bottom < top: "++ show (b,t) + + let t = peekCTicket tt +- size = b - t ++ size = b - t + if size < 0 then do +- writeCounter bottom t ++ writeCounter bottom t + return Nothing + else do + obj <- getCirc arr b +@@ -315,7 +314,7 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do + (b,ol) <- casCounter top tt (t+1) + writeCounter bottom (t+1) + if b then return $! Just obj +- else return $ Nothing ++ else return $ Nothing + + ------------------------------------------------------------ + diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild index 774e610c9b1..46414c05d41 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-2022 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 ~ppc64 ~x86" IUSE="+color-output" RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild index a529161857d..002531a02e7 100644 --- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild +++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3" RDEPEND="dev-haskell/byteable:=[profile?] 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-r2.ebuild index fea7988f16e..3899d491da9 100644 --- a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild +++ b/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,14 +24,14 @@ RDEPEND="dev-haskell/cereal:=[profile?] >=dev-lang/ghc-7.8.2:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3 + >=dev-haskell/cabal-1.18.1.3 " src_prepare() { default cabal_chdeps \ - 'Cabal >= 1.10 && < 3.1' 'Cabal >= 1.10 && < 3.3' + 'Cabal >= 1.10 && < 3.1' 'Cabal >= 1.10' } src_configure() { diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest index f8f5b0bf557..9a07a5b4265 100644 --- a/dev-haskell/citeproc/Manifest +++ b/dev-haskell/citeproc/Manifest @@ -1 +1 @@ -DIST citeproc-0.3.0.9.tar.gz 572112 BLAKE2B df1ff046f4356f5feebf3551b3be9807b3bfca6ef927805efeb2ff5133968f1bd0ae14923ec83309ad2b8dd50d674f4506b1f62adc53a78f6afccea7cb6da5fa SHA512 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f +DIST citeproc-0.7.tar.gz 528208 BLAKE2B 9ad395c2c3ba7bc957554b37af1a514c3deb3247a55a41b35c88b25f25db474043d18de5909e67ac5723fbfb0a5ed8161a16eb851f59c5648cfa3b30149c46fe SHA512 e24675c0d9227bd6ff5f13788c251647df1e61a65a1b0fe94d80c0bf064bd3018285ace6397d0c5f2b5d6e4ee9b91de8b90e6e4251e9914fb8fcbf58ed3c4539 diff --git a/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild b/dev-haskell/citeproc/citeproc-0.7.ebuild index ee9b06f6428..9e98a83ddf6 100644 --- a/dev-haskell/citeproc/citeproc-0.3.0.9.ebuild +++ b/dev-haskell/citeproc/citeproc-0.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,9 +14,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~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?] @@ -26,19 +33,17 @@ RDEPEND="dev-haskell/aeson:=[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/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:=[profile?] ) - !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] <dev-haskell/rfc5051-0.3:=[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/mtl dev-haskell/timeit ) " diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild index d7eda146593..1ef70f17fb8 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-2022 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 ~ppc64 ~x86" IUSE="test" RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild index 7974591baf7..69b0fe62a52 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-2022 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 ~ppc64 ~x86" IUSE="" RESTRICT=test # circular depend: tasty->clock[test]->tasty diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild index 0562f4b765f..e81c11caf57 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-2022 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 ~ppc64 ~x86" IUSE="+quotation testprog" RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] diff --git a/dev-haskell/code-page/code-page-0.1.3.ebuild b/dev-haskell/code-page/code-page-0.1.3.ebuild index 0206747c43b..5bfeb36e9da 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild index 69088c21c11..aa4a46e8b33 100644 --- a/dev-haskell/colour/colour-2.3.5.ebuild +++ b/dev-haskell/colour/colour-2.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" # circular dependencies: colour -> ansi-terminal -> test-framework -> colour RESTRICT=test diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest index c98f1254596..92c817c410e 100644 --- a/dev-haskell/commonmark-extensions/Manifest +++ b/dev-haskell/commonmark-extensions/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild index 4af1c67261a..cff057a9160 100644 --- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild +++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,19 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] +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/parsec:=[profile?] - dev-haskell/text:=[profile?] - >=dev-lang/ghc-8.0.1:= + dev-haskell/network-uri:=[profile?] + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 - test? ( dev-haskell/quickcheck - dev-haskell/tasty - dev-haskell/tasty-hunit - dev-haskell/tasty-quickcheck ) + >=dev-haskell/cabal-2.2.0.1 + test? ( dev-haskell/tasty + dev-haskell/tasty-hunit ) " diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest index c075f06dc9b..4d5feab6490 100644 --- a/dev-haskell/commonmark-pandoc/Manifest +++ b/dev-haskell/commonmark-pandoc/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild index 3fc16f6d2a8..b8a0c45d436 100644 --- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild +++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -14,15 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -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?] +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.0.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest index c72f93bc6db..4429c922717 100644 --- a/dev-haskell/commonmark/Manifest +++ b/dev-haskell/commonmark/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild b/dev-haskell/commonmark/commonmark-0.2.2.ebuild index f6eee225093..01221a5c0f9 100644 --- a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild +++ b/dev-haskell/commonmark/commonmark-0.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,16 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND="dev-haskell/parsec:=[profile?] - dev-haskell/text:=[profile?] +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/quickcheck - dev-haskell/tasty + test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) " diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest index f9254d2aff4..b9ebd93f16e 100644 --- a/dev-haskell/comonad/Manifest +++ b/dev-haskell/comonad/Manifest @@ -1 +1 @@ -DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce +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 3480cf6e57e..00000000000 --- 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.ebuild b/dev-haskell/comonad/comonad-5.0.8.ebuild new file mode 100644 index 00000000000..8052255f099 --- /dev/null +++ b/dev-haskell/comonad/comonad-5.0.8.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 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: +distributive,+containers,test-doctests:test + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="The Comonads package authored by Edward Kmett" +HOMEPAGE="https://github.com/ekmett/comonad/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="+indexed-traversable" + +RDEPEND=">=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] + >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] + >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] + >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] + >=dev-lang/ghc-7.8.2:= + indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.18.1.3 +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=containers \ + --flag=distributive \ + $(cabal_flag indexed-traversable indexed-traversable) +} 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 ace99cc98d5..ed9df40989c 100644 --- a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild +++ b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?] diff --git a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild index d0673fa1d0e..0c07c7981ea 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-8.0.1:= diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild index cc3b589f421..9550d6135d1 100644 --- a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild +++ b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RESTRICT=test # requires network diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest index d87d1eb762c..3ffc1c287e0 100644 --- a/dev-haskell/conduit/Manifest +++ b/dev-haskell/conduit/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/conduit/conduit-1.3.4.ebuild b/dev-haskell/conduit/conduit-1.3.4.2.ebuild index be3bc363246..7af18149e58 100644 --- a/dev-haskell/conduit/conduit-1.3.4.ebuild +++ b/dev-haskell/conduit/conduit-1.3.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,8 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND="dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] @@ -25,10 +24,10 @@ RDEPEND="dev-haskell/exceptions:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-8.6.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/exceptions-0.6 >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 diff --git a/dev-haskell/connection/connection-0.3.1.ebuild b/dev-haskell/connection/connection-0.3.1.ebuild index e5e1fa480a8..ebc1342f46c 100644 --- a/dev-haskell/connection/connection-0.3.1.ebuild +++ b/dev-haskell/connection/connection-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/basement:=[profile?] diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest index c9b22350c17..cda9c6797be 100644 --- a/dev-haskell/constraints/Manifest +++ b/dev-haskell/constraints/Manifest @@ -1 +1 @@ -DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed +DIST constraints-0.13.3.tar.gz 21574 BLAKE2B 444015cbf61b6e017b08339558c2c0a0ed26157b15d64621deec0e564fb97cff5e246acafc8e75917d21c0865805c96adc5c4f8f8aea3978cd6f6707a3fda62c SHA512 c592d1b60c5606c6dbd883b8acc9e2b68addfc71d28a6df184fb3739791759fdf1d8f0ed243acd694d54a6d9bfac8271ddac2e72e4dbfcb9a8622c2178999472 diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.13.3.ebuild index 3f327d93f4a..90010741f1d 100644 --- a/dev-haskell/constraints/constraints-0.11.2.ebuild +++ b/dev-haskell/constraints/constraints-0.13.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.1 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,17 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -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?] +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-7.8.2:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 ) " 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 index 7e81e8fd31d..4a3d4eaa752 100644 --- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild +++ b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest index d006a9f01cb..1e6d5e9bfd4 100644 --- a/dev-haskell/contravariant/Manifest +++ b/dev-haskell/contravariant/Manifest @@ -1 +1 @@ -DIST contravariant-1.5.2.tar.gz 16006 BLAKE2B 251d3f8e0d30176eef224000e2c9185d6161ca6de38c7f8737864d72921e75d715ccf286028c4079781ff25f0e2f2de9c01038f13f3052532eae7d7c9fa23836 SHA512 f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410 +DIST contravariant-1.5.3.tar.gz 13726 BLAKE2B 89dd8d2265c50a848a52ae21022b9a63781e2ff8945d767349f3d14c0b9dd9fe221c564014ae516bc074c2ac6eabbfc4d114378ac81c107a403e15f78655c5bc SHA512 f84e534ea208ebb949e6e1114233e56f284b94ceb756bddeb5786d2c1ed7ed7ec93defcabfa285887316cf880e7b6d2575a76c72bdd9ad73530b4397f5466c87 diff --git a/dev-haskell/contravariant/contravariant-1.5.2.ebuild b/dev-haskell/contravariant/contravariant-1.5.3.ebuild index 4406606f91b..2560224f4c3 100644 --- a/dev-haskell/contravariant/contravariant-1.5.2.ebuild +++ b/dev-haskell/contravariant/contravariant-1.5.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -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 ~ppc64 ~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?] +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.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) - statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] ) + 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 diff --git a/dev-haskell/cookie/cookie-0.4.4.ebuild b/dev-haskell/cookie/cookie-0.4.4.ebuild index ddbacaffbeb..525f6d39ada 100644 --- a/dev-haskell/cookie/cookie-0.4.4.ebuild +++ b/dev-haskell/cookie/cookie-0.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/data-default-class:=[profile?] diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild index 4d824d9ab9a..d49fb202158 100644 --- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild +++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/byteable:=[profile?] diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild index 3c10a514529..517e3c659fd 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest index 597fd058a7b..4723bd17154 100644 --- a/dev-haskell/criterion/Manifest +++ b/dev-haskell/criterion/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/criterion/criterion-1.5.6.2.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild index 23f8a110dba..cb757d41cd0 100644 --- a/dev-haskell/criterion/criterion-1.5.6.2.ebuild +++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild @@ -1,51 +1,48 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.4 +# 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="http://www.serpentine.com/criterion" +HOMEPAGE="https://www.serpentine.com/criterion" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="embed-data-files" -RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] +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.12:=[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/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/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/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:= + >=dev-lang/ghc-8.4.3:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] ) " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/base-compat dev-haskell/hunit >=dev-haskell/quickcheck-2.4 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 3a97aada6a0..affc2975932 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/cereal:=[profile?] diff --git a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild index 4b61011d2c6..43794ddac91 100644 --- a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild +++ b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="all-cpolys" RDEPEND=">=dev-haskell/cereal-0.2:=[profile?] diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild index d693d59019f..c1a0531637b 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild index c1aa468bbc5..c3896581b89 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild index 2e658396175..5903c4b128c 100644 --- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild +++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/securemem:=[profile?] diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild index dec386faa85..f17fd537dfd 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,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild index 52cc584727a..e4f329426a0 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,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild index f509f41b5d4..5e9200585fd 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild index 049b3930c32..f7ad993fe5c 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-2022 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 ~ppc64 ~x86" IUSE="" RESTRICT=test # test suite fails to build diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest index 155a3ff2a2b..e924d8e1134 100644 --- a/dev-haskell/cryptonite/Manifest +++ b/dev-haskell/cryptonite/Manifest @@ -1 +1,2 @@ -DIST cryptonite-0.26.tar.gz 581153 BLAKE2B 2becdd3d0c6f1e037fd4d38143a2a8644e38e9826faa271c971d4feff8a4ab1e4c0a04df338c99a8454cff626f79f3334a0a37b19cc136f33e7c8f53e66bd33a SHA512 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0 +DIST cryptonite-0.28.tar.gz 616309 BLAKE2B 3fa11777574fab06c264709d4de7b56fd4b276fbee93f4731683a9a18f83cf77d2042679f2eac3044d336c5be382e1e4eb0c90862c20b0f452eaafdee401e616 SHA512 c1e485522938f94f15910a5b5a4a3e4dfecbb62df463c80faaa51e9d883c2612611b8486bd0fd13660766cfb6d62d366fbbd03df2db874d525514aae247b6242 +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.28.ebuild index 8728bac1d52..72d0c2fc464 100644 --- a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild +++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild @@ -1,37 +1,49 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.1.9999 +# 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 haskell-cabal +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" +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 ~x86" -IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp" +KEYWORDS="~amd64 ~ppc64 ~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-7.4.1:= + >=dev-lang/ghc-8.4.3:= virtual/libc " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18 - test? ( dev-haskell/memory - dev-haskell/tasty + >=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 \ @@ -41,5 +53,6 @@ src_configure() { --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 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 11b4001ffcb..91b640f27b3 100644 --- a/dev-haskell/cryptonite/metadata.xml +++ b/dev-haskell/cryptonite/metadata.xml @@ -30,6 +30,7 @@ </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="github">haskell-crypto/cryptonite</remote-id> 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 e521e187790..877401d2811 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-2022 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 ~ppc64 ~x86" IUSE="" RESTRICT=test # fails test, not sure if it's severe diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild index 45e7089978a..f5a9d7a39b2 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-2022 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild index bb40bc69477..2b63f20a7d0 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 6fbc7ae0ea6..2a51d739365 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 c10b95079d9..e2900d40a4f 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 290d9ff6950..8f48827716a 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?] diff --git a/dev-haskell/data-fix/Manifest b/dev-haskell/data-fix/Manifest new file mode 100644 index 00000000000..e19ca61a3dd --- /dev/null +++ b/dev-haskell/data-fix/Manifest @@ -0,0 +1,2 @@ +DIST data-fix-0.3.2.cabal 1692 BLAKE2B 09b59f90198d3982c5ed0904a082b00348ed210872f972d2b3bcd8c3507c0af659e879d72f630b42b32ead16fec3a18c42ba462122b1a44ddb2ca8d60f7dc214 SHA512 353aacd3740c247f692be7256a59824fa35512a121d356515e9b87e204a6a68c6add8f14111a47f8930aac386d85ea2494b09d06b34ca939e2838de79834c923 +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.ebuild b/dev-haskell/data-fix/data-fix-0.3.2.ebuild new file mode 100644 index 00000000000..e16fda4a735 --- /dev/null +++ b/dev-haskell/data-fix/data-fix-0.3.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +CABAL_HACKAGE_REVISION="2" +inherit haskell-cabal + +DESCRIPTION="Fixpoint data types" +HOMEPAGE="https://github.com/spell-music/data-fix" +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 ~ppc64 ~x86" + +RDEPEND=">=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 +" +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/data-fix/metadata.xml b/dev-haskell/data-fix/metadata.xml new file mode 100644 index 00000000000..93738152194 --- /dev/null +++ b/dev-haskell/data-fix/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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 9faf65b3f59..2003ee0111c 100644 --- a/dev-haskell/dav/dav-1.3.4.ebuild +++ b/dev-haskell/dav/dav-1.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?] diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest index 5d8457279b5..94a488b3bbb 100644 --- a/dev-haskell/dbus/Manifest +++ b/dev-haskell/dbus/Manifest @@ -1 +1 @@ -DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441 +DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9 diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild index 978131cedba..58157ba088d 100644 --- a/dev-haskell/dbus/dbus-1.2.16.ebuild +++ b/dev-haskell/dbus/dbus-1.2.22.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,32 +14,26 @@ 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 +KEYWORDS="~amd64 ~ppc64 ~x86" 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/lens-5.2:=[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/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:= + >=dev-lang/ghc-8.10.1:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=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.4 + <dev-haskell/tasty-1.5 <dev-haskell/tasty-hunit-0.11 <dev-haskell/tasty-quickcheck-0.11 ) " diff --git a/dev-haskell/dec/dec-0.0.3.ebuild b/dev-haskell/dec/dec-0.0.3.ebuild index 8a3cebbc9cf..01b190fff59 100644 --- a/dev-haskell/dec/dec-0.0.3.ebuild +++ b/dev-haskell/dec/dec-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild index 0a6a6c4d3fe..b5bf07e11bd 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~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 dac611631ef..9dd88cdd429 100644 --- a/dev-haskell/deriving-compat/Manifest +++ b/dev-haskell/deriving-compat/Manifest @@ -1 +1 @@ -DIST deriving-compat-0.5.8.tar.gz 67468 BLAKE2B 0d5ea2e882e598590b69e8682d6a751fadd8cc78cbadc97d884db74730972e93b4045276aa86369d744d4edd9db4942acbdde4abae18002c599d7b0728112be1 SHA512 e0a807142bc324a0205bd3b98fc9c68292100808d448edaf800ed41c073ec0745329458dbbb6c1fe33cc86872a9d2555d76f57c6b9d8a1dcd891dda1a9fcf158 +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.6.ebuild index 8b27d4f7f63..547a712355b 100644 --- a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild +++ b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.2 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,18 +14,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] +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-7.8.2:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=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/tagged-0.7 <dev-haskell/tagged-1 + >=dev-haskell/void-0.5.10 <dev-haskell/void-1 ) " diff --git a/dev-haskell/diff/diff-0.4.0.ebuild b/dev-haskell/diff/diff-0.4.0.ebuild index c3c1a49c4e7..e10eda84243 100644 --- a/dev-haskell/diff/diff-0.4.0.ebuild +++ b/dev-haskell/diff/diff-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild index 45b7a198e8d..b56b33cbf01 100644 --- a/dev-haskell/digest/digest-0.0.1.2.ebuild +++ b/dev-haskell/digest/digest-0.0.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild index 1d0e064b63b..5e41ecfbf1b 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest index 9b3ec5819e2..e8d845fc10a 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.2.1.ebuild index 2389f0d37e2..15c67f37ebf 100644 --- a/dev-haskell/distributive/distributive-0.6.1.ebuild +++ b/dev-haskell/distributive/distributive-0.6.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.9999 +# ebuild generated by hackport 0.6.7.9999 #hackport: flags: +tagged,+semigroups CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" @@ -15,21 +15,15 @@ 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 +KEYWORDS="~amd64 ~ppc64 ~x86" 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:= + >=dev-lang/ghc-8.4.3:= " 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/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/dlist/Manifest b/dev-haskell/dlist/Manifest index 383d9b67e9f..4ea719a988f 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-1.0.ebuild index e66be00e58c..15daed49f8e 100644 --- a/dev-haskell/dlist/dlist-0.8.0.7.ebuild +++ b/dev-haskell/dlist/dlist-1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,12 +14,17 @@ 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="" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="werror" 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 ) + >=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 f326386e7ce..b47c460c73a 100644 --- a/dev-haskell/dlist/metadata.xml +++ b/dev-haskell/dlist/metadata.xml @@ -5,13 +5,7 @@ <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> - <upstream> - <remote-id type="github">spl/dlist</remote-id> - </upstream> + <use> + <flag name="werror">Enable -Werror</flag> + </use> </pkgmetadata> diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest index 4f24893d33c..61a844b87ef 100644 --- a/dev-haskell/doclayout/Manifest +++ b/dev-haskell/doclayout/Manifest @@ -1 +1 @@ -DIST doclayout-0.3.0.2.tar.gz 12140 BLAKE2B 831517277dad7cbec04335fa69a83a1fb7bbd90edfc14cdf4ea5a340f28416eaf28639c8388b9c305daf60097871d1c5454e28600374dab176aa3babe4449a98 SHA512 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0 +DIST doclayout-0.4.tar.gz 38804 BLAKE2B fab7c7090c0416a0d6a377673892ffdd684703f773416fd08ff95e418637caf7a61242931a492f321c09374c020374630e6223d2838650c5078408a041fc9bfb SHA512 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4 diff --git a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild b/dev-haskell/doclayout/doclayout-0.4.ebuild index 7ddee0ab565..84d26d42f02 100644 --- a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild +++ b/dev-haskell/doclayout/doclayout-0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,16 +14,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND="dev-haskell/mtl:=[profile?] +RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?] dev-haskell/safe:=[profile?] - dev-haskell/text:=[profile?] - >=dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-8.6.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 + >=dev-haskell/cabal-2.4.0.1 test? ( dev-haskell/tasty dev-haskell/tasty-golden - dev-haskell/tasty-hunit ) + dev-haskell/tasty-hunit + dev-haskell/tasty-quickcheck ) " diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest index c479a2395b2..42b1b57af6f 100644 --- a/dev-haskell/doctemplates/Manifest +++ b/dev-haskell/doctemplates/Manifest @@ -1,2 +1 @@ -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 diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild index 88f81e5d48b..2eb0972351c 100644 --- a/dev-haskell/doctemplates/doctemplates-0.9.ebuild +++ b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,24 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND="dev-haskell/aeson:=[profile?] - >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[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/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:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/glob dev-haskell/tasty dev-haskell/tasty-golden 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 5fc32b279a8..00000000000 --- 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/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest new file mode 100644 index 00000000000..5bdec94c0bb --- /dev/null +++ b/dev-haskell/doctest-parallel/Manifest @@ -0,0 +1 @@ +DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786 diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild index 012b822c494..6aa28f4165c 100644 --- a/dev-haskell/doctest/doctest-0.16.3.ebuild +++ b/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild @@ -1,34 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Test interactive Haskell examples" -HOMEPAGE="https://github.com/sol/doctest#readme" +HOMEPAGE="https://github.com/martijnbastiaan/doctest-parallel#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 +KEYWORDS="~amd64 ~ppc64 ~x86" +RESTRICT="test" # Known failure, issue #22 on upstream github RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?] + >=dev-haskell/cabal-3.4:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] + dev-haskell/extra:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] + dev-haskell/glob:=[profile?] + >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/syb-0.3:=[profile?] - >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:= + dev-haskell/unordered-containers:=[profile?] + >=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?] + >=dev-lang/ghc-8.10.1:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 + >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/hspec-2.3.0 >=dev-haskell/hspec-core-2.3.0 + dev-haskell/hspec-discover dev-haskell/hunit dev-haskell/mockery >=dev-haskell/quickcheck-2.13.1 diff --git a/dev-haskell/doctest-parallel/metadata.xml b/dev-haskell/doctest-parallel/metadata.xml new file mode 100644 index 00000000000..93738152194 --- /dev/null +++ b/dev-haskell/doctest-parallel/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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/doctest/Manifest b/dev-haskell/doctest/Manifest index a5d722a789f..0acb39397be 100644 --- a/dev-haskell/doctest/Manifest +++ b/dev-haskell/doctest/Manifest @@ -1 +1,2 @@ -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 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 00000000000..def4fb91b38 --- /dev/null +++ b/dev-haskell/doctest/doctest-0.20.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite +inherit haskell-cabal + +# 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 ~ppc64 ~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/easy-file/easy-file-0.2.2.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild index e396dc54841..d0b4cf303dd 100644 --- a/dev-haskell/easy-file/easy-file-0.2.2.ebuild +++ b/dev-haskell/easy-file/easy-file-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild index 4f0b6db6d69..969e0802dd5 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-2022 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 ~ppc64 ~x86" IUSE="examples" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild index 67ab4bd32f9..801e78a5e6c 100644 --- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild +++ b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~ppc64 ~x86" IUSE="" RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10 diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild index 30e1b8aee32..b37428643b8 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux" IUSE="" RDEPEND=">=dev-haskell/random-1.0:=[profile?] diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1-r1.ebuild index 0918386df35..eb6932c6106 100644 --- a/dev-haskell/either/either-5.0.1.1.ebuild +++ b/dev-haskell/either/either-5.0.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] @@ -26,7 +26,14 @@ RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[prof " DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10 - test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 + test? ( >=dev-haskell/quickcheck-2.9 >=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 ) " + +src_prepare(){ + default + + cabal_chdeps \ + 'QuickCheck >= 2.9 && < 2.14' 'QuickCheck >= 2.9' +} diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest index b5bc8cca676..949bb68ee47 100644 --- a/dev-haskell/email-validate/Manifest +++ b/dev-haskell/email-validate/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild index 18fbf2c8037..1ae0376f01f 100644 --- a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild +++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,15 +14,24 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] - >=dev-lang/ghc-7.10.1:= +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-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/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 ) " + +src_prepare() { + default + + cabal_chdeps \ + 'hspec >= 2.2.3 && < 2.9' 'hspec >= 2.2.3' \ + 'doctest >= 0.8 && < 0.19' 'doctest >=0.8' +} 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 00000000000..d60b0c6a784 --- /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/emojis/Manifest b/dev-haskell/emojis/Manifest index 95fd69c1169..0dca0cb15e3 100644 --- a/dev-haskell/emojis/Manifest +++ b/dev-haskell/emojis/Manifest @@ -1 +1 @@ -DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 +DIST emojis-0.1.2.tar.gz 49333 BLAKE2B c67e578cd356c2e7edc4f7880dc3235eff33dd98f773a24c4791442c4d0243b59cd775d8fb2bf4c53c6943434f340104183a99544d16a6d6c8f56c7d0d402dd3 SHA512 e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.2.ebuild index 7b74ee4c2e4..2ed24cc1a01 100644 --- a/dev-haskell/emojis/emojis-0.1.ebuild +++ b/dev-haskell/emojis/emojis-0.1.2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -12,13 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND="dev-haskell/text:=[profile?] - >=dev-lang/ghc-7.10.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.2.0 - test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) + >=dev-haskell/cabal-2.2.0.1 + test? ( dev-haskell/hunit ) " 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 4d881d42a52..7a79ccec628 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?] diff --git a/dev-haskell/entropy/entropy-0.4.1.6.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild index f7b946c45c9..2ecb344836a 100644 --- a/dev-haskell/entropy/entropy-0.4.1.6.ebuild +++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,15 +14,22 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="halvm" RDEPEND=">=dev-lang/ghc-7.10.1:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3 + >=dev-haskell/cabal-1.22.2.0 " +src_prepare() { + default + + 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/erf/erf-2.0.0.0-r1.ebuild b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild index 576c8c059cf..bb1b2f7e838 100644 --- a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild +++ b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild index e63ef2b19c3..5161103f250 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/base-orphans:=[profile?] diff --git a/dev-haskell/errors/errors-2.3.0.ebuild b/dev-haskell/errors/errors-2.3.0.ebuild index 7dd91e3a892..dec8a311838 100644 --- a/dev-haskell/errors/errors-2.3.0.ebuild +++ b/dev-haskell/errors/errors-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild index bfc8bbcbe39..a032fb6a4c7 100644 --- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild +++ b/dev-haskell/exceptions/exceptions-0.10.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 @@ -10,12 +10,10 @@ 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="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] @@ -31,7 +29,7 @@ DEPEND="${RDEPEND} >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) " -CABAL_CORE_LIB_GHC_PV="PM:8.10.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" +CABAL_CORE_LIB_GHC_PV="PM:8.10.5-r1 PM:8.10.6 PM:8.10.7 PM:9.0.1-r1 PM:9.0.2 PM:9999" src_prepare() { default diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild index 70b160ff281..722e5f919d8 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,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest index 40c4ef14dd9..4ca4c346e01 100644 --- a/dev-haskell/extra/Manifest +++ b/dev-haskell/extra/Manifest @@ -1 +1 @@ -DIST extra-1.7.8.tar.gz 43588 BLAKE2B 5ea318ad88fc61b8ad243c42c84aff4ed3fbcbb2f0f2897ed632b86ffc2045154986ffa850a087bba2b0dbee6f3537806d743c74ce4fc67de7762a825f65a60f SHA512 1af19a86824f2aee054debadf35ae2b7f3b2448edbab2df6e2d0a7badab9be167b7982c320a9438cef38afef3cf5b59151f244f6131174d74477dc3980e71d36 +DIST extra-1.7.10.tar.gz 44872 BLAKE2B cdab5f08bf7f2de216aeacacf994b6008aee91900244101c0a0c1bc78f2fe5fc595d03dcab1a13196b885b639320e00fdb2117f93f85ca037b970a8d6a71f480 SHA512 02ce08f7f22defd1db81bfb407361e18b6d98295f561652880d3ee6e91477a7cd89126cb507e7362fe90ed7b46e57b55400ae0ad94f40de39749926efe3018cd diff --git a/dev-haskell/extra/extra-1.7.8.ebuild b/dev-haskell/extra/extra-1.7.10.ebuild index 4acec8c5bc8..bec978e7a25 100644 --- a/dev-haskell/extra/extra-1.7.8.ebuild +++ b/dev-haskell/extra/extra-1.7.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,14 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="2/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=">=dev-haskell/clock-0.7:=[profile?] - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=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/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild index 1b3b9b74b71..1ce54a22460 100644 --- a/dev-haskell/fail/fail-4.9.0.0.ebuild +++ b/dev-haskell/fail/fail-4.9.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild index 511958b1556..4241771e823 100644 --- a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild +++ b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?] diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild index 4bca228c937..5275d9c7389 100644 --- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild +++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?] diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest index 29c505411fc..a03211a49a1 100644 --- a/dev-haskell/feed/Manifest +++ b/dev-haskell/feed/Manifest @@ -1 +1 @@ -DIST feed-1.3.0.1.tar.gz 107230 BLAKE2B 5ed36f28c63e2af4669a37cac0715891b96d37570dfa99404df5764ad1e5b4e512d3d1a54e263c838875cc4a29ce00b3a022b3a2647983cbda4011ba5accd855 SHA512 73662018affac036bcd3c48a8a5b6fcd4e752231d805c12e977c6097a47691c2eca07eb8d6e6840a592bf35892b4b4ec44fb1f73f8a14ecb47fc6904b406f767 +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.2.1.ebuild index 909b96ff32b..dd7b5d0484f 100644 --- a/dev-haskell/feed/feed-1.3.0.1.ebuild +++ b/dev-haskell/feed/feed-1.3.2.1.ebuild @@ -1,42 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 -CABAL_FEATURES="lib profile haddock hoogle hscolour" # markdown-unlit fals to generate a test: "test-suite" +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/bergmark/feed" +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RESTRICT=test # ghc: could not execute: markdown-unlit +PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" ) -RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] +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/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=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 ) " - -src_prepare() { - default - - cabal_chdeps \ - 'base >= 4 && < 4.14' 'base >= 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 00000000000..01ebc653749 --- /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/fgl/Manifest b/dev-haskell/fgl/Manifest index a8ae73dde77..2ee4ca86d07 100644 --- a/dev-haskell/fgl/Manifest +++ b/dev-haskell/fgl/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/fgl/fgl-5.7.0.2.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild index 26d3c88482d..afcf30e183c 100644 --- a/dev-haskell/fgl/fgl-5.7.0.2.ebuild +++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,13 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~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/hspec-2.8 - >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 ) + test? ( >=dev-haskell/hspec-2.1 + >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 ) " + +src_prepare() { + default + + cabal_chdeps \ + 'hspec >= 2.1 && < 2.8' 'hspec >= 2.1' +} 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 f225d60cb20..8e62962c8a3 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-8.0.2:= diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest index bf733c9e006..26f295beb4e 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.9.ebuild index 5c15d58f56c..0a2f5192736 100644 --- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild +++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# 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" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-lang/ghc-7.4.1:= +RDEPEND=">=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18 - test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 ) + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 ) " diff --git a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild index 7da5f531431..e11b6f70db9 100644 --- a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild +++ b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest index 16dbde48ee4..024378ee19c 100644 --- a/dev-haskell/foldl/Manifest +++ b/dev-haskell/foldl/Manifest @@ -1 +1,2 @@ -DIST foldl-1.4.7.tar.gz 21602 BLAKE2B 617f16b0b5ce18c12d5807daf973beb7e5fcd01591ff057d6ec66e8c6fae3cec140949ac87bd5c7d23bbd5ac86cd4355f5c96b8f4d703fa26f291975ff6bac8c SHA512 e1c8569214ee58d1d5333018a50832e8be53fa2751c18b5d93c7c8d393f722248050fc56c6a5243a0f9f8ff94a0cd2f475c03107e70d601bf6bf3a81c509b58d +DIST foldl-1.4.12-rev2.cabal 2668 BLAKE2B 4255e285bade060ee547a96c6db7a7d92b85bde3ca0f496fa7750b42df7e6382adbaa1ee7c2c8327f39eec6aba3eb44b7d29c9213e6595160bd8743fd364f73e SHA512 44ff1cb8f31c9770d78139053f2f31dcba76998339a9d07cd681994a0c34d862a750de2e5afa3b42a16528f38a6f9007a5481b9b52b481258006cd8466060ca1 +DIST foldl-1.4.12.tar.gz 23210 BLAKE2B bbdd9a0b74d5b27b4b8800090a1b2dc717d023d860af8f26846a86866756211b30c755f6a1c3e604d6d1db91e5afa35ee943e014672c0a6e65712e0fbcfd29d0 SHA512 6b345b59c52039e914ea703ab88a08a8bba0a18bea91fcf4cf379ce678e5a97044f563c7b285cb656a764068756b4fae8321308e86813f86d04c462e9889e6e0 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 00000000000..648b8f77cbc --- /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/foldl-1.4.12.ebuild b/dev-haskell/foldl/foldl-1.4.12.ebuild new file mode 100644 index 00000000000..41ff5e4150e --- /dev/null +++ b/dev-haskell/foldl/foldl-1.4.12.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +CABAL_HACKAGE_REVISION="2" +inherit haskell-cabal + +CABAL_FILE="${S}/${PN}.cabal" +CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.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 + https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal + -> ${CABAL_DISTFILE}" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86" + +PATCHES=( "${FILESDIR}/${PN}-1.4.12-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.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.13:=[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 + ) +" +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/foldl/foldl-1.4.7.ebuild b/dev-haskell/foldl/foldl-1.4.7.ebuild deleted file mode 100644 index 943ea2b45db..00000000000 --- 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/foundation/Manifest b/dev-haskell/foundation/Manifest index a0dae253bcc..cd62955f4e3 100644 --- a/dev-haskell/foundation/Manifest +++ b/dev-haskell/foundation/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/foundation/foundation-0.0.25.ebuild b/dev-haskell/foundation/foundation-0.0.26.1.ebuild index 1f75b31ea27..809d236f457 100644 --- a/dev-haskell/foundation/foundation-0.0.25.ebuild +++ b/dev-haskell/foundation/foundation-0.0.26.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.1.9999 +# 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" @@ -15,16 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="experimental" -RESTRICT="test" # fails to doctest +RESTRICT=test # hangs indefinitely -RDEPEND="~dev-haskell/basement-0.0.11:=[profile?] - >=dev-lang/ghc-8.0.1:= +RDEPEND="~dev-haskell/basement-0.0.12:=[profile?] + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/basement >=dev-haskell/doctest-0.9 ) " diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest index c2e62e6912e..a0d75ff1d51 100644 --- a/dev-haskell/free/Manifest +++ b/dev-haskell/free/Manifest @@ -1 +1 @@ -DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91 +DIST free-5.1.9.tar.gz 61606 BLAKE2B 0cf1e666f281c1610411a4f34a94cf1b887522db64d9957db36761ee596cc2d97c5bb7ebfa7c8ed40f42a5ab561d1fa8e2309843bf024e95cbef27a077ec02aa SHA512 925d9271adf5d16a48efaeebd65d54a9c5b4e042f1733382ee2269eee1f62d4b184e54209b384bdd145b76b093d7866f0115a56156c73f85bacb04cb7b265ec0 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 3bc8d782882..00000000000 --- 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 00000000000..415cd2f1fef --- /dev/null +++ b/dev-haskell/free/free-5.1.9.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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 ~ppc64 ~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/fsnotify/fsnotify-0.3.0.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild index 376479a62aa..dcb62721131 100644 --- a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild +++ b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest index 7ad1739e19b..6a9ec8236ad 100644 --- a/dev-haskell/generic-deriving/Manifest +++ b/dev-haskell/generic-deriving/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild index 100fd00432e..dcc3b5370a8 100644 --- a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild +++ b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,13 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] - >=dev-lang/ghc-7.4.1:= +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-1.10 + >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) " diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest index 5082bf3c9f0..89199077806 100644 --- a/dev-haskell/generics-sop/Manifest +++ b/dev-haskell/generics-sop/Manifest @@ -1 +1 @@ -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 diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild index af5a8ad6dad..cf34db4cef2 100644 --- a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild +++ b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.4.9999 +# ebuild generated by hackport 0.6.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,13 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" 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:= + >=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-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest index ac80c70e868..ebe56b346ca 100644 --- a/dev-haskell/genvalidity-hspec/Manifest +++ b/dev-haskell/genvalidity-hspec/Manifest @@ -1 +1 @@ -DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392 +DIST genvalidity-hspec-1.0.0.0.tar.gz 11721 BLAKE2B 70065c7ee463ca097ab2298767e2cf39693c18aad7eb154589930f252e8129795b59018114fc0e5409c788c3fc88a2e1686da02b5fe65c908c50609f6bfd0a73 SHA512 90818ec5bbf91ebe67ae9d079a695de2520c48b93cb7344e003f1b85963a6bb64addc15f1d5789b263b13a390b03c1bb49efecb52bc3de2d4b6988dad96d0626 diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild index 803a16b0fd2..70a1f08184c 100644 --- a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild +++ b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.4 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,17 +14,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?] +RDEPEND=">=dev-haskell/genvalidity-1.0:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] - dev-haskell/hspec-core:=[profile?] + >=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest index 6fb0fb06ee9..e379b9a0f63 100644 --- a/dev-haskell/genvalidity-property/Manifest +++ b/dev-haskell/genvalidity-property/Manifest @@ -1 +1 @@ -DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add +DIST genvalidity-property-1.0.0.0.tar.gz 9333 BLAKE2B 4236156a04abbef4924e8e725f7804a80caee9ecc0672ad0e695390ee50aa29d1b32272472c6df0d6479f0d27c9bbf36b8642123d367c97199e743d7f1f1cfab SHA512 fdb11224baad570cc91762ade0a09be924547df0cb6d3438463e17d981ac8298052051f3dc3df3ccf17386eb12e47cf68a218d4374d806f709df106018fd290c diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild index 5af378911ae..b644a45dab2 100644 --- a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild +++ b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.3 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,17 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?] +RDEPEND=">=dev-haskell/genvalidity-1.0:=[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:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 - test? ( dev-haskell/doctest ) + >=dev-haskell/cabal-2.2.0.1 " diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest index 4e36afd05fc..40c6dd38bb0 100644 --- a/dev-haskell/genvalidity/Manifest +++ b/dev-haskell/genvalidity/Manifest @@ -1 +1 @@ -DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5 +DIST genvalidity-1.0.0.1.tar.gz 12074 BLAKE2B 91a99130c446bbaab556230cd525adf9f2d0be8f04517428e088aadaf5dad30be411a5d22430fad942a273c706a5ca41fd275a19a12589c121d9003b57a25495 SHA512 520122e67b3b95798b9701cd090a80886efd4f029f1a7f54b76adf427d8e457ed3eafa1d3fd4d40b5456ae592cd9153e43f8ed2ed52b014a9f5b66de02f8b01f diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild index a8b688efd42..fe16939bdb0 100644 --- a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild +++ b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,16 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" -RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?] - dev-haskell/random:=[profile?] - >=dev-haskell/validity-0.9:=[profile?] - >=dev-lang/ghc-8.2.1:= +RDEPEND=">=dev-haskell/quickcheck-2.13:2=[profile?] + >=dev-haskell/random-1.1:=[profile?] + >=dev-haskell/validity-0.12:=[profile?] + >=dev-lang/ghc-8.8.1:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.0.0.2 + >=dev-haskell/cabal-3.0.0.0 test? ( dev-haskell/hspec dev-haskell/hspec-core ) " 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 4b16299b9e0..52bf73fff3a 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,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?] diff --git a/dev-haskell/ghc-byteorder/Manifest b/dev-haskell/ghc-byteorder/Manifest new file mode 100644 index 00000000000..e932ce741e0 --- /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 00000000000..130edb16d5b --- /dev/null +++ b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 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="\"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 ~ppc64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 +" + +src_prepare() { + default + cabal_chdeps \ + 'base >=4.11 && <4.15' 'base >=4.11' + eapply_user +} diff --git a/dev-haskell/ghc-byteorder/metadata.xml b/dev-haskell/ghc-byteorder/metadata.xml new file mode 100644 index 00000000000..a23c2f79664 --- /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 "GHC.ByteOrder" API as provided in @base-4.11.0.0@ for legacy GHC releases which didn'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'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 "GHC.ByteOrder" module. + + In order to use this compatibility layer, simply declare a dependency on @ghc-byteorder@ in your @.cabal@ package description like so + + > build-depends: ghc-byteorder ^>= 4.11.0.0 + + And your code will be able to access this respective API version of the module via the usual + + > import GHC.ByteOrder + + mechanism. + </longdescription> +</pkgmetadata> 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 7408ec14413..c6ae35420b2 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,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,13 +15,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~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 " src_prepare() { @@ -30,8 +30,9 @@ src_prepare() { # but in gentoo we install it to fixed patch, so remove Setup.hs detection code cabal-mksetup + # https://github.com/simonmar/ghc-paths/pull/26 cabal_chdeps \ - 'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.3' + 'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.7' # and use gentoo's hardcoded one: # a few things we need to replace, and example values diff --git a/dev-haskell/git-lfs/Manifest b/dev-haskell/git-lfs/Manifest index 971868f91df..a4c299b0304 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 d159ef769a5..00000000000 --- 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.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild new file mode 100644 index 00000000000..2ab66ee6250 --- /dev/null +++ b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.2.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 ~ppc64 ~x86" + +RDEPEND=">=dev-haskell/aeson-1.3:=[profile?] <dev-haskell/aeson-2.1:=[profile?] + >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] + >=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.8:=[profile?] + >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] + >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] + >=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 +" diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest index 6c5b0feaf53..1e723dd0ef1 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 0f8f8bcf04d..00000000000 --- 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 00000000000..590117c70b7 --- /dev/null +++ b/dev-haskell/glob/glob-0.10.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_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 ~ppc64 ~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/groups/Manifest b/dev-haskell/groups/Manifest new file mode 100644 index 00000000000..75f445e4515 --- /dev/null +++ b/dev-haskell/groups/Manifest @@ -0,0 +1 @@ +DIST groups-0.5.3.tar.gz 3396 BLAKE2B fbd87c5954550de266fcbe176d631577c22ad468a061b01f295d21fb8fcf1b9f218489ffe0962a7b9b04e0a5a2ddbc911158eecd6a4d4a0b0a562a70da8afa1d SHA512 5601e9c44d742dd715016d9d4f69f5033aad332c2a5b47d6e79d51e437d3166b6e8bd975f7e4b44acf6cbf1eb5a1fae021ddfd2058c6cd00b25030f0d7b70387 diff --git a/dev-haskell/groups/groups-0.5.3.ebuild b/dev-haskell/groups/groups-0.5.3.ebuild new file mode 100644 index 00000000000..01d0900ac58 --- /dev/null +++ b/dev-haskell/groups/groups-0.5.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="A group is a monoid with invertibility" +HOMEPAGE="https://hackage.haskell.org/package/groups" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=">=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.4 +" diff --git a/dev-haskell/groups/metadata.xml b/dev-haskell/groups/metadata.xml new file mode 100644 index 00000000000..93738152194 --- /dev/null +++ b/dev-haskell/groups/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest index b087e633d8f..f57f5b49c43 100644 --- a/dev-haskell/hackage-security/Manifest +++ b/dev-haskell/hackage-security/Manifest @@ -1,3 +1 @@ -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 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 7c30961a4b4..00000000000 --- 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 fd83a5113c5..00000000000 --- 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/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 2c6a4be4ebc..00000000000 --- 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.1.0.ebuild index e10ab6c3c0b..fd148c49f7e 100644 --- a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild +++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild @@ -1,60 +1,52 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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: -mtl21,+use-network-uri +# 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 - https://hackage.haskell.org/package/${P}/revision/4.cabal -> ${PF}.cabal" +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" +KEYWORDS="~amd64 ~ppc64 ~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:= + >=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/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 + 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/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 ) ) ) ) " -# 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) \ diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml index b6aa0a6ae2b..67d5d614a4f 100644 --- a/dev-haskell/hackage-security/metadata.xml +++ b/dev-haskell/hackage-security/metadata.xml @@ -6,26 +6,6 @@ <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 - (<http://hackage.haskell.org/>). It is based on The Update - Framework (<http://theupdateframework.com/>), a set of - recommendations developed by security researchers at - various universities in the US as well as developers on the - Tor project (<https://www.torproject.org/>). - - 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> </pkgmetadata> diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest index de50c543982..f78fcfe4a07 100644 --- a/dev-haskell/haddock-api/Manifest +++ b/dev-haskell/haddock-api/Manifest @@ -1,2 +1 @@ -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 +DIST haddock-api-2.25.1.tar.gz 208616 BLAKE2B 4ee682e797f6d8790ba83f53111263b07ce4080809d2aa8306123e04dd0d5472822b45ad8f09bcd4d4a4cf01e4462cfe8f6ed683b6468e2870d43f02bc761717 SHA512 ce34eb986733f3cc8338781054ff4d88f7fcdefed476a8a9861657306ffd8d89e7768b2640f354257fd2db336c5d66bd0acdd1676ad401422d785847277d914f 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 84c275fbb34..00000000000 --- 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 cd03ee56f66..00000000000 --- 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 d17fc17abb3..00000000000 --- 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/haddock-api-2.25.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.25.1.ebuild new file mode 100644 index 00000000000..f8f4cad037b --- /dev/null +++ b/dev-haskell/haddock-api/haddock-api-2.25.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 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 hoogle hscolour 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-2" +SLOT="0/${PV}" +#keep in sync with ghc-9.0.2 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="dev-haskell/exceptions:=[profile?] + >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] + >=dev-haskell/haddock-library-1.10.0:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] + dev-haskell/mtl:=[profile?] + >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] + >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] + >=dev-lang/ghc-9.0.2:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.4.1.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-discover-2.4.4 + >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15 ) +" + +src_prepare() { + default + + 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' +} diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest index d021b2c1e5f..083c44d1310 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.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild new file mode 100644 index 00000000000..1f9adfbf861 --- /dev/null +++ b/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +CABAL_HACKAGE_REVISION="3" +inherit haskell-cabal + +CABAL_FILE="${S}/${PN}.cabal" +CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.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 + https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal + -> ${CABAL_DISTFILE}" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=">=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/hspec-2.4.4 + >=dev-haskell/hspec-discover-2.4.4 + >=dev-haskell/optparse-applicative-0.15 + >=dev-haskell/tree-diff-0.1 + >=dev-haskell/base-compat-0.11.0 + >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15 ) +" +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 + + 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' +} 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 0a9bf5474c7..00000000000 --- 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 59c2d563d11..00000000000 --- 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/Manifest b/dev-haskell/haddock/Manifest index a900dd75f77..d896436f417 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -1,2 +1 @@ -DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db -DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036 SHA512 52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003 +DIST haddock-2.25.1.tar.gz 315144 BLAKE2B 465a632d2346ab0aefb47384bc47d165ca62c600917c3293e3c9d6f8ff25217ab9678f5aa95dad1464743d3f8b6080692d2f11752186d59bfca92f8a884c6e57 SHA512 526e358dc1f0fe2d6d692fa990194113dbff7917f815dc4666849dd416a6b8560b9eafab2aeb5f5ffbe2ff790d11ffeb241ebf3c92321a0b0d06326e58bac4eb 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 08f165ce877..00000000000 --- 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/haddock-2.23.1.ebuild b/dev-haskell/haddock/haddock-2.25.1.ebuild index 21f858ae97a..1a2cb1dee76 100644 --- a/dev-haskell/haddock/haddock-2.23.1.ebuild +++ b/dev-haskell/haddock/haddock-2.25.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7 #hackport: flags: -in-ghc-tree -CABAL_FEATURES="" # test-suite unavailable +CABAL_FEATURES="" # broken test-suite inherit haskell-cabal DESCRIPTION="A documentation-generation tool for Haskell libraries" @@ -15,18 +15,17 @@ 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="" +#keep in sync with ghc-9.0.2 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -RESTRICT=test # test suite unavailable +RESTRICT=test # missing test-suite -RDEPEND="~dev-haskell/haddock-api-2.23.1:= +RDEPEND="~dev-haskell/haddock-api-2.25.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 \ diff --git a/dev-haskell/haddock/metadata.xml b/dev-haskell/haddock/metadata.xml index c7bb0e775ab..93738152194 100644 --- a/dev-haskell/haddock/metadata.xml +++ b/dev-haskell/haddock/metadata.xml @@ -1,7 +1,8 @@ <?xml version="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> </pkgmetadata> diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest index da24e9ffe3a..73cfc4c8f7c 100644 --- a/dev-haskell/hakyll/Manifest +++ b/dev-haskell/hakyll/Manifest @@ -1 +1 @@ -DIST hakyll-4.14.0.0.tar.gz 109807 BLAKE2B e1e6e541f5783571740744b9eee1bcd9edd79eec69b5556de39ef7a47f86e23fa0284ccb83ff9212ff4b07b7e2519eff67946ebdbf90663421cf98ea9761c529 SHA512 5f3f7a952b085cf1a59a646c15e42f29c89d4ed0a5a96f55156d19b86340c2361da6c19ff7a70bde98122423e237dc7082bfcc84bc5e96ab9421fdaef84a8cce +DIST hakyll-4.15.1.1.tar.gz 121384 BLAKE2B 3c77cb22a7bc862882aed452a6fa9d0adb58c274d5311e47a8cab6eaa2978e57e5421e2ef496944d03a0100d43ef0da9d1902423c2f104ca02a7437fb4030e4c SHA512 c0fee6bedfe19677484e41d2d0a098bf351c35a8b3adc7fe5de407a0686dd1d1108584b05525f70ce7cac94919b50c09be91706226bbc3f3e3d155cc9bc1eb34 diff --git a/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild b/dev-haskell/hakyll/hakyll-4.15.1.1.ebuild index a9d1b64fa5f..af6b01b7830 100644 --- a/dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild +++ b/dev-haskell/hakyll/hakyll-4.15.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.1.1.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -14,32 +14,30 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~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/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.16:=[profile?] + >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-2:=[profile?] + >=dev-haskell/lifted-async-0.10:=[profile?] <dev-haskell/lifted-async-1:=[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/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.18:=[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?] ) + >=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?] + buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.19:=[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?] @@ -48,12 +46,12 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:= >=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?] ) + usepandoc? ( >=app-text/pandoc-2.11:=[profile?] <app-text/pandoc-2.19:=[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-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 ) @@ -62,11 +60,9 @@ DEPEND="${RDEPEND} 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' + 'pandoc >= 2.11 && < 2.18' 'pandoc >= 2.11' \ + 'pandoc >= 2.11 && < 2.18' 'pandoc >= 2.11' } src_configure() { diff --git a/dev-haskell/happy/happy-1.19.12.ebuild b/dev-haskell/happy/happy-1.19.12.ebuild index c67b77e14af..4765071b102 100644 --- a/dev-haskell/happy/happy-1.19.12.ebuild +++ b/dev-haskell/happy/happy-1.19.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="doc" RDEPEND=">=dev-haskell/mtl-2.2.1:= diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest index 8c3a45c1d7e..dd379791e09 100644 --- a/dev-haskell/hashable-time/Manifest +++ b/dev-haskell/hashable-time/Manifest @@ -1 +1 @@ -DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a +DIST hashable-time-0.3.tar.gz 2240 BLAKE2B 328aa39a575f4f356be83adaa29f42e145c68df0e9a25c38c5ca44f1f8af5cb3c434994412f9602c30469fb4ac22a6ab462e57b2b470b801d59f0ce4bf4f6d91 SHA512 c6715693b55892beab59820e0dc742ddbf3c8b75f3bc4994b90175f4220da841aa514b34e08e5f58971fb523fa75cc2da59f5bb37c7e7744d6de6eacd7c27b51 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 72b81da8323..00000000000 --- 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/hashable-time-0.3.ebuild b/dev-haskell/hashable-time/hashable-time-0.3.ebuild new file mode 100644 index 00000000000..971d420219c --- /dev/null +++ b/dev-haskell/hashable-time/hashable-time-0.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 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="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 ~ppc64 ~x86" + +RDEPEND=">=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] + >=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( dev-haskell/hashable ) +" diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest index b8f7c7c6c83..09b4980ccf6 100644 --- a/dev-haskell/hashable/Manifest +++ b/dev-haskell/hashable/Manifest @@ -1 +1 @@ -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 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 dbcf2526b0c..00000000000 --- 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.ebuild b/dev-haskell/hashable/hashable-1.4.0.2.ebuild new file mode 100644 index 00000000000..44a2379a204 --- /dev/null +++ b/dev-haskell/hashable/hashable-1.4.0.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 +#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 ~ppc64 ~x86" + +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 \ + --flag=random-initial-seed +} diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest index 1fe7076067d..bb8c2dd1cab 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.tar.gz 58599 BLAKE2B a0ce2ecc6b91c3b1c46759ef7e6a067b6872998d7fbecc22e8ee84bafc80bd5b7e286100c3c906a0b60ae86bceafb2cca7717081f347790d70c47e164aea9800 SHA512 7fb82e7c45c13d7bde8a216fb678d20bbd4c970f7860cbc2f08fb5524324f6b9584e1b5d397bdcb3fdbf53928758b608986167bb2bc2f1adae6feb3b0dd94444 diff --git a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.ebuild index b4558c55689..d3059c57ed9 100644 --- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild +++ b/dev-haskell/hashtables/hashtables-1.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.6 -#hackport: flags: sse42:cpu_flags_x86_sse4_2 +# ebuild generated by hackport 0.7.1.1.9999 +#hackport: flags: sse42:cpu_flags_x86_sse4_2,+unsafe-tricks,-portable CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -15,16 +15,16 @@ 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" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling" -RDEPEND="dev-haskell/primitive:=[profile?] +RDEPEND=">=dev-haskell/hashable-1.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?] + 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?] + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2 + >=dev-haskell/cabal-2.2.0.1 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 @@ -38,7 +38,7 @@ src_configure() { $(cabal_flag bounds-checking bounds-checking) \ $(cabal_flag debug debug) \ $(cabal_flag detailed-profiling detailed-profiling) \ - $(cabal_flag portable portable) \ + --flag=-portable \ $(cabal_flag cpu_flags_x86_sse4_2 sse42) \ - $(cabal_flag unsafe-tricks unsafe-tricks) + --flag=unsafe-tricks } diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml index 86c607e5ac2..6f84b90b37d 100644 --- a/dev-haskell/hashtables/metadata.xml +++ b/dev-haskell/hashtables/metadata.xml @@ -3,107 +3,10 @@ <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 - <https://en.wikipedia.org/wiki/Cuckoo_hashing>). 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 - <https://en.wikipedia.org/wiki/Linear_hashing>), 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.: - - > import qualified Data.HashTable.IO as H - > - > type HashTable k v = H.BasicHashTable k v - > - > foo :: IO (HashTable Int Int) - > foo = do - > ht <- H.new - > H.insert ht 1 1 - > 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 <https://en.wikipedia.org/wiki/SSE4>, 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 - <https://github.com/gregorycollins/hashtables/issues>. - </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="github">gregorycollins/hashtables</remote-id> - </upstream> </pkgmetadata> diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest index bcebc77ebeb..98a96350f78 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.tar.gz 72759 BLAKE2B 389908d07775bd150801c7423f3cdc860e1330c0f13cd754374870b4aea19d5bd01f761aec7aa0f2effe87a80c25dc8e7f4390c095627c4d25ed2976de855a63 SHA512 5e8dccceb2230340a7f07f2e0926a938b52106d8a1638be6c1a031802ecbdf12cb42246096518ac12614d5d48479666a44ad33e5e32ab0ac2043b630a7b53746 diff --git a/dev-haskell/haskeline/haskeline-0.8.2.ebuild b/dev-haskell/haskeline/haskeline-0.8.2.ebuild new file mode 100644 index 00000000000..68052da08d5 --- /dev/null +++ b/dev-haskell/haskeline/haskeline-0.8.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.9999 +#hackport: flags: -examples + +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" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +# keep in sync with ghc-8.10.6 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+terminfo" + +RESTRICT=test # test requires example executable which does not work correctly + +RDEPEND=">=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] + >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] + >=dev-lang/ghc-8.4.3:= + terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-examples \ + $(cabal_flag terminfo terminfo) +} + +# ghc-9.0.1 actually comes bundled with haskeline-0.8.1.0 +CABAL_CORE_LIB_GHC_PV="PM:8.10.6 PM:8.10.7 PM:9.0.1-r1 PM:9.0.2 PM:9999" diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest index 0cabd6c8e6d..3485b5f5537 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.1.ebuild index d4c2c7acfd7..05e1fb2529d 100644 --- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild +++ b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# ebuild generated by hackport 0.6.9999 +# ebuild generated by hackport 0.6.4 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest index f86d6143b9f..4926b17618c 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 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 cc8b3943697..00000000000 --- 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 index 9f059879744..e51345e310a 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="1.21/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest index 7f9623bf8eb..ba5add1b180 100644 --- a/dev-haskell/hedgehog/Manifest +++ b/dev-haskell/hedgehog/Manifest @@ -1 +1,2 @@ -DIST hedgehog-1.0.4.tar.gz 68959 BLAKE2B db9b5d2202d1a27fd27703f45083ac3b1e6c26505e4ead2c26bc79f5bd42f9523f2c11299cfa42b095467e289a5c80d2b75cf628828af4b702ad22195f2b1457 SHA512 71eb946550c0189e598d2a4205547c007cc4fd101e1cfab38f79535e7c158dfa3b43dec6dde2331d5fe9cb5b0d4c6212f51b820ec146e47ecd9823a99f0f8133 +DIST hedgehog-1.0.5.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2 +DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98 diff --git a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild index 2b09e994ae4..10615f6f2ca 100644 --- a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild +++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +# ebuild generated by hackport 0.7.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" +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] @@ -34,8 +35,16 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal- >=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:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 " + +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/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild index f66c4ab16b1..41e63a2793f 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-2022 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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml index a6d15f03263..e9a57e77687 100644 --- a/dev-haskell/hinotify/metadata.xml +++ b/dev-haskell/hinotify/metadata.xml @@ -5,6 +5,6 @@ <email>haskell@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">kolmodin/hinotify.git</remote-id> + <remote-id type="github">kolmodin/hinotify</remote-id> </upstream> </pkgmetadata> diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild index e74f3c315fb..7e17d678b59 100644 --- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild +++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RESTRICT=test # Requires network access? diff --git a/dev-haskell/hostname/hostname-1.0-r1.ebuild b/dev-haskell/hostname/hostname-1.0-r1.ebuild index 076f4847b05..b3d15f17dd8 100644 --- a/dev-haskell/hostname/hostname-1.0-r1.ebuild +++ b/dev-haskell/hostname/hostname-1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild index 60cfa4cc7cf..b0d325eb914 100644 --- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild +++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest index 052dde252cf..fee4dcfd5a9 100644 --- a/dev-haskell/hpack/Manifest +++ b/dev-haskell/hpack/Manifest @@ -1 +1 @@ -DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b +DIST hpack-0.35.0.tar.gz 68119 BLAKE2B 5f000976aa5c9948319dfcb5c3043649ccbc6d4c1424a93c48dcfd9307a49333e89df824a1bcfbbfb32f51b38524606292363ba09ed6d2d08f360aae8b6c2afb SHA512 2f5f6aaa1b4a295e98717da822080f918c25ac69d08577c41afdc05e18d17a04ac4ddb83efebdfc0da8962d8220777ca07cabefeede9c8cf162ee05b1d7c5efd diff --git a/dev-haskell/hpack/hpack-0.33.0.ebuild b/dev-haskell/hpack/hpack-0.35.0.ebuild index da9f5c70e10..7acfc91f92f 100644 --- a/dev-haskell/hpack/hpack-0.33.0.ebuild +++ b/dev-haskell/hpack/hpack-0.35.0.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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.7.1.2 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -DESCRIPTION="An alternative format for Haskell packages" +DESCRIPTION="A modern 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/cabal-3.0.0.0:=[profile?] <dev-haskell/cabal-3.7:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/glob-0.9.0:=[profile?] dev-haskell/http-client:=[profile?] @@ -27,14 +26,13 @@ RDEPEND=">=dev-haskell/aeson-1.4.3.0:=[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:= + >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/hunit-1.6.0.0 dev-haskell/interpolate diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild index 6d3897e87d2..21819f6983e 100644 --- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild +++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild index b91fd077bbf..7bf1e26b1cb 100644 --- a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild +++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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 +#hackport: flags: -test,-buildtests,+network--gt-3_0_0 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -15,19 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |