commit: 2c8404693fa30d6ede520f40cdd4ea8bdba1b3b0 Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Fri Jul 22 20:28:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 22 23:07:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c840469
dev-haskell/hakyll: add 4.15.1.1, drop 4.14.0.0-r1 Signed-off-by: matoro <matoro <AT> users.noreply.github.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-haskell/hakyll/Manifest | 2 +- ...l-4.14.0.0-r1.ebuild => hakyll-4.15.1.1.ebuild} | 32 ++++++++++------------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest index da24e9ffe3ae..73cfc4c8f7c9 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 similarity index 79% rename from dev-haskell/hakyll/hakyll-4.14.0.0-r1.ebuild rename to dev-haskell/hakyll/hakyll-4.15.1.1.ebuild index a9d1b64fa5f2..af6b01b7830c 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() {
