diff --git a/app-portage/hackport/hackport-0.7.2.2.ebuild b/app-portage/hackport/hackport-0.7.2.2.ebuild index c82f8252ca254..9caa117dedee7 100644 --- a/app-portage/hackport/hackport-0.7.2.2.ebuild +++ b/app-portage/hackport/hackport-0.7.2.2.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=dev-haskell/async-2.0:= >=dev-haskell/network-3.0:= >=dev-haskell/network-uri-2.6.0.2:= >=dev-haskell/parallel-3.2.1.0:= - dev-haskell/quickcheck:2= + dev-haskell/quickcheck:= >=dev-haskell/random-1:= >=dev-haskell/regex-base-0.94.0.0:= >=dev-haskell/regex-posix-0.96.0.0:= @@ -43,7 +43,7 @@ RDEPEND=">=dev-haskell/async-2.0:= >=dev-haskell/tar-0.5.0.3:= dev-haskell/xml:= >=dev-haskell/zlib-0.5.3:= - >=dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-8.4.3:= =dev-haskell/parsec-3.1.13.0:=[profile?] dev-haskell/parser-combinators:=[profile?] dev-haskell/prettyprinter:=[profile?] - dev-haskell/quickcheck:2= + dev-haskell/quickcheck:= >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-base-0.94.0.0:=[profile?] >=dev-haskell/regex-posix-0.96.0.0:=[profile?] diff --git a/app-portage/hackport/hackport-9999.ebuild b/app-portage/hackport/hackport-9999.ebuild index dfd8f33c2cf4b..6845afdc9bf74 100644 --- a/app-portage/hackport/hackport-9999.ebuild +++ b/app-portage/hackport/hackport-9999.ebuild @@ -42,7 +42,7 @@ RDEPEND=" >=dev-haskell/parsec-3.1.13.0:=[profile?] dev-haskell/parser-combinators:=[profile?] dev-haskell/prettyprinter:=[profile?] - dev-haskell/quickcheck:2= + dev-haskell/quickcheck:= >=dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-base-0.94.0.0:=[profile?] >=dev-haskell/regex-posix-0.96.0.0:=[profile?] diff --git a/dev-haskell/aeson/aeson-2.0.3.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild index 2c9aed3a5f2ad..2f374da46b2ac 100644 --- a/dev-haskell/aeson/aeson-2.0.3.0.ebuild +++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild @@ -28,7 +28,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] =dev-haskell/indexed-traversable-0.1.2:=[profile?] =dev-haskell/onetuple-0.3.1:=[profile?] =dev-haskell/primitive-0.7.3.0:=[profile?] =dev-haskell/quickcheck-2.14.2:2=[profile?] =dev-haskell/quickcheck-2.14.2:=[profile?] =dev-haskell/scientific-0.3.7.0:=[profile?] =dev-haskell/semialign-1.2:=[profile?] =dev-haskell/strict-0.4:=[profile?] =dev-lang/ghc-8.4.3:= =dev-haskell/cabal-2.2.0.1 diff --git a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild index e58612f680b79..a83a9c106765d 100644 --- a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild +++ b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild @@ -24,7 +24,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary RDEPEND=" - >=dev-lang/ghc-8.10.6:= + >=dev-lang/ghc-8.10.6:= =dev-lang/ghc-7.4.1:= =ghc-9.2 +RDEPEND+=" + test? ( + = 4.8 && < 4.15' 'base >= 4.8' + 'base >= 4.8 && < 4.16' 'base >= 4.8' 'hashable >= 1.0 && < 1.4' 'hashable >=1.0' 'HTTP >= 4000.1.5 && < 4000.4' 'HTTP >= 4000.1.5 && < 4000.5' ) diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index 8141101470fa6..fb916d95e0407 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1,5 +1,3 @@ -DIST cabal-3.2.1.0-rev1.cabal 27482 BLAKE2B 7726071d1d59f6f2dcc382346d8e75d219a00bc3b8f936049b464a13224ad1cac0cc6e065a0ab0fdd1ee85d24d3d7e33abbebd603dbac4ff564f72c8aafcab3b SHA512 0d8bb2d72f825a6e3e88e5a0146a97a0ea2f7fa7c4950205ce652648abda2c74ea336654ef77b40f95865cde57126a8725c7538e0d492e74cadf7ebcd4d80d4d -DIST cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598 DIST cabal-3.4.1.0-rev1.cabal 31402 BLAKE2B cfaeee44401e73fa6f80e06896ae21dcbc162a1932963ffdf44428db50a63970ef8323ae6bff0a0f11341a1d31c8b766770b6f6b892d896a27710f44dc655147 SHA512 786c52e25062b0d2934a455a623dc78f4581add2875723356ddb4ff51346e35bf9ad226bda2f25863a30e57e4e7c3ad2f2df7aed3fdbe2c888b4397841b830cc DIST cabal-3.4.1.0.tar.gz 836938 BLAKE2B b185d2beb91a0317b392c6f32ea47a574b8037b23f5131334bca1282359218ab94aa406be737e0fbb15458e7dfa2cba2b22f7776d42c20aeed2b87598cda0e2d SHA512 93233007b70487c76b8ceb9e475ebff0cae4c86a4694820ee505ee83d9049147d60c32c9aea5c4802faf5273adaaae66db299c1ee722aed64c716ac7a3b3aa90 DIST cabal-3.6.3.0.tar.gz 608808 BLAKE2B 921b07d24b1f2905bd856185cdb20f519d077b729e3ae515611f6024dfbe9d8263c3f8dade6751c35ea7584b5044bf53ab5c3f5ec8dd5aa465f519c7ceb272a4 SHA512 47a2e2c6f316d49f9d20b53e6781fe0d3d874a472133d9b16c5d0be5df0fff951560974fa73dccf3fb0b53cb01c68c7f5f5d3545538d7a2c7245aca8ff602020 diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild deleted file mode 100644 index f7ec4a9eae1f8..0000000000000 --- a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ebuild generated by hackport 0.8.0.0.9999 -#hackport: flags: -parsec-struct-diff - -CABAL_HACKAGE_REVISION=1 -CABAL_PN="Cabal" - -# Drop test-suite due to "circular" dependencies with quickcheck -CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite -CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken -inherit haskell-cabal - -DESCRIPTION="A framework for packaging Haskell software" -HOMEPAGE="https://www.haskell.org/cabal/" - -LICENSE="BSD" -SLOT="0/${PV}" -# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV) -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris - -RESTRICT=test # circular deps: cabal -> quickcheck -> cabal - -RDEPEND=" - >=dev-lang/ghc-8.4.3:= -" -DEPEND="${RDEPEND} -" -# test? ( -# >=dev-haskell/base-compat-0.11.0 =dev-haskell/base-orphans-0.6 =dev-haskell/diff-0.4 =dev-haskell/integer-logarithms-1.0.2 =dev-haskell/optparse-applicative-0.13.2.0 =dev-haskell/quickcheck-2.14 =dev-haskell/stm-2.4.5.0 =dev-haskell/tar-0.5.0.3 =dev-haskell/tasty-1.2.3 =dev-haskell/tasty-golden-2.3.1.1 =dev-haskell/tree-diff-0.1 quickcheck -> cabal RDEPEND=" - >=dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-8.4.3:= =dev-lang/ghc-8.6.3:= + >=dev-lang/ghc-8.6.3:= =dev-haskell/byteable-0.1.1:=[profile?] =dev-haskell/crypto-cipher-types-0.0.8:=[profile?] =dev-haskell/quickcheck-2:2=[profile?] + >=dev-haskell/quickcheck-2:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] = 4.5 && < 4.10' 'base >= 4.5' + 'base >= 4.5 && < 4.16' 'base >= 4.5' 'tasty == 0.11.*' 'tasty >= 0.11' 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' + 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2' ) diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml index a39901938d32c..ce013d3a56a12 100644 --- a/dev-haskell/cryptohash-md5/metadata.xml +++ b/dev-haskell/cryptohash-md5/metadata.xml @@ -7,6 +7,6 @@ cryptohash-md5 - haskell-hvr/cryptohash-md5 + hvr/cryptohash-md5 diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest index ec9b31b246860..8691986056e10 100644 --- a/dev-haskell/cryptohash-sha1/Manifest +++ b/dev-haskell/cryptohash-sha1/Manifest @@ -1,3 +1,4 @@ +DIST cryptohash-sha1-0.11.100.1-rev6.cabal 4354 BLAKE2B f89a3045c1ea145f3ac2af440eeea2d213a69c5abaa0f9eb1407a2da34a08aabb7df966f014a9b903eff5ae9ee3262703097e6b5f5df0b13252d3889c8a2776c SHA512 3077375cbff05b415168152eeb213a9ec1c0d0d48f63b394f65399f7ae1421adc8f0e760e1ec7f7a5f83c78377151209c77d23ab01cf0ceb36e899aa000310f3 DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc DIST cryptohash-sha1-0.11.101.0-rev2.cabal 3094 BLAKE2B fc048a5eaefca1df4b1748f46f48f69e7571f90fdfdb3524b7556a8b6a9b3f7b58d363209ec20d9f4892b1b3e69dc1394287e7e70e7009f06dd75bc02e267910 SHA512 1dbf660ca81c2d8633dd6255602fa6b5f2999f55400bd75391be0049ca8bcf221d14b5d294999427ed193aa0514d68e05509b85fc5a2fe9c8be574b0a0542f9a DIST cryptohash-sha1-0.11.101.0.tar.gz 11563 BLAKE2B 4da99b2b4943e3909d3af24f62fb0ecf4c87370075f280a7e9ea44956cd58df9f49076a0d90b60bec9a7dcb3d24df032f6b5ef07644a4b63bdf1099458996163 SHA512 4384fc2f63750400561b5dbea0a343510306d755131121346d6a52cb9420cb12fc7d20247f044beb0ea55ae254ce666edc982d76e999c0762894f405e9b6441e diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild index 1e0a3aca51947..7781ccfebaec6 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 @@ -3,19 +3,19 @@ EAPI=8 -# ebuild generated by hackport 0.5.1.9999 +# ebuild generated by hackport 0.8.4.0.9999 + +CABAL_HACKAGE_REVISION=6 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Fast, pure and practical SHA-1 implementation" HOMEPAGE="https://github.com/hvr/cryptohash-sha1" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= " @@ -29,8 +29,9 @@ DEPEND="${RDEPEND} " CABAL_CHDEPS=( - 'base >= 4.5 && < 4.10' 'base >= 4.5' + 'base >= 4.5 && < 4.16' 'base >= 4.5' 'tasty == 0.11.*' 'tasty >= 0.11' 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' + 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2' ) diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml index 114f360e78d94..fede62a037d90 100644 --- a/dev-haskell/cryptohash-sha1/metadata.xml +++ b/dev-haskell/cryptohash-sha1/metadata.xml @@ -7,6 +7,6 @@ cryptohash-sha1 - haskell-hvr/cryptohash-sha1 + hvr/cryptohash-sha1 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 3c2252862587a..f931823ec69e2 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 @@ -34,6 +34,7 @@ CABAL_CHDEPS=( 'tasty == 0.11.*' 'tasty >= 0.11' 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' 'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' + 'bytestring >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2' ) src_configure() { diff --git a/dev-haskell/cryptonite/cryptonite-0.28.ebuild b/dev-haskell/cryptonite/cryptonite-0.28.ebuild index af3cb754b8e90..618c5f1e6b33c 100644 --- a/dev-haskell/cryptonite/cryptonite-0.28.ebuild +++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild @@ -21,7 +21,7 @@ IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] - >=dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-8.4.3:= =dev-lang/ghc-7.8.2:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild index 4607b051369a3..eca005fa90d42 100644 --- a/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild +++ b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild @@ -14,12 +14,16 @@ HOMEPAGE="https://github.com/Hexirp/doctest-driver-gen#readme" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+executable" +IUSE="executable" PATCHES=( "${FILESDIR}/${PN}-0.3.0.7-add-executable-flag.patch" ) +CABAL_TEST_REQUIRED_BINS=( + "${PN}" +) + RDEPEND=" >=dev-lang/ghc-8.10.6:= " @@ -32,9 +36,21 @@ DEPEND=" " src_configure() { - local config_flags=( - $(cabal_flag executable executable) - ) + if use executable || use test; then + local exe_flag=--flag=executable + else + local exe_flag=--flag=-executable + fi - haskell-cabal_src_configure "${config_flags[@]}" + # test-suite preprocessor needs the newly built components + export LD_LIBRARY_PATH="${S}/dist/build/${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + export PATH="${S}/dist/build/${PN}${PATH+:}${PATH}" + + haskell-cabal_src_configure "${exe_flag}" +} + +src_install() { + local components=( "lib:${PN}" ) + use executable && components+=( "exe:${PN}" ) + haskell-cabal_src_install "${components[@]}" } diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild index d58ef3b9de9db..728adbf91c85a 100644 --- a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild +++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild @@ -31,4 +31,5 @@ DEPEND="${RDEPEND} CABAL_CHDEPS=( 'hspec >= 2.2.3 && < 2.9' 'hspec >= 2.2.3' 'doctest >= 0.8 && < 0.19' 'doctest >=0.8' + 'template-haskell >= 2.10.0.0 && < 2.18' 'template-haskell >=2.10' ) diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild index 4a231a27f25b6..997952325dbb3 100644 --- a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild +++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild @@ -17,7 +17,7 @@ SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="halvm" -RDEPEND=">=dev-lang/ghc-7.10.1:= +RDEPEND=">=dev-lang/ghc-7.10.1:= =ghc-9.2 +RDEPEND+=" + test? ( + =1.10 +-Build-Type: Simple ++Build-Type: Custom + License: BSD3 + License-File: LICENSE + Copyright: 2013 Gabriella Gonzalez +@@ -21,6 +21,12 @@ Source-Repository head + Type: git + Location: https://github.com/Gabriella439/Haskell-Foldl-Library + ++custom-setup ++ setup-depends: ++ base ++ , Cabal ++ , cabal-doctest >= 1.0.0 ++ + Library + HS-Source-Dirs: src + Build-Depends: +@@ -83,6 +89,9 @@ Test-Suite doctest + Main-Is: doctest.hs + Build-Depends: + base, +- doctest >= 0.16 ++ doctest >= 0.16, ++ directory, ++ filepath, ++ base-compat + GHC-Options: -threaded + Default-Language: Haskell2010 +diff --git a/test/doctest.hs b/test/doctest.hs +index 5981eb4..847b897 100644 +--- a/test/doctest.hs ++++ b/test/doctest.hs +@@ -1,4 +1,29 @@ + import Test.DocTest ++import GHC.IO.Encoding (setLocaleEncoding) ++import System.Directory (getCurrentDirectory, makeAbsolute) ++import System.FilePath.Posix (()) ++import System.IO (utf8) ++import Build_doctests (pkgs) ++ ++main = do ++ setLocaleEncoding utf8 ++ pwd <- getCurrentDirectory ++ prefix <- makeAbsolute pwd + +-main :: IO () +-main = doctest ["-isrc", "src/Control/Foldl.hs", "src/Control/Scanl.hs"] ++ let customFlags = ++ [ "-package-env=-" ++ , "-hide-all-packages" ++ , "-no-user-package-db" ++ , "-package-db=" ++ prefix "dist/package.conf.inplace" ++ ] ++ ++ let origFlags = ++ [ "-isrc" ++ ] ++ ++ let modules = ++ [ "src/Control/Foldl.hs" ++ , "src/Control/Scanl.hs" ++ ] ++ ++ doctest $ customFlags ++ pkgs ++ origFlags ++ modules +-- +2.41.0 + diff --git a/dev-haskell/foldl/foldl-1.4.15.ebuild b/dev-haskell/foldl/foldl-1.4.15.ebuild index bc6602decc625..b18f0c7da8e33 100644 --- a/dev-haskell/foldl/foldl-1.4.15.ebuild +++ b/dev-haskell/foldl/foldl-1.4.15.ebuild @@ -15,10 +15,8 @@ LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -PATCHES=( "${FILESDIR}/${PN}-1.4.12-cabal-doctest.patch" ) - -GHC_BOOTSTRAP_PACKAGES=( - cabal-doctest +PATCHES=( + "${FILESDIR}/${PN}-1.4.15-cabal-doctest.patch" ) RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] = 1.8 && < 3.3' 'Cabal >= 1.8' + 'time >= 1.5 && < 1.10' 'time >= 1.5' ) src_configure() { haskell-cabal_src_configure \ --flag=-buildtests \ - --flag=splitbase + --flag=splitbase \ + --flag=minTime15 } diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild index b90c4758ef833..0072be8a8d5a8 100644 --- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild +++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild @@ -19,17 +19,13 @@ HOMEPAGE="https://github.com/hdbc/hdbc-postgresql" LICENSE="BSD" -# For some reason, the slot was previously set to 2. Changing this could cause -# problems as haskell-updater tries to reinstall a version of the same slot. -# This should be changed at some point, but currently the version in ::gentoo -# is also set to 2. -SLOT="2/${PV}" +SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND=" >=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] - >=dev-haskell/hdbc-2.2.0:2=[profile?] + >=dev-haskell/hdbc-2.2.0:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild index 40e59e8935efe..8d237bf11d1cc 100644 --- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild +++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild @@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+splitbase" RDEPEND=">=dev-db/sqlite-3.0 - >=dev-haskell/hdbc-2.3.0.0:2=[profile?] + >=dev-haskell/hdbc-2.3.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild index 89738bb48fb24..f4c9fab13d7b7 100644 --- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild +++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild @@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+splitbase" RDEPEND=">=dev-db/sqlite-3.0 - >=dev-haskell/hdbc-2.3.0.0:2=[profile?] + >=dev-haskell/hdbc-2.3.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild index 16d3945d0c86e..f2d24771a8d8b 100644 --- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild +++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild @@ -17,12 +17,16 @@ HOMEPAGE="https://github.com/hdbc/hdbc" SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" -SLOT="2/${PV}" +SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" RESTRICT="test" # Requires unmaintaned dev-haskell/testpack +CABAL_CHDEPS=( + 'time >= 1.5 && < 1.10' 'time >= 1.5' +) + RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] @@ -36,3 +40,13 @@ DEPEND="${RDEPEND} " S="${WORKDIR}/${MY_P}" + +src_configure() { + config_flags=( + --flag=-buildtests + --flag=splitBase + --flag=minTime15 + ) + + haskell-cabal_src_configure ${config_flags[@]} +} diff --git a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild index 159e1a2ddf5aa..3ef978f673de8 100644 --- a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild +++ b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Haskell Database Connectivity" HOMEPAGE="https://github.com/hdbc/hdbc" LICENSE="BSD" -SLOT="2/${PV}" +SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" PATCHES=( diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest index 6fc30c7f145f5..1fc4946becd19 100644 --- a/dev-haskell/hedgehog/Manifest +++ b/dev-haskell/hedgehog/Manifest @@ -1,3 +1,3 @@ -DIST hedgehog-1.0.5.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2 +DIST hedgehog-1.0.5-rev1.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2 DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98 DIST hedgehog-1.4.tar.gz 77762 BLAKE2B 44b8cc3db1f9cb2b833fa71cbcdb9398456a82a66682985be304bcae0f8def5e1f2587abbd27e708fc15d38117e237fef797014294491272503ef018b566acf6 SHA512 2c91d0bab1f06996ea68e2823d7e2105da616329ba3bb967b230fe018e113ee40a40996a60641084c8f5390743fc002a36670620cfa7068ff594bdd28e4b1a9a diff --git a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild index 045dc2a47e82b..5c505c139823c 100644 --- a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild +++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild @@ -3,35 +3,35 @@ EAPI=8 -# ebuild generated by hackport 0.7.9999 +# ebuild generated by hackport 0.8.4.0.9999 + +CABAL_HACKAGE_REVISION=1 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Release with confidence" HOMEPAGE="https://hedgehog.qa" -HACKAGE_REV="1" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz - https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +CABAL_CHDEPS=( + 'template-haskell >= 2.10 && < 2.18' 'template-haskell >=2.10' +) + RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] =dev-haskell/async-2.0:=[profile?] =dev-haskell/concurrent-output-1.7:=[profile?] =dev-haskell/erf-2.0:=[profile?] =dev-haskell/exceptions-0.7:=[profile?] =dev-haskell/lifted-async-0.7:=[profile?] =dev-haskell/mmorph-1.0:=[profile?] =dev-haskell/monad-control-1.0:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/pretty-show-1.6:=[profile?] =dev-haskell/primitive-0.6:=[profile?] =dev-haskell/random-1.1:=[profile?] =dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/stm-2.4:=[profile?] =dev-haskell/text-1.1:=[profile?] =dev-haskell/transformers-base-0.4.5.1:=[profile?] =dev-haskell/wl-pprint-annotated-0.0:=[profile?] =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/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild index 82aa7e1774c9b..85827564b153d 100644 --- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild +++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild @@ -19,6 +19,10 @@ IUSE="" RESTRICT=test # Requires network access? +CABAL_CHDEPS=( + 'bytestring == 0.10.*' 'bytestring >= 0.10' +) + RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] =dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] =dev-lang/ghc-7.4.1:= =dev-haskell/cabal-1.10 diff --git a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild index 0bb32db0635a2..1b54214140c18 100644 --- a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild +++ b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild @@ -19,7 +19,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/call-stack-0.2.0:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/hunit-1.6:=[profile?] =dev-haskell/quickcheck-2.13.1:2=[profile?] + >=dev-haskell/quickcheck-2.13.1:=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] diff --git a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild index 7bfb07c320331..47e557342c1c6 100644 --- a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild +++ b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild @@ -22,7 +22,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/hunit-1.6:=[profile?] =dev-haskell/quickcheck-2.13.1:2=[profile?] + >=dev-haskell/quickcheck-2.13.1:=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] diff --git a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild index 8ae96f2c37604..0162ff534d118 100644 --- a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild +++ b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] - >=dev-haskell/quickcheck-2.12:2=[profile?] + >=dev-haskell/quickcheck-2.12:=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] diff --git a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild index 3017ed6db01aa..ae4955444518c 100644 --- a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild +++ b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] - >=dev-haskell/quickcheck-2.12:2=[profile?] + >=dev-haskell/quickcheck-2.12:=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] diff --git a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild index 161cfda69aa40..2113672f62490 100644 --- a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild +++ b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild @@ -22,11 +22,11 @@ RDEPEND="dev-haskell/base-compat:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] =dev-haskell/hspec-expectations-0.8.0:=[profile?] dev-haskell/http-types:=[profile?] - dev-haskell/quickcheck:2=[profile?] + dev-haskell/quickcheck:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3:=[profile?] >=dev-haskell/wai-extra-3:=[profile?] - >=dev-lang/ghc-7.8.2:= + >=dev-lang/ghc-7.8.2:= =dev-haskell/hspec-core-2:=[profile?] =dev-haskell/hspec-expectations-0.8.0:=[profile?] dev-haskell/http-types:=[profile?] - dev-haskell/quickcheck:2=[profile?] + dev-haskell/quickcheck:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3:=[profile?] >=dev-haskell/wai-extra-3:=[profile?] diff --git a/dev-haskell/hspec/hspec-2.10.6.ebuild b/dev-haskell/hspec/hspec-2.10.6.ebuild index d6b7bba755476..f8f9cbab5453a 100644 --- a/dev-haskell/hspec/hspec-2.10.6.ebuild +++ b/dev-haskell/hspec/hspec-2.10.6.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="~dev-haskell/hspec-core-2.10.6:=[profile?] ~dev-haskell/hspec-discover-2.10.6:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/quickcheck-2.12:2=[profile?] + >=dev-haskell/quickcheck-2.12:=[profile?] >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/hspec/hspec-2.9.4.ebuild b/dev-haskell/hspec/hspec-2.9.4.ebuild index ab03a4c0b339d..2f38a5db8ae66 100644 --- a/dev-haskell/hspec/hspec-2.9.4.ebuild +++ b/dev-haskell/hspec/hspec-2.9.4.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="~dev-haskell/hspec-core-2.9.4:=[profile?] ~dev-haskell/hspec-discover-2.9.4:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/quickcheck-2.12:2=[profile?] + >=dev-haskell/quickcheck-2.12:=[profile?] >=dev-lang/ghc-8.4.3:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest index e9d1793966126..611ac0253b3a9 100644 --- a/dev-haskell/hsyaml/Manifest +++ b/dev-haskell/hsyaml/Manifest @@ -1,2 +1,3 @@ -DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 +DIST hsyaml-0.2.1.0-rev4.cabal 5397 BLAKE2B 66c3351dd9d89684d17c48aa7efbf6d49e422ce20f5537712fc13ea454f675cd70aca8657695075de8b75bfed1f27de6fb351abc35854535fb1972f54d2fe31e SHA512 abbcd42b604b11ad1758f85f6de732b65fc21f1d08d5855569cce6d52b7ca26c88431bcec640031b7209c768bd5902d401039f52ffd31b857616298000697ffc +DIST hsyaml-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 DIST hsyaml-0.2.1.2.tar.gz 84263 BLAKE2B 1fb534a31cdcc41536e3f0114f27b4f140142293aca052d72d5d5993ff5ff686fea30a893e30efe34c2969ad9237228a43960f8adac201470568628d60464237 SHA512 4ade814924422a0985096be48ce0305f8491df03985511b408fefcf68a044f9ec4a0d29d978c2bb72b36315c49ee3faea69d8336cd5d88ca3d2d86077f46d003 diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild index 4602f8d4b8509..12061ee0f0471 100644 --- a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild +++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild @@ -3,20 +3,20 @@ EAPI=8 +# ebuild generated by hackport 0.8.4.0.9999 + +CABAL_HACKAGE_REVISION=4 +CABAL_PN="HsYAML" + CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -MY_PN="HsYAML" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pure Haskell YAML 1.2 parser" -HOMEPAGE="https://github.com/haskell-hvr/HsYAML" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" +DESCRIPTION="Pure Haskell YAML 1.2 processor" +HOMEPAGE="https://github.com/hvr/HsYAML" LICENSE="GPL-2" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] =dev-haskell/mtl-2.2.1:=[profile?] =4.5 && <4.14' 'base >=4.5' - 'containers >=0.4.2 && <0.7' 'containers >=0.4.2' - 'QuickCheck == 2.13.*' 'QuickCheck >= 2.13' - 'tasty == 1.2.*' 'tasty >= 1.2' - 'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10' -) +src_configure() { + haskell-cabal_src_configure --flag=-exe +} diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml index b11316eec0dc3..a72f234e538f9 100644 --- a/dev-haskell/hsyaml/metadata.xml +++ b/dev-haskell/hsyaml/metadata.xml @@ -10,6 +10,6 @@ HsYAML - haskell-hvr/HsYAML + hvr/HsYAML diff --git a/dev-haskell/http-date/http-date-0.0.8.ebuild b/dev-haskell/http-date/http-date-0.0.8.ebuild index ce23a21ec32c3..7ffa278155d03 100644 --- a/dev-haskell/http-date/http-date-0.0.8.ebuild +++ b/dev-haskell/http-date/http-date-0.0.8.ebuild @@ -20,7 +20,7 @@ IUSE="" RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2 RDEPEND="dev-haskell/attoparsec:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-7.4.1:= =4.5 && <4.16' 'base >=4.5' +) + RDEPEND=">=dev-haskell/indexed-traversable-0.1:=[profile?] =dev-haskell/tagged-0.8.6:=[profile?] =dev-haskell/unordered-containers-0.2.8.0:=[profile?] = 0.9 && < 0.11' 'bytestring >=0.9' +) + RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] =dev-haskell/primitive-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] = 4.5 && < 4.16' 'base >= 4.5' +) + RDEPEND=">=dev-haskell/async-2.2:=[profile?] =dev-haskell/constraints-0.2:=[profile?] =dev-haskell/lifted-base-0.2:=[profile?] =dev-haskell/monad-control-1.0:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-9.0.2:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 + >=dev-haskell/cabal-3.4.1.0 test? ( dev-haskell/hunit - dev-haskell/mtl dev-haskell/tasty =dev-haskell/tasty-hunit-0.9 =dev-haskell/hspec-2.0:=[profile?] =dev-haskell/hspec-expectations-0.8:=[profile?] =dev-haskell/hspec-megaparsec-2.0:=[profile?] =dev-haskell/quickcheck-2.10:2=[profile?] =dev-haskell/quickcheck-2.10:=[profile?] =dev-lang/ghc-9.0.2:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/memory/memory-0.15.0-r1.ebuild b/dev-haskell/memory/memory-0.15.0-r1.ebuild index 9e74ec909bc10..2029df86440bc 100644 --- a/dev-haskell/memory/memory-0.15.0-r1.ebuild +++ b/dev-haskell/memory/memory-0.15.0-r1.ebuild @@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?] - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-8.0.1:= MissingH - haskell-hvr/missingh + hvr/missingh diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild index 300037aba3728..3902a1b62e926 100644 --- a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild +++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild @@ -3,18 +3,17 @@ EAPI=8 -# ebuild generated by hackport 0.6.4.9999 -#hackport: flags: +network--ge-3-0-0 +# ebuild generated by hackport 0.8.4.0.9999 +#hackport: flags: +network--ge-3_0_0 + +CABAL_HACKAGE_REVISION=2 +CABAL_PN="MissingH" CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -MY_PN="MissingH" -MY_P="${MY_PN}-${PV}" - DESCRIPTION="Large utility library" HOMEPAGE="https://hackage.haskell.org/package/MissingH" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" @@ -39,13 +38,6 @@ DEPEND="${RDEPEND} >=dev-haskell/hunit-1.6 = 4.5.0.0 && < 4.15' 'base >= 4.5.0.0' - 'random >= 1.0.1.1 && < 1.2' 'random' -) - src_configure() { haskell-cabal_src_configure \ --flag=network--ge-3_0_0 diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild index 1951801ea8f23..8087ede033a9b 100644 --- a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild +++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild @@ -23,7 +23,7 @@ RDEPEND="dev-haskell/hashable:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] - >=dev-lang/ghc-8.2.1:= + >=dev-lang/ghc-8.2.1:= cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans +CABAL_CHDEPS=( + 'base >= 4.5.0 && < 4.16' 'base >= 4.5.0' +) + RDEPEND=" >=dev-lang/ghc-8.10.6:= " diff --git a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild index 06b359a7220d3..8bac9b253e70b 100644 --- a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild +++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild @@ -26,7 +26,7 @@ RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/persistent-2.14:=[profile?] =dev-haskell/quickcheck-2.9:2=[profile?] + >=dev-haskell/quickcheck-2.9:=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] diff --git a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild index 3563d04b0caa2..ec6966e5a1416 100644 --- a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild +++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild @@ -19,9 +19,9 @@ IUSE="+binary-laws +unary-laws" RDEPEND="dev-haskell/contravariant:=[profile?] >=dev-lang/ghc-8.4.3:= - binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) - unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) - !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) + binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) + unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) + !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) ) " DEPEND="${RDEPEND} >=dev-haskell/cabal-2.4 diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild index 1a22e5080c844..1ff3c61eeb835 100644 --- a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild +++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild @@ -28,11 +28,11 @@ RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= aeson? ( >=dev-haskell/aeson-0.9:=[profile?] ) - binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) + binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) semigroupoids? ( dev-haskell/semigroupoids:=[profile?] ) semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] ) - unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) - !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) + unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) + !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) ) vector? ( >=dev-haskell/vector-0.12:=[profile?] ) " DEPEND="${RDEPEND} diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild index 2955701096546..451810b4b4c08 100644 --- a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild +++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild @@ -22,11 +22,11 @@ RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] =dev-haskell/quickcheck-classes-base-0.6.2:=[profile?] =dev-lang/ghc-8.4.3:= aeson? ( >=dev-haskell/aeson-0.9:=[profile?] ) - binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) + binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) semigroupoids? ( dev-haskell/semigroupoids:=[profile?] ) semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] ) - unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) - !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) + unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] ) + !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) ) vector? ( >=dev-haskell/vector-0.12:=[profile?] ) " DEPEND="${RDEPEND} diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild index a618cad264eda..9356b57ae4e28 100644 --- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild +++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild @@ -24,7 +24,7 @@ RDEPEND=">=dev-haskell/case-insensitive-1.2.0.4:=[profile?] =dev-haskell/integer-logarithms-1.0.3:=[profile?] =dev-haskell/old-time-1.1.0.0:=[profile?] =dev-haskell/onetuple-0.3:=[profile?] =dev-haskell/quickcheck-2.14.1:2=[profile?] =dev-haskell/quickcheck-2.14.1:=[profile?] =dev-haskell/scientific-0.3.6.2:=[profile?] =dev-haskell/splitmix-0.0.2:=[profile?] =dev-haskell/strict-0.4:=[profile?] =dev-haskell/quickcheck-2.7:=[profile?] >=dev-lang/ghc-8.10.6:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild index 29e667b80fcd8..ab6efc03e6aba 100644 --- a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild +++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nick8325/quickcheck" SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" -SLOT="2/${PV}" +SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="+template-haskell" diff --git a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild index bcfff140bd417..6af1c5d02f8fc 100644 --- a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild +++ b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Automatic testing of Haskell programs" HOMEPAGE="https://github.com/nick8325/quickcheck" LICENSE="BSD" -SLOT="2/${PV}" +SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux" IUSE="+template-haskell" diff --git a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild index 20cfff69798f3..ff4a631e7b31d 100644 --- a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild +++ b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] =dev-haskell/semigroups-0.9:=[profile?] =dev-haskell/text-0.11.1.5:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-lang/ghc-7.8.2:= + >=dev-lang/ghc-7.8.2:= regex-base + hvr/regex-base + diff --git a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild index e766df4d17431..cdb10b0b9eddc 100644 --- a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild +++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild @@ -3,14 +3,15 @@ EAPI=8 -# ebuild generated by hackport 0.6.7.9999 +# ebuild generated by hackport 0.8.4.0.9999 + +CABAL_HACKAGE_REVISION=1 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Common \"Text.Regex.*\" API for Regex matching" HOMEPAGE="https://wiki.haskell.org/Regular_expressions" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest index a4b2530c36cf2..b9a93f01cf005 100644 --- a/dev-haskell/regex-posix/Manifest +++ b/dev-haskell/regex-posix/Manifest @@ -1,3 +1,4 @@ +DIST regex-posix-0.96.0.0-rev2.cabal 2861 BLAKE2B 593fde1c9acd274a1e813aa7013ac7f085696156ad216b56c578b05a241d37713b635244bba6c2347d538995669d9ccf92325129a40d8e15c008118059aa1a65 SHA512 6b5fe50e2d9ec0dbdcdec5362c97beb8a80d3d9e9c0a95f766181f49b080d231ae5802d48efd02d8ab006e48354e32b9ea209adb4fb4ef7efb9736ca7aeca7d6 DIST regex-posix-0.96.0.0.tar.gz 12529 BLAKE2B e949fd28a8fee8c0ae056dc0037dc9eb03b3814145740a053752ac121f6ffc60bad5db72832626340f0f201d06ccc649225af9506be671f63fd5b850e20bda6c SHA512 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a DIST regex-posix-0.96.0.1-rev1.cabal 2954 BLAKE2B e53df5885439c8e29cc562a5bbbcbb9434b72ee3c0abba83e5b1a1cbb5f39b1fa002585bbb1d70b3cad5c88ea4b83c4767799bbafed35d7f32fc658c98a53042 SHA512 d8720a871133a1cd8388474766889fd560686a941eef845202fe45c2191908ec444bc93b423e763d183dda2ed06f1cd3c3c44ee846dd01f288dfc4d9832835d0 DIST regex-posix-0.96.0.1.tar.gz 12853 BLAKE2B 8b01c71287cd4477f6fdc11eae0a2447efc39ee538313713de8e851430bb480c56c011389748b113d2ae8b0ec8f6f8306ded2bbfed2226ff3c172fa7a2eb0241 SHA512 4d6383e34fd6144af3004caee70bc83c8894c8e78c147c2e829cdbd9c74af3d1807604db0927554aea20c69a8b5c1eb3dd01d3963b2e615ee39beaa48095125b diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml index 9373815219443..1287ec3517969 100644 --- a/dev-haskell/regex-posix/metadata.xml +++ b/dev-haskell/regex-posix/metadata.xml @@ -5,4 +5,9 @@ haskell@gentoo.org Gentoo Haskell + + regex-posix + hvr/regex-base + hvr/regex-posix + diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild index 902b314f2c348..1027d4a26bca3 100644 --- a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild +++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild @@ -3,20 +3,20 @@ EAPI=8 -# ebuild generated by hackport 0.6.1.9999 +# ebuild generated by hackport 0.8.4.0.9999 #hackport: flags: +newbase,+splitbase,-_regex-posix-clib +CABAL_HACKAGE_REVISION=2 + CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Replaces/Enhances Text.Regex" HOMEPAGE="https://hackage.haskell.org/package/regex-posix" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/regex-base-0.94:=[profile?] = 4.3 && < 4.14' 'base >= 4.3' + 'base >= 4.3 && < 4.16' 'base >= 4.3' ) src_configure() { diff --git a/dev-haskell/servant/servant-0.19.ebuild b/dev-haskell/servant/servant-0.19.ebuild index d15e317c0b0f9..000cd5defb16a 100644 --- a/dev-haskell/servant/servant-0.19.ebuild +++ b/dev-haskell/servant/servant-0.19.ebuild @@ -33,7 +33,7 @@ RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] =dev-haskell/http-types-0.12.2:=[profile?] =dev-haskell/mmorph-1.1.2:=[profile?] =dev-haskell/network-uri-2.6.1.0:=[profile?] =dev-haskell/quickcheck-2.12.6.1:2=[profile?] =dev-haskell/quickcheck-2.12.6.1:=[profile?] =dev-haskell/singleton-bool-0.1.4:=[profile?] =dev-haskell/sop-core-0.4.0.0:=[profile?] =dev-haskell/string-conversions-0.4.0.1:=[profile?] shelly - gregwebs/Shelly.hs + yesodweb/Shelly.hs diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild index 03d0f05b45c77..9d511cbf704ac 100644 --- a/dev-haskell/shelly/shelly-1.9.0.ebuild +++ b/dev-haskell/shelly/shelly-1.9.0.ebuild @@ -3,43 +3,74 @@ EAPI=8 -# ebuild generated by hackport 0.6.1.9999 +# ebuild generated by hackport 0.8.4.0.9999 #hackport: flags: build-examples:examples +CABAL_HACKAGE_REVISION=3 + CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="shell-like (systems) programming in Haskell" -HOMEPAGE="https://github.com/gregwebs/Shelly.hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" +HOMEPAGE="https://github.com/yesodweb/Shelly.hs" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="examples lifted" +CABAL_CHDEPS=( + 'time >= 1.3 && < 1.10' 'time >=1.3' +) + RDEPEND="dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] - >=dev-haskell/exceptions-0.6:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] =dev-haskell/mtl-2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] =dev-lang/ghc-8.0.2:= + >=dev-lang/ghc-9.0.2:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.2.0 + >=dev-haskell/cabal-3.4.1.0 test? ( >=dev-haskell/hspec-2.0 dev-haskell/hspec-contrib >=dev-haskell/hunit-1.2 >=dev-haskell/text-0.11 ) " +example_exes=( + "drain" + "run-handles" + "Color" +) + +src_prepare() { + for e in "${example_exes[@]}"; do + export CABAL_CHDEPS+=( + "Executable ${e}" + "executable ${PN}-examples-${e}" + ) + done + + haskell-cabal_src_prepare +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag examples build-examples) \ $(cabal_flag lifted lifted) } + +pkg_postinst() { + ghc-package_pkg_postinst + + elog "The following example executables installed with this package have been" + elog "renamed to help prevent name collisions:" + + for e in "${example_exes[@]}"; do + elog "${e} -> ${PN}-examples-${e}" + done +} diff --git a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild index f1ab5b1ff80fb..dfc77b48ea851 100644 --- a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild +++ b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild @@ -19,6 +19,10 @@ IUSE="optimised-mixer" RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix +CABAL_CHDEPS=( + 'base >=4.3 && <4.16' 'base >=4.3' +) + RDEPEND=">=dev-lang/ghc-7.4.1:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild index 338682e396881..8119160c28999 100644 --- a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild +++ b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild @@ -16,8 +16,12 @@ SLOT="0/${PV}" # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV) KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +CABAL_CHDEPS=( + 'base >= 4.3 && < 4.15' 'base >= 4.3' +) + RDEPEND=" - >=dev-lang/ghc-8.10.6:= + >=dev-lang/ghc-8.10.6:= = 0.4 && < 0.5' 'chell >= 0.4' +) + RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] =dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= " DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8 - test? ( >=dev-haskell/chell-0.4 =dev-haskell/chell-0.4 >=dev-haskell/temporary-1.1 =dev-haskell/transformers-0.2 ) " diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest index 5691fac5bd86c..885373ffc2eb7 100644 --- a/dev-haskell/tagged/Manifest +++ b/dev-haskell/tagged/Manifest @@ -1,2 +1,3 @@ +DIST tagged-0.8.6.1-rev3.cabal 2874 BLAKE2B 96959835cc58d33e34cacdfe289a37d0c93db91e8ca72b74f23b82451dc0a4e6a113a1c5bc0a810887ef56d0a140c756c73bd8bf36002ddf5ae58307af084814 SHA512 084047d814fc74bbda9b15a737f498ae182bb498bcae64ae6114a8cfff58e4c238c79b99da30531b4560c9564d4cca08f565aa6929a0b902bad9723f482c8216 DIST tagged-0.8.6.1.tar.gz 9842 BLAKE2B 6069ea3705dadfec7bc59d81cd9c425e01ad02131e9b6ce4657ad2b59d61a8dc8a420e518ed083a0d8d6b7171e5c233f3a9d96b15045b738c97d4f86fa3887b3 SHA512 289be845821aada538caf3fd0fc85b8ed115c657dc5beb0408816e43cf72153881ad305a982effa572a46e5b1842d2772af44313674cb0a252db8aeb6953f345 DIST tagged-0.8.7.tar.gz 10082 BLAKE2B f52314aab17206fdf5bad6f334424dde0317f96483509c2da03ee6e823182914be2824350f43e4dd6a7d3e09c34c9d22f00dacba5b2d0f6e2b5a78f204e446fd SHA512 75e8a65a7ebf267a508660e91cb7e265aca3c7b417b4441a01024419f27c0b9614c94a45f0ee58c454492f6e623ccde2d8b9f06cc0100c2f2927efe119fa57ea diff --git a/dev-haskell/tagged/tagged-0.8.6.1.ebuild b/dev-haskell/tagged/tagged-0.8.6.1.ebuild index 6c1481a917467..64c32b8865996 100644 --- a/dev-haskell/tagged/tagged-0.8.6.1.ebuild +++ b/dev-haskell/tagged/tagged-0.8.6.1.ebuild @@ -1,11 +1,13 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# ebuild generated by hackport 0.6.7.9999 +# ebuild generated by hackport 0.8.4.0.9999 #hackport: flags: +deepseq,+transformers +CABAL_HACKAGE_REVISION=3 + CABAL_FEATURES="lib profile haddock hoogle hscolour" # break circular dependencies: # https://github.com/gentoo-haskell/gentoo-haskell/issues/810 @@ -14,12 +16,10 @@ inherit haskell-cabal DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments" HOMEPAGE="https://github.com/ekmett/tagged" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] =dev-lang/ghc-7.8.2:= diff --git a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild index db27af73d319b..e364bb18fefb2 100644 --- a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild +++ b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild @@ -20,7 +20,7 @@ RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] =dev-haskell/hslua-core-2.0:=[profile?] =dev-haskell/hslua-marshalling-2.0:=[profile?] =dev-haskell/lua-arbitrary-1.0:=[profile?] =dev-haskell/quickcheck-2.9:2=[profile?] =dev-haskell/quickcheck-2.9:=[profile?] =dev-haskell/tasty-1.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.4.3:= diff --git a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild index 16250ccc7505c..787f5539f8446 100644 --- a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild +++ b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild @@ -19,7 +19,7 @@ RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] =dev-haskell/hslua-core-2.3:=[profile?] =dev-haskell/hslua-marshalling-2.0:=[profile?] =dev-haskell/lua-arbitrary-1.0:=[profile?] =dev-haskell/quickcheck-2.9:2=[profile?] =dev-haskell/quickcheck-2.9:=[profile?] =dev-haskell/tasty-1.2:=[profile?] =dev-haskell/text-1.2:=[profile?] =dev-lang/ghc-8.8.1:= diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild index fa7412f3b4bc9..2c998919b3f5e 100644 --- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild +++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild @@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND="dev-haskell/optparse-applicative:=[profile?] - >=dev-haskell/quickcheck-2.10:2=[profile?] + >=dev-haskell/quickcheck-2.10:=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-1.0.1:=[profile?] diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild index 7cef49a8629df..f9bb7b4d7cf90 100644 --- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild +++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild @@ -16,7 +16,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND="dev-haskell/optparse-applicative:=[profile?] - >=dev-haskell/quickcheck-2.10:2=[profile?] + >=dev-haskell/quickcheck-2.10:=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-1.0.1:=[profile?] diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest index e9f5ff44ec6de..c6a0163d023d5 100644 --- a/dev-haskell/terminfo/Manifest +++ b/dev-haskell/terminfo/Manifest @@ -1,4 +1,2 @@ -DIST terminfo-0.4.1.4-rev1.cabal 1713 BLAKE2B 01ba0752284de317c02b1f198f451ef0571dc5b98425a5b88cd96c2b08c9ba7971308ad9924f9ef0cbd89473a1ce87046bab1da23b1b1e75f5e718448520f335 SHA512 a008174448cb973e4f5c138cf213d2f8b7233eda81cfd890c82e7bf7fe7f4acae60ef7a8e4b2b12fce5ec09728501e6f042073402bf0d8c6dae9316222c4b47a -DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c DIST terminfo-0.4.1.5-rev1.cabal 1713 BLAKE2B 1f065369dda9b27ff1959ed7071cf71f3f756efa37e1e82c24230e61f88ec0d8392a70211071ca7057bf12011113f28f49aa9dee3f0837eaf21118e3b4d1e149 SHA512 68686c54a1400dcbd76fefd95d564939ccb34f53f5c880103e359c46cd1fbd81480582e271ba9a2c58a0bc6cc6b073609340e301df6824ae61c7a0a5ba2b063b DIST terminfo-0.4.1.5.tar.gz 42371 BLAKE2B f7ada992d945ee882f405925134fc0e396d3f5dd79387ea4c1cd0aaaa0e8b2c447b71a4ad6a9e407cfd43b3f4e3bfead2b04fe92ae34fea62185ae7e836980a3 SHA512 1aa802ded4efa2903b21e31cbb3dafc8e712ba3c58388a5c369224644c80f4886b4fa28671a4fdcdee621cabc80edc131a16e5fe0e7302c8398572676060c091 diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild deleted file mode 100644 index 8a294c24d0c36..0000000000000 --- a/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ebuild generated by hackport 0.8.0.0.9999 - -CABAL_HACKAGE_REVISION=1 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Haskell bindings to the terminfo library" -HOMEPAGE="https://github.com/judah/terminfo" - -LICENSE="BSD" -SLOT="0/${PV}" -# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV) -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-lang/ghc-8.10.6:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 -" - -CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7" diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild index 77325980858f4..3dce34339afaa 100644 --- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild +++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] =dev-haskell/quickcheck-2.4:2=[profile?] + >=dev-haskell/quickcheck-2.4:=[profile?] >=dev-haskell/random-1:=[profile?] =dev-haskell/test-framework-0.8:=[profile?] =dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest index 3b0b9f4c1770d..cbb47e7071960 100644 --- a/dev-haskell/text/Manifest +++ b/dev-haskell/text/Manifest @@ -1,2 +1 @@ -DIST text-1.2.4.1.tar.gz 148905 BLAKE2B 5e3429e3f83a2c12c5482e342fb4a1846538bdf453df23c2144af01d0df3f5a8b831fd76513aea6e303b5a36b38dec185fedf960060264fc49fe917e30964b41 SHA512 4170d9a463cebfbd80b7902e4d71ed1a1f29db96d2cc9045b79908509a633a239edb3b1ff8dac6970074c4d7e91c552e106756d8142709f8fee3a960428c23e7 DIST text-1.2.5.0.tar.gz 155890 BLAKE2B aaf7206dad552ff98a465914ad8183ec1ccd57e56504496a5b8d11645b0f0fb395dd801c9b6fe32b51ed3902658eb5e5fb92187de668d32801597b4eb904b820 SHA512 dbda65180fc012324fe45467b63e0f53e7e0fa2da3b11875e458ba6bd31d0ee7634121967d2aa6853ed5c907c0661dcc59b8c68fb55edab2923490d8b50722d6 diff --git a/dev-haskell/text/text-1.2.4.1-r1.ebuild b/dev-haskell/text/text-1.2.4.1-r1.ebuild deleted file mode 100644 index 853e1268efcb2..0000000000000 --- a/dev-haskell/text/text-1.2.4.1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ebuild generated by hackport 0.8.0.0.9999 -#hackport: flags: -bytestring-builder,-developer,-integer-simple - -CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite -# break circular dependencies: -# https://github.com/gentoo-haskell/gentoo-haskell/issues/810 -CABAL_FEATURES+=" nocabaldep" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/haskell/text" - -LICENSE="BSD-2" -SLOT="0/${PV}" -# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV) -KEYWORDS="~amd64 ~amd64-linux" - -# break cyclic dependencies, test suite requires porting to >=QC-2.11 -RESTRICT=test - -RDEPEND=" - >=dev-lang/ghc-8.10.6:= -" -DEPEND="${RDEPEND} -" - -src_configure() { - haskell-cabal_src_configure \ - --flag=-bytestring-builder \ - --flag=-developer \ - --flag=-integer-simple -} - -CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7" diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest index 78ca93dc765d0..788e4fe41faa4 100644 --- a/dev-haskell/th-lift/Manifest +++ b/dev-haskell/th-lift/Manifest @@ -1,2 +1,3 @@ +DIST th-lift-0.8.2-rev2.cabal 2677 BLAKE2B b6fc00a24607b09d9159c44d74abb852b6a0a7223422b8693ecb93390fd92ba2aec3db54311d45331a3ff3b914232387c4bac3fc46ff4b347a13d06cb40127e5 SHA512 6350106296d52acdc64bd2f183e23ee560b4725e831ce0549a26bd8faed80a632fe09b5e358ac4d06765fff222d13543badbe2218c9f5768e6b37ea4ebbf4c25 DIST th-lift-0.8.2.tar.gz 14385 BLAKE2B 31c02c810a3260450e2efd79e4271d326341cc8a8fae9dc3d0293b4b065978cf9d3e676fb54d003d385d21def498f03014c8065a14c9f90931a2843add8349c0 SHA512 bda1fd661274d911898eb163427a83db81bf5cc6d7cdd2936a84cb314268be2d38c5753727c1e87e83f8edb61e8bbbd0976001f680830b3bc2d4eb96178505ec DIST th-lift-0.8.4.tar.gz 14711 BLAKE2B f045220e93221186c43fad301c1c97f16e35c3651f191f5bc710ca2660cd23dfff05f707c4ba0151cb17eb0ee5a39bf2f36d49511553e23f9d9d8915d47b322a SHA512 fe5d47cc5b9c4a6128761d044ad00262e316862888a218279b62b51b87f32398c534ca65407491d210e7d32bea53c77161333b98bcc969e077221f2d9e3c56f7 diff --git a/dev-haskell/th-lift/th-lift-0.8.2.ebuild b/dev-haskell/th-lift/th-lift-0.8.2.ebuild index 6f1b34d48543b..ad13c913e8fb9 100644 --- a/dev-haskell/th-lift/th-lift-0.8.2.ebuild +++ b/dev-haskell/th-lift/th-lift-0.8.2.ebuild @@ -3,19 +3,19 @@ EAPI=8 -# ebuild generated by hackport 0.6.7.9999 +# ebuild generated by hackport 0.8.4.0.9999 + +CABAL_HACKAGE_REVISION=2 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Derive Template Haskell's Lift class for datatypes" HOMEPAGE="https://github.com/RyanGlScott/th-lift" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] =dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild index a0590ced9c25d..45ce3705e5a28 100644 --- a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild +++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild @@ -16,6 +16,10 @@ LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +CABAL_CHDEPS=( + 'time >= 1.6 && < 1.10' 'time >= 1.6' +) + RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] =dev-haskell/timezone-series-0.1.0:=[profile?] =dev-lang/ghc-8.4.3:= diff --git a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild index 3e504799b0b6b..e02ae7a01c971 100644 --- a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild +++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild @@ -17,6 +17,10 @@ SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" +CABAL_CHDEPS=( + 'time (>= 1.1.4 && < 1.9) || (>= 1.9.1 && < 1.10)' 'time >=1.1.4' +) + RDEPEND=">=dev-lang/ghc-7.4.1:= " DEPEND="${RDEPEND} diff --git a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild index fdf42ed51e860..a7aadab49bfa8 100644 --- a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild +++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.10:=[profile?] =dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] =dev-haskell/parsers-0.12.10:=[profile?] =dev-haskell/primitive-0.7.1.0:=[profile?] =dev-haskell/quickcheck-2.14.2:2=[profile?] =dev-haskell/quickcheck-2.14.2:=[profile?] =dev-haskell/scientific-0.3.6.2:=[profile?] =dev-haskell/semialign-1.1:=[profile?] =dev-haskell/strict-0.4.0.1:=[profile?] =dev-lang/ghc-7.4.1:= =dev-haskell/primitive-0.6.4.0:=[profile?] =dev-lang/ghc-8.4.3:= " + +# doctests do not work on >=ghc-9.2 +RDEPEND+=" + test? ( + =0.15 && <0.19' 'doctest >=0.15' ) diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild index a5d0cb7ab77d9..61623426f704d 100644 --- a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild +++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] =dev-haskell/shakespeare-1.0:=[profile?] =dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-7.4.1:= zlib + haskell/zlib + diff --git a/dev-haskell/zlib/zlib-0.6.2.3.ebuild b/dev-haskell/zlib/zlib-0.6.2.3.ebuild index 240d70743406b..fb6a06ff8e42b 100644 --- a/dev-haskell/zlib/zlib-0.6.2.3.ebuild +++ b/dev-haskell/zlib/zlib-0.6.2.3.ebuild @@ -3,15 +3,16 @@ EAPI=8 -# ebuild generated by hackport 0.6.7.9999 +# ebuild generated by hackport 0.8.4.0.9999 #hackport: flags: +pkg-config +CABAL_HACKAGE_REVISION=1 + CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Compression and decompression in the gzip and zlib formats" HOMEPAGE="https://hackage.haskell.org/package/zlib" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" diff --git a/dev-lang/ghc/ghc-9.0.2-r4.ebuild b/dev-lang/ghc/ghc-9.0.2-r4.ebuild index 140c6cdfed30e..a02446080d369 100644 --- a/dev-lang/ghc/ghc-9.0.2-r4.ebuild +++ b/dev-lang/ghc/ghc-9.0.2-r4.ebuild @@ -161,19 +161,28 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-text/docbook-xml-dtd:4.2 + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-python/sphinx - dev-python/sphinx-rtd-theme - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) - test? ( ${PYTHON_DEPS} ) + >=dev-libs/libxslt-1.1.2 + ) + !ghcbootstrap? ( + ${PREBUILT_BINARY_DEPENDS} + ) + test? ( + ${PYTHON_DEPS} + ) " needs_python() { # test driver is written in python use test && return 0 + use doc && return 0 return 1 } @@ -187,6 +196,13 @@ REQUIRED_USE=" # haskell libraries built with cabal in configure mode, #515354 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" +python_check_deps() { + if use doc; then + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" + fi +} + is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } @@ -629,6 +645,10 @@ src_prepare() { src_configure() { if ! use binary; then + # No upstream LTO support. bug #855596 + filter-lto + append-flags -fno-strict-aliasing + # initialize build.mk echo '# Gentoo changes' > mk/build.mk diff --git a/dev-lang/ghc/ghc-9.2.8.ebuild b/dev-lang/ghc/ghc-9.2.8.ebuild index 8fffbe2cca4ba..2b6f84b93c7f7 100644 --- a/dev-lang/ghc/ghc-9.2.8.ebuild +++ b/dev-lang/ghc/ghc-9.2.8.ebuild @@ -170,19 +170,28 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-text/docbook-xml-dtd:4.2 + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-python/sphinx - dev-python/sphinx-rtd-theme - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) - test? ( ${PYTHON_DEPS} ) + >=dev-libs/libxslt-1.1.2 + ) + !ghcbootstrap? ( + ${PREBUILT_BINARY_DEPENDS} + ) + test? ( + ${PYTHON_DEPS} + ) " needs_python() { # test driver is written in python use test && return 0 + use doc && return 0 return 1 } @@ -196,6 +205,13 @@ REQUIRED_USE=" # haskell libraries built with cabal in configure mode, #515354 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" +python_check_deps() { + if use doc; then + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" + fi +} + is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } @@ -563,9 +579,6 @@ src_prepare() { # UPDATE ME for ghc-7 mkdir "${WORKDIR}"/ghc-bin-installer || die pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 - use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 - use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 popd > /dev/null @@ -656,13 +669,13 @@ src_prepare() { # However, the patch is difficult to apply and our versions of GHC don't # have the update, so we symlink to the system version instead. if use doc; then - local rtd_theme_dir="$(dirname $(python -c "import sphinx_rtd_theme; print(sphinx_rtd_theme.__file__)"))" + local python_str="import sphinx_rtd_theme; print(sphinx_rtd_theme.__file__)" + local rtd_theme_dir="$(dirname $("${EPYTHON}" -c "$python_str"))" local orig_rtd_theme_dir="${S}/docs/users_guide/rtd-theme" - ebegin "Replacing bundled rtd-theme with dev-python/sphinx-rtd-theme" + einfo "Replacing bundled rtd-theme with dev-python/sphinx-rtd-theme" rm -r "${orig_rtd_theme_dir}" || die ln -s "${rtd_theme_dir}" "${orig_rtd_theme_dir}" || die - eend 0 fi # mingw32 target @@ -680,6 +693,10 @@ src_prepare() { src_configure() { if ! use binary; then + # No upstream LTO support. bug #855596 + filter-lto + append-flags -fno-strict-aliasing + # initialize build.mk echo '# Gentoo changes' > mk/build.mk diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index d312969b2e956..8a1282d5e565e 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,2 +1,4 @@ DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c +DIST icu4c-74_1-src.tgz 26625850 BLAKE2B cf8277cd513bd99c85104669e617683e4a91280c4c15a396021289fe0093d64682466550a44a0115bcc9e7abf30e3108dbadfb46e85e832e4cfd689618968507 SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 +DIST icu4c-74_1-src.tgz.asc 659 BLAKE2B d95224933dc665f3c4e6f9cb81ab65d4755fc768161bf8abf97ba0d8ad350bc0ccfccdcb5c21d97b132e036bad960f6021283325c1ec836d2aecc5101af3c298 SHA512 45064eb2cf83dd7e3edc423c43914cc7fbcee38ad79e93c80da1e9e59e0554329a174cd6ef5a8055fe92220621eae9761f7de3b0cb311e5874efa41555e58396 diff --git a/dev-libs/icu-layoutex/icu-layoutex-74.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-74.1.ebuild new file mode 100644 index 0000000000000..001b875476224 --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-74.1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-libs/icu +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="External layout part of International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN/-layoutex}/source + +LICENSE="BSD" +SLOT="0/${PV%.*}.1" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +fi +IUSE="debug static-libs test" +RESTRICT="!test? ( test )" + +DEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" ) + +src_prepare() { + default + + # Disable renaming as it assumes stable ABI and that consumers + # won't use unofficial APIs. We need this despite the configure argument. + sed -i \ + -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ + common/unicode/uconfig.h || die + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + eautoreconf +} + +src_configure() { + MAKEOPTS+=" VERBOSE=1" + + # ICU tries to append -std=c++11 without this, so as of 71.1, + # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, + # we still need this. + append-cxxflags -std=c++14 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + # We want a minimal build as this is just for layoutex + # so we disable as much as possible + --disable-samples + --disable-extras + --disable-icuio + + # This is icu-layoutex, so.. + --enable-layoutex + + $(use_enable debug) + $(use_enable static-libs static) + + # Need tools for tests, otherwise get this in configure: + # "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests. + # ## Expect build failures in the 'data', 'test', and other directories." + # ... although layoutex has no tests right now anyway, but let's keep this + # for the future. + $(use_enable test tools) + $(use_enable test tests) + ) + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # icu tries to use clang by default + tc-export CC CXX + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + emake -C layoutex VERBOSE="1" check +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index d312969b2e956..8a1282d5e565e 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1,4 @@ DIST icu4c-73_2-src.tgz 26519906 BLAKE2B 3f7dec9d527939d6d594c92844a400733e43af018bbc2f600edcb18299211a2f2285332188976d15e1ef672191416abac0b95a9d1a2ea6ababdaddf12708ccef SHA512 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 DIST icu4c-73_2-src.tgz.asc 659 BLAKE2B 83e082ba15ba7aeb366b6d97da15d076c200f9051e55bf00ba13265a3d87aade5a5b18c98a0c903d5015821c63e4b340ffbcc7940a654d169ad1948d6594ce63 SHA512 7598b8cc498ada8ca904b13f7aba27abd3f8f3013a0677d7ffab42d5413df9d2f0526107559301abc4049123b2e6d4d4f4cc589cbd943959d97b595dd57ea63c +DIST icu4c-74_1-src.tgz 26625850 BLAKE2B cf8277cd513bd99c85104669e617683e4a91280c4c15a396021289fe0093d64682466550a44a0115bcc9e7abf30e3108dbadfb46e85e832e4cfd689618968507 SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 +DIST icu4c-74_1-src.tgz.asc 659 BLAKE2B d95224933dc665f3c4e6f9cb81ab65d4755fc768161bf8abf97ba0d8ad350bc0ccfccdcb5c21d97b132e036bad960f6021283325c1ec836d2aecc5101af3c298 SHA512 45064eb2cf83dd7e3edc423c43914cc7fbcee38ad79e93c80da1e9e59e0554329a174cd6ef5a8055fe92220621eae9761f7de3b0cb311e5874efa41555e58396 diff --git a/dev-libs/icu/icu-74.1.ebuild b/dev-libs/icu/icu-74.1.ebuild new file mode 100644 index 0000000000000..2b16d0d0702ad --- /dev/null +++ b/dev-libs/icu/icu-74.1.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-libs/icu-layoutex + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/icu.asc +inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/-rc} +MY_PV=${MY_PV//./_} + +DESCRIPTION="International Components for Unicode" +HOMEPAGE="https://icu.unicode.org/" +SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz" +SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${MY_PV/_/-}/icu4c-${MY_PV/-rc/rc}-src.tgz.asc )" +S="${WORKDIR}"/${PN}/source + +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi +LICENSE="BSD" +SLOT="0/${PV%.*}.1" +IUSE="debug doc examples static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/autoconf-archive + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + verify-sig? ( >=sec-keys/openpgp-keys-icu-20221020 ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/icu-config +) + +PATCHES=( + "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" + "${FILESDIR}/${PN}-64.2-darwin.patch" + "${FILESDIR}/${PN}-68.1-nonunicode.patch" +) + +src_prepare() { + default + + # Disable renaming as it assumes stable ABI and that consumers + # won't use unofficial APIs. We need this despite the configure argument. + sed -i \ + -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ + common/unicode/uconfig.h || die + + # Fix linking of icudata + sed -i \ + -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ + config/mh-linux || die + + # Append doxygen configuration to configure + sed -i \ + -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + MAKEOPTS+=" VERBOSE=1" + + # ICU tries to append -std=c++11 without this, so as of 71.1, + # despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17, + # we still need this. + append-cxxflags -std=c++14 + + if tc-is-cross-compiler; then + mkdir "${WORKDIR}"/host || die + pushd "${WORKDIR}"/host >/dev/null || die + + CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ + CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ + RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ + "${S}"/configure --disable-renaming --disable-debug \ + --disable-samples --enable-static || die + emake + + popd >/dev/null || die + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --disable-renaming + --disable-samples + # TODO: Merge with dev-libs/icu-layoutex + # Planned to do this w/ 73.2 but seem to get test failures + # only with --enable-layoutex. + --disable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + $(use_enable test tests) + $(multilib_native_use_enable examples samples) + ) + + #if use test ; then + # myeconfargs+=( + # --enable-extras + # --enable-tools + # ) + #else + # myeconfargs+=( + # $(multilib_native_enable extras) + # $(multilib_native_enable tools) + # ) + #fi + + tc-is-cross-compiler && myeconfargs+=( + --with-cross-build="${WORKDIR}"/host + ) + + # Work around cross-endian testing failures with LTO, bug #757681 + if tc-is-cross-compiler && is-flagq '-flto*' ; then + myeconfargs+=( --disable-strict ) + fi + + # ICU tries to use clang by default + tc-export CC CXX + + # Make sure we configure with the same shell as we run icu-config + # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined + export CONFIG_SHELL="${EPREFIX}/bin/sh" + # Probably have no /bin/sh in prefix-chain + [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc; then + doxygen -u Doxyfile || die + doxygen Doxyfile || die + fi +} + +multilib_src_test() { + # INTLTEST_OPTS: intltest options + # -e: Exhaustive testing + # -l: Reporting of memory leaks + # -v: Increased verbosity + # IOTEST_OPTS: iotest options + # -e: Exhaustive testing + # -v: Increased verbosity + # CINTLTST_OPTS: cintltst options + # -e: Exhaustive testing + # -v: Increased verbosity + emake check +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doc/html/* + fi +} + +multilib_src_install_all() { + local HTML_DOCS=( ../readme.html ) + einstalldocs +} diff --git a/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild b/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild index c6c9cfada7db6..5667e7fc6f642 100644 --- a/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild +++ b/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild @@ -37,7 +37,7 @@ RDEPEND=" >=dev-haskell/aeson-1.4.0:=[profile?] =dev-haskell/diff-0.4.0:=[profile?] =dev-haskell/parsec-3.1.14:=[profile?] =dev-haskell/quickcheck-2.14.2:2=[profile?] =dev-haskell/quickcheck-2.14.2:=[profile?] =dev-haskell/regex-tdfa-1.2.0:=[profile?] =dev-lang/ghc-8.10.6:= || ( diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild index 0b65231e2a48a..47a14cc79186e 100644 --- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild +++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild @@ -65,7 +65,7 @@ RDEPEND="dev-haskell/aeson:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= - >=dev-haskell/quickcheck-2.10.0:2= + >=dev-haskell/quickcheck-2.10.0:= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= diff --git a/dev-vcs/git-annex/git-annex-10.20230802.ebuild b/dev-vcs/git-annex/git-annex-10.20230802.ebuild index 36f22413658bd..6d160a5cd4e09 100644 --- a/dev-vcs/git-annex/git-annex-10.20230802.ebuild +++ b/dev-vcs/git-annex/git-annex-10.20230802.ebuild @@ -62,7 +62,7 @@ RDEPEND="dev-haskell/aeson:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= - >=dev-haskell/quickcheck-2.10.0:2= + >=dev-haskell/quickcheck-2.10.0:= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= diff --git a/dev-vcs/git-repair/git-repair-1.20220404.ebuild b/dev-vcs/git-repair/git-repair-1.20220404.ebuild index b9afa202886f8..c397b70a3f9f2 100644 --- a/dev-vcs/git-repair/git-repair-1.20220404.ebuild +++ b/dev-vcs/git-repair/git-repair-1.20220404.ebuild @@ -35,7 +35,7 @@ RDEPEND=" >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.14.1:=[profile?] - dev-haskell/quickcheck:2=[profile?] + dev-haskell/quickcheck:=[profile?] dev-haskell/split:=[profile?] >=dev-haskell/unix-compat-0.5:=[profile?] dev-haskell/utf8-string:=[profile?] diff --git a/dev-vcs/git-repair/git-repair-1.20230814.ebuild b/dev-vcs/git-repair/git-repair-1.20230814.ebuild index e05583b21e7c4..d1a35796e0b81 100644 --- a/dev-vcs/git-repair/git-repair-1.20230814.ebuild +++ b/dev-vcs/git-repair/git-repair-1.20230814.ebuild @@ -35,7 +35,7 @@ RDEPEND=" >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= >=dev-haskell/optparse-applicative-0.14.1:= - dev-haskell/quickcheck:2= + dev-haskell/quickcheck:= dev-haskell/split:= dev-haskell/text:= >=dev-haskell/unix-compat-0.5:= diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index b44e7b3069724..a3e2da6155f36 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -370,6 +370,7 @@ cabal-bootstrap() { # See: local default_exposed_pkgs=" Cabal + array base binary bytestring diff --git a/profiles/package.mask b/profiles/package.mask index a138903e36063..2abc8138e0e73 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,19 @@ #--- END OF EXAMPLES --- +# hololeap (2023-11-19) +# Package has been masked for a long time, is useless for ::gentoo, and has no +# reverse dependencies. +# Removal on 2023-12-19. +dev-haskell/doctest-parallel + +# hololeap (2023-11-19) +# Bundled library for GHC, exposed as an ebuild for historical reasons. +# No reverse dependencies, no longer needed in ::gentoo tree. +# See: +# Removal on 2023-12-19. +dev-haskell/terminfo + # Sam James (2023-11-19) # GCC 10 and older no longer receive upstream support or fixes for # bugs. Please switch to a newer GCC version using gcc-config. @@ -490,12 +503,6 @@ x11-drivers/nvidia-drivers:0/390 # Unfixed root privilege escalation, bug #631552 sys-cluster/slurm -# hololeap (2022-08-21) -# doctest-parallel does not currently work with Setup.hs (used internally by -# haskell-cabal.eclass) -# See: -dev-haskell/doctest-parallel - # Joonas Niilola (2022-04-29) # Apparently the "b" in version means "beta". 3.24 is available, we # should update to that. #841437 diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023 index 01993a2e33a77..94acf5c449a92 100644 --- a/profiles/updates/4Q-2023 +++ b/profiles/updates/4Q-2023 @@ -23,3 +23,8 @@ move kde-misc/wacomtablet kde-plasma/wacomtablet move kde-apps/print-manager kde-plasma/print-manager move dev-libs/kuserfeedback kde-frameworks/kuserfeedback move dev-python/pure_eval dev-python/pure-eval +slotmove dev-haskell/extra 2 0 +slotmove dev-haskell/hdbc-postgresql 2 0 +slotmove dev-haskell/hdbc 2 0 +slotmove dev-haskell/parallel 3 0 +slotmove dev-haskell/quickcheck 2 0