gentoo resync : 25.08.2020

3 files changed, 13 insertions, 68 deletions

diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index a20b16b0cebd..2195f8eed6ba 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1,5 +1,3 @@
-DIST yesod-1.4.3.tar.gz 9023 BLAKE2B ef7db3731a4f2c828dcba4cb6f5982141897de553ce096460a9514a97ba1ba2074270e25c6519c6ade14a597c50d4bfaf475f16d5308c936cab328285db416c1 SHA512 2964e290307fde99ea0b3ad27af61a5c2d4577fcf24eeb18d7ddd2d7210db8801d4d3a824ae6331e4d79a23155f9943b7b0f705c347bcec4a947fbe7c83b9278
-DIST yesod-1.4.4.tar.gz 9146 BLAKE2B b49d699ac0f5fec33b194f71dba35eb913e6d9b5b50113ccf9602c3bc14adaf7c66d8fb64ef5a1fd268c20196099204d20af75649f965deb2475c07db5279254 SHA512 ff58454e31efa47a50f04905c555a684d2a7415c726f60a206332f96ecb152eb566e285679d97cc1233baae9cc5cd42702365358ec2a55559a8b898540803f7c
-EBUILD yesod-1.4.3.ebuild 1690 BLAKE2B df7f1a09a848b779fc3b2f11647ad6f810e933b0feca0db69e7f49034148188de6be7548c667eab8307e1734755c7a8bdd4de659e78cffb5fb996db75a50c371 SHA512 54c4267749f543ec1afea3c7dacb10b71ffc4466075eb95e112d7de314d11094bce2271e70fd6f1462b4985eeb30c140c5feaaffd37008e359ee06c633940250
-EBUILD yesod-1.4.4.ebuild 1620 BLAKE2B e31f2a4e4545aaffb1c55d0a53075b5966014510315fb7e3928e110d2881a9ffc2d1b7807d81553132829f6410bc8e1919501f346c89ddfd43687603e254a1d5 SHA512 49cd09512176f95aababffbcf151a878632e4c4d4163e827e40354092b1ffc78d48af33a7edcf23d867613a8000cf4ce45c39c575d611eb8c923c518e327b86c
+DIST yesod-1.6.1.0.tar.gz 9794 BLAKE2B b0306995ca93646d4ed1eb58356c706b1a4fb773cbcf3dd7649405484af1f077f7f22c9d1792d9fb34aca11dc357dd7d527bbc5e5d6f60d24baa0b3797f60255 SHA512 712eed39b64f515cb949186ddb950133cc2daccde6d4a9b0115809e5f4726a957b2809ee785b348971c617b3d173bcd40776b065f5bf1d68b79af12905ada77a
+EBUILD yesod-1.6.1.0.ebuild 1365 BLAKE2B d6814d3eab382d8df160a3af8c18ec0f0e338f7952d19eaea4507029027f55a90540858b041768f0efb5c2a362eb60e65ce1f4f2b78758d2881deefc04555f82 SHA512 5201ac2521c8bbb62cdca5d93c358e6868bdd22bc3d7467f1f0f99ad28409dc08ccb7ba3c65a8aa8fcb2a8518694dc058103aeab8a7b881c916938c3b089ff01
 MISC metadata.xml 838 BLAKE2B 229a6fd86e08c1bc3599a352211185621421c313d5facb16d5801e75b665897b9e4ff1ffe61a6712e1b92ab997bb08ddadd4e2058a812c4d769d69cf50a52b57 SHA512 965f516cfca88189b5e2e6f69a7e939c3c21c308604ff7c67b63176a3cd07a4bbc920c366989b01344b2ced3d8a783ba7f6f69bc1ec20288a73635c206c25211
diff --git a/dev-haskell/yesod/yesod-1.4.3.ebuild b/dev-haskell/yesod/yesod-1.4.3.ebuild
deleted file mode 100644
index e1837b61d437..000000000000
--- a/dev-haskell/yesod/yesod-1.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/yesod/yesod-1.4.4.ebuild b/dev-haskell/yesod/yesod-1.6.1.0.ebuild
index 0d8dc22e0d5d..79758008e39e 100644
--- a/dev-haskell/yesod/yesod-1.4.4.ebuild
+++ b/dev-haskell/yesod/yesod-1.6.1.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
+HOMEPAGE="http://www.yesodweb.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -18,16 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.14:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
 	dev-haskell/data-default-class:=[profile?]
 	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	dev-haskell/file-embed:=[profile?]
 	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
 	dev-haskell/shakespeare:=[profile?]
 	dev-haskell/streaming-commons:=[profile?]
 	dev-haskell/text:=[profile?]
@@ -37,11 +32,11 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/wai-logger:=[profile?]
 	>=dev-haskell/warp-1.3:=[profile?]
 	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.0.0.2
 "